diff options
299 files changed, 9764 insertions, 6050 deletions
diff --git a/Android.mk b/Android.mk index 427b88848d46..7c9397fc218c 100644 --- a/Android.mk +++ b/Android.mk @@ -130,6 +130,8 @@ LOCAL_SRC_FILES += \ core/java/android/bluetooth/IBluetoothSap.aidl \ core/java/android/bluetooth/IBluetoothStateChangeCallback.aidl \ core/java/android/bluetooth/IBluetoothHeadsetClient.aidl \ + core/java/android/bluetooth/IBluetoothInputHost.aidl \ + core/java/android/bluetooth/IBluetoothHidDeviceCallback.aidl \ core/java/android/bluetooth/IBluetoothGatt.aidl \ core/java/android/bluetooth/IBluetoothGattCallback.aidl \ core/java/android/bluetooth/IBluetoothGattServerCallback.aidl \ diff --git a/api/current.txt b/api/current.txt index 21961f5029dc..a84bfb5f7893 100644 --- a/api/current.txt +++ b/api/current.txt @@ -38,6 +38,7 @@ package android { field public static final java.lang.String BIND_TELECOM_CONNECTION_SERVICE = "android.permission.BIND_TELECOM_CONNECTION_SERVICE"; field public static final java.lang.String BIND_TEXT_SERVICE = "android.permission.BIND_TEXT_SERVICE"; field public static final java.lang.String BIND_TV_INPUT = "android.permission.BIND_TV_INPUT"; + field public static final java.lang.String BIND_VISUAL_VOICEMAIL_SERVICE = "android.permission.BIND_VISUAL_VOICEMAIL_SERVICE"; field public static final java.lang.String BIND_VOICE_INTERACTION = "android.permission.BIND_VOICE_INTERACTION"; field public static final java.lang.String BIND_VPN_SERVICE = "android.permission.BIND_VPN_SERVICE"; field public static final java.lang.String BIND_VR_LISTENER_SERVICE = "android.permission.BIND_VR_LISTENER_SERVICE"; @@ -6777,6 +6778,7 @@ package android.appwidget { method public void notifyAppWidgetViewDataChanged(int, int); method public void partiallyUpdateAppWidget(int[], android.widget.RemoteViews); method public void partiallyUpdateAppWidget(int, android.widget.RemoteViews); + method public boolean requestPinAppWidget(android.content.ComponentName, android.app.PendingIntent); method public void updateAppWidget(int[], android.widget.RemoteViews); method public void updateAppWidget(int, android.widget.RemoteViews); method public void updateAppWidget(android.content.ComponentName, android.widget.RemoteViews); @@ -9760,11 +9762,13 @@ package android.content.pm { method public boolean accept(android.os.Bundle); method public boolean accept(); method public int describeContents(); + method public android.appwidget.AppWidgetProviderInfo getAppWidgetProviderInfo(); method public int getRequestType(); method public android.content.pm.ShortcutInfo getShortcutInfo(); method public boolean isValid(); method public void writeToParcel(android.os.Parcel, int); field public static final android.os.Parcelable.Creator<android.content.pm.LauncherApps.PinItemRequest> CREATOR; + field public static final int REQUEST_TYPE_APPWIDGET = 2; // 0x2 field public static final int REQUEST_TYPE_SHORTCUT = 1; // 0x1 } @@ -19947,6 +19951,7 @@ package android.media { field public static final int USAGE_ASSISTANCE_ACCESSIBILITY = 11; // 0xb field public static final int USAGE_ASSISTANCE_NAVIGATION_GUIDANCE = 12; // 0xc field public static final int USAGE_ASSISTANCE_SONIFICATION = 13; // 0xd + field public static final int USAGE_ASSISTANT = 16; // 0x10 field public static final int USAGE_GAME = 14; // 0xe field public static final int USAGE_MEDIA = 1; // 0x1 field public static final int USAGE_NOTIFICATION = 5; // 0x5 @@ -38153,6 +38158,54 @@ package android.telephony { method public void onReceiveUssdResponseFailed(java.lang.String, int); } + public abstract class VisualVoicemailService extends android.app.Service { + ctor public VisualVoicemailService(); + method public android.os.IBinder onBind(android.content.Intent); + method public abstract void onCellServiceConnected(android.telephony.VisualVoicemailService.VisualVoicemailTask, android.telecom.PhoneAccountHandle); + method public abstract void onSimRemoved(android.telephony.VisualVoicemailService.VisualVoicemailTask, android.telecom.PhoneAccountHandle); + method public abstract void onSmsReceived(android.telephony.VisualVoicemailService.VisualVoicemailTask, android.telephony.VisualVoicemailSms); + method public abstract void onStopped(android.telephony.VisualVoicemailService.VisualVoicemailTask); + method public static final void sendVisualVoicemailSms(android.content.Context, android.telecom.PhoneAccountHandle, java.lang.String, short, java.lang.String, android.app.PendingIntent); + method public static final void setSmsFilterSettings(android.content.Context, android.telecom.PhoneAccountHandle, android.telephony.VisualVoicemailSmsFilterSettings); + field public static final java.lang.String SERVICE_INTERFACE = "android.telephony.VisualVoicemailService"; + } + + public static class VisualVoicemailService.VisualVoicemailTask { + method public final void finish(); + } + + public final class VisualVoicemailSms implements android.os.Parcelable { + method public int describeContents(); + method public android.os.Bundle getFields(); + method public java.lang.String getMessageBody(); + method public android.telecom.PhoneAccountHandle getPhoneAccountHandle(); + method public java.lang.String getPrefix(); + method public void writeToParcel(android.os.Parcel, int); + field public static final android.os.Parcelable.Creator<android.telephony.VisualVoicemailSms> CREATOR; + } + + public final class VisualVoicemailSmsFilterSettings implements android.os.Parcelable { + method public int describeContents(); + method public void writeToParcel(android.os.Parcel, int); + field public static final android.os.Parcelable.Creator<android.telephony.VisualVoicemailSmsFilterSettings> CREATOR; + field public static final java.lang.String DEFAULT_CLIENT_PREFIX = "//VVM"; + field public static final int DEFAULT_DESTINATION_PORT = -1; // 0xffffffff + field public static final java.util.List<java.lang.String> DEFAULT_ORIGINATING_NUMBERS; + field public static final int DESTINATION_PORT_ANY = -1; // 0xffffffff + field public static final int DESTINATION_PORT_DATA_SMS = -2; // 0xfffffffe + field public final java.lang.String clientPrefix; + field public final int destinationPort; + field public final java.util.List<java.lang.String> originatingNumbers; + } + + public static class VisualVoicemailSmsFilterSettings.Builder { + ctor public VisualVoicemailSmsFilterSettings.Builder(); + method public android.telephony.VisualVoicemailSmsFilterSettings build(); + method public android.telephony.VisualVoicemailSmsFilterSettings.Builder setClientPrefix(java.lang.String); + method public android.telephony.VisualVoicemailSmsFilterSettings.Builder setDestinationPort(int); + method public android.telephony.VisualVoicemailSmsFilterSettings.Builder setOriginatingNumbers(java.util.List<java.lang.String>); + } + } package android.telephony.cdma { @@ -46086,6 +46139,11 @@ package android.webkit { method public abstract android.view.View getFullScreenView(int, android.content.Context); } + public abstract class RenderProcessGoneDetail { + ctor public RenderProcessGoneDetail(); + method public abstract boolean didCrash(); + } + public class ServiceWorkerClient { ctor public ServiceWorkerClient(); method public android.webkit.WebResourceResponse shouldInterceptRequest(android.webkit.WebResourceRequest); @@ -46610,6 +46668,7 @@ package android.webkit { method public void onReceivedHttpError(android.webkit.WebView, android.webkit.WebResourceRequest, android.webkit.WebResourceResponse); method public void onReceivedLoginRequest(android.webkit.WebView, java.lang.String, java.lang.String, java.lang.String); method public void onReceivedSslError(android.webkit.WebView, android.webkit.SslErrorHandler, android.net.http.SslError); + method public boolean onRenderProcessGone(android.webkit.WebView, android.webkit.RenderProcessGoneDetail); method public void onScaleChanged(android.webkit.WebView, float, float); method public deprecated void onTooManyRedirects(android.webkit.WebView, android.os.Message, android.os.Message); method public void onUnhandledKeyEvent(android.webkit.WebView, android.view.KeyEvent); diff --git a/api/removed.txt b/api/removed.txt index 10e6eb5e60d8..35b485980276 100644 --- a/api/removed.txt +++ b/api/removed.txt @@ -99,67 +99,6 @@ package android.graphics { } -package android.location { - - public final class GnssMeasurement implements android.os.Parcelable { - field public static final int MULTIPATH_INDICATOR_NOT_USED = 2; // 0x2 - } - - public final class GnssMeasurementsEvent implements android.os.Parcelable { - field public static final int STATUS_GNSS_LOCATION_DISABLED = 2; // 0x2 - field public static final int STATUS_NOT_SUPPORTED = 0; // 0x0 - field public static final int STATUS_READY = 1; // 0x1 - } - - public final class GnssNavigationMessageEvent implements android.os.Parcelable { - ctor public GnssNavigationMessageEvent(android.location.GnssNavigationMessage); - method public int describeContents(); - method public android.location.GnssNavigationMessage getNavigationMessage(); - method public void writeToParcel(android.os.Parcel, int); - field public static final android.os.Parcelable.Creator<android.location.GnssNavigationMessageEvent> CREATOR; - field public static final int STATUS_GNSS_LOCATION_DISABLED = 2; // 0x2 - field public static final int STATUS_NOT_SUPPORTED = 0; // 0x0 - field public static final int STATUS_READY = 1; // 0x1 - } - - public static abstract class GnssNavigationMessageEvent.Callback { - ctor public GnssNavigationMessageEvent.Callback(); - method public void onGnssNavigationMessageReceived(android.location.GnssNavigationMessageEvent); - method public void onStatusChanged(int); - } - - public abstract interface GnssNmeaListener { - method public abstract void onNmeaReceived(long, java.lang.String); - } - - public final class GnssStatus { - method public int getNumSatellites(); - method public boolean hasAlmanac(int); - method public boolean hasEphemeris(int); - } - - public abstract class GnssStatusCallback { - ctor public GnssStatusCallback(); - method public void onFirstFix(int); - method public void onSatelliteStatusChanged(android.location.GnssStatus); - method public void onStarted(); - method public void onStopped(); - } - - public class LocationManager { - method public boolean addNmeaListener(android.location.GnssNmeaListener); - method public boolean addNmeaListener(android.location.GnssNmeaListener, android.os.Handler); - method public boolean registerGnssNavigationMessageCallback(android.location.GnssNavigationMessageEvent.Callback); - method public boolean registerGnssNavigationMessageCallback(android.location.GnssNavigationMessageEvent.Callback, android.os.Handler); - method public boolean registerGnssStatusCallback(android.location.GnssStatusCallback); - method public boolean registerGnssStatusCallback(android.location.GnssStatusCallback, android.os.Handler); - method public void removeNmeaListener(android.location.GnssNmeaListener); - method public void unregisterGnssNavigationMessageCallback(android.location.GnssNavigationMessageEvent.Callback); - method public void unregisterGnssStatusCallback(android.location.GnssStatusCallback); - } - -} - package android.media { public final class AudioFormat implements android.os.Parcelable { diff --git a/api/system-current.txt b/api/system-current.txt index 0a75c85c0988..aeb17fbfe530 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -41,6 +41,7 @@ package android { field public static final java.lang.String BIND_INPUT_METHOD = "android.permission.BIND_INPUT_METHOD"; field public static final java.lang.String BIND_KEYGUARD_APPWIDGET = "android.permission.BIND_KEYGUARD_APPWIDGET"; field public static final java.lang.String BIND_MIDI_DEVICE_SERVICE = "android.permission.BIND_MIDI_DEVICE_SERVICE"; + field public static final java.lang.String BIND_NETWORK_RECOMMENDATION_SERVICE = "android.permission.BIND_NETWORK_RECOMMENDATION_SERVICE"; field public static final java.lang.String BIND_NFC_SERVICE = "android.permission.BIND_NFC_SERVICE"; field public static final java.lang.String BIND_NOTIFICATION_ASSISTANT_SERVICE = "android.permission.BIND_NOTIFICATION_ASSISTANT_SERVICE"; field public static final java.lang.String BIND_NOTIFICATION_LISTENER_SERVICE = "android.permission.BIND_NOTIFICATION_LISTENER_SERVICE"; @@ -55,6 +56,7 @@ package android { field public static final java.lang.String BIND_TRUST_AGENT = "android.permission.BIND_TRUST_AGENT"; field public static final java.lang.String BIND_TV_INPUT = "android.permission.BIND_TV_INPUT"; field public static final java.lang.String BIND_TV_REMOTE_SERVICE = "android.permission.BIND_TV_REMOTE_SERVICE"; + field public static final java.lang.String BIND_VISUAL_VOICEMAIL_SERVICE = "android.permission.BIND_VISUAL_VOICEMAIL_SERVICE"; field public static final java.lang.String BIND_VOICE_INTERACTION = "android.permission.BIND_VOICE_INTERACTION"; field public static final java.lang.String BIND_VPN_SERVICE = "android.permission.BIND_VPN_SERVICE"; field public static final java.lang.String BIND_VR_LISTENER_SERVICE = "android.permission.BIND_VR_LISTENER_SERVICE"; @@ -7089,6 +7091,7 @@ package android.appwidget { method public void notifyAppWidgetViewDataChanged(int, int); method public void partiallyUpdateAppWidget(int[], android.widget.RemoteViews); method public void partiallyUpdateAppWidget(int, android.widget.RemoteViews); + method public boolean requestPinAppWidget(android.content.ComponentName, android.app.PendingIntent); method public void updateAppWidget(int[], android.widget.RemoteViews); method public void updateAppWidget(int, android.widget.RemoteViews); method public void updateAppWidget(android.content.ComponentName, android.widget.RemoteViews); @@ -10169,11 +10172,13 @@ package android.content.pm { method public boolean accept(android.os.Bundle); method public boolean accept(); method public int describeContents(); + method public android.appwidget.AppWidgetProviderInfo getAppWidgetProviderInfo(); method public int getRequestType(); method public android.content.pm.ShortcutInfo getShortcutInfo(); method public boolean isValid(); method public void writeToParcel(android.os.Parcel, int); field public static final android.os.Parcelable.Creator<android.content.pm.LauncherApps.PinItemRequest> CREATOR; + field public static final int REQUEST_TYPE_APPWIDGET = 2; // 0x2 field public static final int REQUEST_TYPE_SHORTCUT = 1; // 0x1 } @@ -21440,6 +21445,7 @@ package android.media { field public static final int USAGE_ASSISTANCE_ACCESSIBILITY = 11; // 0xb field public static final int USAGE_ASSISTANCE_NAVIGATION_GUIDANCE = 12; // 0xc field public static final int USAGE_ASSISTANCE_SONIFICATION = 13; // 0xd + field public static final int USAGE_ASSISTANT = 16; // 0x10 field public static final int USAGE_GAME = 14; // 0xe field public static final int USAGE_MEDIA = 1; // 0x1 field public static final int USAGE_NOTIFICATION = 5; // 0x5 @@ -21789,7 +21795,8 @@ package android.media { field public static final int PLAYER_TYPE_JAM_AUDIOTRACK = 1; // 0x1 field public static final int PLAYER_TYPE_JAM_MEDIAPLAYER = 2; // 0x2 field public static final int PLAYER_TYPE_JAM_SOUNDPOOL = 3; // 0x3 - field public static final int PLAYER_TYPE_SLES_AUDIOPLAYER = 11; // 0xb + field public static final int PLAYER_TYPE_SLES_AUDIOPLAYER_BUFFERQUEUE = 11; // 0xb + field public static final int PLAYER_TYPE_SLES_AUDIOPLAYER_URI_FD = 12; // 0xc field public static final int PLAYER_TYPE_UNKNOWN = -1; // 0xffffffff } @@ -26171,6 +26178,14 @@ package android.net { field public static final android.os.Parcelable.Creator<android.net.RecommendationRequest> CREATOR; } + public static final class RecommendationRequest.Builder { + ctor public RecommendationRequest.Builder(); + method public android.net.RecommendationRequest build(); + method public android.net.RecommendationRequest.Builder setCurrentRecommendedWifiConfig(android.net.wifi.WifiConfiguration); + method public android.net.RecommendationRequest.Builder setNetworkCapabilities(android.net.NetworkCapabilities); + method public android.net.RecommendationRequest.Builder setScanResults(android.net.wifi.ScanResult[]); + } + public final class RecommendationResult implements android.os.Parcelable { method public static android.net.RecommendationResult createConnectRecommendation(android.net.wifi.WifiConfiguration); method public static android.net.RecommendationResult createDoNotConnectRecommendation(); @@ -26235,10 +26250,16 @@ package android.net { ctor public ScoredNetwork(android.net.NetworkKey, android.net.RssiCurve); ctor public ScoredNetwork(android.net.NetworkKey, android.net.RssiCurve, boolean); ctor public ScoredNetwork(android.net.NetworkKey, android.net.RssiCurve, boolean, android.os.Bundle); + method public int calculateBadge(int); method public int describeContents(); method public void writeToParcel(android.os.Parcel, int); + field public static final java.lang.String ATTRIBUTES_KEY_BADGING_CURVE = "android.net.attributes.key.BADGING_CURVE"; field public static final java.lang.String ATTRIBUTES_KEY_HAS_CAPTIVE_PORTAL = "android.net.attributes.key.HAS_CAPTIVE_PORTAL"; field public static final java.lang.String ATTRIBUTES_KEY_RANKING_SCORE_OFFSET = "android.net.attributes.key.RANKING_SCORE_OFFSET"; + field public static final int BADGING_4K = 30; // 0x1e + field public static final int BADGING_HD = 20; // 0x14 + field public static final int BADGING_NONE = 0; // 0x0 + field public static final int BADGING_SD = 10; // 0xa field public static final android.os.Parcelable.Creator<android.net.ScoredNetwork> CREATOR; field public final android.os.Bundle attributes; field public final boolean meteredHint; @@ -26246,6 +26267,9 @@ package android.net { field public final android.net.RssiCurve rssiCurve; } + public static abstract class ScoredNetwork.Badging implements java.lang.annotation.Annotation { + } + public class TrafficStats { ctor public TrafficStats(); method public static void clearThreadStatsTag(); @@ -41330,6 +41354,54 @@ package android.telephony { method public void onReceiveUssdResponseFailed(java.lang.String, int); } + public abstract class VisualVoicemailService extends android.app.Service { + ctor public VisualVoicemailService(); + method public android.os.IBinder onBind(android.content.Intent); + method public abstract void onCellServiceConnected(android.telephony.VisualVoicemailService.VisualVoicemailTask, android.telecom.PhoneAccountHandle); + method public abstract void onSimRemoved(android.telephony.VisualVoicemailService.VisualVoicemailTask, android.telecom.PhoneAccountHandle); + method public abstract void onSmsReceived(android.telephony.VisualVoicemailService.VisualVoicemailTask, android.telephony.VisualVoicemailSms); + method public abstract void onStopped(android.telephony.VisualVoicemailService.VisualVoicemailTask); + method public static final void sendVisualVoicemailSms(android.content.Context, android.telecom.PhoneAccountHandle, java.lang.String, short, java.lang.String, android.app.PendingIntent); + method public static final void setSmsFilterSettings(android.content.Context, android.telecom.PhoneAccountHandle, android.telephony.VisualVoicemailSmsFilterSettings); + field public static final java.lang.String SERVICE_INTERFACE = "android.telephony.VisualVoicemailService"; + } + + public static class VisualVoicemailService.VisualVoicemailTask { + method public final void finish(); + } + + public final class VisualVoicemailSms implements android.os.Parcelable { + method public int describeContents(); + method public android.os.Bundle getFields(); + method public java.lang.String getMessageBody(); + method public android.telecom.PhoneAccountHandle getPhoneAccountHandle(); + method public java.lang.String getPrefix(); + method public void writeToParcel(android.os.Parcel, int); + field public static final android.os.Parcelable.Creator<android.telephony.VisualVoicemailSms> CREATOR; + } + + public final class VisualVoicemailSmsFilterSettings implements android.os.Parcelable { + method public int describeContents(); + method public void writeToParcel(android.os.Parcel, int); + field public static final android.os.Parcelable.Creator<android.telephony.VisualVoicemailSmsFilterSettings> CREATOR; + field public static final java.lang.String DEFAULT_CLIENT_PREFIX = "//VVM"; + field public static final int DEFAULT_DESTINATION_PORT = -1; // 0xffffffff + field public static final java.util.List<java.lang.String> DEFAULT_ORIGINATING_NUMBERS; + field public static final int DESTINATION_PORT_ANY = -1; // 0xffffffff + field public static final int DESTINATION_PORT_DATA_SMS = -2; // 0xfffffffe + field public final java.lang.String clientPrefix; + field public final int destinationPort; + field public final java.util.List<java.lang.String> originatingNumbers; + } + + public static class VisualVoicemailSmsFilterSettings.Builder { + ctor public VisualVoicemailSmsFilterSettings.Builder(); + method public android.telephony.VisualVoicemailSmsFilterSettings build(); + method public android.telephony.VisualVoicemailSmsFilterSettings.Builder setClientPrefix(java.lang.String); + method public android.telephony.VisualVoicemailSmsFilterSettings.Builder setDestinationPort(int); + method public android.telephony.VisualVoicemailSmsFilterSettings.Builder setOriginatingNumbers(java.util.List<java.lang.String>); + } + } package android.telephony.cdma { @@ -49333,6 +49405,11 @@ package android.webkit { method public abstract android.view.View getFullScreenView(int, android.content.Context); } + public abstract class RenderProcessGoneDetail { + ctor public RenderProcessGoneDetail(); + method public abstract boolean didCrash(); + } + public class ServiceWorkerClient { ctor public ServiceWorkerClient(); method public android.webkit.WebResourceResponse shouldInterceptRequest(android.webkit.WebResourceRequest); @@ -49928,6 +50005,7 @@ package android.webkit { method public void onReceivedHttpError(android.webkit.WebView, android.webkit.WebResourceRequest, android.webkit.WebResourceResponse); method public void onReceivedLoginRequest(android.webkit.WebView, java.lang.String, java.lang.String, java.lang.String); method public void onReceivedSslError(android.webkit.WebView, android.webkit.SslErrorHandler, android.net.http.SslError); + method public boolean onRenderProcessGone(android.webkit.WebView, android.webkit.RenderProcessGoneDetail); method public void onScaleChanged(android.webkit.WebView, float, float); method public deprecated void onTooManyRedirects(android.webkit.WebView, android.os.Message, android.os.Message); method public void onUnhandledKeyEvent(android.webkit.WebView, android.view.KeyEvent); diff --git a/api/system-removed.txt b/api/system-removed.txt index 0919b8f4d275..8016f58ccedb 100644 --- a/api/system-removed.txt +++ b/api/system-removed.txt @@ -97,67 +97,6 @@ package android.graphics { } -package android.location { - - public final class GnssMeasurement implements android.os.Parcelable { - field public static final int MULTIPATH_INDICATOR_NOT_USED = 2; // 0x2 - } - - public final class GnssMeasurementsEvent implements android.os.Parcelable { - field public static final int STATUS_GNSS_LOCATION_DISABLED = 2; // 0x2 - field public static final int STATUS_NOT_SUPPORTED = 0; // 0x0 - field public static final int STATUS_READY = 1; // 0x1 - } - - public final class GnssNavigationMessageEvent implements android.os.Parcelable { - ctor public GnssNavigationMessageEvent(android.location.GnssNavigationMessage); - method public int describeContents(); - method public android.location.GnssNavigationMessage getNavigationMessage(); - method public void writeToParcel(android.os.Parcel, int); - field public static final android.os.Parcelable.Creator<android.location.GnssNavigationMessageEvent> CREATOR; - field public static final int STATUS_GNSS_LOCATION_DISABLED = 2; // 0x2 - field public static final int STATUS_NOT_SUPPORTED = 0; // 0x0 - field public static final int STATUS_READY = 1; // 0x1 - } - - public static abstract class GnssNavigationMessageEvent.Callback { - ctor public GnssNavigationMessageEvent.Callback(); - method public void onGnssNavigationMessageReceived(android.location.GnssNavigationMessageEvent); - method public void onStatusChanged(int); - } - - public abstract interface GnssNmeaListener { - method public abstract void onNmeaReceived(long, java.lang.String); - } - - public final class GnssStatus { - method public int getNumSatellites(); - method public boolean hasAlmanac(int); - method public boolean hasEphemeris(int); - } - - public abstract class GnssStatusCallback { - ctor public GnssStatusCallback(); - method public void onFirstFix(int); - method public void onSatelliteStatusChanged(android.location.GnssStatus); - method public void onStarted(); - method public void onStopped(); - } - - public class LocationManager { - method public boolean addNmeaListener(android.location.GnssNmeaListener); - method public boolean addNmeaListener(android.location.GnssNmeaListener, android.os.Handler); - method public boolean registerGnssNavigationMessageCallback(android.location.GnssNavigationMessageEvent.Callback); - method public boolean registerGnssNavigationMessageCallback(android.location.GnssNavigationMessageEvent.Callback, android.os.Handler); - method public boolean registerGnssStatusCallback(android.location.GnssStatusCallback); - method public boolean registerGnssStatusCallback(android.location.GnssStatusCallback, android.os.Handler); - method public void removeNmeaListener(android.location.GnssNmeaListener); - method public void unregisterGnssNavigationMessageCallback(android.location.GnssNavigationMessageEvent.Callback); - method public void unregisterGnssStatusCallback(android.location.GnssStatusCallback); - } - -} - package android.media { public final class AudioFormat implements android.os.Parcelable { diff --git a/api/test-current.txt b/api/test-current.txt index cfd70936fbc4..ff70fee1d6e8 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -38,6 +38,7 @@ package android { field public static final java.lang.String BIND_TELECOM_CONNECTION_SERVICE = "android.permission.BIND_TELECOM_CONNECTION_SERVICE"; field public static final java.lang.String BIND_TEXT_SERVICE = "android.permission.BIND_TEXT_SERVICE"; field public static final java.lang.String BIND_TV_INPUT = "android.permission.BIND_TV_INPUT"; + field public static final java.lang.String BIND_VISUAL_VOICEMAIL_SERVICE = "android.permission.BIND_VISUAL_VOICEMAIL_SERVICE"; field public static final java.lang.String BIND_VOICE_INTERACTION = "android.permission.BIND_VOICE_INTERACTION"; field public static final java.lang.String BIND_VPN_SERVICE = "android.permission.BIND_VPN_SERVICE"; field public static final java.lang.String BIND_VR_LISTENER_SERVICE = "android.permission.BIND_VR_LISTENER_SERVICE"; @@ -6799,6 +6800,7 @@ package android.appwidget { method public void notifyAppWidgetViewDataChanged(int, int); method public void partiallyUpdateAppWidget(int[], android.widget.RemoteViews); method public void partiallyUpdateAppWidget(int, android.widget.RemoteViews); + method public boolean requestPinAppWidget(android.content.ComponentName, android.app.PendingIntent); method public void updateAppWidget(int[], android.widget.RemoteViews); method public void updateAppWidget(int, android.widget.RemoteViews); method public void updateAppWidget(android.content.ComponentName, android.widget.RemoteViews); @@ -9788,11 +9790,13 @@ package android.content.pm { method public boolean accept(android.os.Bundle); method public boolean accept(); method public int describeContents(); + method public android.appwidget.AppWidgetProviderInfo getAppWidgetProviderInfo(); method public int getRequestType(); method public android.content.pm.ShortcutInfo getShortcutInfo(); method public boolean isValid(); method public void writeToParcel(android.os.Parcel, int); field public static final android.os.Parcelable.Creator<android.content.pm.LauncherApps.PinItemRequest> CREATOR; + field public static final int REQUEST_TYPE_APPWIDGET = 2; // 0x2 field public static final int REQUEST_TYPE_SHORTCUT = 1; // 0x1 } @@ -20034,6 +20038,7 @@ package android.media { field public static final int USAGE_ASSISTANCE_ACCESSIBILITY = 11; // 0xb field public static final int USAGE_ASSISTANCE_NAVIGATION_GUIDANCE = 12; // 0xc field public static final int USAGE_ASSISTANCE_SONIFICATION = 13; // 0xd + field public static final int USAGE_ASSISTANT = 16; // 0x10 field public static final int USAGE_GAME = 14; // 0xe field public static final int USAGE_MEDIA = 1; // 0x1 field public static final int USAGE_NOTIFICATION = 5; // 0x5 @@ -38271,6 +38276,54 @@ package android.telephony { method public void onReceiveUssdResponseFailed(java.lang.String, int); } + public abstract class VisualVoicemailService extends android.app.Service { + ctor public VisualVoicemailService(); + method public android.os.IBinder onBind(android.content.Intent); + method public abstract void onCellServiceConnected(android.telephony.VisualVoicemailService.VisualVoicemailTask, android.telecom.PhoneAccountHandle); + method public abstract void onSimRemoved(android.telephony.VisualVoicemailService.VisualVoicemailTask, android.telecom.PhoneAccountHandle); + method public abstract void onSmsReceived(android.telephony.VisualVoicemailService.VisualVoicemailTask, android.telephony.VisualVoicemailSms); + method public abstract void onStopped(android.telephony.VisualVoicemailService.VisualVoicemailTask); + method public static final void sendVisualVoicemailSms(android.content.Context, android.telecom.PhoneAccountHandle, java.lang.String, short, java.lang.String, android.app.PendingIntent); + method public static final void setSmsFilterSettings(android.content.Context, android.telecom.PhoneAccountHandle, android.telephony.VisualVoicemailSmsFilterSettings); + field public static final java.lang.String SERVICE_INTERFACE = "android.telephony.VisualVoicemailService"; + } + + public static class VisualVoicemailService.VisualVoicemailTask { + method public final void finish(); + } + + public final class VisualVoicemailSms implements android.os.Parcelable { + method public int describeContents(); + method public android.os.Bundle getFields(); + method public java.lang.String getMessageBody(); + method public android.telecom.PhoneAccountHandle getPhoneAccountHandle(); + method public java.lang.String getPrefix(); + method public void writeToParcel(android.os.Parcel, int); + field public static final android.os.Parcelable.Creator<android.telephony.VisualVoicemailSms> CREATOR; + } + + public final class VisualVoicemailSmsFilterSettings implements android.os.Parcelable { + method public int describeContents(); + method public void writeToParcel(android.os.Parcel, int); + field public static final android.os.Parcelable.Creator<android.telephony.VisualVoicemailSmsFilterSettings> CREATOR; + field public static final java.lang.String DEFAULT_CLIENT_PREFIX = "//VVM"; + field public static final int DEFAULT_DESTINATION_PORT = -1; // 0xffffffff + field public static final java.util.List<java.lang.String> DEFAULT_ORIGINATING_NUMBERS; + field public static final int DESTINATION_PORT_ANY = -1; // 0xffffffff + field public static final int DESTINATION_PORT_DATA_SMS = -2; // 0xfffffffe + field public final java.lang.String clientPrefix; + field public final int destinationPort; + field public final java.util.List<java.lang.String> originatingNumbers; + } + + public static class VisualVoicemailSmsFilterSettings.Builder { + ctor public VisualVoicemailSmsFilterSettings.Builder(); + method public android.telephony.VisualVoicemailSmsFilterSettings build(); + method public android.telephony.VisualVoicemailSmsFilterSettings.Builder setClientPrefix(java.lang.String); + method public android.telephony.VisualVoicemailSmsFilterSettings.Builder setDestinationPort(int); + method public android.telephony.VisualVoicemailSmsFilterSettings.Builder setOriginatingNumbers(java.util.List<java.lang.String>); + } + } package android.telephony.cdma { @@ -46382,6 +46435,11 @@ package android.webkit { method public abstract android.view.View getFullScreenView(int, android.content.Context); } + public abstract class RenderProcessGoneDetail { + ctor public RenderProcessGoneDetail(); + method public abstract boolean didCrash(); + } + public class ServiceWorkerClient { ctor public ServiceWorkerClient(); method public android.webkit.WebResourceResponse shouldInterceptRequest(android.webkit.WebResourceRequest); @@ -46906,6 +46964,7 @@ package android.webkit { method public void onReceivedHttpError(android.webkit.WebView, android.webkit.WebResourceRequest, android.webkit.WebResourceResponse); method public void onReceivedLoginRequest(android.webkit.WebView, java.lang.String, java.lang.String, java.lang.String); method public void onReceivedSslError(android.webkit.WebView, android.webkit.SslErrorHandler, android.net.http.SslError); + method public boolean onRenderProcessGone(android.webkit.WebView, android.webkit.RenderProcessGoneDetail); method public void onScaleChanged(android.webkit.WebView, float, float); method public deprecated void onTooManyRedirects(android.webkit.WebView, android.os.Message, android.os.Message); method public void onUnhandledKeyEvent(android.webkit.WebView, android.view.KeyEvent); diff --git a/api/test-removed.txt b/api/test-removed.txt index 10e6eb5e60d8..35b485980276 100644 --- a/api/test-removed.txt +++ b/api/test-removed.txt @@ -99,67 +99,6 @@ package android.graphics { } -package android.location { - - public final class GnssMeasurement implements android.os.Parcelable { - field public static final int MULTIPATH_INDICATOR_NOT_USED = 2; // 0x2 - } - - public final class GnssMeasurementsEvent implements android.os.Parcelable { - field public static final int STATUS_GNSS_LOCATION_DISABLED = 2; // 0x2 - field public static final int STATUS_NOT_SUPPORTED = 0; // 0x0 - field public static final int STATUS_READY = 1; // 0x1 - } - - public final class GnssNavigationMessageEvent implements android.os.Parcelable { - ctor public GnssNavigationMessageEvent(android.location.GnssNavigationMessage); - method public int describeContents(); - method public android.location.GnssNavigationMessage getNavigationMessage(); - method public void writeToParcel(android.os.Parcel, int); - field public static final android.os.Parcelable.Creator<android.location.GnssNavigationMessageEvent> CREATOR; - field public static final int STATUS_GNSS_LOCATION_DISABLED = 2; // 0x2 - field public static final int STATUS_NOT_SUPPORTED = 0; // 0x0 - field public static final int STATUS_READY = 1; // 0x1 - } - - public static abstract class GnssNavigationMessageEvent.Callback { - ctor public GnssNavigationMessageEvent.Callback(); - method public void onGnssNavigationMessageReceived(android.location.GnssNavigationMessageEvent); - method public void onStatusChanged(int); - } - - public abstract interface GnssNmeaListener { - method public abstract void onNmeaReceived(long, java.lang.String); - } - - public final class GnssStatus { - method public int getNumSatellites(); - method public boolean hasAlmanac(int); - method public boolean hasEphemeris(int); - } - - public abstract class GnssStatusCallback { - ctor public GnssStatusCallback(); - method public void onFirstFix(int); - method public void onSatelliteStatusChanged(android.location.GnssStatus); - method public void onStarted(); - method public void onStopped(); - } - - public class LocationManager { - method public boolean addNmeaListener(android.location.GnssNmeaListener); - method public boolean addNmeaListener(android.location.GnssNmeaListener, android.os.Handler); - method public boolean registerGnssNavigationMessageCallback(android.location.GnssNavigationMessageEvent.Callback); - method public boolean registerGnssNavigationMessageCallback(android.location.GnssNavigationMessageEvent.Callback, android.os.Handler); - method public boolean registerGnssStatusCallback(android.location.GnssStatusCallback); - method public boolean registerGnssStatusCallback(android.location.GnssStatusCallback, android.os.Handler); - method public void removeNmeaListener(android.location.GnssNmeaListener); - method public void unregisterGnssNavigationMessageCallback(android.location.GnssNavigationMessageEvent.Callback); - method public void unregisterGnssStatusCallback(android.location.GnssStatusCallback); - } - -} - package android.media { public final class AudioFormat implements android.os.Parcelable { diff --git a/compiled-classes-phone b/compiled-classes-phone index f09bad93132e..7239a7f664c8 100644 --- a/compiled-classes-phone +++ b/compiled-classes-phone @@ -632,6 +632,7 @@ android.bluetooth.BluetoothAdapter$LeScanCallback android.bluetooth.BluetoothAudioConfig android.bluetooth.BluetoothClass android.bluetooth.BluetoothClass$1 +android.bluetooth.BluetoothCodecConfig android.bluetooth.BluetoothDevice android.bluetooth.BluetoothDevice$1 android.bluetooth.BluetoothDevice$2 diff --git a/core/java/android/accessibilityservice/AccessibilityService.java b/core/java/android/accessibilityservice/AccessibilityService.java index b311c218de30..3e5cc54c9fe7 100644 --- a/core/java/android/accessibilityservice/AccessibilityService.java +++ b/core/java/android/accessibilityservice/AccessibilityService.java @@ -1531,8 +1531,9 @@ public abstract class AccessibilityService extends Service { mCaller.sendMessage(message); } - public void onAccessibilityEvent(AccessibilityEvent event) { - Message message = mCaller.obtainMessageO(DO_ON_ACCESSIBILITY_EVENT, event); + public void onAccessibilityEvent(AccessibilityEvent event, boolean serviceWantsEvent) { + Message message = mCaller.obtainMessageBO( + DO_ON_ACCESSIBILITY_EVENT, serviceWantsEvent, event); mCaller.sendMessage(message); } @@ -1581,9 +1582,14 @@ public abstract class AccessibilityService extends Service { switch (message.what) { case DO_ON_ACCESSIBILITY_EVENT: { AccessibilityEvent event = (AccessibilityEvent) message.obj; + boolean serviceWantsEvent = message.arg1 != 0; if (event != null) { + // Send the event to AccessibilityCache via AccessibilityInteractionClient AccessibilityInteractionClient.getInstance().onAccessibilityEvent(event); - mCallback.onAccessibilityEvent(event); + if (serviceWantsEvent) { + // Send the event to AccessibilityService + mCallback.onAccessibilityEvent(event); + } // Make sure the event is recycled. try { event.recycle(); diff --git a/core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl b/core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl index ef05d6f524c7..da16a65558a7 100644 --- a/core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl +++ b/core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl @@ -31,7 +31,7 @@ import android.view.KeyEvent; void init(in IAccessibilityServiceConnection connection, int connectionId, IBinder windowToken); - void onAccessibilityEvent(in AccessibilityEvent event); + void onAccessibilityEvent(in AccessibilityEvent event, in boolean serviceWantsEvent); void onInterrupt(); diff --git a/core/java/android/app/ContextImpl.java b/core/java/android/app/ContextImpl.java index 5f706dcf8fb1..d08bee507b77 100644 --- a/core/java/android/app/ContextImpl.java +++ b/core/java/android/app/ContextImpl.java @@ -509,10 +509,23 @@ class ContextImpl extends Context { * Common-path handling of app data dir creation */ private static File ensurePrivateDirExists(File file) { + return ensurePrivateDirExists(file, 0771, -1); + } + + private static File ensurePrivateCacheDirExists(File file) { + final int gid = UserHandle.getCacheAppGid(Process.myUid()); + return ensurePrivateDirExists(file, 02771, gid); + } + + private static File ensurePrivateDirExists(File file, int mode, int gid) { if (!file.exists()) { + final String path = file.getAbsolutePath(); try { - Os.mkdir(file.getAbsolutePath(), 0771); - Os.chmod(file.getAbsolutePath(), 0771); + Os.mkdir(path, mode); + Os.chmod(path, mode); + if (gid != -1) { + Os.chown(path, -1, gid); + } } catch (ErrnoException e) { if (e.errno == OsConstants.EEXIST) { // We must have raced with someone; that's okay @@ -581,7 +594,7 @@ class ContextImpl extends Context { if (mCacheDir == null) { mCacheDir = new File(getDataDir(), "cache"); } - return ensurePrivateDirExists(mCacheDir); + return ensurePrivateCacheDirExists(mCacheDir); } } @@ -591,7 +604,7 @@ class ContextImpl extends Context { if (mCodeCacheDir == null) { mCodeCacheDir = new File(getDataDir(), "code_cache"); } - return ensurePrivateDirExists(mCodeCacheDir); + return ensurePrivateCacheDirExists(mCodeCacheDir); } } @@ -1470,6 +1483,12 @@ class ContextImpl extends Context { return mMainThread.getApplicationThread(); } + /** @hide */ + @Override + public Handler getMainThreadHandler() { + return mMainThread.getHandler(); + } + private boolean bindServiceCommon(Intent service, ServiceConnection conn, int flags, Handler handler, UserHandle user) { // Keep this in sync with DevicePolicyManager.bindDeviceAdminServiceAsUser. diff --git a/core/java/android/app/IActivityManager.aidl b/core/java/android/app/IActivityManager.aidl index fcc6e3d1e913..fd139f748fc6 100644 --- a/core/java/android/app/IActivityManager.aidl +++ b/core/java/android/app/IActivityManager.aidl @@ -319,7 +319,12 @@ interface IActivityManager { void registerUserSwitchObserver(in IUserSwitchObserver observer, in String name); void unregisterUserSwitchObserver(in IUserSwitchObserver observer); int[] getRunningUserIds(); + + // Deprecated - This method is only used by a few internal components and it will soon be + // replaced by a proper bug report API (which will be restricted to a few, pre-defined apps). + // No new code should be calling it. void requestBugReport(int bugreportType); + long inputDispatchingTimedOut(int pid, boolean aboveSystem, in String reason); void clearPendingBackup(); Intent getIntentForIntentSender(in IIntentSender sender); @@ -453,6 +458,11 @@ interface IActivityManager { // Stop Binder transaction tracking for all applications and dump trace data to the given file // descriptor. boolean stopBinderTrackingAndDump(in ParcelFileDescriptor fd); + /** + * Try to place task to provided position. The final position might be different depending on + * current user and stacks state. The task will be moved to target stack if it's currently in + * different stack. + */ void positionTaskInStack(int taskId, int stackId, int position); int getActivityStackId(in IBinder token); void exitFreeformMode(in IBinder token); diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index 617288428916..6f73388ff139 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -7111,8 +7111,8 @@ public class DevicePolicyManager { * @param serviceIntent Identifies the service to connect to. The Intent must specify either an * explicit component name or a package name to match an * {@link IntentFilter} published by a service. - * @param conn Receives information as the service is started and stopped. This must be a - * valid {@link ServiceConnection} object; it must not be {@code null}. + * @param conn Receives information as the service is started and stopped in main thread. This + * must be a valid {@link ServiceConnection} object; it must not be {@code null}. * @param flags Operation options for the binding operation. See * {@link Context#bindService(Intent, ServiceConnection, int)}. * @param targetUser Which user to bind to. Must be one of the users returned by @@ -7131,7 +7131,8 @@ public class DevicePolicyManager { throwIfParentInstance("bindDeviceAdminServiceAsUser"); // Keep this in sync with ContextImpl.bindServiceCommon. try { - final IServiceConnection sd = mContext.getServiceDispatcher(conn, null, flags); + final IServiceConnection sd = mContext.getServiceDispatcher( + conn, mContext.getMainThreadHandler(), flags); serviceIntent.prepareToLeaveProcess(mContext); return mService.bindDeviceAdminServiceAsUser(admin, mContext.getIApplicationThread(), mContext.getActivityToken(), serviceIntent, diff --git a/core/java/android/appwidget/AppWidgetManager.java b/core/java/android/appwidget/AppWidgetManager.java index 9f654c25e2c5..318968158559 100644 --- a/core/java/android/appwidget/AppWidgetManager.java +++ b/core/java/android/appwidget/AppWidgetManager.java @@ -16,11 +16,15 @@ package android.appwidget; +import android.annotation.NonNull; import android.annotation.Nullable; +import android.app.PendingIntent; import android.content.ComponentName; import android.content.Context; import android.content.Intent; +import android.content.IntentSender; import android.content.pm.ParceledListSlice; +import android.content.pm.ShortcutInfo; import android.os.Bundle; import android.os.IBinder; import android.os.Process; @@ -1079,4 +1083,41 @@ public class AppWidgetManager { info.minResizeHeight = TypedValue.complexToDimensionPixelSize(info.minResizeHeight, mDisplayMetrics); } + + /** + * Request to pin an app widget on the current launcher. It's up to the launcher to accept this + * request (optionally showing a user confirmation). If the request is accepted, the caller will + * get a confirmation with extra {@link #EXTRA_APPWIDGET_ID}. + * + * <p>When a request is denied by the user, the caller app will not get any response. + * + * <p>Only apps with a foreground activity or a foreground service can call it. Otherwise + * it'll throw {@link IllegalStateException}. + * + * <p>When an app calls this API when a previous request is still waiting for a response, + * the previous request will be canceled. + * + * @param provider The {@link ComponentName} for the {@link + * android.content.BroadcastReceiver BroadcastReceiver} provider for your AppWidget. + * @param successCallback If not null, this intent will be sent when the widget is created. + * + * @return {@code TRUE} if the launcher supports this feature. Note the API will return without + * waiting for the user to respond, so getting {@code TRUE} from this API does *not* mean + * the shortcut is pinned. {@code FALSE} if the launcher doesn't support this feature. + * + * @see android.content.pm.ShortcutManager#isRequestPinShortcutSupported() + * @see android.content.pm.ShortcutManager#requestPinShortcut(ShortcutInfo, IntentSender) + * + * @throws IllegalStateException The caller doesn't have a foreground activity or a foreground + * service or when the user is locked. + */ + public boolean requestPinAppWidget(@NonNull ComponentName provider, + @Nullable PendingIntent successCallback) { + try { + return mService.requestPinAppWidget(mPackageName, provider, + successCallback == null ? null : successCallback.getIntentSender()); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } + } } diff --git a/core/java/android/bluetooth/BluetoothA2dp.java b/core/java/android/bluetooth/BluetoothA2dp.java index 3de159a6cff2..1ce80077a748 100644 --- a/core/java/android/bluetooth/BluetoothA2dp.java +++ b/core/java/android/bluetooth/BluetoothA2dp.java @@ -103,6 +103,27 @@ public final class BluetoothA2dp implements BluetoothProfile { "android.bluetooth.a2dp.profile.action.AVRCP_CONNECTION_STATE_CHANGED"; /** + * Intent used to broadcast the change in the Audio Codec state of the + * A2DP Source profile. + * + * <p>This intent will have 3 extras: + * <ul> + * <li> {@link #EXTRA_CODEC_CONFIG} - The current codec configuration. </li> + * <li> {@link #EXTRA_PREVIOUS_CODEC_CONFIG} - The previous codec configuration. </li> + * <li> {@link BluetoothDevice#EXTRA_DEVICE} - The remote device if the device is currently + * connected, otherwise it is not included.</li> + * </ul> + * + * <p>Requires {@link android.Manifest.permission#BLUETOOTH} permission to + * receive. + * + * @hide + */ + @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION) + public static final String ACTION_CODEC_CONFIG_CHANGED = + "android.bluetooth.a2dp.profile.action.CODEC_CONFIG_CHANGED"; + + /** * A2DP sink device is streaming music. This state can be one of * {@link #EXTRA_STATE} or {@link #EXTRA_PREVIOUS_STATE} of * {@link #ACTION_PLAYING_STATE_CHANGED} intent. @@ -544,6 +565,54 @@ public final class BluetoothA2dp implements BluetoothProfile { } /** + * Gets the current codec configuration. + * + * @return the current codec configuration + * @hide + */ + public BluetoothCodecConfig getCodecConfig() { + if (DBG) Log.d(TAG, "getCodecConfig"); + try { + mServiceLock.readLock().lock(); + if (mService != null && isEnabled()) { + return mService.getCodecConfig(); + } + if (mService == null) { + Log.w(TAG, "Proxy not attached to service"); + } + return null; + } catch (RemoteException e) { + Log.e(TAG, "Error talking to BT service in getCodecConfig()", e); + return null; + } finally { + mServiceLock.readLock().unlock(); + } + } + + /** + * Sets the codec configuration preference. + * + * @param codecConfig the codec configuration preference + * @hide + */ + public void setCodecConfigPreference(BluetoothCodecConfig codecConfig) { + if (DBG) Log.d(TAG, "setCodecConfigPreference"); + try { + mServiceLock.readLock().lock(); + if (mService != null && isEnabled()) { + mService.setCodecConfigPreference(codecConfig); + } + if (mService == null) Log.w(TAG, "Proxy not attached to service"); + return; + } catch (RemoteException e) { + Log.e(TAG, "Error talking to BT service in setCodecConfigPreference()", e); + return; + } finally { + mServiceLock.readLock().unlock(); + } + } + + /** * Helper for converting a state to a string. * * For debug use only - strings are not internationalized. diff --git a/core/java/android/bluetooth/BluetoothAdapter.java b/core/java/android/bluetooth/BluetoothAdapter.java index 6c1e2a932700..885b42f3b10c 100644 --- a/core/java/android/bluetooth/BluetoothAdapter.java +++ b/core/java/android/bluetooth/BluetoothAdapter.java @@ -680,30 +680,7 @@ public final class BluetoothAdapter { } /** - * Performs action based on user action to turn BT ON - * or OFF if BT is in BLE_ON state - */ - private void notifyUserAction(boolean enable) { - try { - mServiceLock.readLock().lock(); - if (mService == null) { - Log.e(TAG, "mService is null"); - return; - } - if (enable) { - mService.onLeServiceUp(); //NA:TODO implementation pending - } else { - mService.onBrEdrDown(); //NA:TODO implementation pending - } - } catch (RemoteException e) { - Log.e(TAG, "", e); - } finally { - mServiceLock.readLock().unlock(); - } - } - - /** - * Turns off Bluetooth LE which was earlier turned on by calling EnableBLE(). + * Turns off Bluetooth LE which was earlier turned on by calling enableBLE(). * * <p> If the internal Adapter state is STATE_BLE_ON, this would trigger the transition * to STATE_OFF and completely shut-down Bluetooth @@ -733,61 +710,50 @@ public final class BluetoothAdapter { if (!isBleScanAlwaysAvailable()) return false; int state = getLeState(); - if (state == BluetoothAdapter.STATE_ON) { - if (DBG) Log.d (TAG, "STATE_ON: shouldn't disable"); - try { - mManagerService.updateBleAppCount(mToken, false); - } catch (RemoteException e) { - Log.e(TAG, "", e); - } - return true; - - } else if (state == BluetoothAdapter.STATE_BLE_ON) { - if (DBG) Log.d (TAG, "STATE_BLE_ON"); - int bleAppCnt = 0; + if (state == BluetoothAdapter.STATE_ON || state == BluetoothAdapter.STATE_BLE_ON) { + String packageName = ActivityThread.currentPackageName(); + if (DBG) Log.d (TAG, "disableBLE(): de-registering " + packageName); try { - bleAppCnt = mManagerService.updateBleAppCount(mToken, false); + mManagerService.updateBleAppCount(mToken, false, packageName); } catch (RemoteException e) { Log.e(TAG, "", e); } - if (bleAppCnt == 0) { - // Disable only if there are no other clients - notifyUserAction(false); - } return true; } - if (DBG) Log.d (TAG, "STATE_OFF: Already disabled"); + if (DBG) Log.d (TAG, "disableBLE(): Already disabled"); return false; } /** - * Special Applications who want to only turn on Bluetooth Low Energy (BLE) would - * EnableBLE, EnableBLE brings-up Bluetooth so that application can access - * only LE related feature (Bluetooth GATT layers interfaces using the respective class) - * EnableBLE in turn registers the existance of a special App which wants to - * turn on Bluetooth Low enrgy part without making it visible at the settings UI - * as Bluetooth ON. - * <p>Invoking EnableBLE when Bluetooth is already in ON state, would just registers - * the existance of special Application and doesn't do anything to current BT state. - * when user turn OFF Bluetooth from UI, if there is an existance of special app, Bluetooth - * would stay in BLE_ON state so that LE features are still acessible to the special - * Applications. + * Applications who want to only use Bluetooth Low Energy (BLE) can call enableBLE. * - * <p>This is an asynchronous call: it will return immediately, and + * enableBLE registers the existence of an app using only LE functions. + * + * enableBLE may enable Bluetooth to an LE only mode so that an app can use + * LE related features (BluetoothGatt or BluetoothGattServer classes) + * + * If the user disables Bluetooth while an app is registered to use LE only features, + * Bluetooth will remain on in LE only mode for the app. + * + * When Bluetooth is in LE only mode, it is not shown as ON to the UI. + * + * <p>This is an asynchronous call: it returns immediately, and * clients should listen for {@link #ACTION_BLE_STATE_CHANGED} - * to be notified of subsequent adapter state changes. If this call returns - * true, then the adapter state will immediately transition from {@link - * #STATE_OFF} to {@link #STATE_BLE_TURNING_ON}, and some time - * later transition to either {@link #STATE_OFF} or {@link - * #STATE_BLE_ON}. If this call returns false then there was an - * immediate problem that will prevent the adapter from being turned on - - * such as Airplane mode, or the adapter is already turned on. - * (@link #ACTION_BLE_STATE_CHANGED) returns the Bluetooth Adapter's various + * to be notified of adapter state changes. + * + * If this call returns * true, then the adapter state is either in a mode where + * LE is available, or will transition from {@link #STATE_OFF} to {@link #STATE_BLE_TURNING_ON}, + * and some time later transition to either {@link #STATE_OFF} or {@link #STATE_BLE_ON}. + * + * If this call returns false then there was an immediate problem that prevents the + * adapter from being turned on - such as Airplane mode. + * + * {@link #ACTION_BLE_STATE_CHANGED} returns the Bluetooth Adapter's various * states, It includes all the classic Bluetooth Adapter states along with * internal BLE only states * - * @return true to indicate Bluetooth LE start-up has begun, or false on + * @return true to indicate Bluetooth LE will be available, or false on * immediate error * @hide */ @@ -796,13 +762,14 @@ public final class BluetoothAdapter { if (!isBleScanAlwaysAvailable()) return false; try { - mManagerService.updateBleAppCount(mToken, true); + String packageName = ActivityThread.currentPackageName(); + mManagerService.updateBleAppCount(mToken, true, packageName); if (isLeEnabled()) { if (DBG) Log.d(TAG, "enableBLE(): Bluetooth already enabled"); return true; } if (DBG) Log.d(TAG, "enableBLE(): Calling enable"); - return mManagerService.enable(ActivityThread.currentPackageName()); + return mManagerService.enable(packageName); } catch (RemoteException e) { Log.e(TAG, "", e); } @@ -1940,6 +1907,9 @@ public final class BluetoothAdapter { } else if (profile == BluetoothProfile.MAP_CLIENT) { BluetoothMapClient mapClient = new BluetoothMapClient(context, listener); return true; + } else if (profile == BluetoothProfile.INPUT_HOST) { + BluetoothInputHost iHost = new BluetoothInputHost(context, listener); + return true; } else { return false; } @@ -2016,6 +1986,10 @@ public final class BluetoothAdapter { BluetoothMapClient mapClient = (BluetoothMapClient)proxy; mapClient.close(); break; + case BluetoothProfile.INPUT_HOST: + BluetoothInputHost iHost = (BluetoothInputHost) proxy; + iHost.close(); + break; } } @@ -2087,7 +2061,7 @@ public final class BluetoothAdapter { return true; } try { - return mManagerService.enableNoAutoConnect(); + return mManagerService.enableNoAutoConnect(ActivityThread.currentPackageName()); } catch (RemoteException e) {Log.e(TAG, "", e);} return false; } diff --git a/location/java/android/location/GnssNavigationMessageEvent.aidl b/core/java/android/bluetooth/BluetoothCodecConfig.aidl index e765739942bf..553e66e1dac5 100644 --- a/location/java/android/location/GnssNavigationMessageEvent.aidl +++ b/core/java/android/bluetooth/BluetoothCodecConfig.aidl @@ -1,11 +1,11 @@ /* - * Copyright (C) 2014, The Android Open Source Project + * 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 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -14,6 +14,6 @@ * limitations under the License. */ -package android.location; +package android.bluetooth; -parcelable GnssNavigationMessageEvent; +parcelable BluetoothCodecConfig; diff --git a/core/java/android/bluetooth/BluetoothCodecConfig.java b/core/java/android/bluetooth/BluetoothCodecConfig.java new file mode 100644 index 000000000000..5cc127766e83 --- /dev/null +++ b/core/java/android/bluetooth/BluetoothCodecConfig.java @@ -0,0 +1,287 @@ +/* + * 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. + */ + +package android.bluetooth; + +import android.os.Parcel; +import android.os.Parcelable; + +import java.util.Objects; + +/** + * Represents the codec configuration for a Bluetooth A2DP source device. + * + * {@see BluetoothA2dp} + * + * {@hide} + */ +public final class BluetoothCodecConfig implements Parcelable { + + /** + * Extra for the codec configuration intents of the individual profiles. + * + * This extra represents the current codec configuration of the A2DP + * profile. + */ + public static final String EXTRA_CODEC_CONFIG = "android.bluetooth.codec.extra.CODEC_CONFIG"; + + /** + * Extra for the codec configuration intents of the individual profiles. + * + * This extra represents the previous codec configuration of the A2DP + * profile. + */ + public static final String EXTRA_PREVIOUS_CODEC_CONFIG = + "android.bluetooth.codec.extra.PREVIOUS_CODEC_CONFIG"; + + public static final int SOURCE_CODEC_TYPE_SBC = 0; + public static final int SOURCE_CODEC_TYPE_INVALID = 1000 * 1000; + + public static final int CODEC_PRIORITY_DEFAULT = 0; + public static final int CODEC_PRIORITY_HIGHEST = 1000 * 1000; + + public static final int SAMPLE_RATE_NONE = 0; + public static final int SAMPLE_RATE_44100 = 0x1 << 0; + public static final int SAMPLE_RATE_48000 = 0x1 << 1; + public static final int SAMPLE_RATE_88200 = 0x1 << 2; + public static final int SAMPLE_RATE_96000 = 0x1 << 3; + public static final int SAMPLE_RATE_176400 = 0x1 << 4; + public static final int SAMPLE_RATE_192000 = 0x1 << 5; + + public static final int BITS_PER_SAMPLE_NONE = 0; + public static final int BITS_PER_SAMPLE_16 = 0x1 << 0; + public static final int BITS_PER_SAMPLE_24 = 0x1 << 1; + public static final int BITS_PER_SAMPLE_32 = 0x1 << 2; + + public static final int CHANNEL_MODE_NONE = 0; + public static final int CHANNEL_MODE_MONO = 0x1 << 0; + public static final int CHANNEL_MODE_STEREO = 0x1 << 1; + + private final int mCodecType; + private final int mCodecPriority; + private final int mSampleRate; + private final int mBitsPerSample; + private final int mChannelMode; + private final long mCodecSpecific1; + private final long mCodecSpecific2; + private final long mCodecSpecific3; + private final long mCodecSpecific4; + + public BluetoothCodecConfig(int codecType, int codecPriority, + int sampleRate, int bitsPerSample, + int channelMode,long codecSpecific1, + long codecSpecific2, long codecSpecific3, + long codecSpecific4) { + mCodecType = codecType; + mCodecPriority = codecPriority; + mSampleRate = sampleRate; + mBitsPerSample = bitsPerSample; + mChannelMode = channelMode; + mCodecSpecific1 = codecSpecific1; + mCodecSpecific2 = codecSpecific2; + mCodecSpecific3 = codecSpecific3; + mCodecSpecific4 = codecSpecific4; + } + + @Override + public boolean equals(Object o) { + if (o instanceof BluetoothCodecConfig) { + BluetoothCodecConfig other = (BluetoothCodecConfig)o; + return (other.mCodecType == mCodecType && + other.mCodecPriority == mCodecPriority && + other.mSampleRate == mSampleRate && + other.mBitsPerSample == mBitsPerSample && + other.mChannelMode == mChannelMode && + other.mCodecSpecific1 == mCodecSpecific1 && + other.mCodecSpecific2 == mCodecSpecific2 && + other.mCodecSpecific3 == mCodecSpecific3 && + other.mCodecSpecific4 == mCodecSpecific4); + } + return false; + } + + @Override + public int hashCode() { + return Objects.hash(mCodecType, mCodecPriority, mSampleRate, + mBitsPerSample, mChannelMode, mCodecSpecific1, + mCodecSpecific2, mCodecSpecific3, mCodecSpecific4); + } + + @Override + public String toString() { + return "{mCodecType:" + mCodecType + + ",mCodecPriority:" + mCodecPriority + + ",mSampleRate:" + String.format("0x%x", mSampleRate) + + ",mBitsPerSample:" + String.format("0x%x", mBitsPerSample) + + ",mChannelMode:" + String.format("0x%x", mChannelMode) + + ",mCodecSpecific1:" + mCodecSpecific1 + + ",mCodecSpecific2:" + mCodecSpecific2 + + ",mCodecSpecific3:" + mCodecSpecific3 + + ",mCodecSpecific4:" + mCodecSpecific4 + "}"; + } + + public int describeContents() { + return 0; + } + + public static final Parcelable.Creator<BluetoothCodecConfig> CREATOR = + new Parcelable.Creator<BluetoothCodecConfig>() { + public BluetoothCodecConfig createFromParcel(Parcel in) { + final int codecType = in.readInt(); + final int codecPriority = in.readInt(); + final int sampleRate = in.readInt(); + final int bitsPerSample = in.readInt(); + final int channelMode = in.readInt(); + final long codecSpecific1 = in.readLong(); + final long codecSpecific2 = in.readLong(); + final long codecSpecific3 = in.readLong(); + final long codecSpecific4 = in.readLong(); + return new BluetoothCodecConfig(codecType, codecPriority, + sampleRate, bitsPerSample, + channelMode, codecSpecific1, + codecSpecific2, codecSpecific3, + codecSpecific4); + } + public BluetoothCodecConfig[] newArray(int size) { + return new BluetoothCodecConfig[size]; + } + }; + + public void writeToParcel(Parcel out, int flags) { + out.writeInt(mCodecType); + out.writeInt(mCodecPriority); + out.writeInt(mSampleRate); + out.writeInt(mBitsPerSample); + out.writeInt(mChannelMode); + out.writeLong(mCodecSpecific1); + out.writeLong(mCodecSpecific2); + out.writeLong(mCodecSpecific3); + out.writeLong(mCodecSpecific4); + } + + /** + * Returns the codec type. + * See {@link android.bluetooth.BluetoothCodecConfig#SOURCE_CODEC_TYPE_SBC}. + * + * @return the codec type + */ + public int getCodecType() { + return mCodecType; + } + + /** + * Returns the codec selection priority. + * The codec selection priority is relative to other codecs: larger value + * means higher priority. If 0, reset to default. + * + * @return the codec priority + */ + public int getCodecPriority() { + return mCodecPriority; + } + + /** + * Returns the codec sample rate. The value can be a bitmask with all + * supported sample rates: + * {@link android.bluetooth.BluetoothCodecConfig#SAMPLE_RATE_NONE} or + * {@link android.bluetooth.BluetoothCodecConfig#SAMPLE_RATE_44100} or + * {@link android.bluetooth.BluetoothCodecConfig#SAMPLE_RATE_48000} or + * {@link android.bluetooth.BluetoothCodecConfig#SAMPLE_RATE_88200} or + * {@link android.bluetooth.BluetoothCodecConfig#SAMPLE_RATE_96000} or + * {@link android.bluetooth.BluetoothCodecConfig#SAMPLE_RATE_176400} or + * {@link android.bluetooth.BluetoothCodecConfig#SAMPLE_RATE_192000} + * + * @return the codec sample rate + */ + public int getSampleRate() { + return mSampleRate; + } + + /** + * Returns the codec bits per sample. The value can be a bitmask with all + * bits per sample supported: + * {@link android.bluetooth.BluetoothCodecConfig#BITS_PER_SAMPLE_NONE} or + * {@link android.bluetooth.BluetoothCodecConfig#BITS_PER_SAMPLE_16} or + * {@link android.bluetooth.BluetoothCodecConfig#BITS_PER_SAMPLE_24} or + * {@link android.bluetooth.BluetoothCodecConfig#BITS_PER_SAMPLE_32} + * + * @return the codec bits per sample + */ + public int getBitsPerSample() { + return mBitsPerSample; + } + + /** + * Returns the codec channel mode. The value can be a bitmask with all + * supported channel modes: + * {@link android.bluetooth.BluetoothCodecConfig#CHANNEL_MODE_NONE} or + * {@link android.bluetooth.BluetoothCodecConfig#CHANNEL_MODE_MONO} or + * {@link android.bluetooth.BluetoothCodecConfig#CHANNEL_MODE_STEREO} + * + * @return the codec channel mode + */ + public int getChannelMode() { + return mChannelMode; + } + + /** + * Returns a codec specific value1. + * + * @return a codec specific value1. + */ + public long getCodecSpecific1() { + return mCodecSpecific1; + } + + /** + * Returns a codec specific value2. + * + * @return a codec specific value2 + */ + public long getCodecSpecific2() { + return mCodecSpecific2; + } + + /** + * Returns a codec specific value3. + * + * @return a codec specific value3 + */ + public long getCodecSpecific3() { + return mCodecSpecific3; + } + + /** + * Returns a codec specific value4. + * + * @return a codec specific value4 + */ + public long getCodecSpecific4() { + return mCodecSpecific4; + } + + /** + * Checks whether the audio feeding parameters are same. + * + * @param other the codec config to compare against + * @return true if the audio feeding parameters are same, otherwise false + */ + public boolean sameAudioFeedingParameters(BluetoothCodecConfig other) { + return (other != null && other.mSampleRate == mSampleRate && + other.mBitsPerSample == mBitsPerSample && + other.mChannelMode == mChannelMode); + } +} diff --git a/core/java/android/bluetooth/BluetoothHidDeviceAppConfiguration.aidl b/core/java/android/bluetooth/BluetoothHidDeviceAppConfiguration.aidl new file mode 100644 index 000000000000..283a71790d3d --- /dev/null +++ b/core/java/android/bluetooth/BluetoothHidDeviceAppConfiguration.aidl @@ -0,0 +1,19 @@ +/* +** Copyright 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. +*/ + +package android.bluetooth; + +parcelable BluetoothHidDeviceAppConfiguration; diff --git a/core/java/android/bluetooth/BluetoothHidDeviceAppConfiguration.java b/core/java/android/bluetooth/BluetoothHidDeviceAppConfiguration.java new file mode 100644 index 000000000000..05ba64e981f1 --- /dev/null +++ b/core/java/android/bluetooth/BluetoothHidDeviceAppConfiguration.java @@ -0,0 +1,70 @@ +/* + * 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. + */ + +package android.bluetooth; + +import android.os.Parcel; +import android.os.Parcelable; + +import java.util.Random; + +/** @hide */ +public final class BluetoothHidDeviceAppConfiguration implements Parcelable { + private final long mHash; + + BluetoothHidDeviceAppConfiguration() { + Random rnd = new Random(); + mHash = rnd.nextLong(); + } + + BluetoothHidDeviceAppConfiguration(long hash) { + mHash = hash; + } + + @Override + public boolean equals(Object o) { + if (o instanceof BluetoothHidDeviceAppConfiguration) { + BluetoothHidDeviceAppConfiguration config = (BluetoothHidDeviceAppConfiguration) o; + return mHash == config.mHash; + } + return false; + } + + @Override + public int describeContents() { + return 0; + } + + public static final Parcelable.Creator<BluetoothHidDeviceAppConfiguration> CREATOR = + new Parcelable.Creator<BluetoothHidDeviceAppConfiguration>() { + + @Override + public BluetoothHidDeviceAppConfiguration createFromParcel(Parcel in) { + long hash = in.readLong(); + return new BluetoothHidDeviceAppConfiguration(hash); + } + + @Override + public BluetoothHidDeviceAppConfiguration[] newArray(int size) { + return new BluetoothHidDeviceAppConfiguration[size]; + } + }; + + @Override + public void writeToParcel(Parcel out, int flags) { + out.writeLong(mHash); + } +} diff --git a/core/java/android/bluetooth/BluetoothHidDeviceAppQosSettings.aidl b/core/java/android/bluetooth/BluetoothHidDeviceAppQosSettings.aidl new file mode 100644 index 000000000000..14f91140af2b --- /dev/null +++ b/core/java/android/bluetooth/BluetoothHidDeviceAppQosSettings.aidl @@ -0,0 +1,19 @@ +/* +** Copyright 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. +*/ + +package android.bluetooth; + +parcelable BluetoothHidDeviceAppQosSettings; diff --git a/core/java/android/bluetooth/BluetoothHidDeviceAppQosSettings.java b/core/java/android/bluetooth/BluetoothHidDeviceAppQosSettings.java new file mode 100644 index 000000000000..0d6530c11a91 --- /dev/null +++ b/core/java/android/bluetooth/BluetoothHidDeviceAppQosSettings.java @@ -0,0 +1,97 @@ +/* + * 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. + */ + +package android.bluetooth; + +import android.os.Parcel; +import android.os.Parcelable; + +import java.util.Random; + +/** @hide */ +public final class BluetoothHidDeviceAppQosSettings implements Parcelable { + + final public int serviceType; + final public int tokenRate; + final public int tokenBucketSize; + final public int peakBandwidth; + final public int latency; + final public int delayVariation; + + final static public int SERVICE_NO_TRAFFIC = 0x00; + final static public int SERVICE_BEST_EFFORT = 0x01; + final static public int SERVICE_GUARANTEED = 0x02; + + final static public int MAX = (int) 0xffffffff; + + public BluetoothHidDeviceAppQosSettings(int serviceType, int tokenRate, int tokenBucketSize, + int peakBandwidth, + int latency, int delayVariation) { + this.serviceType = serviceType; + this.tokenRate = tokenRate; + this.tokenBucketSize = tokenBucketSize; + this.peakBandwidth = peakBandwidth; + this.latency = latency; + this.delayVariation = delayVariation; + } + + @Override + public boolean equals(Object o) { + if (o instanceof BluetoothHidDeviceAppQosSettings) { + BluetoothHidDeviceAppQosSettings qos = (BluetoothHidDeviceAppQosSettings) o; + return false; + } + return false; + } + + @Override + public int describeContents() { + return 0; + } + + public static final Parcelable.Creator<BluetoothHidDeviceAppQosSettings> CREATOR = + new Parcelable.Creator<BluetoothHidDeviceAppQosSettings>() { + + @Override + public BluetoothHidDeviceAppQosSettings createFromParcel(Parcel in) { + + return new BluetoothHidDeviceAppQosSettings(in.readInt(), in.readInt(), in.readInt(), + in.readInt(), + in.readInt(), in.readInt()); + } + + @Override + public BluetoothHidDeviceAppQosSettings[] newArray(int size) { + return new BluetoothHidDeviceAppQosSettings[size]; + } + }; + + @Override + public void writeToParcel(Parcel out, int flags) { + out.writeInt(serviceType); + out.writeInt(tokenRate); + out.writeInt(tokenBucketSize); + out.writeInt(peakBandwidth); + out.writeInt(latency); + out.writeInt(delayVariation); + } + + public int[] toArray() { + return new int[] { + serviceType, tokenRate, tokenBucketSize, peakBandwidth, latency, delayVariation + }; + } +} diff --git a/core/java/android/bluetooth/BluetoothHidDeviceAppSdpSettings.aidl b/core/java/android/bluetooth/BluetoothHidDeviceAppSdpSettings.aidl new file mode 100644 index 000000000000..87dd10ee15f4 --- /dev/null +++ b/core/java/android/bluetooth/BluetoothHidDeviceAppSdpSettings.aidl @@ -0,0 +1,19 @@ +/* +** Copyright 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. +*/ + +package android.bluetooth; + +parcelable BluetoothHidDeviceAppSdpSettings; diff --git a/core/java/android/bluetooth/BluetoothHidDeviceAppSdpSettings.java b/core/java/android/bluetooth/BluetoothHidDeviceAppSdpSettings.java new file mode 100644 index 000000000000..f9a224581953 --- /dev/null +++ b/core/java/android/bluetooth/BluetoothHidDeviceAppSdpSettings.java @@ -0,0 +1,80 @@ +/* + * 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. + */ + +package android.bluetooth; + +import android.os.Parcel; +import android.os.Parcelable; + +import java.util.Random; + +/** @hide */ +public final class BluetoothHidDeviceAppSdpSettings implements Parcelable { + + final public String name; + final public String description; + final public String provider; + final public byte subclass; + final public byte[] descriptors; + + public BluetoothHidDeviceAppSdpSettings(String name, String description, String provider, + byte subclass, byte[] descriptors) { + this.name = name; + this.description = description; + this.provider = provider; + this.subclass = subclass; + this.descriptors = descriptors.clone(); + } + + @Override + public boolean equals(Object o) { + if (o instanceof BluetoothHidDeviceAppSdpSettings) { + BluetoothHidDeviceAppSdpSettings sdp = (BluetoothHidDeviceAppSdpSettings) o; + return false; + } + return false; + } + + @Override + public int describeContents() { + return 0; + } + + public static final Parcelable.Creator<BluetoothHidDeviceAppSdpSettings> CREATOR = + new Parcelable.Creator<BluetoothHidDeviceAppSdpSettings>() { + + @Override + public BluetoothHidDeviceAppSdpSettings createFromParcel(Parcel in) { + + return new BluetoothHidDeviceAppSdpSettings(in.readString(), in.readString(), + in.readString(), in.readByte(), in.createByteArray()); + } + + @Override + public BluetoothHidDeviceAppSdpSettings[] newArray(int size) { + return new BluetoothHidDeviceAppSdpSettings[size]; + } + }; + + @Override + public void writeToParcel(Parcel out, int flags) { + out.writeString(name); + out.writeString(description); + out.writeString(provider); + out.writeByte(subclass); + out.writeByteArray(descriptors); + } +} diff --git a/core/java/android/bluetooth/BluetoothHidDeviceCallback.java b/core/java/android/bluetooth/BluetoothHidDeviceCallback.java new file mode 100644 index 000000000000..f519776276fc --- /dev/null +++ b/core/java/android/bluetooth/BluetoothHidDeviceCallback.java @@ -0,0 +1,128 @@ +/* + * 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. + */ + +package android.bluetooth; + +import android.util.Log; + +/** @hide */ +public abstract class BluetoothHidDeviceCallback { + + private static final String TAG = BluetoothHidDeviceCallback.class.getSimpleName(); + + /** + * Callback called when application registration state changes. Usually it's + * called due to either + * {@link BluetoothHidDevice#registerApp(String, String, String, byte, byte[], + * BluetoothHidDeviceCallback)} + * or + * {@link BluetoothHidDevice#unregisterApp(BluetoothHidDeviceAppConfiguration)} + * , but can be also unsolicited in case e.g. Bluetooth was turned off in + * which case application is unregistered automatically. + * + * @param pluggedDevice {@link BluetoothDevice} object which represents host + * that currently has Virtual Cable established with device. Only + * valid when application is registered, can be <code>null</code> + * . + * @param config {@link BluetoothHidDeviceAppConfiguration} object which + * represents token required to unregister application using + * {@link BluetoothHidDevice#unregisterApp(BluetoothHidDeviceAppConfiguration)} + * . + * @param registered <code>true</code> if application is registered, + * <code>false</code> otherwise. + */ + public void onAppStatusChanged(BluetoothDevice pluggedDevice, + BluetoothHidDeviceAppConfiguration config, boolean registered) { + Log.d(TAG, "onAppStatusChanged: pluggedDevice=" + pluggedDevice + " registered=" + + registered); + } + + /** + * Callback called when connection state with remote host was changed. + * Application can assume than Virtual Cable is established when called with + * {@link BluetoothProfile#STATE_CONNECTED} <code>state</code>. + * + * @param device {@link BluetoothDevice} object representing host device + * which connection state was changed. + * @param state Connection state as defined in {@link BluetoothProfile}. + */ + public void onConnectionStateChanged(BluetoothDevice device, int state) { + Log.d(TAG, "onConnectionStateChanged: device=" + device + " state=" + state); + } + + /** + * Callback called when GET_REPORT is received from remote host. Should be + * replied by application using + * {@link BluetoothHidDevice#replyReport(BluetoothDevice, byte, byte, byte[])}. + * + * @param type Requested Report Type. + * @param id Requested Report Id, can be 0 if no Report Id are defined in + * descriptor. + * @param bufferSize Requested buffer size, application shall respond with + * at least given number of bytes. + */ + public void onGetReport(BluetoothDevice device, byte type, byte id, int bufferSize) { + Log.d(TAG, "onGetReport: device=" + device + " type=" + type + " id=" + id + " bufferSize=" + + bufferSize); + } + + /** + * Callback called when SET_REPORT is received from remote host. In case + * received data are invalid, application shall respond with + * {@link BluetoothHidDevice#reportError(BluetoothDevice)}. + * + * @param type Report Type. + * @param id Report Id. + * @param data Report data. + */ + public void onSetReport(BluetoothDevice device, byte type, byte id, byte[] data) { + Log.d(TAG, "onSetReport: device=" + device + " type=" + type + " id=" + id); + } + + /** + * Callback called when SET_PROTOCOL is received from remote host. + * Application shall use this information to send only reports valid for + * given protocol mode. By default, + * {@link BluetoothHidDevice#PROTOCOL_REPORT_MODE} shall be assumed. + * + * @param protocol Protocol Mode. + */ + public void onSetProtocol(BluetoothDevice device, byte protocol) { + Log.d(TAG, "onSetProtocol: device=" + device + " protocol=" + protocol); + } + + /** + * Callback called when report data is received over interrupt channel. + * Report Type is assumed to be + * {@link BluetoothHidDevice#REPORT_TYPE_OUTPUT}. + * + * @param reportId Report Id. + * @param data Report data. + */ + public void onIntrData(BluetoothDevice device, byte reportId, byte[] data) { + Log.d(TAG, "onIntrData: device=" + device + " reportId=" + reportId); + } + + /** + * Callback called when Virtual Cable is removed. This can be either due to + * {@link BluetoothHidDevice#unplug(BluetoothDevice)} or request from remote + * side. After this callback is received connection will be disconnected + * automatically. + */ + public void onVirtualCableUnplug(BluetoothDevice device) { + Log.d(TAG, "onVirtualCableUnplug: device=" + device); + } +} diff --git a/core/java/android/bluetooth/BluetoothInputHost.java b/core/java/android/bluetooth/BluetoothInputHost.java new file mode 100644 index 000000000000..68d105f1155d --- /dev/null +++ b/core/java/android/bluetooth/BluetoothInputHost.java @@ -0,0 +1,558 @@ +/* + * 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. + */ + +package android.bluetooth; + +import android.annotation.SdkConstant; +import android.annotation.SdkConstant.SdkConstantType; +import android.content.ComponentName; +import android.content.Context; +import android.content.Intent; +import android.content.ServiceConnection; +import android.os.IBinder; +import android.os.RemoteException; +import android.util.Log; + +import java.util.Arrays; +import java.util.ArrayList; +import java.util.List; + +/** + * @hide + */ +public final class BluetoothInputHost implements BluetoothProfile { + + private static final String TAG = BluetoothInputHost.class.getSimpleName(); + + /** + * Intent used to broadcast the change in connection state of the Input + * Host profile. + * + * <p>This intent will have 3 extras: + * <ul> + * <li> {@link #EXTRA_STATE} - The current state of the profile. </li> + * <li> {@link #EXTRA_PREVIOUS_STATE}- The previous state of the profile.</li> + * <li> {@link BluetoothDevice#EXTRA_DEVICE} - The remote device. </li> + * </ul> + * + * <p>{@link #EXTRA_STATE} or {@link #EXTRA_PREVIOUS_STATE} can be any of + * {@link #STATE_DISCONNECTED}, {@link #STATE_CONNECTING}, + * {@link #STATE_CONNECTED}, {@link #STATE_DISCONNECTING}. + * + * <p>Requires {@link android.Manifest.permission#BLUETOOTH} permission to + * receive. + */ + @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION) + public static final String ACTION_CONNECTION_STATE_CHANGED = + "android.bluetooth.inputhost.profile.action.CONNECTION_STATE_CHANGED"; + + /** + * Constants representing device subclass. + * + * @see #registerApp(String, String, String, byte, byte[], + * BluetoothHidDeviceCallback) + */ + public static final byte SUBCLASS1_NONE = (byte) 0x00; + public static final byte SUBCLASS1_KEYBOARD = (byte) 0x40; + public static final byte SUBCLASS1_MOUSE = (byte) 0x80; + public static final byte SUBCLASS1_COMBO = (byte) 0xC0; + + public static final byte SUBCLASS2_UNCATEGORIZED = (byte) 0x00; + public static final byte SUBCLASS2_JOYSTICK = (byte) 0x01; + public static final byte SUBCLASS2_GAMEPAD = (byte) 0x02; + public static final byte SUBCLASS2_REMOTE_CONTROL = (byte) 0x03; + public static final byte SUBCLASS2_SENSING_DEVICE = (byte) 0x04; + public static final byte SUBCLASS2_DIGITIZER_TABLED = (byte) 0x05; + public static final byte SUBCLASS2_CARD_READER = (byte) 0x06; + + /** + * Constants representing report types. + * + * @see BluetoothHidDeviceCallback#onGetReport(byte, byte, int) + * @see BluetoothHidDeviceCallback#onSetReport(byte, byte, byte[]) + * @see BluetoothHidDeviceCallback#onIntrData(byte, byte[]) + */ + public static final byte REPORT_TYPE_INPUT = (byte) 1; + public static final byte REPORT_TYPE_OUTPUT = (byte) 2; + public static final byte REPORT_TYPE_FEATURE = (byte) 3; + + /** + * Constants representing error response for Set Report. + * + * @see BluetoothHidDeviceCallback#onSetReport(byte, byte, byte[]) + */ + public static final byte ERROR_RSP_SUCCESS = (byte) 0; + public static final byte ERROR_RSP_NOT_READY = (byte) 1; + public static final byte ERROR_RSP_INVALID_RPT_ID = (byte) 2; + public static final byte ERROR_RSP_UNSUPPORTED_REQ = (byte) 3; + public static final byte ERROR_RSP_INVALID_PARAM = (byte) 4; + public static final byte ERROR_RSP_UNKNOWN = (byte) 14; + + /** + * Constants representing protocol mode used set by host. Default is always + * {@link #PROTOCOL_REPORT_MODE} unless notified otherwise. + * + * @see BluetoothHidDeviceCallback#onSetProtocol(byte) + */ + public static final byte PROTOCOL_BOOT_MODE = (byte) 0; + public static final byte PROTOCOL_REPORT_MODE = (byte) 1; + + private Context mContext; + + private ServiceListener mServiceListener; + + private IBluetoothInputHost mService; + + private BluetoothAdapter mAdapter; + + private static class BluetoothHidDeviceCallbackWrapper extends IBluetoothHidDeviceCallback.Stub { + + private BluetoothHidDeviceCallback mCallback; + + public BluetoothHidDeviceCallbackWrapper(BluetoothHidDeviceCallback callback) { + mCallback = callback; + } + + @Override + public void onAppStatusChanged(BluetoothDevice pluggedDevice, + BluetoothHidDeviceAppConfiguration config, boolean registered) { + mCallback.onAppStatusChanged(pluggedDevice, config, registered); + } + + @Override + public void onConnectionStateChanged(BluetoothDevice device, int state) { + mCallback.onConnectionStateChanged(device, state); + } + + @Override + public void onGetReport(BluetoothDevice device, byte type, byte id, int bufferSize) { + mCallback.onGetReport(device, type, id, bufferSize); + } + + @Override + public void onSetReport(BluetoothDevice device, byte type, byte id, byte[] data) { + mCallback.onSetReport(device, type, id, data); + } + + @Override + public void onSetProtocol(BluetoothDevice device, byte protocol) { + mCallback.onSetProtocol(device, protocol); + } + + @Override + public void onIntrData(BluetoothDevice device, byte reportId, byte[] data) { + mCallback.onIntrData(device, reportId, data); + } + + @Override + public void onVirtualCableUnplug(BluetoothDevice device) { + mCallback.onVirtualCableUnplug(device); + } + } + + final private IBluetoothStateChangeCallback mBluetoothStateChangeCallback = + new IBluetoothStateChangeCallback.Stub() { + + public void onBluetoothStateChange(boolean up) { + Log.d(TAG, "onBluetoothStateChange: up=" + up); + synchronized (mConnection) { + if (!up) { + Log.d(TAG,"Unbinding service..."); + if (mService != null) { + mService = null; + try { + mContext.unbindService(mConnection); + } catch (IllegalArgumentException e) { + Log.e(TAG,"onBluetoothStateChange: could not unbind service:", e); + } + } + } else { + try { + if (mService == null) { + Log.d(TAG,"Binding HID Device service..."); + doBind(); + } + } catch (IllegalStateException e) { + Log.e(TAG,"onBluetoothStateChange: could not bind to HID Dev service: ", e); + } catch (SecurityException e) { + Log.e(TAG,"onBluetoothStateChange: could not bind to HID Dev service: ", e); + } + } + } + } + }; + + private ServiceConnection mConnection = new ServiceConnection() { + + public void onServiceConnected(ComponentName className, IBinder service) { + Log.d(TAG, "onServiceConnected()"); + + mService = IBluetoothInputHost.Stub.asInterface(service); + + if (mServiceListener != null) { + mServiceListener.onServiceConnected(BluetoothProfile.INPUT_HOST, + BluetoothInputHost.this); + } + } + + public void onServiceDisconnected(ComponentName className) { + Log.d(TAG, "onServiceDisconnected()"); + + mService = null; + + if (mServiceListener != null) { + mServiceListener.onServiceDisconnected(BluetoothProfile.INPUT_HOST); + } + } + }; + + BluetoothInputHost(Context context, ServiceListener listener) { + Log.v(TAG, "BluetoothInputHost"); + + mContext = context; + mServiceListener = listener; + mAdapter = BluetoothAdapter.getDefaultAdapter(); + + IBluetoothManager mgr = mAdapter.getBluetoothManager(); + if (mgr != null) { + try { + mgr.registerStateChangeCallback(mBluetoothStateChangeCallback); + } catch (RemoteException e) { + e.printStackTrace(); + } + } + + doBind(); + } + + boolean doBind() { + Intent intent = new Intent(IBluetoothInputHost.class.getName()); + ComponentName comp = intent.resolveSystemService(mContext.getPackageManager(), 0); + intent.setComponent(comp); + if (comp == null || !mContext.bindServiceAsUser(intent, mConnection, 0, + android.os.Process.myUserHandle())) { + Log.e(TAG, "Could not bind to Bluetooth HID Device Service with " + intent); + return false; + } + Log.d(TAG, "Bound to HID Device Service"); + return true; + } + + void close() { + Log.v(TAG, "close()"); + + IBluetoothManager mgr = mAdapter.getBluetoothManager(); + if (mgr != null) { + try { + mgr.unregisterStateChangeCallback(mBluetoothStateChangeCallback); + } catch (RemoteException e) { + e.printStackTrace(); + } + } + + synchronized (mConnection) { + if (mService != null) { + mService = null; + try { + mContext.unbindService(mConnection); + } catch (IllegalArgumentException e) { + Log.e(TAG,"close: could not unbind HID Dev service: ", e); + } + } + } + + mServiceListener = null; + } + + /** + * {@inheritDoc} + */ + public List<BluetoothDevice> getConnectedDevices() { + Log.v(TAG, "getConnectedDevices()"); + + if (mService != null) { + try { + return mService.getConnectedDevices(); + } catch (RemoteException e) { + Log.e(TAG, e.toString()); + } + } else { + Log.w(TAG, "Proxy not attached to service"); + } + + return new ArrayList<BluetoothDevice>(); + } + + /** + * {@inheritDoc} + */ + public List<BluetoothDevice> getDevicesMatchingConnectionStates(int[] states) { + Log.v(TAG, "getDevicesMatchingConnectionStates(): states=" + Arrays.toString(states)); + + if (mService != null) { + try { + return mService.getDevicesMatchingConnectionStates(states); + } catch (RemoteException e) { + Log.e(TAG, e.toString()); + } + } else { + Log.w(TAG, "Proxy not attached to service"); + } + + return new ArrayList<BluetoothDevice>(); + } + + /** + * {@inheritDoc} + */ + public int getConnectionState(BluetoothDevice device) { + Log.v(TAG, "getConnectionState(): device=" + device); + + if (mService != null) { + try { + return mService.getConnectionState(device); + } catch (RemoteException e) { + Log.e(TAG, e.toString()); + } + } else { + Log.w(TAG, "Proxy not attached to service"); + } + + return STATE_DISCONNECTED; + } + + /** + * Registers application to be used for HID device. Connections to HID + * Device are only possible when application is registered. Only one + * application can be registered at time. When no longer used, application + * should be unregistered using + * {@link #unregisterApp(BluetoothHidDeviceAppConfiguration)}. + * + * @param sdp {@link BluetoothHidDeviceAppSdpSettings} object of + * HID Device SDP record. + * @param inQos {@link BluetoothHidDeviceAppQosSettings} object of + * Incoming QoS Settings. + * @param outQos {@link BluetoothHidDeviceAppQosSettings} object of + * Outgoing QoS Settings. + * @param callback {@link BluetoothHidDeviceCallback} object to which + * callback messages will be sent. + * @return + */ + public boolean registerApp(BluetoothHidDeviceAppSdpSettings sdp, + BluetoothHidDeviceAppQosSettings inQos, BluetoothHidDeviceAppQosSettings outQos, + BluetoothHidDeviceCallback callback) { + Log.v(TAG, "registerApp(): sdp=" + sdp + " inQos=" + inQos + " outQos=" + outQos + + " callback=" + callback); + + boolean result = false; + + if (sdp == null || callback == null) { + return false; + } + + if (mService != null) { + try { + BluetoothHidDeviceAppConfiguration config = + new BluetoothHidDeviceAppConfiguration(); + BluetoothHidDeviceCallbackWrapper cbw = + new BluetoothHidDeviceCallbackWrapper(callback); + result = mService.registerApp(config, sdp, inQos, outQos, cbw); + } catch (RemoteException e) { + Log.e(TAG, e.toString()); + } + } else { + Log.w(TAG, "Proxy not attached to service"); + } + + return result; + } + + /** + * Unregisters application. Active connection will be disconnected and no + * new connections will be allowed until registered again using + * {@link #registerApp(String, String, String, byte, byte[], BluetoothHidDeviceCallback)} + * + * @param config {@link BluetoothHidDeviceAppConfiguration} object as + * obtained from + * {@link BluetoothHidDeviceCallback#onAppStatusChanged(BluetoothDevice, + * BluetoothHidDeviceAppConfiguration, boolean)} + * + * @return + */ + public boolean unregisterApp(BluetoothHidDeviceAppConfiguration config) { + Log.v(TAG, "unregisterApp()"); + + boolean result = false; + + if (mService != null) { + try { + result = mService.unregisterApp(config); + } catch (RemoteException e) { + Log.e(TAG, e.toString()); + } + } else { + Log.w(TAG, "Proxy not attached to service"); + } + + return result; + } + + /** + * Sends report to remote host using interrupt channel. + * + * @param id Report Id, as defined in descriptor. Can be 0 in case Report Id + * are not defined in descriptor. + * @param data Report data, not including Report Id. + * @return + */ + public boolean sendReport(BluetoothDevice device, int id, byte[] data) { + boolean result = false; + + if (mService != null) { + try { + result = mService.sendReport(device, id, data); + } catch (RemoteException e) { + Log.e(TAG, e.toString()); + } + } else { + Log.w(TAG, "Proxy not attached to service"); + } + + return result; + } + + /** + * Sends report to remote host as reply for GET_REPORT request from + * {@link BluetoothHidDeviceCallback#onGetReport(BluetoothDevice, byte, byte, int)}. + * + * @param type Report Type, as in request. + * @param id Report Id, as in request. + * @param data Report data, not including Report Id. + * @return + */ + public boolean replyReport(BluetoothDevice device, byte type, byte id, byte[] data) { + Log.v(TAG, "replyReport(): device=" + device + " type=" + type + " id=" + id); + + boolean result = false; + + if (mService != null) { + try { + result = mService.replyReport(device, type, id, data); + } catch (RemoteException e) { + Log.e(TAG, e.toString()); + } + } else { + Log.w(TAG, "Proxy not attached to service"); + } + + return result; + } + + /** + * Sends error handshake message as reply for invalid SET_REPORT request + * from {@link BluetoothHidDeviceCallback#onSetReport(BluetoothDevice, byte, byte, byte[])}. + * + * @param error Error to be sent for SET_REPORT via HANDSHAKE. + * @return + */ + public boolean reportError(BluetoothDevice device, byte error) { + Log.v(TAG, "reportError(): device=" + device + " error=" + error); + + boolean result = false; + + if (mService != null) { + try { + result = mService.reportError(device, error); + } catch (RemoteException e) { + Log.e(TAG, e.toString()); + } + } else { + Log.w(TAG, "Proxy not attached to service"); + } + + return result; + } + + /** + * Sends Virtual Cable Unplug to currently connected host. + * + * @return + */ + public boolean unplug(BluetoothDevice device) { + Log.v(TAG, "unplug(): device=" + device); + + boolean result = false; + + if (mService != null) { + try { + result = mService.unplug(device); + } catch (RemoteException e) { + Log.e(TAG, e.toString()); + } + } else { + Log.w(TAG, "Proxy not attached to service"); + } + + return result; + } + + /** + * Initiates connection to host which currently has Virtual Cable + * established with device. + * + * @return + */ + public boolean connect(BluetoothDevice device) { + Log.v(TAG, "connect(): device=" + device); + + boolean result = false; + + if (mService != null) { + try { + result = mService.connect(device); + } catch (RemoteException e) { + Log.e(TAG, e.toString()); + } + } else { + Log.w(TAG, "Proxy not attached to service"); + } + + return result; + } + + /** + * Disconnects from currently connected host. + * + * @return + */ + public boolean disconnect(BluetoothDevice device) { + Log.v(TAG, "disconnect(): device=" + device); + + boolean result = false; + + if (mService != null) { + try { + result = mService.disconnect(device); + } catch (RemoteException e) { + Log.e(TAG, e.toString()); + } + } else { + Log.w(TAG, "Proxy not attached to service"); + } + + return result; + } +} diff --git a/core/java/android/bluetooth/BluetoothProfile.java b/core/java/android/bluetooth/BluetoothProfile.java index f3636070fa5c..2f64c719ec10 100644 --- a/core/java/android/bluetooth/BluetoothProfile.java +++ b/core/java/android/bluetooth/BluetoothProfile.java @@ -143,11 +143,17 @@ public interface BluetoothProfile { public static final int MAP_CLIENT = 18; /** + * Input Host + * @hide + */ + static public final int INPUT_HOST = 19; + + /** * Max profile ID. This value should be updated whenever a new profile is added to match * the largest value assigned to a profile. * @hide */ - public static final int MAX_PROFILE_ID = 17; + public static final int MAX_PROFILE_ID = 19; /** * Default priority for devices that we try to auto-connect to and diff --git a/core/java/android/bluetooth/IBluetoothA2dp.aidl b/core/java/android/bluetooth/IBluetoothA2dp.aidl index 26ff9e274c39..5b524eb18a5e 100644 --- a/core/java/android/bluetooth/IBluetoothA2dp.aidl +++ b/core/java/android/bluetooth/IBluetoothA2dp.aidl @@ -16,6 +16,7 @@ package android.bluetooth; +import android.bluetooth.BluetoothCodecConfig; import android.bluetooth.BluetoothDevice; /** @@ -36,4 +37,6 @@ interface IBluetoothA2dp { oneway void adjustAvrcpAbsoluteVolume(int direction); oneway void setAvrcpAbsoluteVolume(int volume); boolean isA2dpPlaying(in BluetoothDevice device); + BluetoothCodecConfig getCodecConfig(); + oneway void setCodecConfigPreference(in BluetoothCodecConfig codecConfig); } diff --git a/core/java/android/bluetooth/IBluetoothHidDeviceCallback.aidl b/core/java/android/bluetooth/IBluetoothHidDeviceCallback.aidl new file mode 100644 index 000000000000..a737198ad954 --- /dev/null +++ b/core/java/android/bluetooth/IBluetoothHidDeviceCallback.aidl @@ -0,0 +1,31 @@ +/* + * 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. + */ + +package android.bluetooth; + +import android.bluetooth.BluetoothDevice; +import android.bluetooth.BluetoothHidDeviceAppConfiguration; + +/** @hide */ +interface IBluetoothHidDeviceCallback { + void onAppStatusChanged(in BluetoothDevice device, in BluetoothHidDeviceAppConfiguration config, boolean registered); + void onConnectionStateChanged(in BluetoothDevice device, in int state); + void onGetReport(in BluetoothDevice device, in byte type, in byte id, in int bufferSize); + void onSetReport(in BluetoothDevice device, in byte type, in byte id, in byte[] data); + void onSetProtocol(in BluetoothDevice device, in byte protocol); + void onIntrData(in BluetoothDevice device, in byte reportId, in byte[] data); + void onVirtualCableUnplug(in BluetoothDevice device); +} diff --git a/core/java/android/bluetooth/IBluetoothInputHost.aidl b/core/java/android/bluetooth/IBluetoothInputHost.aidl new file mode 100644 index 000000000000..6c4993f750e6 --- /dev/null +++ b/core/java/android/bluetooth/IBluetoothInputHost.aidl @@ -0,0 +1,40 @@ +/* + * 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. + */ + +package android.bluetooth; + +import android.bluetooth.BluetoothDevice; +import android.bluetooth.BluetoothHidDeviceAppConfiguration; +import android.bluetooth.IBluetoothHidDeviceCallback; +import android.bluetooth.BluetoothHidDeviceAppSdpSettings; +import android.bluetooth.BluetoothHidDeviceAppQosSettings; + +/** @hide */ +interface IBluetoothInputHost { + boolean registerApp(in BluetoothHidDeviceAppConfiguration config, + in BluetoothHidDeviceAppSdpSettings sdp, in BluetoothHidDeviceAppQosSettings inQos, + in BluetoothHidDeviceAppQosSettings outQos, in IBluetoothHidDeviceCallback callback); + boolean unregisterApp(in BluetoothHidDeviceAppConfiguration config); + boolean sendReport(in BluetoothDevice device, in int id, in byte[] data); + boolean replyReport(in BluetoothDevice device, in byte type, in byte id, in byte[] data); + boolean reportError(in BluetoothDevice device, byte error); + boolean unplug(in BluetoothDevice device); + boolean connect(in BluetoothDevice device); + boolean disconnect(in BluetoothDevice device); + List<BluetoothDevice> getConnectedDevices(); + List<BluetoothDevice> getDevicesMatchingConnectionStates(in int[] states); + int getConnectionState(in BluetoothDevice device); +} diff --git a/core/java/android/bluetooth/IBluetoothManager.aidl b/core/java/android/bluetooth/IBluetoothManager.aidl index 3af4a4d7b502..2d5fc98e5e51 100644 --- a/core/java/android/bluetooth/IBluetoothManager.aidl +++ b/core/java/android/bluetooth/IBluetoothManager.aidl @@ -35,8 +35,8 @@ interface IBluetoothManager void unregisterStateChangeCallback(in IBluetoothStateChangeCallback callback); boolean isEnabled(); boolean enable(String packageName); - boolean enableNoAutoConnect(); - boolean disable( String packageName, boolean persist); + boolean enableNoAutoConnect(String packageName); + boolean disable(String packageName, boolean persist); int getState(); IBluetoothGatt getBluetoothGatt(); @@ -47,7 +47,7 @@ interface IBluetoothManager String getName(); boolean isBleScanAlwaysAvailable(); - int updateBleAppCount(IBinder b, boolean enable); + int updateBleAppCount(IBinder b, boolean enable, String packageName); boolean isBleAppPresent(); } diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java index f0f1d99b9f96..9dc60ab82f2d 100644 --- a/core/java/android/content/Context.java +++ b/core/java/android/content/Context.java @@ -4403,4 +4403,11 @@ public abstract class Context { public IApplicationThread getIApplicationThread() { throw new RuntimeException("Not implemented. Must override in a subclass."); } + + /** + * @hide + */ + public Handler getMainThreadHandler() { + throw new RuntimeException("Not implemented. Must override in a subclass."); + } } diff --git a/core/java/android/content/ContextWrapper.java b/core/java/android/content/ContextWrapper.java index 75336559088b..4b6076b37fdf 100644 --- a/core/java/android/content/ContextWrapper.java +++ b/core/java/android/content/ContextWrapper.java @@ -885,4 +885,12 @@ public class ContextWrapper extends Context { public IApplicationThread getIApplicationThread() { return mBase.getIApplicationThread(); } + + /** + * @hide + */ + @Override + public Handler getMainThreadHandler() { + return mBase.getMainThreadHandler(); + } } diff --git a/core/java/android/content/pm/LauncherApps.java b/core/java/android/content/pm/LauncherApps.java index 5f4bc00a28f0..4b5b995cd218 100644 --- a/core/java/android/content/pm/LauncherApps.java +++ b/core/java/android/content/pm/LauncherApps.java @@ -22,6 +22,7 @@ import android.annotation.Nullable; import android.annotation.SdkConstant; import android.annotation.SdkConstant.SdkConstantType; import android.annotation.TestApi; +import android.appwidget.AppWidgetProviderInfo; import android.content.ActivityNotFoundException; import android.content.ComponentName; import android.content.Context; @@ -1138,21 +1139,35 @@ public class LauncherApps { /** This is a request to pin shortcut. */ public static final int REQUEST_TYPE_SHORTCUT = 1; + /** This is a request to pin app widget. */ + public static final int REQUEST_TYPE_APPWIDGET = 2; + @IntDef(value = {REQUEST_TYPE_SHORTCUT}) @Retention(RetentionPolicy.SOURCE) public @interface RequestType {} private final int mRequestType; private final ShortcutInfo mShortcutInfo; + private final AppWidgetProviderInfo mAppWidgetInfo; private final IPinItemRequest mInner; /** * @hide */ - public PinItemRequest(@RequestType int requestType, ShortcutInfo shortcutInfo, - IPinItemRequest inner) { - mRequestType = requestType; + public PinItemRequest(ShortcutInfo shortcutInfo, IPinItemRequest inner) { + mRequestType = REQUEST_TYPE_SHORTCUT; mShortcutInfo = shortcutInfo; + mAppWidgetInfo = null; + mInner = inner; + } + + /** + * @hide + */ + public PinItemRequest(AppWidgetProviderInfo appWidgetInfo, IPinItemRequest inner) { + mRequestType = REQUEST_TYPE_APPWIDGET; + mShortcutInfo = null; + mAppWidgetInfo = appWidgetInfo; mInner = inner; } @@ -1175,6 +1190,15 @@ public class LauncherApps { } /** + * {@link AppWidgetProviderInfo} sent by the requesting app. Always non-null for a + * {@link #REQUEST_TYPE_APPWIDGET} request. + */ + @Nullable + public AppWidgetProviderInfo getAppWidgetProviderInfo() { + return mAppWidgetInfo; + } + + /** * Return {@code TRUE} if a request is valid -- i.e. {@link #accept(Bundle)} has not been * called, and it has not been canceled. */ @@ -1208,14 +1232,22 @@ public class LauncherApps { final ClassLoader cl = getClass().getClassLoader(); mRequestType = source.readInt(); - mShortcutInfo = source.readParcelable(cl); + mShortcutInfo = mRequestType == REQUEST_TYPE_SHORTCUT ? + (ShortcutInfo) source.readParcelable(cl) : null; + mAppWidgetInfo = mRequestType == REQUEST_TYPE_APPWIDGET ? + (AppWidgetProviderInfo) source.readParcelable(cl) : null; mInner = IPinItemRequest.Stub.asInterface(source.readStrongBinder()); } @Override public void writeToParcel(Parcel dest, int flags) { dest.writeInt(mRequestType); - dest.writeParcelable(mShortcutInfo, flags); + if (mRequestType == REQUEST_TYPE_SHORTCUT) { + dest.writeParcelable(mShortcutInfo, flags); + } + if (mRequestType == REQUEST_TYPE_APPWIDGET) { + dest.writeParcelable(mAppWidgetInfo, flags); + } dest.writeStrongBinder(mInner.asBinder()); } diff --git a/core/java/android/content/pm/ShortcutManager.java b/core/java/android/content/pm/ShortcutManager.java index c8f00b8e53c6..c8fb3d174fe0 100644 --- a/core/java/android/content/pm/ShortcutManager.java +++ b/core/java/android/content/pm/ShortcutManager.java @@ -867,7 +867,7 @@ public class ShortcutManager { * * @throws IllegalArgumentException if a shortcut with the same ID exists and is disabled. * @throws IllegalStateException The caller doesn't have a foreground activity or a foreground - * service. + * service or when the user is locked. */ public boolean requestPinShortcut(@NonNull ShortcutInfo shortcut, @Nullable IntentSender resultIntent) { diff --git a/core/java/android/content/pm/ShortcutServiceInternal.java b/core/java/android/content/pm/ShortcutServiceInternal.java index af5610570f70..4773c730406f 100644 --- a/core/java/android/content/pm/ShortcutServiceInternal.java +++ b/core/java/android/content/pm/ShortcutServiceInternal.java @@ -19,8 +19,10 @@ package android.content.pm; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.UserIdInt; +import android.appwidget.AppWidgetProviderInfo; import android.content.ComponentName; import android.content.Intent; +import android.content.IntentSender; import android.content.pm.LauncherApps.ShortcutQuery; import android.os.ParcelFileDescriptor; @@ -68,4 +70,8 @@ public abstract class ShortcutServiceInternal { public abstract boolean hasShortcutHostPermission(int launcherUserId, @NonNull String callingPackage); + + public abstract boolean requestPinAppWidget(@NonNull String callingPackage, + @NonNull AppWidgetProviderInfo appWidget, @Nullable IntentSender resultIntent, + int userId); } diff --git a/core/java/android/net/LocalServerSocket.java b/core/java/android/net/LocalServerSocket.java index 9464222f091d..e1eaf00d0f20 100644 --- a/core/java/android/net/LocalServerSocket.java +++ b/core/java/android/net/LocalServerSocket.java @@ -87,9 +87,9 @@ public class LocalServerSocket { { LocalSocketImpl acceptedImpl = new LocalSocketImpl(); - impl.accept (acceptedImpl); + impl.accept(acceptedImpl); - return new LocalSocket(acceptedImpl, LocalSocket.SOCKET_UNKNOWN); + return LocalSocket.createLocalSocketForAccept(acceptedImpl, LocalSocket.SOCKET_UNKNOWN); } /** diff --git a/core/java/android/net/LocalSocket.java b/core/java/android/net/LocalSocket.java index e14facb1abb5..3f8d9d3b6723 100644 --- a/core/java/android/net/LocalSocket.java +++ b/core/java/android/net/LocalSocket.java @@ -75,17 +75,24 @@ public class LocalSocket implements Closeable { isConnected = true; } - /** - * for use with AndroidServerSocket - * @param impl a SocketImpl - */ - /*package*/ LocalSocket(LocalSocketImpl impl, int sockType) { + private LocalSocket(LocalSocketImpl impl, int sockType) { this.impl = impl; this.sockType = sockType; this.isConnected = false; this.isBound = false; } + /** + * for use with LocalServerSocket.accept() + */ + static LocalSocket createLocalSocketForAccept(LocalSocketImpl impl, int sockType) { + LocalSocket socket = new LocalSocket(impl, sockType); + socket.isConnected = true; + socket.isBound = true; + socket.implCreated = true; + return socket; + } + /** {@inheritDoc} */ @Override public String toString() { diff --git a/core/java/android/net/LocalSocketImpl.java b/core/java/android/net/LocalSocketImpl.java index 0f0e9c49a0b0..d8f782115cf8 100644 --- a/core/java/android/net/LocalSocketImpl.java +++ b/core/java/android/net/LocalSocketImpl.java @@ -235,29 +235,29 @@ class LocalSocketImpl * @throws IOException */ public void create(int sockType) throws IOException { - // no error if socket already created - // need this for LocalServerSocket.accept() - if (fd == null) { - int osType; - switch (sockType) { - case LocalSocket.SOCKET_DGRAM: - osType = OsConstants.SOCK_DGRAM; - break; - case LocalSocket.SOCKET_STREAM: - osType = OsConstants.SOCK_STREAM; - break; - case LocalSocket.SOCKET_SEQPACKET: - osType = OsConstants.SOCK_SEQPACKET; - break; - default: - throw new IllegalStateException("unknown sockType"); - } - try { - fd = Os.socket(OsConstants.AF_UNIX, osType, 0); - mFdCreatedInternally = true; - } catch (ErrnoException e) { - e.rethrowAsIOException(); - } + if (fd != null) { + throw new IOException("LocalSocketImpl already has an fd"); + } + + int osType; + switch (sockType) { + case LocalSocket.SOCKET_DGRAM: + osType = OsConstants.SOCK_DGRAM; + break; + case LocalSocket.SOCKET_STREAM: + osType = OsConstants.SOCK_STREAM; + break; + case LocalSocket.SOCKET_SEQPACKET: + osType = OsConstants.SOCK_SEQPACKET; + break; + default: + throw new IllegalStateException("unknown sockType"); + } + try { + fd = Os.socket(OsConstants.AF_UNIX, osType, 0); + mFdCreatedInternally = true; + } catch (ErrnoException e) { + e.rethrowAsIOException(); } } diff --git a/core/java/android/net/RecommendationRequest.java b/core/java/android/net/RecommendationRequest.java index a96f90d57746..d013f6442f23 100644 --- a/core/java/android/net/RecommendationRequest.java +++ b/core/java/android/net/RecommendationRequest.java @@ -41,6 +41,7 @@ public final class RecommendationRequest implements Parcelable { * Builder class for constructing {@link RecommendationRequest} instances. * @hide */ + @SystemApi public static final class Builder { private ScanResult[] mScanResults; private WifiConfiguration mCurrentConfig; diff --git a/core/java/android/net/ScoredNetwork.java b/core/java/android/net/ScoredNetwork.java index 94e518707cf9..7e3dd77cf384 100644 --- a/core/java/android/net/ScoredNetwork.java +++ b/core/java/android/net/ScoredNetwork.java @@ -16,6 +16,7 @@ package android.net; +import android.annotation.IntDef; import android.annotation.Nullable; import android.annotation.SystemApi; import android.os.Bundle; @@ -24,6 +25,8 @@ import android.os.Parcelable; import java.lang.Math; import java.lang.UnsupportedOperationException; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; import java.util.Objects; /** @@ -33,6 +36,15 @@ import java.util.Objects; */ @SystemApi public class ScoredNetwork implements Parcelable { + + /** + * Key used with the {@link #attributes} bundle to define the badging curve. + * + * <p>The badging curve is a {@link RssiCurve} used to map different RSSI values to {@link + * Badging} enums. + */ + public static final String ATTRIBUTES_KEY_BADGING_CURVE = + "android.net.attributes.key.BADGING_CURVE"; /** * Extra used with {@link #attributes} to specify whether the * network is believed to have a captive portal. @@ -58,6 +70,15 @@ public class ScoredNetwork implements Parcelable { public static final String ATTRIBUTES_KEY_RANKING_SCORE_OFFSET = "android.net.attributes.key.RANKING_SCORE_OFFSET"; + @IntDef({BADGING_NONE, BADGING_SD, BADGING_HD, BADGING_4K}) + @Retention(RetentionPolicy.SOURCE) + public @interface Badging {} + + public static final int BADGING_NONE = 0; + public static final int BADGING_SD = 10; + public static final int BADGING_HD = 20; + public static final int BADGING_4K = 30; + /** A {@link NetworkKey} uniquely identifying this network. */ public final NetworkKey networkKey; @@ -249,6 +270,25 @@ public class ScoredNetwork implements Parcelable { } } + /** + * Return the {@link Badging} enum for this network for the given RSSI, derived from the + * badging curve. + * + * <p>If no badging curve is present, {@link #BADGE_NONE} will be returned. + * + * @param rssi The rssi level for which the badge should be calculated + */ + @Badging + public int calculateBadge(int rssi) { + if (attributes != null && attributes.containsKey(ATTRIBUTES_KEY_BADGING_CURVE)) { + RssiCurve badgingCurve = + attributes.getParcelable(ATTRIBUTES_KEY_BADGING_CURVE); + return badgingCurve.lookupScore(rssi); + } + + return BADGING_NONE; + } + public static final Parcelable.Creator<ScoredNetwork> CREATOR = new Parcelable.Creator<ScoredNetwork>() { @Override diff --git a/core/java/android/os/BaseBundle.java b/core/java/android/os/BaseBundle.java index e771aa4c632c..14760ab66fbc 100644 --- a/core/java/android/os/BaseBundle.java +++ b/core/java/android/os/BaseBundle.java @@ -213,7 +213,7 @@ public class BaseBundle { * If the underlying data are stored as a Parcel, unparcel them * using the currently assigned class loader. */ - /* package */ synchronized void unparcel() { + /* package */ void unparcel() { synchronized (this) { final Parcel parcelledData = mParcelledData; if (parcelledData == null) { @@ -319,34 +319,37 @@ public class BaseBundle { } void copyInternal(BaseBundle from, boolean deep) { - if (from.mParcelledData != null) { - if (from.isEmptyParcel()) { - mParcelledData = NoImagePreloadHolder.EMPTY_PARCEL; + synchronized (from) { + if (from.mParcelledData != null) { + if (from.isEmptyParcel()) { + mParcelledData = NoImagePreloadHolder.EMPTY_PARCEL; + } else { + mParcelledData = Parcel.obtain(); + mParcelledData.appendFrom(from.mParcelledData, 0, + from.mParcelledData.dataSize()); + mParcelledData.setDataPosition(0); + } } else { - mParcelledData = Parcel.obtain(); - mParcelledData.appendFrom(from.mParcelledData, 0, from.mParcelledData.dataSize()); - mParcelledData.setDataPosition(0); + mParcelledData = null; } - } else { - mParcelledData = null; - } - if (from.mMap != null) { - if (!deep) { - mMap = new ArrayMap<>(from.mMap); - } else { - final ArrayMap<String, Object> fromMap = from.mMap; - final int N = fromMap.size(); - mMap = new ArrayMap<>(N); - for (int i=0; i<N; i++) { - mMap.append(fromMap.keyAt(i), deepcopyValue(fromMap.valueAt(i))); + if (from.mMap != null) { + if (!deep) { + mMap = new ArrayMap<>(from.mMap); + } else { + final ArrayMap<String, Object> fromMap = from.mMap; + final int N = fromMap.size(); + mMap = new ArrayMap<>(N); + for (int i = 0; i < N; i++) { + mMap.append(fromMap.keyAt(i), deepcopyValue(fromMap.valueAt(i))); + } } + } else { + mMap = null; } - } else { - mMap = null; - } - mClassLoader = from.mClassLoader; + mClassLoader = from.mClassLoader; + } } Object deepcopyValue(Object value) { @@ -1441,39 +1444,42 @@ public class BaseBundle { void writeToParcelInner(Parcel parcel, int flags) { // Keep implementation in sync with writeToParcel() in // frameworks/native/libs/binder/PersistableBundle.cpp. - final Parcel parcelledData; + final ArrayMap<String, Object> map; synchronized (this) { - parcelledData = mParcelledData; - } - if (parcelledData != null) { - if (isEmptyParcel()) { - parcel.writeInt(0); - } else { - int length = parcelledData.dataSize(); - parcel.writeInt(length); - parcel.writeInt(BUNDLE_MAGIC); - parcel.appendFrom(parcelledData, 0, length); - } - } else { - // Special case for empty bundles. - if (mMap == null || mMap.size() <= 0) { - parcel.writeInt(0); + // unparcel() can race with this method and cause the parcel to recycle + // at the wrong time. So synchronize access the mParcelledData's content. + if (mParcelledData != null) { + if (mParcelledData == NoImagePreloadHolder.EMPTY_PARCEL) { + parcel.writeInt(0); + } else { + int length = mParcelledData.dataSize(); + parcel.writeInt(length); + parcel.writeInt(BUNDLE_MAGIC); + parcel.appendFrom(mParcelledData, 0, length); + } return; } - int lengthPos = parcel.dataPosition(); - parcel.writeInt(-1); // dummy, will hold length - parcel.writeInt(BUNDLE_MAGIC); - - int startPos = parcel.dataPosition(); - parcel.writeArrayMapInternal(mMap); - int endPos = parcel.dataPosition(); - - // Backpatch length - parcel.setDataPosition(lengthPos); - int length = endPos - startPos; - parcel.writeInt(length); - parcel.setDataPosition(endPos); + map = mMap; + } + + // Special case for empty bundles. + if (map == null || map.size() <= 0) { + parcel.writeInt(0); + return; } + int lengthPos = parcel.dataPosition(); + parcel.writeInt(-1); // dummy, will hold length + parcel.writeInt(BUNDLE_MAGIC); + + int startPos = parcel.dataPosition(); + parcel.writeArrayMapInternal(map); + int endPos = parcel.dataPosition(); + + // Backpatch length + parcel.setDataPosition(lengthPos); + int length = endPos - startPos; + parcel.writeInt(length); + parcel.setDataPosition(endPos); } /** diff --git a/core/java/android/os/Build.java b/core/java/android/os/Build.java index 0d6d36961750..daf8b2dd9666 100644 --- a/core/java/android/os/Build.java +++ b/core/java/android/os/Build.java @@ -818,7 +818,7 @@ public class Build { */ public static boolean isBuildConsistent() { // Don't care on eng builds. Incremental build may trigger false negative. - if ("eng".equals(TYPE)) return true; + if (IS_ENG) return true; final String system = SystemProperties.get("ro.build.fingerprint"); final String vendor = SystemProperties.get("ro.vendor.build.fingerprint"); @@ -882,6 +882,10 @@ public class Build { public static final boolean IS_DEBUGGABLE = SystemProperties.getInt("ro.debuggable", 0) == 1; + /** {@hide} */ + public static final boolean IS_ENG = + "eng".equals(getString("ro.build.type")); + /** * Specifies whether the permissions needed by a legacy app should be * reviewed before any of its components can run. A legacy app is one diff --git a/core/java/android/os/HwBinder.java b/core/java/android/os/HwBinder.java index 481b2dc096d5..bcc3468724fd 100644 --- a/core/java/android/os/HwBinder.java +++ b/core/java/android/os/HwBinder.java @@ -33,11 +33,14 @@ public abstract class HwBinder implements IHwBinder { mNativeContext); } + @Override public final native void transact( - int code, HwParcel request, HwParcel reply, int flags); + int code, HwParcel request, HwParcel reply, int flags) + throws RemoteException; public abstract void onTransact( - int code, HwParcel request, HwParcel reply, int flags); + int code, HwParcel request, HwParcel reply, int flags) + throws RemoteException; public native final void registerService( ArrayList<String> interfaceChain, diff --git a/core/java/android/os/HwRemoteBinder.java b/core/java/android/os/HwRemoteBinder.java index 83866b3cceb7..2f89ce6270be 100644 --- a/core/java/android/os/HwRemoteBinder.java +++ b/core/java/android/os/HwRemoteBinder.java @@ -32,12 +32,18 @@ public class HwRemoteBinder implements IHwBinder { mNativeContext); } + @Override public IHwInterface queryLocalInterface(String descriptor) { return null; } + @Override public native final void transact( - int code, HwParcel request, HwParcel reply, int flags); + int code, HwParcel request, HwParcel reply, int flags) + throws RemoteException; + + public native boolean linkToDeath(DeathRecipient recipient, long cookie); + public native boolean unlinkToDeath(DeathRecipient recipient); private static native final long native_init(); @@ -52,5 +58,9 @@ public class HwRemoteBinder implements IHwBinder { 128 /* size */); } + private static final void sendDeathNotice(DeathRecipient recipient, long cookie) { + recipient.serviceDied(cookie); + } + private long mNativeContext; } diff --git a/core/java/android/os/IHwBinder.java b/core/java/android/os/IHwBinder.java index 76e881eda8af..2a6567989ced 100644 --- a/core/java/android/os/IHwBinder.java +++ b/core/java/android/os/IHwBinder.java @@ -23,7 +23,20 @@ public interface IHwBinder { public static final int FLAG_ONEWAY = 1; public void transact( - int code, HwParcel request, HwParcel reply, int flags); + int code, HwParcel request, HwParcel reply, int flags) + throws RemoteException; public IHwInterface queryLocalInterface(String descriptor); + + /** + * Interface for receiving a callback when the process hosting a service + * has gone away. + */ + public interface DeathRecipient { + public void serviceDied(long cookie); + } + + public boolean linkToDeath(DeathRecipient recipient, long cookie); + + public boolean unlinkToDeath(DeathRecipient recipient); } diff --git a/core/java/android/os/Process.java b/core/java/android/os/Process.java index 9cd1a4246a58..d6688e3c00f7 100644 --- a/core/java/android/os/Process.java +++ b/core/java/android/os/Process.java @@ -184,6 +184,11 @@ public class Process { */ public static final int LAST_SHARED_APPLICATION_GID = 59999; + /** {@hide} */ + public static final int FIRST_APPLICATION_CACHE_GID = 20000; + /** {@hide} */ + public static final int LAST_APPLICATION_CACHE_GID = 29999; + /** * Standard priority of application threads. * Use with {@link #setThreadPriority(int)} and diff --git a/core/java/android/os/UserHandle.java b/core/java/android/os/UserHandle.java index b04d149c3427..4aec8aea24c5 100644 --- a/core/java/android/os/UserHandle.java +++ b/core/java/android/os/UserHandle.java @@ -215,6 +215,15 @@ public final class UserHandle implements Parcelable { } /** + * Returns the cache GID for a given UID or appId. + * @hide + */ + public static int getCacheAppGid(int id) { + return Process.FIRST_APPLICATION_CACHE_GID + (id % PER_USER_RANGE) + - Process.FIRST_APPLICATION_UID; + } + + /** * Generate a text representation of the uid, breaking out its individual * components -- user, app, isolated, etc. * @hide diff --git a/core/java/android/provider/VoicemailContract.java b/core/java/android/provider/VoicemailContract.java index 5099eebf6eb1..c3cbcdc3932c 100644 --- a/core/java/android/provider/VoicemailContract.java +++ b/core/java/android/provider/VoicemailContract.java @@ -106,15 +106,7 @@ public class VoicemailContract { /** * Broadcast intent to inform a new visual voicemail SMS has been received. This intent will - * only be delivered to the voicemail client. The intent will have the following extra values: - * - * <ul> - * <li><em>{@link #EXTRA_VOICEMAIL_SMS_TYPE}</em> - (String) The event type of the SMS. Common - * values are "SYNC" or "STATUS"</li> - * <li><em>{@link #EXTRA_VOICEMAIL_SMS_DATA}</em> - (Bundle) The fields sent by the SMS</li> - * <li><em>{@link #EXTRA_VOICEMAIL_SMS_SUBID}</em> - (Integer) The subscription ID of the - * phone account that received the SMS</li> - * </ul> + * only be delivered to the telephony service. {@link #EXTRA_VOICEMAIL_SMS} will be included. */ /** @hide */ @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION) @@ -122,42 +114,11 @@ public class VoicemailContract { "android.intent.action.VOICEMAIL_SMS_RECEIVED"; /** - * Optional extra included in {@link #ACTION_VOICEMAIL_SMS_RECEIVED} broadcast intents to - * indicate the event type of the SMS. Common values are "SYNC" or "STATUS". The extra will not - * exist if the framework cannot parse the SMS as voicemail but the carrier pattern indicates - * it is. - */ - /** @hide */ - public static final String EXTRA_VOICEMAIL_SMS_PREFIX = - "com.android.voicemail.extra.VOICEMAIL_SMS_PREFIX"; - - /** - * Optional extra included in {@link #ACTION_VOICEMAIL_SMS_RECEIVED} broadcast intents to - * indicate the fields sent by the SMS. The extra will not exist if the framework cannot - * parse the SMS as voicemail but the carrier pattern indicates it is. - */ - /** @hide */ - public static final String EXTRA_VOICEMAIL_SMS_FIELDS = - "com.android.voicemail.extra.VOICEMAIL_SMS_FIELDS"; - - /** - * Extra included in {@link #ACTION_VOICEMAIL_SMS_RECEIVED} broadcast intents to indicate the - * message body of the SMS. This extra is included if the framework cannot - * parse the SMS as voicemail but the carrier pattern indicates it is. - */ - /** + * Extra in {@link #ACTION_VOICEMAIL_SMS_RECEIVED} indicating the content of the SMS. + * * @hide */ - public static final String EXTRA_VOICEMAIL_SMS_MESSAGE_BODY = - "com.android.voicemail.extra.VOICEMAIL_SMS_MESSAGE_BODY"; - - /** - * Extra included in {@link #ACTION_VOICEMAIL_SMS_RECEIVED} broadcast intents to indicate he - * subscription ID of the phone account that received the SMS. - */ - /** @hide */ - public static final String EXTRA_VOICEMAIL_SMS_SUBID = - "com.android.voicemail.extra.VOICEMAIL_SMS_SUBID"; + public static final String EXTRA_VOICEMAIL_SMS = "android.provider.extra.VOICEMAIL_SMS"; /** * Extra included in {@link Intent#ACTION_PROVIDER_CHANGED} broadcast intents to indicate if the diff --git a/core/java/android/speech/tts/EventLoggerV1.java b/core/java/android/speech/tts/EventLogger.java index 2b02b43cdecd..f03df311731a 100644 --- a/core/java/android/speech/tts/EventLoggerV1.java +++ b/core/java/android/speech/tts/EventLogger.java @@ -18,14 +18,14 @@ package android.speech.tts; import android.text.TextUtils; /** - * Writes data about a given speech synthesis request for V1 API to the event - * logs. The data that is logged includes the calling app, length of the - * utterance, speech rate / pitch, the latency, and overall time taken. + * Writes data about a given speech synthesis request to the event logs. The data that is logged + * includes the calling app, length of the utterance, speech rate / pitch, the latency, and overall + * time taken. */ -class EventLoggerV1 extends AbstractEventLogger { +class EventLogger extends AbstractEventLogger { private final SynthesisRequest mRequest; - EventLoggerV1(SynthesisRequest request, int callerUid, int callerPid, String serviceApp) { + EventLogger(SynthesisRequest request, int callerUid, int callerPid, String serviceApp) { super(callerUid, callerPid, serviceApp); mRequest = request; } diff --git a/core/java/android/speech/tts/SynthesisCallback.java b/core/java/android/speech/tts/SynthesisCallback.java index 6c7a21760405..2fd84996ece0 100644 --- a/core/java/android/speech/tts/SynthesisCallback.java +++ b/core/java/android/speech/tts/SynthesisCallback.java @@ -18,7 +18,6 @@ package android.speech.tts; import android.annotation.IntDef; import android.annotation.IntRange; import android.media.AudioFormat; -import android.speech.tts.TextToSpeech; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -40,107 +39,107 @@ import java.lang.annotation.RetentionPolicy; */ public interface SynthesisCallback { - /** @hide */ - @Retention(RetentionPolicy.SOURCE) - @IntDef({AudioFormat.ENCODING_PCM_8BIT, AudioFormat.ENCODING_PCM_16BIT, - AudioFormat.ENCODING_PCM_FLOAT}) - public @interface SupportedAudioFormat {}; + /** @hide */ + @Retention(RetentionPolicy.SOURCE) + @IntDef({ + AudioFormat.ENCODING_PCM_8BIT, + AudioFormat.ENCODING_PCM_16BIT, + AudioFormat.ENCODING_PCM_FLOAT + }) + @interface SupportedAudioFormat {}; /** - * @return the maximum number of bytes that the TTS engine can pass in a single call of - * {@link #audioAvailable}. Calls to {@link #audioAvailable} with data lengths - * larger than this value will not succeed. + * @return the maximum number of bytes that the TTS engine can pass in a single call of {@link + * #audioAvailable}. Calls to {@link #audioAvailable} with data lengths larger than this + * value will not succeed. */ - public int getMaxBufferSize(); + int getMaxBufferSize(); - // TODO: Replace reference to Android N to an API level when the API level for N is decided. - /** - * The service should call this when it starts to synthesize audio for this - * request. - * - * This method should only be called on the synthesis thread, - * while in {@link TextToSpeechService#onSynthesizeText}. - * - * @param sampleRateInHz Sample rate in HZ of the generated audio. - * @param audioFormat Audio format of the generated audio. Must be one of - * {@link AudioFormat#ENCODING_PCM_8BIT} or - * {@link AudioFormat#ENCODING_PCM_16BIT}. Can also be - * {@link AudioFormat#ENCODING_PCM_FLOAT} when targetting Android N and - * above. - * @param channelCount The number of channels. Must be {@code 1} or {@code 2}. - * @return {@link TextToSpeech#SUCCESS}, {@link TextToSpeech#ERROR} or - * {@link TextToSpeech#STOPPED}. - */ - public int start(int sampleRateInHz, @SupportedAudioFormat int audioFormat, - @IntRange(from=1,to=2) int channelCount); + /** + * The service should call this when it starts to synthesize audio for this request. + * + * <p>This method should only be called on the synthesis thread, while in {@link + * TextToSpeechService#onSynthesizeText}. + * + * @param sampleRateInHz Sample rate in HZ of the generated audio. + * @param audioFormat Audio format of the generated audio. Must be one of {@link + * AudioFormat#ENCODING_PCM_8BIT} or {@link AudioFormat#ENCODING_PCM_16BIT}. Can also be + * {@link AudioFormat#ENCODING_PCM_FLOAT} when targetting Android N and above. + * @param channelCount The number of channels. Must be {@code 1} or {@code 2}. + * @return {@link android.speech.tts.TextToSpeech#SUCCESS}, {@link + * android.speech.tts.TextToSpeech#ERROR} or {@link android.speech.tts.TextToSpeech#STOPPED}. + */ + int start( + int sampleRateInHz, + @SupportedAudioFormat int audioFormat, + @IntRange(from = 1, to = 2) int channelCount); - /** - * The service should call this method when synthesized audio is ready for consumption. - * - * This method should only be called on the synthesis thread, - * while in {@link TextToSpeechService#onSynthesizeText}. - * - * @param buffer The generated audio data. This method will not hold on to {@code buffer}, - * so the caller is free to modify it after this method returns. - * @param offset The offset into {@code buffer} where the audio data starts. - * @param length The number of bytes of audio data in {@code buffer}. This must be - * less than or equal to the return value of {@link #getMaxBufferSize}. - * @return {@link TextToSpeech#SUCCESS}, {@link TextToSpeech#ERROR} or - * {@link TextToSpeech#STOPPED}. - */ - public int audioAvailable(byte[] buffer, int offset, int length); + /** + * The service should call this method when synthesized audio is ready for consumption. + * + * <p>This method should only be called on the synthesis thread, while in {@link + * TextToSpeechService#onSynthesizeText}. + * + * @param buffer The generated audio data. This method will not hold on to {@code buffer}, so the + * caller is free to modify it after this method returns. + * @param offset The offset into {@code buffer} where the audio data starts. + * @param length The number of bytes of audio data in {@code buffer}. This must be less than or + * equal to the return value of {@link #getMaxBufferSize}. + * @return {@link android.speech.tts.TextToSpeech#SUCCESS}, {@link + * android.speech.tts.TextToSpeech#ERROR} or {@link android.speech.tts.TextToSpeech#STOPPED}. + */ + int audioAvailable(byte[] buffer, int offset, int length); - /** - * The service should call this method when all the synthesized audio for a request has - * been passed to {@link #audioAvailable}. - * - * This method should only be called on the synthesis thread, - * while in {@link TextToSpeechService#onSynthesizeText}. - * - * This method has to be called if {@link #start} and/or {@link #error} was called. - * - * @return {@link TextToSpeech#SUCCESS}, {@link TextToSpeech#ERROR} or - * {@link TextToSpeech#STOPPED}. - */ - public int done(); + /** + * The service should call this method when all the synthesized audio for a request has been + * passed to {@link #audioAvailable}. + * + * <p>This method should only be called on the synthesis thread, while in {@link + * TextToSpeechService#onSynthesizeText}. + * + * <p>This method has to be called if {@link #start} and/or {@link #error} was called. + * + * @return {@link android.speech.tts.TextToSpeech#SUCCESS}, {@link + * android.speech.tts.TextToSpeech#ERROR} or {@link android.speech.tts.TextToSpeech#STOPPED}. + */ + int done(); /** * The service should call this method if the speech synthesis fails. * - * This method should only be called on the synthesis thread, - * while in {@link TextToSpeechService#onSynthesizeText}. + * <p>This method should only be called on the synthesis thread, while in {@link + * TextToSpeechService#onSynthesizeText}. */ - public void error(); + void error(); - - /** - * The service should call this method if the speech synthesis fails. - * - * This method should only be called on the synthesis thread, - * while in {@link TextToSpeechService#onSynthesizeText}. - * - * @param errorCode Error code to pass to the client. One of the ERROR_ values from - * {@link TextToSpeech} - */ - public void error(@TextToSpeech.Error int errorCode); + /** + * The service should call this method if the speech synthesis fails. + * + * <p>This method should only be called on the synthesis thread, while in {@link + * TextToSpeechService#onSynthesizeText}. + * + * @param errorCode Error code to pass to the client. One of the ERROR_ values from {@link + * android.speech.tts.TextToSpeech} + */ + void error(@TextToSpeech.Error int errorCode); /** * Check if {@link #start} was called or not. * - * This method should only be called on the synthesis thread, - * while in {@link TextToSpeechService#onSynthesizeText}. + * <p>This method should only be called on the synthesis thread, while in {@link + * TextToSpeechService#onSynthesizeText}. * - * Useful for checking if a fallback from network request is possible. + * <p>Useful for checking if a fallback from network request is possible. */ - public boolean hasStarted(); + boolean hasStarted(); /** * Check if {@link #done} was called or not. * - * This method should only be called on the synthesis thread, - * while in {@link TextToSpeechService#onSynthesizeText}. + * <p>This method should only be called on the synthesis thread, while in {@link + * TextToSpeechService#onSynthesizeText}. * - * Useful for checking if a fallback from network request is possible. + * <p>Useful for checking if a fallback from network request is possible. */ - public boolean hasFinished(); + boolean hasFinished(); } diff --git a/core/java/android/speech/tts/TextToSpeech.java b/core/java/android/speech/tts/TextToSpeech.java index d55c7bd5a9eb..24cad950f648 100644 --- a/core/java/android/speech/tts/TextToSpeech.java +++ b/core/java/android/speech/tts/TextToSpeech.java @@ -191,7 +191,7 @@ public class TextToSpeech { * * @param status {@link TextToSpeech#SUCCESS} or {@link TextToSpeech#ERROR}. */ - public void onInit(int status); + void onInit(int status); } /** @@ -208,7 +208,7 @@ public class TextToSpeech { * * @param utteranceId the identifier of the utterance. */ - public void onUtteranceCompleted(String utteranceId); + void onUtteranceCompleted(String utteranceId); } /** diff --git a/core/java/android/speech/tts/TextToSpeechService.java b/core/java/android/speech/tts/TextToSpeechService.java index 9b238ce64c97..55da52b028d7 100644 --- a/core/java/android/speech/tts/TextToSpeechService.java +++ b/core/java/android/speech/tts/TextToSpeechService.java @@ -226,17 +226,14 @@ public abstract class TextToSpeechService extends Service { protected abstract void onStop(); /** - * Tells the service to synthesize speech from the given text. This method - * should block until the synthesis is finished. Used for requests from V1 - * clients ({@link android.speech.tts.TextToSpeech}). Called on the synthesis - * thread. + * Tells the service to synthesize speech from the given text. This method should block until + * the synthesis is finished. Called on the synthesis thread. * * @param request The synthesis request. - * @param callback The callback that the engine must use to make data - * available for playback or for writing to a file. + * @param callback The callback that the engine must use to make data available for playback or + * for writing to a file. */ - protected abstract void onSynthesizeText(SynthesisRequest request, - SynthesisCallback callback); + protected abstract void onSynthesizeText(SynthesisRequest request, SynthesisCallback callback); /** * Queries the service for a set of features supported for a given language. @@ -655,12 +652,17 @@ public abstract class TextToSpeechService extends Service { } interface UtteranceProgressDispatcher { - public void dispatchOnStop(); - public void dispatchOnSuccess(); - public void dispatchOnStart(); - public void dispatchOnError(int errorCode); - public void dispatchOnBeginSynthesis(int sampleRateInHz, int audioFormat, int channelCount); - public void dispatchOnAudioAvailable(byte[] audio); + void dispatchOnStop(); + + void dispatchOnSuccess(); + + void dispatchOnStart(); + + void dispatchOnError(int errorCode); + + void dispatchOnBeginSynthesis(int sampleRateInHz, int audioFormat, int channelCount); + + void dispatchOnAudioAvailable(byte[] audio); } /** Set of parameters affecting audio output. */ @@ -708,8 +710,7 @@ public abstract class TextToSpeechService extends Service { } /** Create AudioOutputParams from A {@link SynthesisRequest#getParams()} bundle */ - static AudioOutputParams createFromV1ParamsBundle(Bundle paramsBundle, - boolean isSpeech) { + static AudioOutputParams createFromParamsBundle(Bundle paramsBundle, boolean isSpeech) { if (paramsBundle == null) { return new AudioOutputParams(); } @@ -897,16 +898,19 @@ public abstract class TextToSpeechService extends Service { } /** - * UtteranceSpeechItem for V1 API speech items. V1 API speech items keep - * synthesis parameters in a single Bundle passed as parameter. This class - * allow subclasses to access them conveniently. + * Synthesis parameters are kept in a single Bundle passed as parameter. This class allow + * subclasses to access them conveniently. */ - private abstract class SpeechItemV1 extends UtteranceSpeechItem { + private abstract class UtteranceSpeechItemWithParams extends UtteranceSpeechItem { protected final Bundle mParams; protected final String mUtteranceId; - SpeechItemV1(Object callerIdentity, int callerUid, int callerPid, - Bundle params, String utteranceId) { + UtteranceSpeechItemWithParams( + Object callerIdentity, + int callerUid, + int callerPid, + Bundle params, + String utteranceId) { super(callerIdentity, callerUid, callerPid); mParams = params; mUtteranceId = utteranceId; @@ -930,11 +934,11 @@ public abstract class TextToSpeechService extends Service { } AudioOutputParams getAudioParams() { - return AudioOutputParams.createFromV1ParamsBundle(mParams, true); + return AudioOutputParams.createFromParamsBundle(mParams, true); } } - class SynthesisSpeechItemV1 extends SpeechItemV1 { + class SynthesisSpeechItem extends UtteranceSpeechItemWithParams { // Never null. private final CharSequence mText; private final SynthesisRequest mSynthesisRequest; @@ -942,19 +946,23 @@ public abstract class TextToSpeechService extends Service { // Non null after synthesis has started, and all accesses // guarded by 'this'. private AbstractSynthesisCallback mSynthesisCallback; - private final EventLoggerV1 mEventLogger; + private final EventLogger mEventLogger; private final int mCallerUid; - public SynthesisSpeechItemV1(Object callerIdentity, int callerUid, int callerPid, - Bundle params, String utteranceId, CharSequence text) { + public SynthesisSpeechItem( + Object callerIdentity, + int callerUid, + int callerPid, + Bundle params, + String utteranceId, + CharSequence text) { super(callerIdentity, callerUid, callerPid, params, utteranceId); mText = text; mCallerUid = callerUid; mSynthesisRequest = new SynthesisRequest(mText, mParams); mDefaultLocale = getSettingsLocale(); setRequestParams(mSynthesisRequest); - mEventLogger = new EventLoggerV1(mSynthesisRequest, callerUid, callerPid, - mPackageName); + mEventLogger = new EventLogger(mSynthesisRequest, callerUid, callerPid, mPackageName); } public CharSequence getText() { @@ -1048,11 +1056,16 @@ public abstract class TextToSpeechService extends Service { } } - private class SynthesisToFileOutputStreamSpeechItemV1 extends SynthesisSpeechItemV1 { + private class SynthesisToFileOutputStreamSpeechItem extends SynthesisSpeechItem { private final FileOutputStream mFileOutputStream; - public SynthesisToFileOutputStreamSpeechItemV1(Object callerIdentity, int callerUid, - int callerPid, Bundle params, String utteranceId, CharSequence text, + public SynthesisToFileOutputStreamSpeechItem( + Object callerIdentity, + int callerUid, + int callerPid, + Bundle params, + String utteranceId, + CharSequence text, FileOutputStream fileOutputStream) { super(callerIdentity, callerUid, callerPid, params, utteranceId, text); mFileOutputStream = fileOutputStream; @@ -1075,11 +1088,16 @@ public abstract class TextToSpeechService extends Service { } } - private class AudioSpeechItemV1 extends SpeechItemV1 { + private class AudioSpeechItem extends UtteranceSpeechItemWithParams { private final AudioPlaybackQueueItem mItem; - public AudioSpeechItemV1(Object callerIdentity, int callerUid, int callerPid, - Bundle params, String utteranceId, Uri uri) { + public AudioSpeechItem( + Object callerIdentity, + int callerUid, + int callerPid, + Bundle params, + String utteranceId, + Uri uri) { super(callerIdentity, callerUid, callerPid, params, utteranceId); mItem = new AudioPlaybackQueueItem(this, getCallerIdentity(), TextToSpeechService.this, uri, getAudioParams()); @@ -1107,7 +1125,7 @@ public abstract class TextToSpeechService extends Service { @Override AudioOutputParams getAudioParams() { - return AudioOutputParams.createFromV1ParamsBundle(mParams, false); + return AudioOutputParams.createFromParamsBundle(mParams, false); } } @@ -1214,202 +1232,252 @@ public abstract class TextToSpeechService extends Service { } /** - * Binder returned from {@code #onBind(Intent)}. The methods in this class can be - * called called from several different threads. + * Binder returned from {@code #onBind(Intent)}. The methods in this class can be called called + * from several different threads. */ // NOTE: All calls that are passed in a calling app are interned so that // they can be used as message objects (which are tested for equality using ==). - private final ITextToSpeechService.Stub mBinder = new ITextToSpeechService.Stub() { - @Override - public int speak(IBinder caller, CharSequence text, int queueMode, Bundle params, - String utteranceId) { - if (!checkNonNull(caller, text, params)) { - return TextToSpeech.ERROR; - } - - SpeechItem item = new SynthesisSpeechItemV1(caller, - Binder.getCallingUid(), Binder.getCallingPid(), params, utteranceId, text); - return mSynthHandler.enqueueSpeechItem(queueMode, item); - } - - @Override - public int synthesizeToFileDescriptor(IBinder caller, CharSequence text, ParcelFileDescriptor - fileDescriptor, Bundle params, String utteranceId) { - if (!checkNonNull(caller, text, fileDescriptor, params)) { - return TextToSpeech.ERROR; - } - - // In test env, ParcelFileDescriptor instance may be EXACTLY the same - // one that is used by client. And it will be closed by a client, thus - // preventing us from writing anything to it. - final ParcelFileDescriptor sameFileDescriptor = ParcelFileDescriptor.adoptFd( - fileDescriptor.detachFd()); - - SpeechItem item = new SynthesisToFileOutputStreamSpeechItemV1(caller, - Binder.getCallingUid(), Binder.getCallingPid(), params, utteranceId, text, - new ParcelFileDescriptor.AutoCloseOutputStream(sameFileDescriptor)); - return mSynthHandler.enqueueSpeechItem(TextToSpeech.QUEUE_ADD, item); - } + private final ITextToSpeechService.Stub mBinder = + new ITextToSpeechService.Stub() { + @Override + public int speak( + IBinder caller, + CharSequence text, + int queueMode, + Bundle params, + String utteranceId) { + if (!checkNonNull(caller, text, params)) { + return TextToSpeech.ERROR; + } - @Override - public int playAudio(IBinder caller, Uri audioUri, int queueMode, Bundle params, - String utteranceId) { - if (!checkNonNull(caller, audioUri, params)) { - return TextToSpeech.ERROR; - } + SpeechItem item = + new SynthesisSpeechItem( + caller, + Binder.getCallingUid(), + Binder.getCallingPid(), + params, + utteranceId, + text); + return mSynthHandler.enqueueSpeechItem(queueMode, item); + } - SpeechItem item = new AudioSpeechItemV1(caller, - Binder.getCallingUid(), Binder.getCallingPid(), params, utteranceId, audioUri); - return mSynthHandler.enqueueSpeechItem(queueMode, item); - } + @Override + public int synthesizeToFileDescriptor( + IBinder caller, + CharSequence text, + ParcelFileDescriptor fileDescriptor, + Bundle params, + String utteranceId) { + if (!checkNonNull(caller, text, fileDescriptor, params)) { + return TextToSpeech.ERROR; + } - @Override - public int playSilence(IBinder caller, long duration, int queueMode, String utteranceId) { - if (!checkNonNull(caller)) { - return TextToSpeech.ERROR; - } + // In test env, ParcelFileDescriptor instance may be EXACTLY the same + // one that is used by client. And it will be closed by a client, thus + // preventing us from writing anything to it. + final ParcelFileDescriptor sameFileDescriptor = + ParcelFileDescriptor.adoptFd(fileDescriptor.detachFd()); + + SpeechItem item = + new SynthesisToFileOutputStreamSpeechItem( + caller, + Binder.getCallingUid(), + Binder.getCallingPid(), + params, + utteranceId, + text, + new ParcelFileDescriptor.AutoCloseOutputStream( + sameFileDescriptor)); + return mSynthHandler.enqueueSpeechItem(TextToSpeech.QUEUE_ADD, item); + } - SpeechItem item = new SilenceSpeechItem(caller, - Binder.getCallingUid(), Binder.getCallingPid(), utteranceId, duration); - return mSynthHandler.enqueueSpeechItem(queueMode, item); - } + @Override + public int playAudio( + IBinder caller, + Uri audioUri, + int queueMode, + Bundle params, + String utteranceId) { + if (!checkNonNull(caller, audioUri, params)) { + return TextToSpeech.ERROR; + } - @Override - public boolean isSpeaking() { - return mSynthHandler.isSpeaking() || mAudioPlaybackHandler.isSpeaking(); - } + SpeechItem item = + new AudioSpeechItem( + caller, + Binder.getCallingUid(), + Binder.getCallingPid(), + params, + utteranceId, + audioUri); + return mSynthHandler.enqueueSpeechItem(queueMode, item); + } - @Override - public int stop(IBinder caller) { - if (!checkNonNull(caller)) { - return TextToSpeech.ERROR; - } + @Override + public int playSilence( + IBinder caller, long duration, int queueMode, String utteranceId) { + if (!checkNonNull(caller)) { + return TextToSpeech.ERROR; + } - return mSynthHandler.stopForApp(caller); - } + SpeechItem item = + new SilenceSpeechItem( + caller, + Binder.getCallingUid(), + Binder.getCallingPid(), + utteranceId, + duration); + return mSynthHandler.enqueueSpeechItem(queueMode, item); + } - @Override - public String[] getLanguage() { - return onGetLanguage(); - } + @Override + public boolean isSpeaking() { + return mSynthHandler.isSpeaking() || mAudioPlaybackHandler.isSpeaking(); + } - @Override - public String[] getClientDefaultLanguage() { - return getSettingsLocale(); - } + @Override + public int stop(IBinder caller) { + if (!checkNonNull(caller)) { + return TextToSpeech.ERROR; + } - /* - * If defaults are enforced, then no language is "available" except - * perhaps the default language selected by the user. - */ - @Override - public int isLanguageAvailable(String lang, String country, String variant) { - if (!checkNonNull(lang)) { - return TextToSpeech.ERROR; - } + return mSynthHandler.stopForApp(caller); + } - return onIsLanguageAvailable(lang, country, variant); - } + @Override + public String[] getLanguage() { + return onGetLanguage(); + } - @Override - public String[] getFeaturesForLanguage(String lang, String country, String variant) { - Set<String> features = onGetFeaturesForLanguage(lang, country, variant); - String[] featuresArray = null; - if (features != null) { - featuresArray = new String[features.size()]; - features.toArray(featuresArray); - } else { - featuresArray = new String[0]; - } - return featuresArray; - } + @Override + public String[] getClientDefaultLanguage() { + return getSettingsLocale(); + } - /* - * There is no point loading a non default language if defaults - * are enforced. - */ - @Override - public int loadLanguage(IBinder caller, String lang, String country, String variant) { - if (!checkNonNull(lang)) { - return TextToSpeech.ERROR; - } - int retVal = onIsLanguageAvailable(lang, country, variant); + /* + * If defaults are enforced, then no language is "available" except + * perhaps the default language selected by the user. + */ + @Override + public int isLanguageAvailable(String lang, String country, String variant) { + if (!checkNonNull(lang)) { + return TextToSpeech.ERROR; + } - if (retVal == TextToSpeech.LANG_AVAILABLE || - retVal == TextToSpeech.LANG_COUNTRY_AVAILABLE || - retVal == TextToSpeech.LANG_COUNTRY_VAR_AVAILABLE) { + return onIsLanguageAvailable(lang, country, variant); + } - SpeechItem item = new LoadLanguageItem(caller, Binder.getCallingUid(), - Binder.getCallingPid(), lang, country, variant); + @Override + public String[] getFeaturesForLanguage( + String lang, String country, String variant) { + Set<String> features = onGetFeaturesForLanguage(lang, country, variant); + String[] featuresArray = null; + if (features != null) { + featuresArray = new String[features.size()]; + features.toArray(featuresArray); + } else { + featuresArray = new String[0]; + } + return featuresArray; + } - if (mSynthHandler.enqueueSpeechItem(TextToSpeech.QUEUE_ADD, item) != - TextToSpeech.SUCCESS) { - return TextToSpeech.ERROR; + /* + * There is no point loading a non default language if defaults + * are enforced. + */ + @Override + public int loadLanguage( + IBinder caller, String lang, String country, String variant) { + if (!checkNonNull(lang)) { + return TextToSpeech.ERROR; + } + int retVal = onIsLanguageAvailable(lang, country, variant); + + if (retVal == TextToSpeech.LANG_AVAILABLE + || retVal == TextToSpeech.LANG_COUNTRY_AVAILABLE + || retVal == TextToSpeech.LANG_COUNTRY_VAR_AVAILABLE) { + + SpeechItem item = + new LoadLanguageItem( + caller, + Binder.getCallingUid(), + Binder.getCallingPid(), + lang, + country, + variant); + + if (mSynthHandler.enqueueSpeechItem(TextToSpeech.QUEUE_ADD, item) + != TextToSpeech.SUCCESS) { + return TextToSpeech.ERROR; + } + } + return retVal; } - } - return retVal; - } - @Override - public List<Voice> getVoices() { - return onGetVoices(); - } + @Override + public List<Voice> getVoices() { + return onGetVoices(); + } - @Override - public int loadVoice(IBinder caller, String voiceName) { - if (!checkNonNull(voiceName)) { - return TextToSpeech.ERROR; - } - int retVal = onIsValidVoiceName(voiceName); - - if (retVal == TextToSpeech.SUCCESS) { - SpeechItem item = new LoadVoiceItem(caller, Binder.getCallingUid(), - Binder.getCallingPid(), voiceName); - if (mSynthHandler.enqueueSpeechItem(TextToSpeech.QUEUE_ADD, item) != - TextToSpeech.SUCCESS) { - return TextToSpeech.ERROR; + @Override + public int loadVoice(IBinder caller, String voiceName) { + if (!checkNonNull(voiceName)) { + return TextToSpeech.ERROR; + } + int retVal = onIsValidVoiceName(voiceName); + + if (retVal == TextToSpeech.SUCCESS) { + SpeechItem item = + new LoadVoiceItem( + caller, + Binder.getCallingUid(), + Binder.getCallingPid(), + voiceName); + if (mSynthHandler.enqueueSpeechItem(TextToSpeech.QUEUE_ADD, item) + != TextToSpeech.SUCCESS) { + return TextToSpeech.ERROR; + } + } + return retVal; } - } - return retVal; - } - public String getDefaultVoiceNameFor(String lang, String country, String variant) { - if (!checkNonNull(lang)) { - return null; - } - int retVal = onIsLanguageAvailable(lang, country, variant); + public String getDefaultVoiceNameFor(String lang, String country, String variant) { + if (!checkNonNull(lang)) { + return null; + } + int retVal = onIsLanguageAvailable(lang, country, variant); - if (retVal == TextToSpeech.LANG_AVAILABLE || - retVal == TextToSpeech.LANG_COUNTRY_AVAILABLE || - retVal == TextToSpeech.LANG_COUNTRY_VAR_AVAILABLE) { - return onGetDefaultVoiceNameFor(lang, country, variant); - } else { - return null; - } - } + if (retVal == TextToSpeech.LANG_AVAILABLE + || retVal == TextToSpeech.LANG_COUNTRY_AVAILABLE + || retVal == TextToSpeech.LANG_COUNTRY_VAR_AVAILABLE) { + return onGetDefaultVoiceNameFor(lang, country, variant); + } else { + return null; + } + } - @Override - public void setCallback(IBinder caller, ITextToSpeechCallback cb) { - // Note that passing in a null callback is a valid use case. - if (!checkNonNull(caller)) { - return; - } + @Override + public void setCallback(IBinder caller, ITextToSpeechCallback cb) { + // Note that passing in a null callback is a valid use case. + if (!checkNonNull(caller)) { + return; + } - mCallbacks.setCallback(caller, cb); - } + mCallbacks.setCallback(caller, cb); + } - private String intern(String in) { - // The input parameter will be non null. - return in.intern(); - } + private String intern(String in) { + // The input parameter will be non null. + return in.intern(); + } - private boolean checkNonNull(Object... args) { - for (Object o : args) { - if (o == null) return false; - } - return true; - } - }; + private boolean checkNonNull(Object... args) { + for (Object o : args) { + if (o == null) return false; + } + return true; + } + }; private class CallbackMap extends RemoteCallbackList<ITextToSpeechCallback> { private final HashMap<IBinder, ITextToSpeechCallback> mCallerToCallback diff --git a/core/java/android/speech/tts/TtsEngines.java b/core/java/android/speech/tts/TtsEngines.java index 412eba304e89..a8c3453293ab 100644 --- a/core/java/android/speech/tts/TtsEngines.java +++ b/core/java/android/speech/tts/TtsEngines.java @@ -471,9 +471,7 @@ public class TtsEngines { String[] ret = new String[]{"","",""}; try { // Note that the default locale might have an empty variant - // or language, and we take care that the construction is - // the same as {@link #getV1Locale} i.e no trailing delimiters - // or spaces. + // or language. ret[0] = locale.getISO3Language(); ret[1] = locale.getISO3Country(); ret[2] = locale.getVariant(); diff --git a/core/java/android/text/Layout.java b/core/java/android/text/Layout.java index fd6fc7dc0860..3cb81b0a250f 100644 --- a/core/java/android/text/Layout.java +++ b/core/java/android/text/Layout.java @@ -1092,8 +1092,10 @@ public abstract class Layout { int dir = getParagraphDirection(line); TextLine tl = TextLine.obtain(); + mPaint.setHyphenEdit(getHyphen(line)); tl.set(mPaint, mText, start, end, dir, directions, hasTabs, tabStops); float width = tl.metrics(null); + mPaint.setHyphenEdit(0); TextLine.recycle(tl); return width; } @@ -1114,8 +1116,10 @@ public abstract class Layout { int dir = getParagraphDirection(line); TextLine tl = TextLine.obtain(); + mPaint.setHyphenEdit(getHyphen(line)); tl.set(mPaint, mText, start, end, dir, directions, hasTabs, tabStops); float width = tl.metrics(null); + mPaint.setHyphenEdit(0); TextLine.recycle(tl); return width; } diff --git a/core/java/android/view/accessibility/AccessibilityCache.java b/core/java/android/view/accessibility/AccessibilityCache.java index ee5bbe815521..9bc4bc7725ff 100644 --- a/core/java/android/view/accessibility/AccessibilityCache.java +++ b/core/java/android/view/accessibility/AccessibilityCache.java @@ -42,6 +42,26 @@ public final class AccessibilityCache { private static final boolean CHECK_INTEGRITY = "eng".equals(Build.TYPE); + /** + * {@link AccessibilityEvent} types that are critical for the cache to stay up to date + * + * When adding new event types in {@link #onAccessibilityEvent}, please add it here also, to + * make sure that the events are delivered to cache regardless of + * {@link android.accessibilityservice.AccessibilityServiceInfo#eventTypes} + */ + public static final int CACHE_CRITICAL_EVENTS_MASK = + AccessibilityEvent.TYPE_VIEW_ACCESSIBILITY_FOCUSED + | AccessibilityEvent.TYPE_VIEW_ACCESSIBILITY_FOCUS_CLEARED + | AccessibilityEvent.TYPE_VIEW_FOCUSED + | AccessibilityEvent.TYPE_VIEW_SELECTED + | AccessibilityEvent.TYPE_VIEW_TEXT_CHANGED + | AccessibilityEvent.TYPE_VIEW_CLICKED + | AccessibilityEvent.TYPE_VIEW_TEXT_SELECTION_CHANGED + | AccessibilityEvent.TYPE_WINDOW_CONTENT_CHANGED + | AccessibilityEvent.TYPE_VIEW_SCROLLED + | AccessibilityEvent.TYPE_WINDOWS_CHANGED + | AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED; + private final Object mLock = new Object(); private final AccessibilityNodeRefresher mAccessibilityNodeRefresher; @@ -100,6 +120,9 @@ public final class AccessibilityCache { * Notifies the cache that the something in the UI changed. As a result * the cache will either refresh some nodes or evict some nodes. * + * Note: any event that ends up affecting the cache should also be present in + * {@link #CACHE_CRITICAL_EVENTS_MASK} + * * @param event An event. */ public void onAccessibilityEvent(AccessibilityEvent event) { diff --git a/location/java/android/location/GnssNmeaListener.java b/core/java/android/webkit/RenderProcessGoneDetail.java index 756ae49f92cf..77d85963ce2d 100644 --- a/location/java/android/location/GnssNmeaListener.java +++ b/core/java/android/webkit/RenderProcessGoneDetail.java @@ -14,18 +14,22 @@ * limitations under the License. */ -package android.location; +package android.webkit; /** -* Used for receiving NMEA sentences from the GNSS. -* NMEA 0183 is a standard for communicating with marine electronic devices -* and is a common method for receiving data from a GNSS, typically over a serial port. -* See <a href="http://en.wikipedia.org/wiki/NMEA_0183">NMEA 0183</a> for more details. -* You can implement this interface and call {@link LocationManager#addNmeaListener} -* to receive NMEA data from the GNSS engine. -* @removed -*/ -public interface GnssNmeaListener { - /** Called when an NMEA message is received. */ - void onNmeaReceived(long timestamp, String nmea); + * This class provides more specific information about why the render process + * exited. The application may use this to decide how to handle the situation. + **/ +public abstract class RenderProcessGoneDetail { + /** + * Indicates whether the render process was observed to crash, or whether + * it was killed by the system. + * + * If the render process was killed, this is most likely caused by the + * system being low on memory. + * + * @return True if render process crashed, otherwise it was killed by + * system. + **/ + public abstract boolean didCrash(); } diff --git a/core/java/android/webkit/WebViewClient.java b/core/java/android/webkit/WebViewClient.java index 76d3fb15d049..8703468a74a7 100644 --- a/core/java/android/webkit/WebViewClient.java +++ b/core/java/android/webkit/WebViewClient.java @@ -466,4 +466,31 @@ public class WebViewClient { public void onReceivedLoginRequest(WebView view, String realm, String account, String args) { } + + /** + * Notify host application that the given webview's render process has exited. + * + * Multiple WebView instances may be associated with a single render process; + * onRenderProcessGone will be called for each WebView that was affected. + * The application's implementation of this callback should only attempt to + * clean up the specific WebView given as a parameter, and should not assume + * that other WebView instances are affected. + * + * The given WebView can't be used, and should be removed from the view hierarchy, + * all references to it should be cleaned up, e.g any references in the Activity + * or other classes saved using findViewById and similar calls, etc + * + * To cause an render process crash for test purpose, the application can + * call loadUrl("chrome://crash") on the WebView. Note that multiple WebView + * instances may be affected if they share a render process, not just the + * specific WebView which loaded chrome://crash. + * + * @param view The WebView which needs to be cleaned up. + * @param detail the reason why it exited. + * @return true if the host application handled the situation that process has + * exited, otherwise, application will crash. + */ + public boolean onRenderProcessGone(WebView view, RenderProcessGoneDetail detail) { + return false; + } } diff --git a/core/java/com/android/internal/app/ChooserActivity.java b/core/java/com/android/internal/app/ChooserActivity.java index c314cae2f55c..16a12518574d 100644 --- a/core/java/com/android/internal/app/ChooserActivity.java +++ b/core/java/com/android/internal/app/ChooserActivity.java @@ -69,6 +69,7 @@ import android.widget.AbsListView; import android.widget.BaseAdapter; import android.widget.ListView; import com.android.internal.R; +import com.android.internal.annotations.VisibleForTesting; import com.android.internal.app.ResolverActivity.TargetInfo; import com.android.internal.logging.MetricsLogger; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; @@ -93,9 +94,13 @@ public class ChooserActivity extends ResolverActivity { private IntentSender mRefinementIntentSender; private RefinementResultReceiver mRefinementResultReceiver; private ChooserTarget[] mCallerChooserTargets; + private ComponentName[] mFilteredComponentNames; private Intent mReferrerFillInIntent; + private long mChooserShownTime; + private boolean mIsSuccessfullySelected; + private ChooserListAdapter mChooserListAdapter; private ChooserRowAdapter mChooserRowAdapter; @@ -155,6 +160,8 @@ public class ChooserActivity extends ResolverActivity { @Override protected void onCreate(Bundle savedInstanceState) { + final long intentReceivedTime = System.currentTimeMillis(); + mIsSuccessfullySelected = false; Intent intent = getIntent(); Parcelable targetParcelable = intent.getParcelableExtra(Intent.EXTRA_INTENT); if (!(targetParcelable instanceof Intent)) { @@ -235,7 +242,7 @@ public class ChooserActivity extends ResolverActivity { } names[i] = (ComponentName) pa[i]; } - setFilteredComponents(names); + mFilteredComponentNames = names; } pa = intent.getParcelableArrayExtra(Intent.EXTRA_CHOOSER_TARGETS); @@ -257,6 +264,13 @@ public class ChooserActivity extends ResolverActivity { null, false); MetricsLogger.action(this, MetricsEvent.ACTION_ACTIVITY_CHOOSER_SHOWN); + + mChooserShownTime = System.currentTimeMillis(); + final long systemCost = mChooserShownTime - intentReceivedTime; + MetricsLogger.histogram(null, "system_cost_for_smart_sharing", (int) systemCost); + if (DEBUG) { + Log.d(TAG, "System Time Cost is " + systemCost); + } } static SharedPreferences getPinnedSharedPrefs(Context context) { @@ -410,6 +424,7 @@ public class ChooserActivity extends ResolverActivity { @Override public void startSelected(int which, boolean always, boolean filtered) { + final long selectionCost = System.currentTimeMillis() - mChooserShownTime; super.startSelected(which, always, filtered); if (mChooserListAdapter != null) { @@ -435,6 +450,17 @@ public class ChooserActivity extends ResolverActivity { if (cat != 0) { MetricsLogger.action(this, cat, value); } + + if (mIsSuccessfullySelected) { + if (DEBUG) { + Log.d(TAG, "User Selection Time Cost is " + selectionCost); + Log.d(TAG, "position of selected app/service/caller is " + + Integer.toString(value)); + } + MetricsLogger.histogram(null, "user_selection_cost_for_smart_sharing", + (int) selectionCost); + MetricsLogger.histogram(null, "app_position_for_smart_sharing", value); + } } } @@ -563,6 +589,7 @@ public class ChooserActivity extends ResolverActivity { if (ri != null && ri.activityInfo != null) { usageStatsManager.reportChooserSelection(ri.activityInfo.packageName, getUserId(), annotation, null, info.getResolvedIntent().getAction()); + mResolverComparator.updateModel(info.getResolvedComponentName()); if (DEBUG) { Log.d(TAG, "ResolveInfo Package is" + ri.activityInfo.packageName); } @@ -570,6 +597,7 @@ public class ChooserActivity extends ResolverActivity { Log.d(TAG, "Can not log Chooser Counts of null ResovleInfo"); } } + mIsSuccessfullySelected = true; } void onRefinementResult(TargetInfo selectedTarget, Intent matchingIntent) { @@ -642,17 +670,65 @@ public class ChooserActivity extends ResolverActivity { } } + public class ChooserListController extends ResolverListController { + public ChooserListController(Context context, + PackageManager pm, + Intent targetIntent, + String referrerPackageName, + int launchedFromUid) { + super(context, pm, targetIntent, referrerPackageName, launchedFromUid); + } + + @Override + boolean isComponentPinned(ComponentName name) { + return mPinnedSharedPrefs.getBoolean(name.flattenToString(), false); + } + + @Override + boolean isComponentFiltered(ComponentName name) { + if (mFilteredComponentNames == null) { + return false; + } + for (ComponentName filteredComponentName : mFilteredComponentNames) { + if (name.equals(filteredComponentName)) { + return true; + } + } + return false; + } + + @Override + public float getScore(DisplayResolveInfo target) { + if (target == null) { + return CALLER_TARGET_SCORE_BOOST; + } + float score = super.getScore(target); + if (target.isPinned()) { + score += PINNED_TARGET_SCORE_BOOST; + } + return score; + } + } + @Override public ResolveListAdapter createAdapter(Context context, List<Intent> payloadIntents, Intent[] initialIntents, List<ResolveInfo> rList, int launchedFromUid, boolean filterLastUsed) { final ChooserListAdapter adapter = new ChooserListAdapter(context, payloadIntents, - initialIntents, rList, launchedFromUid, filterLastUsed); - if (DEBUG) Log.d(TAG, "Adapter created; querying services"); - queryTargetServices(adapter); + initialIntents, rList, launchedFromUid, filterLastUsed, createListController()); return adapter; } + @VisibleForTesting + protected ResolverListController createListController() { + return new ChooserListController( + this, + mPm, + getTargetIntent(), + getReferrerPackageName(), + mLaunchedFromUid); + } + final class ChooserTargetInfo implements TargetInfo { private final DisplayResolveInfo mSourceInfo; private final ResolveInfo mBackupResolveInfo; @@ -853,10 +929,11 @@ public class ChooserActivity extends ResolverActivity { public ChooserListAdapter(Context context, List<Intent> payloadIntents, Intent[] initialIntents, List<ResolveInfo> rList, int launchedFromUid, - boolean filterLastUsed) { + boolean filterLastUsed, ResolverListController resolverListController) { // Don't send the initial intents through the shared ResolverActivity path, // we want to separate them into a different section. - super(context, payloadIntents, null, rList, launchedFromUid, filterLastUsed); + super(context, payloadIntents, null, rList, launchedFromUid, filterLastUsed, + resolverListController); if (initialIntents != null) { final PackageManager pm = getPackageManager(); @@ -922,18 +999,6 @@ public class ChooserActivity extends ResolverActivity { } @Override - public float getScore(DisplayResolveInfo target) { - if (target == null) { - return CALLER_TARGET_SCORE_BOOST; - } - float score = super.getScore(target); - if (target.isPinned()) { - score += PINNED_TARGET_SCORE_BOOST; - } - return score; - } - - @Override public View onCreateView(ViewGroup parent) { return mInflater.inflate( com.android.internal.R.layout.resolve_grid_item, parent, false); @@ -944,6 +1009,8 @@ public class ChooserActivity extends ResolverActivity { if (mServiceTargets != null) { pruneServiceTargets(); } + if (DEBUG) Log.d(TAG, "List built querying services"); + queryTargetServices(this); } @Override diff --git a/core/java/com/android/internal/app/MediaRouteControllerDialog.java b/core/java/com/android/internal/app/MediaRouteControllerDialog.java index b0e037396c83..5ce3e54561ce 100644 --- a/core/java/com/android/internal/app/MediaRouteControllerDialog.java +++ b/core/java/com/android/internal/app/MediaRouteControllerDialog.java @@ -18,19 +18,23 @@ package com.android.internal.app; import com.android.internal.R; -import android.app.Dialog; +import android.app.AlertDialog; import android.app.MediaRouteActionProvider; import android.app.MediaRouteButton; import android.content.Context; +import android.content.DialogInterface; +import android.content.res.Resources; +import android.content.res.TypedArray; +import android.graphics.drawable.AnimationDrawable; import android.graphics.drawable.Drawable; +import android.graphics.drawable.StateListDrawable; import android.media.MediaRouter; import android.media.MediaRouter.RouteGroup; import android.media.MediaRouter.RouteInfo; import android.os.Bundle; +import android.util.TypedValue; import android.view.KeyEvent; import android.view.View; -import android.view.Window; -import android.widget.Button; import android.widget.FrameLayout; import android.widget.LinearLayout; import android.widget.SeekBar; @@ -46,7 +50,7 @@ import android.widget.SeekBar; * * TODO: Move this back into the API, as in the support library media router. */ -public class MediaRouteControllerDialog extends Dialog { +public class MediaRouteControllerDialog extends AlertDialog { // Time to wait before updating the volume when the user lets go of the seek bar // to allow the route provider time to propagate the change and publish a new // route descriptor. @@ -57,8 +61,9 @@ public class MediaRouteControllerDialog extends Dialog { private final MediaRouter.RouteInfo mRoute; private boolean mCreated; - private Drawable mMediaRouteConnectingDrawable; - private Drawable mMediaRouteOnDrawable; + private Drawable mMediaRouteButtonDrawable; + private int[] mMediaRouteConnectingState = { R.attr.state_checked, R.attr.state_enabled }; + private int[] mMediaRouteOnState = { R.attr.state_activated, R.attr.state_enabled }; private Drawable mCurrentIconDrawable; private boolean mVolumeControlEnabled = true; @@ -68,8 +73,6 @@ public class MediaRouteControllerDialog extends Dialog { private View mControlView; - private Button mDisconnectButton; - public MediaRouteControllerDialog(Context context, int theme) { super(context, theme); @@ -132,14 +135,28 @@ public class MediaRouteControllerDialog extends Dialog { @Override protected void onCreate(Bundle savedInstanceState) { + setTitle(mRoute.getName()); + Resources res = getContext().getResources(); + setButton(BUTTON_NEGATIVE, res.getString(R.string.media_route_controller_disconnect), + new OnClickListener() { + @Override + public void onClick(DialogInterface dialogInterface, int id) { + if (mRoute.isSelected()) { + mRouter.getDefaultRoute().select(); + } + dismiss(); + } + }); + View customView = getLayoutInflater().inflate(R.layout.media_route_controller_dialog, null); + setView(customView, 0, 0, 0, 0); super.onCreate(savedInstanceState); - getWindow().requestFeature(Window.FEATURE_LEFT_ICON); - - setContentView(R.layout.media_route_controller_dialog); - - mVolumeLayout = (LinearLayout)findViewById(R.id.media_route_volume_layout); - mVolumeSlider = (SeekBar)findViewById(R.id.media_route_volume_slider); + View customPanelView = getWindow().findViewById(R.id.customPanel); + if (customPanelView != null) { + customPanelView.setMinimumHeight(0); + } + mVolumeLayout = (LinearLayout) customView.findViewById(R.id.media_route_volume_layout); + mVolumeSlider = (SeekBar) customView.findViewById(R.id.media_route_volume_slider); mVolumeSlider.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() { private final Runnable mStopTrackingTouch = new Runnable() { @Override @@ -176,22 +193,12 @@ public class MediaRouteControllerDialog extends Dialog { } }); - mDisconnectButton = (Button)findViewById(R.id.media_route_disconnect_button); - mDisconnectButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (mRoute.isSelected()) { - mRouter.getDefaultRoute().select(); - } - dismiss(); - } - }); - + mMediaRouteButtonDrawable = obtainMediaRouteButtonDrawable(); mCreated = true; if (update()) { mControlView = onCreateMediaControlView(savedInstanceState); FrameLayout controlFrame = - (FrameLayout)findViewById(R.id.media_route_control_frame); + (FrameLayout) customView.findViewById(R.id.media_route_control_frame); if (mControlView != null) { controlFrame.addView(mControlView); controlFrame.setVisibility(View.VISIBLE); @@ -201,7 +208,6 @@ public class MediaRouteControllerDialog extends Dialog { } } - @Override public void onAttachedToWindow() { super.onAttachedToWindow(); @@ -248,24 +254,41 @@ public class MediaRouteControllerDialog extends Dialog { Drawable icon = getIconDrawable(); if (icon != mCurrentIconDrawable) { mCurrentIconDrawable = icon; - getWindow().setFeatureDrawable(Window.FEATURE_LEFT_ICON, icon); + if (icon instanceof AnimationDrawable) { + AnimationDrawable animDrawable = (AnimationDrawable) icon; + if (!animDrawable.isRunning()) { + animDrawable.start(); + } + } + setIcon(icon); } return true; } + private Drawable obtainMediaRouteButtonDrawable() { + Context context = getContext(); + TypedValue value = new TypedValue(); + if (!context.getTheme().resolveAttribute(R.attr.mediaRouteButtonStyle, value, true)) { + return null; + } + int[] drawableAttrs = new int[] { R.attr.externalRouteEnabledDrawable }; + TypedArray a = context.obtainStyledAttributes(value.data, drawableAttrs); + Drawable drawable = a.getDrawable(0); + a.recycle(); + return drawable; + } + private Drawable getIconDrawable() { - if (mRoute.isConnecting()) { - if (mMediaRouteConnectingDrawable == null) { - mMediaRouteConnectingDrawable = getContext().getDrawable( - R.drawable.ic_media_route_connecting_holo_dark); - } - return mMediaRouteConnectingDrawable; + if (!(mMediaRouteButtonDrawable instanceof StateListDrawable)) { + return mMediaRouteButtonDrawable; + } else if (mRoute.isConnecting()) { + StateListDrawable stateListDrawable = (StateListDrawable) mMediaRouteButtonDrawable; + stateListDrawable.setState(mMediaRouteConnectingState); + return stateListDrawable.getCurrent(); } else { - if (mMediaRouteOnDrawable == null) { - mMediaRouteOnDrawable = getContext().getDrawable( - R.drawable.ic_media_route_on_holo_dark); - } - return mMediaRouteOnDrawable; + StateListDrawable stateListDrawable = (StateListDrawable) mMediaRouteButtonDrawable; + stateListDrawable.setState(mMediaRouteOnState); + return stateListDrawable.getCurrent(); } } diff --git a/core/java/com/android/internal/app/MediaRouteControllerDialogFragment.java b/core/java/com/android/internal/app/MediaRouteControllerDialogFragment.java index 466c01558173..4c30501c2d17 100644 --- a/core/java/com/android/internal/app/MediaRouteControllerDialogFragment.java +++ b/core/java/com/android/internal/app/MediaRouteControllerDialogFragment.java @@ -39,7 +39,6 @@ public class MediaRouteControllerDialogFragment extends DialogFragment { */ public MediaRouteControllerDialogFragment() { setCancelable(true); - setStyle(STYLE_NORMAL, android.R.style.Theme_DeviceDefault_Dialog); } /** diff --git a/core/java/com/android/internal/app/ResolverActivity.java b/core/java/com/android/internal/app/ResolverActivity.java index c516b5cd7c3a..f2bd701920e8 100644 --- a/core/java/com/android/internal/app/ResolverActivity.java +++ b/core/java/com/android/internal/app/ResolverActivity.java @@ -16,15 +16,14 @@ package com.android.internal.app; -import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.StringRes; +import android.annotation.UiThread; import android.app.Activity; import android.app.ActivityThread; import android.app.VoiceInteractor.PickOptionRequest; import android.app.VoiceInteractor.PickOptionRequest.Option; import android.app.VoiceInteractor.Prompt; -import android.content.pm.ComponentInfo; import android.os.AsyncTask; import android.os.RemoteException; import android.provider.MediaStore; @@ -33,6 +32,7 @@ import android.text.TextUtils; import android.util.Slog; import android.widget.AbsListView; import com.android.internal.R; +import com.android.internal.annotations.VisibleForTesting; import com.android.internal.content.PackageMonitor; import android.app.ActivityManager; @@ -75,7 +75,6 @@ import com.android.internal.widget.ResolverDrawerLayout; import java.util.ArrayList; import java.util.Arrays; -import java.util.Collections; import java.util.HashSet; import java.util.Iterator; import java.util.List; @@ -83,21 +82,16 @@ import java.util.Objects; import java.util.Set; import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK; -import static android.view.WindowManager.LayoutParams.FLAG_LAYOUT_INSET_DECOR; -import static android.view.WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN; /** * This activity is displayed when the system attempts to start an Intent for * which there is more than one matching activity, allowing the user to decide * which to go to. It is not normally used directly by application developers. */ +@UiThread public class ResolverActivity extends Activity { - private static final String TAG = "ResolverActivity"; - private static final boolean DEBUG = false; - private int mLaunchedFromUid; - private ResolveListAdapter mAdapter; - private PackageManager mPm; + protected ResolveListAdapter mAdapter; private boolean mSafeForwardingMode; private boolean mAlwaysUseOption; private AbsListView mAdapterView; @@ -108,13 +102,19 @@ public class ResolverActivity extends Activity { private int mLastSelected = AbsListView.INVALID_POSITION; private boolean mResolvingHome = false; private int mProfileSwitchMessageId = -1; + private int mLayoutId; private final ArrayList<Intent> mIntents = new ArrayList<>(); - private ResolverComparator mResolverComparator; private PickTargetOptionRequest mPickOptionRequest; - private ComponentName[] mFilteredComponents; + private String mReferrerPackage; + protected ResolverComparator mResolverComparator; protected ResolverDrawerLayout mResolverDrawerLayout; protected String mContentType; + protected PackageManager mPm; + protected int mLaunchedFromUid; + + private static final String TAG = "ResolverActivity"; + private static final boolean DEBUG = false; private boolean mRegistered; private final PackageMonitor mPackageMonitor = new PackageMonitor() { @@ -261,6 +261,7 @@ public class ResolverActivity extends Activity { mPackageMonitor.register(this, getMainLooper(), false); mRegistered = true; + mReferrerPackage = getReferrerPackageName(); final ActivityManager am = (ActivityManager) getSystemService(ACTIVITY_SERVICE); mIconDpi = am.getLauncherLargeIconDensity(); @@ -268,11 +269,6 @@ public class ResolverActivity extends Activity { // Add our initial intent as the first item, regardless of what else has already been added. mIntents.add(0, new Intent(intent)); - final String referrerPackage = getReferrerPackageName(); - - mResolverComparator = new ResolverComparator(this, getTargetIntent(), referrerPackage); - mContentType = mResolverComparator.mContentType; - if (configureContentView(mIntents, initialIntents, rList, alwaysUseOption)) { return; } @@ -306,11 +302,11 @@ public class ResolverActivity extends Activity { if (titleIcon != null) { ApplicationInfo ai = null; try { - if (!TextUtils.isEmpty(referrerPackage)) { - ai = mPm.getApplicationInfo(referrerPackage, 0); + if (!TextUtils.isEmpty(mReferrerPackage)) { + ai = mPm.getApplicationInfo(mReferrerPackage, 0); } } catch (NameNotFoundException e) { - Log.e(TAG, "Could not find referrer package " + referrerPackage); + Log.e(TAG, "Could not find referrer package " + mReferrerPackage); } if (ai != null) { @@ -372,24 +368,6 @@ public class ResolverActivity extends Activity { + (categories != null ? Arrays.toString(categories.toArray()) : "")); } - public final void setFilteredComponents(ComponentName[] components) { - mFilteredComponents = components; - } - - public final boolean isComponentFiltered(ComponentInfo component) { - if (mFilteredComponents == null) { - return false; - } - - final ComponentName checkName = component.getComponentName(); - for (ComponentName name : mFilteredComponents) { - if (name.equals(checkName)) { - return true; - } - } - return false; - } - /** * Perform any initialization needed for voice interaction. */ @@ -431,7 +409,7 @@ public class ResolverActivity extends Activity { return mIntents.isEmpty() ? null : mIntents.get(0); } - private String getReferrerPackageName() { + protected String getReferrerPackageName() { final Uri referrer = getReferrer(); if (referrer != null && "android-app".equals(referrer.getScheme())) { return referrer.getHost(); @@ -689,7 +667,7 @@ public class ResolverActivity extends Activity { final Intent intent = target != null ? target.getResolvedIntent() : null; if (intent != null && (mAlwaysUseOption || mAdapter.hasFilteredItem()) - && mAdapter.mOrigResolveList != null) { + && mAdapter.mUnfilteredResolveList != null) { // Build a reasonable intent filter, based on what matched. IntentFilter filter = new IntentFilter(); Intent filterIntent; @@ -774,11 +752,11 @@ public class ResolverActivity extends Activity { } if (filter != null) { - final int N = mAdapter.mOrigResolveList.size(); + final int N = mAdapter.mUnfilteredResolveList.size(); ComponentName[] set = new ComponentName[N]; int bestMatch = 0; for (int i=0; i<N; i++) { - ResolveInfo r = mAdapter.mOrigResolveList.get(i).getResolveInfoAt(0); + ResolveInfo r = mAdapter.mUnfilteredResolveList.get(i).getResolveInfoAt(0); set[i] = new ComponentName(r.activityInfo.packageName, r.activityInfo.name); if (r.match > bestMatch) bestMatch = r.match; @@ -899,7 +877,17 @@ public class ResolverActivity extends Activity { Intent[] initialIntents, List<ResolveInfo> rList, int launchedFromUid, boolean filterLastUsed) { return new ResolveListAdapter(context, payloadIntents, initialIntents, rList, - launchedFromUid, filterLastUsed); + launchedFromUid, filterLastUsed, createListController()); + } + + @VisibleForTesting + protected ResolverListController createListController() { + return new ResolverListController( + this, + mPm, + getTargetIntent(), + getReferrerPackageName(), + mLaunchedFromUid); } /** @@ -914,32 +902,38 @@ public class ResolverActivity extends Activity { // to handle. mAdapter = createAdapter(this, payloadIntents, initialIntents, rList, mLaunchedFromUid, alwaysUseOption && !isVoiceInteraction()); + boolean rebuildCompleted = mAdapter.rebuildList(); - final int layoutId; if (mAdapter.hasFilteredItem()) { - layoutId = R.layout.resolver_list_with_default; + mLayoutId = R.layout.resolver_list_with_default; alwaysUseOption = false; } else { - layoutId = getLayoutResource(); + mLayoutId = getLayoutResource(); } mAlwaysUseOption = alwaysUseOption; int count = mAdapter.getUnfilteredCount(); - if (count == 1 && mAdapter.getOtherProfile() == null) { - // Only one target, so we're a candidate to auto-launch! - final TargetInfo target = mAdapter.targetInfoForPosition(0, false); - if (shouldAutoLaunchSingleChoice(target)) { - safelyStartActivity(target); - mPackageMonitor.unregister(); - mRegistered = false; - finish(); - return true; + + // We only rebuild asynchronously when we have multiple elements to sort. In the case where + // we're already done, we can check if we should auto-launch immediately. + if (rebuildCompleted) { + if (count == 1 && mAdapter.getOtherProfile() == null) { + // Only one target, so we're a candidate to auto-launch! + final TargetInfo target = mAdapter.targetInfoForPosition(0, false); + if (shouldAutoLaunchSingleChoice(target)) { + safelyStartActivity(target); + mPackageMonitor.unregister(); + mRegistered = false; + finish(); + return true; + } } } - if (count > 0) { - setContentView(layoutId); + + if (count > 0 || !rebuildCompleted) { + setContentView(mLayoutId); mAdapterView = (AbsListView) findViewById(R.id.resolver_list); - onPrepareAdapterView(mAdapterView, mAdapter, alwaysUseOption); + onPrepareAdapterView(mAdapterView, mAdapter, mAlwaysUseOption); } else { setContentView(R.layout.resolver_list); @@ -1236,20 +1230,21 @@ public class ResolverActivity extends Activity { private final List<ResolveInfo> mBaseResolveList; private ResolveInfo mLastChosen; private DisplayResolveInfo mOtherProfile; - private final int mLaunchedFromUid; private boolean mHasExtendedInfo; + private ResolverListController mResolverListController; protected final LayoutInflater mInflater; List<DisplayResolveInfo> mDisplayList; - List<ResolvedComponentInfo> mOrigResolveList; + List<ResolvedComponentInfo> mUnfilteredResolveList; private int mLastChosenPosition = -1; private boolean mFilterLastUsed; public ResolveListAdapter(Context context, List<Intent> payloadIntents, Intent[] initialIntents, List<ResolveInfo> rList, int launchedFromUid, - boolean filterLastUsed) { + boolean filterLastUsed, + ResolverListController resolverListController) { mIntents = payloadIntents; mInitialIntents = initialIntents; mBaseResolveList = rList; @@ -1257,12 +1252,11 @@ public class ResolverActivity extends Activity { mInflater = LayoutInflater.from(context); mDisplayList = new ArrayList<>(); mFilterLastUsed = filterLastUsed; - rebuildList(); + mResolverListController = resolverListController; } public void handlePackagesChanged() { rebuildList(); - notifyDataSetChanged(); if (getCount() == 0) { // We no longer have any items... just finish the activity. finish(); @@ -1293,12 +1287,17 @@ public class ResolverActivity extends Activity { } public float getScore(DisplayResolveInfo target) { - return mResolverComparator.getScore(target.getResolvedComponentName()); + return mResolverListController.getScore(target); } - private void rebuildList() { + /** + * Rebuild the list of resolvers. In some cases some parts will need some asynchronous work + * to complete. + * + * @return Whether or not the list building is completed. + */ + protected boolean rebuildList() { List<ResolvedComponentInfo> currentResolveList = null; - try { final Intent primaryIntent = getTargetIntent(); mLastChosen = AppGlobals.getPackageManager().getLastChosenActivity( @@ -1312,84 +1311,88 @@ public class ResolverActivity extends Activity { mOtherProfile = null; mDisplayList.clear(); if (mBaseResolveList != null) { - currentResolveList = mOrigResolveList = new ArrayList<>(); - addResolveListDedupe(currentResolveList, getTargetIntent(), mBaseResolveList); + currentResolveList = mUnfilteredResolveList = new ArrayList<>(); + mResolverListController.addResolveListDedupe(currentResolveList, + getTargetIntent(), + mBaseResolveList); } else { - final boolean shouldGetResolvedFilter = shouldGetResolvedFilter(); - final boolean shouldGetActivityMetadata = shouldGetActivityMetadata(); - for (int i = 0, N = mIntents.size(); i < N; i++) { - final Intent intent = mIntents.get(i); - final List<ResolveInfo> infos = mPm.queryIntentActivities(intent, - PackageManager.MATCH_DEFAULT_ONLY - | (shouldGetResolvedFilter ? PackageManager.GET_RESOLVED_FILTER : 0) - | (shouldGetActivityMetadata ? PackageManager.GET_META_DATA : 0)); - if (infos != null) { - if (currentResolveList == null) { - currentResolveList = mOrigResolveList = new ArrayList<>(); - } - addResolveListDedupe(currentResolveList, intent, infos); - } + currentResolveList = + mResolverListController.getResolversForIntent(shouldGetResolvedFilter(), + shouldGetActivityMetadata(), + mIntents); + if (currentResolveList == null) { + processSortedList(currentResolveList); + return true; } - - // Filter out any activities that the launched uid does not - // have permission for. - // Also filter out those that are suspended because they couldn't - // be started. We don't do this when we have an explicit - // list of resolved activities, because that only happens when - // we are being subclassed, so we can safely launch whatever - // they gave us. - if (currentResolveList != null) { - for (int i=currentResolveList.size()-1; i >= 0; i--) { - ActivityInfo ai = currentResolveList.get(i) - .getResolveInfoAt(0).activityInfo; - int granted = ActivityManager.checkComponentPermission( - ai.permission, mLaunchedFromUid, - ai.applicationInfo.uid, ai.exported); - boolean suspended = (ai.applicationInfo.flags - & ApplicationInfo.FLAG_SUSPENDED) != 0; - if (granted != PackageManager.PERMISSION_GRANTED || suspended - || isComponentFiltered(ai)) { - // Access not allowed! - if (mOrigResolveList == currentResolveList) { - mOrigResolveList = new ArrayList<>(mOrigResolveList); - } - currentResolveList.remove(i); - } - } + List<ResolvedComponentInfo> originalList = + mResolverListController.filterIneligibleActivities(currentResolveList, + true); + if (originalList != null) { + mUnfilteredResolveList = originalList; } } int N; if ((currentResolveList != null) && ((N = currentResolveList.size()) > 0)) { - // Only display the first matches that are either of equal - // priority or have asked to be default options. - ResolvedComponentInfo rci0 = currentResolveList.get(0); - ResolveInfo r0 = rci0.getResolveInfoAt(0); - for (int i=1; i<N; i++) { - ResolveInfo ri = currentResolveList.get(i).getResolveInfoAt(0); - if (DEBUG) Log.v( - TAG, - r0.activityInfo.name + "=" + - r0.priority + "/" + r0.isDefault + " vs " + - ri.activityInfo.name + "=" + - ri.priority + "/" + ri.isDefault); - if (r0.priority != ri.priority || - r0.isDefault != ri.isDefault) { - while (i < N) { - if (mOrigResolveList == currentResolveList) { - mOrigResolveList = new ArrayList<>(mOrigResolveList); - } - currentResolveList.remove(i); - N--; - } - } + // We only care about fixing the unfilteredList if the current resolve list and + // current resolve list are currently the same. + List<ResolvedComponentInfo> originalList = + mResolverListController.filterLowPriority(currentResolveList, + mUnfilteredResolveList == currentResolveList); + if (originalList != null) { + mUnfilteredResolveList = originalList; } + if (N > 1) { - mResolverComparator.compute(currentResolveList); - Collections.sort(currentResolveList, mResolverComparator); + AsyncTask<List<ResolvedComponentInfo>, + Void, + List<ResolvedComponentInfo>> sortingTask = + new AsyncTask<List<ResolvedComponentInfo>, + Void, + List<ResolvedComponentInfo>>() { + @Override + protected List<ResolvedComponentInfo> doInBackground( + List<ResolvedComponentInfo>... params) { + mResolverListController.sort(params[0]); + return params[0]; + } + + @Override + protected void onPostExecute(List<ResolvedComponentInfo> sortedComponents) { + processSortedList(sortedComponents); + onPrepareAdapterView(mAdapterView, mAdapter, mAlwaysUseOption); + if (mProfileView != null) { + bindProfileView(); + } + } + }; + sortingTask.execute(currentResolveList); + return false; + } else { + processSortedList(currentResolveList); + return true; } + } else { + processSortedList(currentResolveList); + return true; + } + } + + private void disableLastChosenIfNeeded() { + // Layout doesn't handle both profile button and last chosen + // so disable last chosen if profile button is present. + if (mOtherProfile != null && mLastChosenPosition >= 0) { + mLastChosenPosition = -1; + mFilterLastUsed = false; + } + } + + + private void processSortedList(List<ResolvedComponentInfo> sortedComponents) { + int N; + if (sortedComponents != null && (N = sortedComponents.size()) != 0) { // First put the initial items at the top. if (mInitialIntents != null) { - for (int i=0; i<mInitialIntents.length; i++) { + for (int i = 0; i < mInitialIntents.length; i++) { Intent ii = mInitialIntents[i]; if (ii == null) { continue; @@ -1405,7 +1408,7 @@ public class ResolverActivity extends Activity { UserManager userManager = (UserManager) getSystemService(Context.USER_SERVICE); if (ii instanceof LabeledIntent) { - LabeledIntent li = (LabeledIntent)ii; + LabeledIntent li = (LabeledIntent) ii; ri.resolvePackageName = li.getSourcePackage(); ri.labelRes = li.getLabelResource(); ri.nonLocalizedLabel = li.getNonLocalizedLabel(); @@ -1423,16 +1426,16 @@ public class ResolverActivity extends Activity { // Check for applications with same name and use application name or // package name if necessary - rci0 = currentResolveList.get(0); - r0 = rci0.getResolveInfoAt(0); + ResolvedComponentInfo rci0 = sortedComponents.get(0); + ResolveInfo r0 = rci0.getResolveInfoAt(0); int start = 0; - CharSequence r0Label = r0.loadLabel(mPm); + CharSequence r0Label = r0.loadLabel(mPm); mHasExtendedInfo = false; for (int i = 1; i < N; i++) { if (r0Label == null) { r0Label = r0.activityInfo.packageName; } - ResolvedComponentInfo rci = currentResolveList.get(i); + ResolvedComponentInfo rci = sortedComponents.get(i); ResolveInfo ri = rci.getResolveInfoAt(0); CharSequence riLabel = ri.loadLabel(mPm); if (riLabel == null) { @@ -1441,59 +1444,19 @@ public class ResolverActivity extends Activity { if (riLabel.equals(r0Label)) { continue; } - processGroup(currentResolveList, start, (i-1), rci0, r0Label); + processGroup(sortedComponents, start, (i - 1), rci0, r0Label); rci0 = rci; r0 = ri; r0Label = riLabel; start = i; } // Process last group - processGroup(currentResolveList, start, (N-1), rci0, r0Label); - } - - // Layout doesn't handle both profile button and last chosen - // so disable last chosen if profile button is present. - if (mOtherProfile != null && mLastChosenPosition >= 0) { - mLastChosenPosition = -1; - mFilterLastUsed = false; + processGroup(sortedComponents, start, (N - 1), rci0, r0Label); } - + disableLastChosenIfNeeded(); onListRebuilt(); } - private void addResolveListDedupe(List<ResolvedComponentInfo> into, Intent intent, - List<ResolveInfo> from) { - final int fromCount = from.size(); - final int intoCount = into.size(); - for (int i = 0; i < fromCount; i++) { - final ResolveInfo newInfo = from.get(i); - boolean found = false; - // Only loop to the end of into as it was before we started; no dupes in from. - for (int j = 0; j < intoCount; j++) { - final ResolvedComponentInfo rci = into.get(j); - if (isSameResolvedComponent(newInfo, rci)) { - found = true; - rci.add(intent, newInfo); - break; - } - } - if (!found) { - final ComponentName name = new ComponentName( - newInfo.activityInfo.packageName, newInfo.activityInfo.name); - final ResolvedComponentInfo rci = new ResolvedComponentInfo(name, - intent, newInfo); - rci.setPinned(isComponentPinned(name)); - into.add(rci); - } - } - } - - private boolean isSameResolvedComponent(ResolveInfo a, ResolvedComponentInfo b) { - final ActivityInfo ai = a.activityInfo; - return ai.packageName.equals(b.name.getPackageName()) - && ai.name.equals(b.name.getClassName()); - } - public void onListRebuilt() { // This space for rent } @@ -1715,7 +1678,8 @@ public class ResolverActivity extends Activity { } } - static final class ResolvedComponentInfo { + @VisibleForTesting + public static final class ResolvedComponentInfo { public final ComponentName name; private boolean mPinned; private final List<Intent> mIntents = new ArrayList<>(); diff --git a/core/java/com/android/internal/app/ResolverComparator.java b/core/java/com/android/internal/app/ResolverComparator.java index 75be906397a7..45fad97f6422 100644 --- a/core/java/com/android/internal/app/ResolverComparator.java +++ b/core/java/com/android/internal/app/ResolverComparator.java @@ -27,11 +27,16 @@ import android.content.pm.ApplicationInfo; import android.content.pm.ComponentInfo; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; +import android.content.SharedPreferences; +import android.os.Environment; +import android.os.storage.StorageManager; import android.os.UserHandle; import android.text.TextUtils; +import android.util.ArrayMap; import android.util.Log; import com.android.internal.app.ResolverActivity.ResolvedComponentInfo; +import java.io.File; import java.text.Collator; import java.util.ArrayList; import java.util.Comparator; @@ -54,6 +59,12 @@ class ResolverComparator implements Comparator<ResolvedComponentInfo> { private static final float RECENCY_MULTIPLIER = 2.f; + // feature names used in ranking. + private static final String LAUNCH_SCORE = "launch"; + private static final String TIME_SPENT_SCORE = "timeSpent"; + private static final String RECENCY_SCORE = "recency"; + private static final String CHOOSER_SCORE = "chooser"; + private final Collator mCollator; private final boolean mHttp; private final PackageManager mPm; @@ -65,6 +76,7 @@ class ResolverComparator implements Comparator<ResolvedComponentInfo> { private final String mReferrerPackage; public String mContentType; private String mAction; + private LogisticRegressionAppRanker mRanker; public ResolverComparator(Context context, Intent intent, String referrerPackage) { mCollator = Collator.getInstance(context.getResources().getConfiguration().locale); @@ -80,6 +92,7 @@ class ResolverComparator implements Comparator<ResolvedComponentInfo> { mStats = mUsm.queryAndAggregateUsageStats(mSinceTime, mCurrentTime); mContentType = intent.getType(); mAction = intent.getAction(); + mRanker = new LogisticRegressionAppRanker(context); } public void compute(List<ResolvedComponentInfo> targets) { @@ -152,16 +165,13 @@ class ResolverComparator implements Comparator<ResolvedComponentInfo> { for (ScoredTarget target : mScoredTargets.values()) { final float recency = (float) Math.max(target.lastTimeUsed - recentSinceTime, 0) / (mostRecentlyUsedTime - recentSinceTime); - final float recencyScore = recency * recency * RECENCY_MULTIPLIER; - final float usageTimeScore = (float) target.timeSpent / mostTimeSpent; - final float launchCountScore = (float) target.launchCount / mostLaunched; - - target.score = recencyScore + usageTimeScore + launchCountScore; + target.setFeatures((float) target.launchCount / mostLaunched, + (float) target.timeSpent / mostTimeSpent, + recency * recency * RECENCY_MULTIPLIER, + (float) target.chooserCount / mostSelected); + target.selectProb = mRanker.predict(target.getFeatures()); if (DEBUG) { - Log.d(TAG, "Scores: recencyScore: " + recencyScore - + " usageTimeScore: " + usageTimeScore - + " launchCountScore: " + launchCountScore - + " - " + target); + Log.d(TAG, "Scores: " + target); } } } @@ -215,17 +225,11 @@ class ResolverComparator implements Comparator<ResolvedComponentInfo> { final ScoredTarget rhsTarget = mScoredTargets.get(new ComponentName( rhs.activityInfo.packageName, rhs.activityInfo.name)); - final int chooserCountDiff = Long.compare( - rhsTarget.chooserCount, lhsTarget.chooserCount); - - if (chooserCountDiff != 0) { - return chooserCountDiff > 0 ? 1 : -1; - } - - final int diff = Float.compare(rhsTarget.score, lhsTarget.score); + final int selectProbDiff = Float.compare( + rhsTarget.selectProb, lhsTarget.selectProb); - if (diff != 0) { - return diff > 0 ? 1 : -1; + if (selectProbDiff != 0) { + return selectProbDiff > 0 ? 1 : -1; } } } @@ -241,32 +245,160 @@ class ResolverComparator implements Comparator<ResolvedComponentInfo> { public float getScore(ComponentName name) { final ScoredTarget target = mScoredTargets.get(name); if (target != null) { - return target.score; + return target.selectProb; } return 0; } static class ScoredTarget { public final ComponentInfo componentInfo; - public float score; public long lastTimeUsed; public long timeSpent; public long launchCount; public long chooserCount; + public ArrayMap<String, Float> features; + public float selectProb; public ScoredTarget(ComponentInfo ci) { componentInfo = ci; + features = new ArrayMap<>(5); } @Override public String toString() { return "ScoredTarget{" + componentInfo - + " score: " + score + " lastTimeUsed: " + lastTimeUsed + " timeSpent: " + timeSpent + " launchCount: " + launchCount + " chooserCount: " + chooserCount + + " selectProb: " + selectProb + "}"; } + + public void setFeatures(float launchCountScore, float usageTimeScore, float recencyScore, + float chooserCountScore) { + features.put(LAUNCH_SCORE, launchCountScore); + features.put(TIME_SPENT_SCORE, usageTimeScore); + features.put(RECENCY_SCORE, recencyScore); + features.put(CHOOSER_SCORE, chooserCountScore); + } + + public ArrayMap<String, Float> getFeatures() { + return features; + } + } + + public void updateModel(ComponentName componentName) { + if (mScoredTargets == null || componentName == null || + !mScoredTargets.containsKey(componentName)) { + return; + } + ScoredTarget selected = mScoredTargets.get(componentName); + for (ComponentName targetComponent : mScoredTargets.keySet()) { + if (targetComponent.equals(componentName)) { + continue; + } + ScoredTarget target = mScoredTargets.get(targetComponent); + // A potential point of optimization. Save updates or derive a closed form for the + // positive case, to avoid calculating them repeatedly. + if (target.selectProb >= selected.selectProb) { + mRanker.update(target.getFeatures(), target.selectProb, false); + mRanker.update(selected.getFeatures(), selected.selectProb, true); + } + } + mRanker.commitUpdate(); + } + + class LogisticRegressionAppRanker { + private static final String PARAM_SHARED_PREF_NAME = "resolver_ranker_params"; + private static final String BIAS_PREF_KEY = "bias"; + private static final float LEARNING_RATE = 0.02f; + private static final float REGULARIZER_PARAM = 0.1f; + private SharedPreferences mParamSharedPref; + private ArrayMap<String, Float> mFeatureWeights; + private float mBias; + + public LogisticRegressionAppRanker(Context context) { + mParamSharedPref = getParamSharedPref(context); + } + + public float predict(ArrayMap<String, Float> target) { + if (target == null || mParamSharedPref == null) { + return 0.0f; + } + final int featureSize = target.size(); + if (featureSize == 0) { + return 0.0f; + } + float sum = 0.0f; + if (mFeatureWeights == null) { + mBias = mParamSharedPref.getFloat(BIAS_PREF_KEY, 0.0f); + mFeatureWeights = new ArrayMap<>(featureSize); + for (int i = 0; i < featureSize; i++) { + String featureName = target.keyAt(i); + float weight = mParamSharedPref.getFloat(featureName, 0.0f); + sum += weight * target.valueAt(i); + mFeatureWeights.put(featureName, weight); + } + } else { + for (int i = 0; i < featureSize; i++) { + String featureName = target.keyAt(i); + float weight = mFeatureWeights.getOrDefault(featureName, 0.0f); + sum += weight * target.valueAt(i); + } + } + return (float) (1.0 / (1.0 + Math.exp(-mBias - sum))); + } + + public void update(ArrayMap<String, Float> target, float predict, boolean isSelected) { + if (target == null || target.size() == 0) { + return; + } + final int featureSize = target.size(); + if (mFeatureWeights == null) { + mBias = 0.0f; + mFeatureWeights = new ArrayMap<>(featureSize); + } + float error = isSelected ? 1.0f - predict : -predict; + for (int i = 0; i < featureSize; i++) { + String featureName = target.keyAt(i); + float currentWeight = mFeatureWeights.getOrDefault(featureName, 0.0f); + mBias += LEARNING_RATE * error; + currentWeight = currentWeight - LEARNING_RATE * REGULARIZER_PARAM * currentWeight + + LEARNING_RATE * error * target.valueAt(i); + mFeatureWeights.put(featureName, currentWeight); + } + if (DEBUG) { + Log.d(TAG, "Weights: " + mFeatureWeights + " Bias: " + mBias); + } + } + + public void commitUpdate() { + if (mFeatureWeights == null || mFeatureWeights.size() == 0) { + return; + } + SharedPreferences.Editor editor = mParamSharedPref.edit(); + editor.putFloat(BIAS_PREF_KEY, mBias); + final int size = mFeatureWeights.size(); + for (int i = 0; i < size; i++) { + editor.putFloat(mFeatureWeights.keyAt(i), mFeatureWeights.valueAt(i)); + } + editor.apply(); + } + + private SharedPreferences getParamSharedPref(Context context) { + // The package info in the context isn't initialized in the way it is for normal apps, + // so the standard, name-based context.getSharedPreferences doesn't work. Instead, we + // build the path manually below using the same policy that appears in ContextImpl. + if (DEBUG) { + Log.d(TAG, "Context Package Name: " + context.getPackageName()); + } + final File prefsFile = new File(new File( + Environment.getDataUserCePackageDirectory(StorageManager.UUID_PRIVATE_INTERNAL, + context.getUserId(), context.getPackageName()), + "shared_prefs"), + PARAM_SHARED_PREF_NAME + ".xml"); + return context.getSharedPreferences(prefsFile, Context.MODE_PRIVATE); + } } } diff --git a/core/java/com/android/internal/app/ResolverListController.java b/core/java/com/android/internal/app/ResolverListController.java new file mode 100644 index 000000000000..b91ecb625bcf --- /dev/null +++ b/core/java/com/android/internal/app/ResolverListController.java @@ -0,0 +1,221 @@ +/* + * 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. + */ + + +package com.android.internal.app; + +import android.annotation.WorkerThread; +import android.app.ActivityManager; +import android.content.ComponentName; +import android.content.Context; +import android.content.Intent; +import android.content.pm.ActivityInfo; +import android.content.pm.ApplicationInfo; +import android.content.pm.PackageManager; +import android.content.pm.ResolveInfo; +import android.util.Log; +import com.android.internal.annotations.VisibleForTesting; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +/** + * A helper for the ResolverActivity that exposes methods to retrieve, filter and sort its list of + * resolvers. + */ +public class ResolverListController { + + private final Context mContext; + private final PackageManager mpm; + private final int mLaunchedFromUid; + + // Needed for sorting resolvers. + private final Intent mTargetIntent; + private final String mReferrerPackage; + + private static final String TAG = "ResolverListController"; + private static final boolean DEBUG = false; + + private ResolverComparator mResolverComparator; + + public ResolverListController( + Context context, + PackageManager pm, + Intent targetIntent, + String referrerPackage, + int launchedFromUid) { + mContext = context; + mpm = pm; + mLaunchedFromUid = launchedFromUid; + mTargetIntent = targetIntent; + mReferrerPackage = referrerPackage; + } + + @VisibleForTesting + public List<ResolverActivity.ResolvedComponentInfo> getResolversForIntent( + boolean shouldGetResolvedFilter, + boolean shouldGetActivityMetadata, + List<Intent> intents) { + List<ResolverActivity.ResolvedComponentInfo> resolvedComponents = null; + for (int i = 0, N = intents.size(); i < N; i++) { + final Intent intent = intents.get(i); + final List<ResolveInfo> infos = mpm.queryIntentActivities(intent, + PackageManager.MATCH_DEFAULT_ONLY + | (shouldGetResolvedFilter ? PackageManager.GET_RESOLVED_FILTER : 0) + | (shouldGetActivityMetadata ? PackageManager.GET_META_DATA : 0)); + if (infos != null) { + if (resolvedComponents == null) { + resolvedComponents = new ArrayList<>(); + } + addResolveListDedupe(resolvedComponents, intent, infos); + } + } + return resolvedComponents; + } + + @VisibleForTesting + public void addResolveListDedupe(List<ResolverActivity.ResolvedComponentInfo> into, + Intent intent, + List<ResolveInfo> from) { + final int fromCount = from.size(); + final int intoCount = into.size(); + for (int i = 0; i < fromCount; i++) { + final ResolveInfo newInfo = from.get(i); + boolean found = false; + // Only loop to the end of into as it was before we started; no dupes in from. + for (int j = 0; j < intoCount; j++) { + final ResolverActivity.ResolvedComponentInfo rci = into.get(j); + if (isSameResolvedComponent(newInfo, rci)) { + found = true; + rci.add(intent, newInfo); + break; + } + } + if (!found) { + final ComponentName name = new ComponentName( + newInfo.activityInfo.packageName, newInfo.activityInfo.name); + final ResolverActivity.ResolvedComponentInfo rci = + new ResolverActivity.ResolvedComponentInfo(name, intent, newInfo); + rci.setPinned(isComponentPinned(name)); + into.add(rci); + } + } + } + + // Filter out any activities that the launched uid does not have permission for. + // + // Also filter out those that are suspended because they couldn't be started. We don't do this + // when we have an explicit list of resolved activities, because that only happens when + // we are being subclassed, so we can safely launch whatever they gave us. + // + // To preserve the inputList, optionally will return the original list if any modification has + // been made. + @VisibleForTesting + public ArrayList<ResolverActivity.ResolvedComponentInfo> filterIneligibleActivities( + List<ResolverActivity.ResolvedComponentInfo> inputList, + boolean returnCopyOfOriginalListIfModified) { + ArrayList<ResolverActivity.ResolvedComponentInfo> listToReturn = null; + for (int i = inputList.size()-1; i >= 0; i--) { + ActivityInfo ai = inputList.get(i) + .getResolveInfoAt(0).activityInfo; + int granted = ActivityManager.checkComponentPermission( + ai.permission, mLaunchedFromUid, + ai.applicationInfo.uid, ai.exported); + boolean suspended = (ai.applicationInfo.flags + & ApplicationInfo.FLAG_SUSPENDED) != 0; + if (granted != PackageManager.PERMISSION_GRANTED || suspended + || isComponentFiltered(ai.getComponentName())) { + // Access not allowed! We're about to filter an item, + // so modify the unfiltered version if it hasn't already been modified. + if (returnCopyOfOriginalListIfModified && listToReturn == null) { + listToReturn = new ArrayList<>(inputList); + } + inputList.remove(i); + } + } + return listToReturn; + } + + // Filter out any low priority items. + // + // To preserve the inputList, optionally will return the original list if any modification has + // been made. + @VisibleForTesting + public ArrayList<ResolverActivity.ResolvedComponentInfo> filterLowPriority( + List<ResolverActivity.ResolvedComponentInfo> inputList, + boolean returnCopyOfOriginalListIfModified) { + ArrayList<ResolverActivity.ResolvedComponentInfo> listToReturn = null; + // Only display the first matches that are either of equal + // priority or have asked to be default options. + ResolverActivity.ResolvedComponentInfo rci0 = inputList.get(0); + ResolveInfo r0 = rci0.getResolveInfoAt(0); + int N = inputList.size(); + for (int i = 1; i < N; i++) { + ResolveInfo ri = inputList.get(i).getResolveInfoAt(0); + if (DEBUG) Log.v( + TAG, + r0.activityInfo.name + "=" + + r0.priority + "/" + r0.isDefault + " vs " + + ri.activityInfo.name + "=" + + ri.priority + "/" + ri.isDefault); + if (r0.priority != ri.priority || + r0.isDefault != ri.isDefault) { + while (i < N) { + if (returnCopyOfOriginalListIfModified && listToReturn == null) { + listToReturn = new ArrayList<>(inputList); + } + inputList.remove(i); + N--; + } + } + } + return listToReturn; + } + + @VisibleForTesting + @WorkerThread + public void sort(List<ResolverActivity.ResolvedComponentInfo> inputList) { + if (mResolverComparator == null) { + mResolverComparator = new ResolverComparator(mContext, mTargetIntent, mReferrerPackage); + } + mResolverComparator.compute(inputList); + Collections.sort(inputList, mResolverComparator); + } + + private static boolean isSameResolvedComponent(ResolveInfo a, + ResolverActivity.ResolvedComponentInfo b) { + final ActivityInfo ai = a.activityInfo; + return ai.packageName.equals(b.name.getPackageName()) + && ai.name.equals(b.name.getClassName()); + } + + boolean isComponentPinned(ComponentName name) { + return false; + } + + boolean isComponentFiltered(ComponentName componentName) { + return false; + } + + @VisibleForTesting + public float getScore(ResolverActivity.DisplayResolveInfo target) { + if (mResolverComparator == null) { + mResolverComparator = new ResolverComparator(mContext, mTargetIntent, mReferrerPackage); + } + return mResolverComparator.getScore(target.getResolvedComponentName()); + } +} diff --git a/core/java/com/android/internal/appwidget/IAppWidgetService.aidl b/core/java/com/android/internal/appwidget/IAppWidgetService.aidl index 951a45a7b437..a1eac363a6e8 100644 --- a/core/java/com/android/internal/appwidget/IAppWidgetService.aidl +++ b/core/java/com/android/internal/appwidget/IAppWidgetService.aidl @@ -67,5 +67,7 @@ interface IAppWidgetService { void unbindRemoteViewsService(String callingPackage, int appWidgetId, in Intent intent); int[] getAppWidgetIds(in ComponentName providerComponent); boolean isBoundWidgetPackage(String packageName, int userId); + boolean requestPinAppWidget(String packageName, in ComponentName providerComponent, + in IntentSender resultIntent); } diff --git a/core/java/com/android/internal/os/ZygoteConnection.java b/core/java/com/android/internal/os/ZygoteConnection.java index 39cb464de56c..e9e642a58a33 100644 --- a/core/java/com/android/internal/os/ZygoteConnection.java +++ b/core/java/com/android/internal/os/ZygoteConnection.java @@ -171,6 +171,8 @@ class ZygoteConnection { return handleAbiListQuery(); } + ZygoteInit.maybePreload(); + if (parsedArgs.preloadPackage != null) { return handlePreloadPackage(parsedArgs.preloadPackage, parsedArgs.preloadPackageLibs); diff --git a/core/java/com/android/internal/os/ZygoteInit.java b/core/java/com/android/internal/os/ZygoteInit.java index c88e9da49c8e..f47784ee7c03 100644 --- a/core/java/com/android/internal/os/ZygoteInit.java +++ b/core/java/com/android/internal/os/ZygoteInit.java @@ -112,6 +112,8 @@ public class ZygoteInit { private static final int ROOT_UID = 0; private static final int ROOT_GID = 0; + private static boolean sPreloadComplete; + static void preload(BootTimingsTraceLog bootTimingsTraceLog) { Log.d(TAG, "begin preload"); bootTimingsTraceLog.traceBegin("BeginIcuCachePinning"); @@ -134,6 +136,15 @@ public class ZygoteInit { endIcuCachePinning(); warmUpJcaProviders(); Log.d(TAG, "end preload"); + + sPreloadComplete = true; + } + + public static void maybePreload() { + if (!sPreloadComplete) { + Log.i(TAG, "Lazily preloading resources."); + preload(new BootTimingsTraceLog("ZygoteInitTiming_lazy", Trace.TRACE_TAG_DALVIK)); + } } private static void beginIcuCachePinning() { @@ -660,9 +671,12 @@ public class ZygoteInit { boolean startSystemServer = false; String socketName = "zygote"; String abiList = null; + boolean enableLazyPreload = false; for (int i = 1; i < argv.length; i++) { if ("start-system-server".equals(argv[i])) { startSystemServer = true; + } else if ("--enable-lazy-preload".equals(argv[i])) { + enableLazyPreload = true; } else if (argv[i].startsWith(ABI_LIST_ARG)) { abiList = argv[i].substring(ABI_LIST_ARG.length()); } else if (argv[i].startsWith(SOCKET_NAME_ARG)) { @@ -677,13 +691,17 @@ public class ZygoteInit { } zygoteServer.registerServerSocket(socketName); - bootTimingsTraceLog.traceBegin("ZygotePreload"); - EventLog.writeEvent(LOG_BOOT_PROGRESS_PRELOAD_START, - SystemClock.uptimeMillis()); - preload(bootTimingsTraceLog); - EventLog.writeEvent(LOG_BOOT_PROGRESS_PRELOAD_END, - SystemClock.uptimeMillis()); - bootTimingsTraceLog.traceEnd(); // ZygotePreload + // In some configurations, we avoid preloading resources and classes eagerly. + // In such cases, we will preload things prior to our first fork. + if (!enableLazyPreload) { + bootTimingsTraceLog.traceBegin("ZygotePreload"); + EventLog.writeEvent(LOG_BOOT_PROGRESS_PRELOAD_START, + SystemClock.uptimeMillis()); + preload(bootTimingsTraceLog); + EventLog.writeEvent(LOG_BOOT_PROGRESS_PRELOAD_END, + SystemClock.uptimeMillis()); + bootTimingsTraceLog.traceEnd(); // ZygotePreload + } // Finish profiling the zygote initialization. SamplingProfilerIntegration.writeZygoteSnapshot(); diff --git a/core/jni/android/graphics/Bitmap.cpp b/core/jni/android/graphics/Bitmap.cpp index 8f74bf8a4b6f..59cbc939890a 100755 --- a/core/jni/android/graphics/Bitmap.cpp +++ b/core/jni/android/graphics/Bitmap.cpp @@ -52,6 +52,7 @@ public: mAllocationSize = mBitmap->getAllocationByteCount(); mRowBytes = mBitmap->rowBytes(); mGenerationId = mBitmap->getGenerationID(); + mIsHardware = mBitmap->isHardware(); mBitmap.reset(); } @@ -118,6 +119,13 @@ public: return mGenerationId; } + bool isHardware() { + if (mBitmap) { + return mBitmap->isHardware(); + } + return mIsHardware; + } + ~BitmapWrapper() { } private: @@ -127,6 +135,7 @@ private: size_t mAllocationSize; size_t mRowBytes; uint32_t mGenerationId; + bool mIsHardware; }; // Convenience class that does not take a global ref on the pixels, relying @@ -775,7 +784,7 @@ static jint Bitmap_rowBytes(JNIEnv* env, jobject, jlong bitmapHandle) { static jint Bitmap_config(JNIEnv* env, jobject, jlong bitmapHandle) { LocalScopedBitmap bitmap(bitmapHandle); - if (bitmap->bitmap().isHardware()) { + if (bitmap->isHardware()) { return GraphicsJNI::hardwareLegacyBitmapConfig(); } return GraphicsJNI::colorTypeToLegacyBitmapConfig(bitmap->info().colorType()); @@ -1208,7 +1217,7 @@ static jboolean Bitmap_sameAs(JNIEnv* env, jobject, jlong bm0Handle, jlong bm1Ha // Paying the price for making Hardware Bitmap as Config: // later check for colorType will pass successfully, // because Hardware Config internally may be RGBA8888 or smth like that. - if (bitmap0->bitmap().isHardware() != bitmap1->bitmap().isHardware()) { + if (bitmap0->isHardware() != bitmap1->isHardware()) { return JNI_FALSE; } @@ -1282,6 +1291,23 @@ static jint Bitmap_getAllocationByteCount(JNIEnv* env, jobject, jlong bitmapPtr) return static_cast<jint>(bitmapHandle->getAllocationByteCount()); } +static jobject Bitmap_nativeCopyPreserveInternalConfig(JNIEnv* env, jobject, jlong bitmapPtr) { + LocalScopedBitmap bitmapHandle(bitmapPtr); + LOG_ALWAYS_FATAL_IF(!bitmapHandle->isHardware(), + "Hardware config is only supported config in Bitmap_nativeCopyPreserveInternalConfig"); + Bitmap& hwuiBitmap = bitmapHandle->bitmap(); + SkBitmap src; + hwuiBitmap.getSkBitmap(&src); + + SkBitmap result; + HeapAllocator allocator; + if (!src.copyTo(&result, hwuiBitmap.info().colorType(), &allocator)) { + doThrowRE(env, "Could not copy a hardware bitmap."); + return NULL; + } + return createBitmap(env, allocator.getStorageObjAndReset(), kBitmapCreateFlag_None); +} + /////////////////////////////////////////////////////////////////////////////// static jclass make_globalref(JNIEnv* env, const char classname[]) { @@ -1340,6 +1366,8 @@ static const JNINativeMethod gBitmapMethods[] = { { "nativeSameAs", "(JJ)Z", (void*)Bitmap_sameAs }, { "nativePrepareToDraw", "(J)V", (void*)Bitmap_prepareToDraw }, { "nativeGetAllocationByteCount", "(J)I", (void*)Bitmap_getAllocationByteCount }, + { "nativeCopyPreserveInternalConfig", "(J)Landroid/graphics/Bitmap;", + (void*)Bitmap_nativeCopyPreserveInternalConfig }, }; int register_android_graphics_Bitmap(JNIEnv* env) diff --git a/core/jni/android/graphics/GIFMovie.cpp b/core/jni/android/graphics/GIFMovie.cpp index 035417e66592..92c774643a3a 100644 --- a/core/jni/android/graphics/GIFMovie.cpp +++ b/core/jni/android/graphics/GIFMovie.cpp @@ -121,7 +121,7 @@ static void copyLine(uint32_t* dst, const unsigned char* src, const ColorMapObje int transparent, int width) { for (; width > 0; width--, src++, dst++) { - if (*src != transparent) { + if (*src != transparent && *src < cmap->ColorCount) { const GifColorType& col = cmap->Colors[*src]; *dst = SkPackARGB32(0xFF, col.Red, col.Green, col.Blue); } diff --git a/core/jni/android_media_AudioSystem.cpp b/core/jni/android_media_AudioSystem.cpp index 664c7ea02181..226e9e366cd4 100644 --- a/core/jni/android_media_AudioSystem.cpp +++ b/core/jni/android_media_AudioSystem.cpp @@ -463,6 +463,18 @@ android_media_AudioSystem_getDeviceConnectionState(JNIEnv *env, jobject thiz, ji } static jint +android_media_AudioSystem_handleDeviceConfigChange(JNIEnv *env, jobject thiz, jint device, jstring device_address, jstring device_name) +{ + const char *c_address = env->GetStringUTFChars(device_address, NULL); + const char *c_name = env->GetStringUTFChars(device_name, NULL); + int status = check_AudioSystem_Command(AudioSystem::handleDeviceConfigChange(static_cast <audio_devices_t>(device), + c_address, c_name)); + env->ReleaseStringUTFChars(device_address, c_address); + env->ReleaseStringUTFChars(device_name, c_name); + return (jint) status; +} + +static jint android_media_AudioSystem_setPhoneState(JNIEnv *env, jobject thiz, jint state) { return (jint) check_AudioSystem_Command(AudioSystem::setPhoneState((audio_mode_t) state)); @@ -1764,6 +1776,7 @@ static const JNINativeMethod gMethods[] = { {"newAudioPlayerId", "()I", (void *)android_media_AudioSystem_newAudioPlayerId}, {"setDeviceConnectionState", "(IILjava/lang/String;Ljava/lang/String;)I", (void *)android_media_AudioSystem_setDeviceConnectionState}, {"getDeviceConnectionState", "(ILjava/lang/String;)I", (void *)android_media_AudioSystem_getDeviceConnectionState}, + {"handleDeviceConfigChange", "(ILjava/lang/String;Ljava/lang/String;)I", (void *)android_media_AudioSystem_handleDeviceConfigChange}, {"setPhoneState", "(I)I", (void *)android_media_AudioSystem_setPhoneState}, {"setForceUse", "(II)I", (void *)android_media_AudioSystem_setForceUse}, {"getForceUse", "(I)I", (void *)android_media_AudioSystem_getForceUse}, diff --git a/core/jni/android_net_LocalSocketImpl.cpp b/core/jni/android_net_LocalSocketImpl.cpp index d6d431019a6d..37b6df1e3d2c 100644 --- a/core/jni/android_net_LocalSocketImpl.cpp +++ b/core/jni/android_net_LocalSocketImpl.cpp @@ -202,9 +202,7 @@ static ssize_t socket_read_all(JNIEnv *env, jobject thisJ, int fd, msg.msg_control = cmsgbuf; msg.msg_controllen = sizeof(cmsgbuf); - do { - ret = recvmsg(fd, &msg, MSG_NOSIGNAL); - } while (ret < 0 && errno == EINTR); + ret = TEMP_FAILURE_RETRY(recvmsg(fd, &msg, MSG_NOSIGNAL | MSG_CMSG_CLOEXEC)); if (ret < 0 && errno == EPIPE) { // Treat this as an end of stream diff --git a/core/jni/android_os_HwBinder.cpp b/core/jni/android_os_HwBinder.cpp index 95e031bd96d8..c456d622ab5a 100644 --- a/core/jni/android_os_HwBinder.cpp +++ b/core/jni/android_os_HwBinder.cpp @@ -52,6 +52,8 @@ static struct { jmethodID get; } gArrayListMethods; +static jclass gErrorClass; + static struct fields_t { jfieldID contextID; jmethodID onTransactID; @@ -144,6 +146,22 @@ status_t JHwBinder::onTransact( replyObj.get(), flags); + if (env->ExceptionCheck()) { + jthrowable excep = env->ExceptionOccurred(); + env->ExceptionDescribe(); + + if (env->IsInstanceOf(excep, gErrorClass)) { + /* It's an error */ + LOG(ERROR) << "Forcefully exiting"; + exit(1); + } else { + env->ExceptionClear(); + LOG(ERROR) << "Uncaught exception!"; + } + + env->DeleteLocalRef(excep); + } + status_t err = OK; if (!replyContext->wasSent()) { @@ -356,6 +374,9 @@ int register_android_os_HwBinder(JNIEnv *env) { gArrayListMethods.size = GetMethodIDOrDie(env, arrayListClass, "size", "()I"); gArrayListMethods.get = GetMethodIDOrDie(env, arrayListClass, "get", "(I)Ljava/lang/Object;"); + jclass errorClass = FindClassOrDie(env, "java/lang/Error"); + gErrorClass = MakeGlobalRefOrDie(env, errorClass); + return RegisterMethodsOrDie(env, CLASS_PATH, gMethods, NELEM(gMethods)); } diff --git a/core/jni/android_os_HwParcel.cpp b/core/jni/android_os_HwParcel.cpp index a10d80746e46..b9d810a4190b 100644 --- a/core/jni/android_os_HwParcel.cpp +++ b/core/jni/android_os_HwParcel.cpp @@ -49,7 +49,7 @@ static struct fields_t { } gFields; -void signalExceptionForError(JNIEnv *env, status_t err) { +void signalExceptionForError(JNIEnv *env, status_t err, bool canThrowRemoteException) { switch (err) { case OK: break; @@ -114,8 +114,13 @@ void signalExceptionForError(JNIEnv *env, status_t err) { default: { + std::stringstream ss; + ss << "HwBinder Error: (" << err << ")"; + jniThrowException( - env, "java/lang/RuntimeException", "Unknown error"); + env, + canThrowRemoteException ? "android/os/RemoteException" : "java/lang/RuntimeException", + ss.str().c_str()); break; } diff --git a/core/jni/android_os_HwParcel.h b/core/jni/android_os_HwParcel.h index 708bbba1901c..f81de9bf30b7 100644 --- a/core/jni/android_os_HwParcel.h +++ b/core/jni/android_os_HwParcel.h @@ -67,7 +67,7 @@ private: DISALLOW_COPY_AND_ASSIGN(JHwParcel); }; -void signalExceptionForError(JNIEnv *env, status_t err); +void signalExceptionForError(JNIEnv *env, status_t err, bool canThrowRemoteException = false); int register_android_os_HwParcel(JNIEnv *env); } // namespace android diff --git a/core/jni/android_os_HwRemoteBinder.cpp b/core/jni/android_os_HwRemoteBinder.cpp index 1d5d6d59639a..f2f8e52db9f5 100644 --- a/core/jni/android_os_HwRemoteBinder.cpp +++ b/core/jni/android_os_HwRemoteBinder.cpp @@ -25,6 +25,7 @@ #include <JNIHelp.h> #include <android_runtime/AndroidRuntime.h> #include <hidl/Status.h> +#include <ScopedUtfChars.h> #include <nativehelper/ScopedLocalRef.h> #include "core_jni_helpers.h" @@ -38,26 +39,196 @@ using android::AndroidRuntime; namespace android { static struct fields_t { + jclass proxy_class; jfieldID contextID; jmethodID constructID; + jmethodID sendDeathNotice; +} gProxyOffsets; + +static struct class_offsets_t +{ + jmethodID mGetName; +} gClassOffsets; + +static JavaVM* jnienv_to_javavm(JNIEnv* env) +{ + JavaVM* vm; + return env->GetJavaVM(&vm) >= 0 ? vm : NULL; +} + +static JNIEnv* javavm_to_jnienv(JavaVM* vm) +{ + JNIEnv* env; + return vm->GetEnv((void **)&env, JNI_VERSION_1_4) >= 0 ? env : NULL; +} + +// ---------------------------------------------------------------------------- +class HwBinderDeathRecipient : public hardware::IBinder::DeathRecipient +{ +public: + HwBinderDeathRecipient(JNIEnv* env, jobject object, jlong cookie, const sp<HwBinderDeathRecipientList>& list) + : mVM(jnienv_to_javavm(env)), mObject(env->NewGlobalRef(object)), + mObjectWeak(NULL), mCookie(cookie), mList(list) + { + // These objects manage their own lifetimes so are responsible for final bookkeeping. + // The list holds a strong reference to this object. + list->add(this); + } + + void binderDied(const wp<hardware::IBinder>& who) + { + if (mObject != NULL) { + JNIEnv* env = javavm_to_jnienv(mVM); + + env->CallStaticVoidMethod(gProxyOffsets.proxy_class, gProxyOffsets.sendDeathNotice, mObject, mCookie); + if (env->ExceptionCheck()) { + ALOGE("Uncaught exception returned from death notification."); + env->ExceptionClear(); + } + + // Serialize with our containing HwBinderDeathRecipientList so that we can't + // delete the global ref on mObject while the list is being iterated. + sp<HwBinderDeathRecipientList> list = mList.promote(); + if (list != NULL) { + AutoMutex _l(list->lock()); + + // Demote from strong ref to weak after binderDied() has been delivered, + // to allow the DeathRecipient and BinderProxy to be GC'd if no longer needed. + mObjectWeak = env->NewWeakGlobalRef(mObject); + env->DeleteGlobalRef(mObject); + mObject = NULL; + } + } + } + + void clearReference() + { + sp<HwBinderDeathRecipientList> list = mList.promote(); + if (list != NULL) { + list->remove(this); + } else { + ALOGE("clearReference() on JDR %p but DRL wp purged", this); + } + } + + bool matches(jobject obj) { + bool result; + JNIEnv* env = javavm_to_jnienv(mVM); + + if (mObject != NULL) { + result = env->IsSameObject(obj, mObject); + } else { + jobject me = env->NewLocalRef(mObjectWeak); + result = env->IsSameObject(obj, me); + env->DeleteLocalRef(me); + } + return result; + } + + void warnIfStillLive() { + if (mObject != NULL) { + // Okay, something is wrong -- we have a hard reference to a live death + // recipient on the VM side, but the list is being torn down. + JNIEnv* env = javavm_to_jnienv(mVM); + ScopedLocalRef<jclass> objClassRef(env, env->GetObjectClass(mObject)); + ScopedLocalRef<jstring> nameRef(env, + (jstring) env->CallObjectMethod(objClassRef.get(), gClassOffsets.mGetName)); + ScopedUtfChars nameUtf(env, nameRef.get()); + if (nameUtf.c_str() != NULL) { + ALOGW("BinderProxy is being destroyed but the application did not call " + "unlinkToDeath to unlink all of its death recipients beforehand. " + "Releasing leaked death recipient: %s", nameUtf.c_str()); + } else { + ALOGW("BinderProxy being destroyed; unable to get DR object name"); + env->ExceptionClear(); + } + } + } + +protected: + virtual ~HwBinderDeathRecipient() + { + JNIEnv* env = javavm_to_jnienv(mVM); + if (mObject != NULL) { + env->DeleteGlobalRef(mObject); + } else { + env->DeleteWeakGlobalRef(mObjectWeak); + } + } + +private: + JavaVM* const mVM; + jobject mObject; + jweak mObjectWeak; // will be a weak ref to the same VM-side DeathRecipient after binderDied() + jlong mCookie; + wp<HwBinderDeathRecipientList> mList; +}; +// ---------------------------------------------------------------------------- + +HwBinderDeathRecipientList::HwBinderDeathRecipientList() { +} + +HwBinderDeathRecipientList::~HwBinderDeathRecipientList() { + AutoMutex _l(mLock); + + for (const sp<HwBinderDeathRecipient>& deathRecipient : mList) { + deathRecipient->warnIfStillLive(); + } +} + +void HwBinderDeathRecipientList::add(const sp<HwBinderDeathRecipient>& recipient) { + AutoMutex _l(mLock); + + mList.push_back(recipient); +} -} gFields; +void HwBinderDeathRecipientList::remove(const sp<HwBinderDeathRecipient>& recipient) { + AutoMutex _l(mLock); + + List< sp<HwBinderDeathRecipient> >::iterator iter; + for (iter = mList.begin(); iter != mList.end(); iter++) { + if (*iter == recipient) { + mList.erase(iter); + return; + } + } +} + +sp<HwBinderDeathRecipient> HwBinderDeathRecipientList::find(jobject recipient) { + AutoMutex _l(mLock); + + for (const sp<HwBinderDeathRecipient>& deathRecipient : mList) { + if (deathRecipient->matches(recipient)) { + return deathRecipient; + } + } + return NULL; +} + +Mutex& HwBinderDeathRecipientList::lock() { + return mLock; +} // static void JHwRemoteBinder::InitClass(JNIEnv *env) { - ScopedLocalRef<jclass> clazz(env, FindClassOrDie(env, CLASS_PATH)); + jclass clazz = FindClassOrDie(env, CLASS_PATH); - gFields.contextID = - GetFieldIDOrDie(env, clazz.get(), "mNativeContext", "J"); + gProxyOffsets.proxy_class = MakeGlobalRefOrDie(env, clazz); + gProxyOffsets.contextID = + GetFieldIDOrDie(env, clazz, "mNativeContext", "J"); + gProxyOffsets.constructID = GetMethodIDOrDie(env, clazz, "<init>", "()V"); + gProxyOffsets.sendDeathNotice = GetStaticMethodIDOrDie(env, clazz, "sendDeathNotice", + "(Landroid/os/IHwBinder$DeathRecipient;J)V"); - gFields.constructID = GetMethodIDOrDie(env, clazz.get(), "<init>", "()V"); + clazz = FindClassOrDie(env, "java/lang/Class"); + gClassOffsets.mGetName = GetMethodIDOrDie(env, clazz, "getName", "()Ljava/lang/String;"); } // static sp<JHwRemoteBinder> JHwRemoteBinder::SetNativeContext( JNIEnv *env, jobject thiz, const sp<JHwRemoteBinder> &context) { sp<JHwRemoteBinder> old = - (JHwRemoteBinder *)env->GetLongField(thiz, gFields.contextID); + (JHwRemoteBinder *)env->GetLongField(thiz, gProxyOffsets.contextID); if (context != NULL) { context->incStrong(NULL /* id */); @@ -67,7 +238,7 @@ sp<JHwRemoteBinder> JHwRemoteBinder::SetNativeContext( old->decStrong(NULL /* id */); } - env->SetLongField(thiz, gFields.contextID, (long)context.get()); + env->SetLongField(thiz, gProxyOffsets.contextID, (long)context.get()); return old; } @@ -75,7 +246,7 @@ sp<JHwRemoteBinder> JHwRemoteBinder::SetNativeContext( // static sp<JHwRemoteBinder> JHwRemoteBinder::GetNativeContext( JNIEnv *env, jobject thiz) { - return (JHwRemoteBinder *)env->GetLongField(thiz, gFields.contextID); + return (JHwRemoteBinder *)env->GetLongField(thiz, gProxyOffsets.contextID); } // static @@ -84,7 +255,7 @@ jobject JHwRemoteBinder::NewObject( ScopedLocalRef<jclass> clazz(env, FindClassOrDie(env, CLASS_PATH)); // XXX Have to look up the constructor here because otherwise that static - // class initializer isn't called and gFields.constructID is undefined :( + // class initializer isn't called and gProxyOffsets.constructID is undefined :( jmethodID constructID = GetMethodIDOrDie(env, clazz.get(), "<init>", "()V"); @@ -97,6 +268,7 @@ jobject JHwRemoteBinder::NewObject( JHwRemoteBinder::JHwRemoteBinder( JNIEnv *env, jobject thiz, const sp<hardware::IBinder> &binder) : mBinder(binder) { + mDeathRecipientList = new HwBinderDeathRecipientList(); jclass clazz = env->GetObjectClass(thiz); CHECK(clazz != NULL); @@ -114,7 +286,7 @@ JHwRemoteBinder::~JHwRemoteBinder() { mClass = NULL; } -sp<hardware::IBinder> JHwRemoteBinder::getBinder() { +sp<hardware::IBinder> JHwRemoteBinder::getBinder() const { return mBinder; } @@ -122,6 +294,10 @@ void JHwRemoteBinder::setBinder(const sp<hardware::IBinder> &binder) { mBinder = binder; } +sp<HwBinderDeathRecipientList> JHwRemoteBinder::getDeathRecipientList() const { + return mDeathRecipientList; +} + } // namespace android //////////////////////////////////////////////////////////////////////////////// @@ -171,7 +347,74 @@ static void JHwRemoteBinder_native_transact( JHwParcel::GetNativeContext(env, replyObj)->getParcel(); status_t err = binder->transact(code, *request, reply, flags); - signalExceptionForError(env, err); + signalExceptionForError(env, err, true /* canThrowRemoteException */); +} + +static jboolean JHwRemoteBinder_linkToDeath(JNIEnv* env, jobject thiz, + jobject recipient, jlong cookie) +{ + if (recipient == NULL) { + jniThrowNullPointerException(env, NULL); + return JNI_FALSE; + } + + sp<JHwRemoteBinder> context = JHwRemoteBinder::GetNativeContext(env, thiz); + sp<hardware::IBinder> binder = context->getBinder(); + + if (!binder->localBinder()) { + HwBinderDeathRecipientList* list = (context->getDeathRecipientList()).get(); + sp<HwBinderDeathRecipient> jdr = new HwBinderDeathRecipient(env, recipient, cookie, list); + status_t err = binder->linkToDeath(jdr, NULL, 0); + if (err != NO_ERROR) { + // Failure adding the death recipient, so clear its reference + // now. + jdr->clearReference(); + return JNI_FALSE; + } + } + + return JNI_TRUE; +} + +static jboolean JHwRemoteBinder_unlinkToDeath(JNIEnv* env, jobject thiz, + jobject recipient) +{ + jboolean res = JNI_FALSE; + if (recipient == NULL) { + jniThrowNullPointerException(env, NULL); + return res; + } + + sp<JHwRemoteBinder> context = JHwRemoteBinder::GetNativeContext(env, thiz); + sp<hardware::IBinder> binder = context->getBinder(); + + if (!binder->localBinder()) { + status_t err = NAME_NOT_FOUND; + + // If we find the matching recipient, proceed to unlink using that + HwBinderDeathRecipientList* list = (context->getDeathRecipientList()).get(); + sp<HwBinderDeathRecipient> origJDR = list->find(recipient); + if (origJDR != NULL) { + wp<hardware::IBinder::DeathRecipient> dr; + err = binder->unlinkToDeath(origJDR, NULL, 0, &dr); + if (err == NO_ERROR && dr != NULL) { + sp<hardware::IBinder::DeathRecipient> sdr = dr.promote(); + HwBinderDeathRecipient* jdr = static_cast<HwBinderDeathRecipient*>(sdr.get()); + if (jdr != NULL) { + jdr->clearReference(); + } + } + } + + if (err == NO_ERROR || err == DEAD_OBJECT) { + res = JNI_TRUE; + } else { + jniThrowException(env, "java/util/NoSuchElementException", + "Death link does not exist"); + } + } + + return res; } static JNINativeMethod gMethods[] = { @@ -183,6 +426,14 @@ static JNINativeMethod gMethods[] = { { "transact", "(IL" PACKAGE_PATH "/HwParcel;L" PACKAGE_PATH "/HwParcel;I)V", (void *)JHwRemoteBinder_native_transact }, + + {"linkToDeath", + "(Landroid/os/IHwBinder$DeathRecipient;J)Z", + (void*)JHwRemoteBinder_linkToDeath}, + + {"unlinkToDeath", + "(Landroid/os/IHwBinder$DeathRecipient;)Z", + (void*)JHwRemoteBinder_unlinkToDeath}, }; namespace android { diff --git a/core/jni/android_os_HwRemoteBinder.h b/core/jni/android_os_HwRemoteBinder.h index fd33338986a0..77a02784926d 100644 --- a/core/jni/android_os_HwRemoteBinder.h +++ b/core/jni/android_os_HwRemoteBinder.h @@ -20,10 +20,33 @@ #include <android-base/macros.h> #include <hwbinder/Binder.h> #include <jni.h> +#include <utils/List.h> +#include <utils/Mutex.h> #include <utils/RefBase.h> namespace android { +// Per-IBinder death recipient bookkeeping. This is how we reconcile local jobject +// death recipient references passed in through JNI with the permanent corresponding +// HwBinderDeathRecipient objects. + +class HwBinderDeathRecipient; + +class HwBinderDeathRecipientList : public RefBase { + List< sp<HwBinderDeathRecipient> > mList; + Mutex mLock; + +public: + HwBinderDeathRecipientList(); + ~HwBinderDeathRecipientList(); + + void add(const sp<HwBinderDeathRecipient>& recipient); + void remove(const sp<HwBinderDeathRecipient>& recipient); + sp<HwBinderDeathRecipient> find(jobject recipient); + + Mutex& lock(); // Use with care; specifically for mutual exclusion during binder death +}; + struct JHwRemoteBinder : public RefBase { static void InitClass(JNIEnv *env); @@ -37,8 +60,9 @@ struct JHwRemoteBinder : public RefBase { JHwRemoteBinder( JNIEnv *env, jobject thiz, const sp<hardware::IBinder> &binder); - sp<hardware::IBinder> getBinder(); + sp<hardware::IBinder> getBinder() const; void setBinder(const sp<hardware::IBinder> &binder); + sp<HwBinderDeathRecipientList> getDeathRecipientList() const; protected: virtual ~JHwRemoteBinder(); @@ -48,7 +72,7 @@ private: jobject mObject; sp<hardware::IBinder> mBinder; - + sp<HwBinderDeathRecipientList> mDeathRecipientList; DISALLOW_COPY_AND_ASSIGN(JHwRemoteBinder); }; diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index a8935295905e..4c9fb0455196 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -168,6 +168,8 @@ <protected-broadcast android:name="android.bluetooth.a2dp.profile.action.PLAYING_STATE_CHANGED" /> <protected-broadcast + android:name="android.bluetooth.a2dp.profile.action.CODEC_CONFIG_CHANGED" /> + <protected-broadcast android:name="android.bluetooth.a2dp-sink.profile.action.CONNECTION_STATE_CHANGED" /> <protected-broadcast android:name="android.bluetooth.a2dp-sink.profile.action.PLAYING_STATE_CHANGED" /> @@ -182,6 +184,8 @@ <protected-broadcast android:name="android.bluetooth.input.profile.action.VIRTUAL_UNPLUG_STATUS" /> <protected-broadcast + android:name="android.bluetooth.inputhost.profile.action.CONNECTION_STATE_CHANGED" /> + <protected-broadcast android:name="android.bluetooth.map.profile.action.CONNECTION_STATE_CHANGED" /> <protected-broadcast android:name="android.bluetooth.mapmce.profile.action.CONNECTION_STATE_CHANGED" /> <protected-broadcast android:name="android.bluetooth.mapmce.profile.action.MESSAGE_RECEIVED" /> @@ -1546,6 +1550,14 @@ <permission android:name="android.permission.BIND_INCALL_SERVICE" android:protectionLevel="signature|privileged" /> + <!-- Must be required by a link {@link android.telephony.VisualVoicemailService} to ensure that + only the system can bind to it. + <p>Protection level: signature|privileged + --> + <permission + android:name="android.permission.BIND_VISUAL_VOICEMAIL_SERVICE" + android:protectionLevel="signature|privileged"/> + <!-- Must be required by a {@link android.telecom.CallScreeningService}, to ensure that only the system can bind to it. <p>Protection level: signature|privileged @@ -1828,8 +1840,7 @@ android:description="@string/permdesc_install_shortcut" android:protectionLevel="normal"/> - <!-- Allows an application to uninstall a shortcut in Launcher. - <p>Protection level: normal + <!--This permission is no longer supported. --> <permission android:name="com.android.launcher.permission.UNINSTALL_SHORTCUT" android:label="@string/permlab_uninstall_shortcut" @@ -2062,6 +2073,12 @@ <permission android:name="android.permission.RESET_SHORTCUT_MANAGER_THROTTLING" android:protectionLevel="signature" /> + <!-- Allows the system to bind to the discovered Network Recommendation Service. + @SystemApi @hide --> + <permission android:name="android.permission.BIND_NETWORK_RECOMMENDATION_SERVICE" + android:protectionLevel="signature" /> + <uses-permission android:name="android.permission.BIND_NETWORK_RECOMMENDATION_SERVICE"/> + <!-- ========================================= --> <!-- Permissions for special development tools --> <!-- ========================================= --> diff --git a/core/res/res/layout/media_route_controller_dialog.xml b/core/res/res/layout/media_route_controller_dialog.xml index 0bf70dae062c..24a25353f40d 100644 --- a/core/res/res/layout/media_route_controller_dialog.xml +++ b/core/res/res/layout/media_route_controller_dialog.xml @@ -47,17 +47,5 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:visibility="gone" /> - - <!-- Disconnect button. --> - <LinearLayout android:layout_width="match_parent" - android:layout_height="wrap_content" - style="?attr/buttonBarStyle"> - <Button android:id="@+id/media_route_disconnect_button" - android:layout_width="match_parent" - android:layout_height="match_parent" - style="?attr/buttonBarButtonStyle" - android:gravity="center" - android:text="@string/media_route_controller_disconnect" /> - </LinearLayout> </LinearLayout> -</ScrollView>
\ No newline at end of file +</ScrollView> diff --git a/core/res/res/values-af/strings.xml b/core/res/res/values-af/strings.xml index 9cd9b7e7f424..5393d1aaa161 100644 --- a/core/res/res/values-af/strings.xml +++ b/core/res/res/values-af/strings.xml @@ -46,8 +46,7 @@ <string name="defaultMsisdnAlphaTag" msgid="2850889754919584674">"MSISDN1"</string> <string name="mmiError" msgid="5154499457739052907">"Verbindingsprobleem of ongeldige MMI-kode."</string> <string name="mmiFdnError" msgid="5224398216385316471">"Bewerking is beperk tot belbeperking-nommers."</string> - <!-- no translation found for mmiErrorWhileRoaming (762488890299284230) --> - <skip /> + <string name="mmiErrorWhileRoaming" msgid="762488890299284230">"Kan oproep-aanstuurinstellings nie van jou foon af verander tewyl jy swerf nie."</string> <string name="serviceEnabled" msgid="8147278346414714315">"Diens is geaktiveer."</string> <string name="serviceEnabledFor" msgid="6856228140453471041">"Diens geaktiveer vir:"</string> <string name="serviceDisabled" msgid="1937553226592516411">"Diens is gedeaktiveer."</string> @@ -98,10 +97,8 @@ <string name="RestrictedOnVoiceData" msgid="996636487106171320">"Stem/data-dienste is geblokkeer."</string> <string name="RestrictedOnVoiceSms" msgid="1888588152792023873">"Stem-/SMS-dienste is geblokkeer."</string> <string name="RestrictedOnAll" msgid="5643028264466092821">"Alle stem-/data-/SMS-dienste is geblokkeer."</string> - <!-- no translation found for NetworkPreferenceSwitchTitle (4008877505368566980) --> - <skip /> - <!-- no translation found for NetworkPreferenceSwitchSummary (7335915397439759249) --> - <skip /> + <string name="NetworkPreferenceSwitchTitle" msgid="4008877505368566980">"Kan netwerk nie bereik nie"</string> + <string name="NetworkPreferenceSwitchSummary" msgid="7335915397439759249">"Probeer om die soort te verander wat jy by Instellings > Sellulêre netwerke > Voorkeurnetwerksoort kies, om ontvangs te verbeter."</string> <string name="peerTtyModeFull" msgid="6165351790010341421">"Ander party het TTY-modus VOL versoek"</string> <string name="peerTtyModeHco" msgid="5728602160669216784">"Ander party het TTY-modus GOD versoek"</string> <string name="peerTtyModeVco" msgid="1742404978686538049">"Ander party het TTY-modus SOD versoek"</string> @@ -185,10 +182,8 @@ <string name="work_profile_deleted_description" msgid="6305147513054341102">"Werkprofiel is uitgevee weens ontbrekende administrasieprogram."</string> <string name="work_profile_deleted_details" msgid="226615743462361248">"Die werkprofiel se administrasieprogram ontbreek of is korrup. Gevolglik is jou werkprofiel en verwante data uitgevee. Kontak jou administrateur vir bystand."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="6019770344820507579">"Jou werkprofiel is nie meer op hierdie toestel beskikbaar nie."</string> - <!-- no translation found for network_logging_notification_title (1805392571290161924) --> - <skip /> - <!-- no translation found for network_logging_notification_text (4448072433371155729) --> - <skip /> + <string name="network_logging_notification_title" msgid="1805392571290161924">"Netwerkverkeer word gemonitor"</string> + <string name="network_logging_notification_text" msgid="4448072433371155729">"Tik vir meer besonderhede"</string> <string name="factory_reset_warning" msgid="5423253125642394387">"Jou toestel sal uitgevee word"</string> <string name="factory_reset_message" msgid="4905025204141900666">"Die administrasieprogram kort komponente of is korrup en kan nie gebruik word nie. Jou toestel sal nou uitgevee word. Kontak jou administrateur vir bystand."</string> <string name="me" msgid="6545696007631404292">"Ek"</string> @@ -306,12 +301,9 @@ <string name="permlab_sendSms" msgid="7544599214260982981">"SMS-boodskappe te stuur en te bekyk"</string> <string name="permdesc_sendSms" msgid="7094729298204937667">"Laat die program toe om SMS-boodskappe te stuur. Dit kan tot onverwagse heffings lei. Kwaadwillige programme kan jou geld kos deur boodskappe sonder jou bevestiging te stuur."</string> <string name="permlab_readSms" msgid="8745086572213270480">"lees jou teksboodskappe (SMS of MMS)"</string> - <!-- no translation found for permdesc_readSms (4741697454888074891) --> - <skip /> - <!-- no translation found for permdesc_readSms (5796670395641116592) --> - <skip /> - <!-- no translation found for permdesc_readSms (6826832415656437652) --> - <skip /> + <string name="permdesc_readSms" product="tablet" msgid="4741697454888074891">"Hierdie program kan alle SMS\'e (teksboodskappe) wat op jou tablet geberg is, lees."</string> + <string name="permdesc_readSms" product="tv" msgid="5796670395641116592">"Hierdie program kan alle SMS\'e (teksboodskappe) wat op jou TV geberg is, lees."</string> + <string name="permdesc_readSms" product="default" msgid="6826832415656437652">"Hierdie program kan alle SMS\'e (teksboodskappe) wat op jou foon geberg is, lees."</string> <string name="permlab_receiveWapPush" msgid="5991398711936590410">"ontvang teksboodskappe (WAP)"</string> <string name="permdesc_receiveWapPush" msgid="748232190220583385">"Laat die program toe om WAP-boodskappe te ontvang en te verwerk. Hierdie toestemming sluit ook in dat boodskappe wat na jou toestel gestuur is, gemonitor of uitgevee kan word, sonder dat jy dit gesien het."</string> <string name="permlab_getTasks" msgid="6466095396623933906">"haal lopende programme op"</string> @@ -324,10 +316,8 @@ <string name="permdesc_enableCarMode" msgid="4853187425751419467">"Laat die program toe om die motormodus te aktiveer."</string> <string name="permlab_killBackgroundProcesses" msgid="3914026687420177202">"maak ander programme toe"</string> <string name="permdesc_killBackgroundProcesses" msgid="4593353235959733119">"Laat die program toe om agtergrondprosesse van ander programme te beëindig. Dit kan moontlik veroorsaak dat ander programme ophou werk."</string> - <!-- no translation found for permlab_systemAlertWindow (7238805243128138690) --> - <skip /> - <!-- no translation found for permdesc_systemAlertWindow (2393776099672266188) --> - <skip /> + <string name="permlab_systemAlertWindow" msgid="7238805243128138690">"Hierdie program kan bo-op ander programme verskyn"</string> + <string name="permdesc_systemAlertWindow" msgid="2393776099672266188">"Hierdie program kan bokant ander programme of ander dele van die skerm verskyn. Dit kan met normale programgebruik inmeng en die voorkoms van ander programme verander."</string> <string name="permlab_persistentActivity" msgid="8841113627955563938">"laat program altyd loop"</string> <string name="permdesc_persistentActivity" product="tablet" msgid="8525189272329086137">"Laat die program toe om dele van ditself deurdringend in die geheue te hou. Dit kan geheue wat aan ander programme beskikbaar is, beperk, en die tablet stadiger maak."</string> <string name="permdesc_persistentActivity" product="tv" msgid="5086862529499103587">"Laat die program toe om dele van homself blywend in die berging te maak. Dit kan die berging wat beskikbaar is vir ander programme beperk, wat die TV stadiger sal maak."</string> @@ -353,51 +343,37 @@ <string name="permdesc_writeContacts" product="tv" msgid="5438230957000018959">"Laat die program toe om die data oor jou kontakte wat op jou TV gestoor is te verander, insluitend hoe gereeld jy spesifieke kontakte gebel, ge-e-pos of op ander maniere met hulle gekommunikeer het. Hierdie toestemming laat programme toe om kontakdata uit te vee."</string> <string name="permdesc_writeContacts" product="default" msgid="589869224625163558">"Laat die program toe om data oor jou kontakte wat op jou foon gestoor is te verander, insluitend die gereeldheid waarop jy oproepe gemaak het, gee-pos het, of op ander maniere met spesifieke kontakte gekommunikeer het. Hierdie toestemming laat programme toe om kontakdata te skrap."</string> <string name="permlab_readCallLog" msgid="3478133184624102739">"lees oproeprekord"</string> - <!-- no translation found for permdesc_readCallLog (3204122446463552146) --> - <skip /> + <string name="permdesc_readCallLog" msgid="3204122446463552146">"Hierdie program kan jou oproepgeskiedenis lees."</string> <string name="permlab_writeCallLog" msgid="8552045664743499354">"skryf oproeprekord"</string> <string name="permdesc_writeCallLog" product="tablet" msgid="6661806062274119245">"Laat die program toe om jou tablet se oproeprekord, insluitende data oor inkomende en uitgaande oproepe, te verander. Kwaadwillige programme kan dit gebruik om jou oproeprekord uit te vee of te verander."</string> <string name="permdesc_writeCallLog" product="tv" msgid="4225034892248398019">"Laat die program toe om jou TV se oproeprekord te wysig, insluitend data oor inkomende en uitgaande oproepe. Kwaadwillige programme kan dit gebruik om jou oproeprekord uit te vee of te wysig."</string> <string name="permdesc_writeCallLog" product="default" msgid="683941736352787842">"Laat die program toe om jou foon se oproeprekord, insluitende data oor inkomende en uitgaande oproepe, te verander. Kwaadwillige programme kan dit gebruik om jou oproeprekord uit te vee of te verander."</string> <string name="permlab_bodySensors" msgid="4683341291818520277">"verkry toegang tot liggaamsensors (soos hartklopmonitors)"</string> <string name="permdesc_bodySensors" product="default" msgid="4380015021754180431">"Laat die program toe om toegang te verkry tot data van sensors af wat jou fisieke toestand, soos jou polsslag, monitor."</string> - <!-- no translation found for permlab_readCalendar (6716116972752441641) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (4993979255403945892) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (8837931557573064315) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (4373978642145196715) --> - <skip /> + <string name="permlab_readCalendar" msgid="6716116972752441641">"Lees kalendergebeurtenisse en -besonderhede"</string> + <string name="permdesc_readCalendar" product="tablet" msgid="4993979255403945892">"Hierdie program kan alle kalendergebeurtenisse lees wat op jou tablet geberg is of jou kalenderdata stoor."</string> + <string name="permdesc_readCalendar" product="tv" msgid="8837931557573064315">"Hierdie program kan alle kalendergebeurtenisse lees wat op jou TV geberg is of jou kalenderdata stoor."</string> + <string name="permdesc_readCalendar" product="default" msgid="4373978642145196715">"Hierdie program kan alle kalendergebeurtenisse lees wat op jou foon geberg is of jou kalenderdata stoor."</string> <string name="permlab_writeCalendar" msgid="8438874755193825647">"voeg by of verander kalenderafsprake en stuur \'n e-pos aan gaste sonder eienaars se medewete"</string> - <!-- no translation found for permdesc_writeCalendar (1675270619903625982) --> - <skip /> - <!-- no translation found for permdesc_writeCalendar (9017809326268135866) --> - <skip /> - <!-- no translation found for permdesc_writeCalendar (7592791790516943173) --> - <skip /> + <string name="permdesc_writeCalendar" product="tablet" msgid="1675270619903625982">"Hierdie program kan kalendergebeurtenisse op jou tablet byvoeg, verwyder of verander. Hierdie program kan boodskappe stuur wat lyk of dit van kalendereienaars af kom of gebeurtenisse verander sonder om hul eienaars in te lig."</string> + <string name="permdesc_writeCalendar" product="tv" msgid="9017809326268135866">"Hierdie program kan kalendergebeurtenisse op jou TV byvoeg, verwyder of verander. Hierdie program kan boodskappe stuur wat lyk of dit van kalendereienaars af kom of gebeurtenisse verander sonder om hul eienaars in te lig."</string> + <string name="permdesc_writeCalendar" product="default" msgid="7592791790516943173">"Hierdie program kan kalendergebeurtenisse op jou foon byvoeg, verwyder of verander. Hierdie program kan boodskappe stuur wat lyk of dit van kalendereienaars af kom of gebeurtenisse verander sonder om hul eienaars in te lig."</string> <string name="permlab_accessLocationExtraCommands" msgid="2836308076720553837">"Kry toegang tot ekstra liggingverskaffer-bevele"</string> <string name="permdesc_accessLocationExtraCommands" msgid="6078307221056649927">"Gee die program toegang tot ekstra liggingverskaffer-bevele. Dit kan die program dalk toelaat om in te meng met die werking van die GPS of ander liggingbronne."</string> <string name="permlab_accessFineLocation" msgid="251034415460950944">"verkry toegang tot presiese ligging (GPS- en netwerkgegrond)"</string> - <!-- no translation found for permdesc_accessFineLocation (5821994817969957884) --> - <skip /> + <string name="permdesc_accessFineLocation" msgid="5821994817969957884">"Hierdie program kan jou ligging kry op grond van GPS of netwerkhulpbronne soos selfoontorings en Wi-Fi-netwerke. Hierdie liggingdienste moet aangeskakel en op jou foon beskikbaar wees sodat die program hulle kan gebruik. Dit kan batteryverbruik verhoog."</string> <string name="permlab_accessCoarseLocation" msgid="7715277613928539434">"verkry toegang tot benaderde ligging (netwerkgegrond)"</string> - <!-- no translation found for permdesc_accessCoarseLocation (3373266766487862426) --> - <skip /> - <!-- no translation found for permdesc_accessCoarseLocation (1884022719818788511) --> - <skip /> - <!-- no translation found for permdesc_accessCoarseLocation (7788009094906196995) --> - <skip /> + <string name="permdesc_accessCoarseLocation" product="tablet" msgid="3373266766487862426">"Hierdie program kan jou ligging kry op grond van jou netwerkhulpbronne soos selfoontorings en Wi-Fi-netwerke. Hierdie liggingdienste moet aangeskakel en op jou tablet beskikbaar wees sodat die program hulle kan gebruik."</string> + <string name="permdesc_accessCoarseLocation" product="tv" msgid="1884022719818788511">"Hierdie program kan jou ligging kry op grond van jou netwerkhulpbronne soos selfoontorings en Wi-Fi-netwerke. Hierdie liggingdienste moet aangeskakel en op jou TV beskikbaar wees sodat die program hulle kan gebruik."</string> + <string name="permdesc_accessCoarseLocation" product="default" msgid="7788009094906196995">"Hierdie program kan jou ligging kry op grond van jou netwerkhulpbronne soos selfoontorings en Wi-Fi-netwerke. Hierdie liggingdienste moet aangeskakel en op jou foon beskikbaar wees sodat die program hulle kan gebruik."</string> <string name="permlab_modifyAudioSettings" msgid="6095859937069146086">"verander jou klankinstellings"</string> <string name="permdesc_modifyAudioSettings" msgid="3522565366806248517">"Laat die program toe om globale klankinstellings soos volume en watter luidspreker vir uitvoer gebruik word, te verander."</string> <string name="permlab_recordAudio" msgid="3876049771427466323">"neem klank op"</string> - <!-- no translation found for permdesc_recordAudio (4245930455135321433) --> - <skip /> + <string name="permdesc_recordAudio" msgid="4245930455135321433">"Hierdie program kan enige tyd oudio met die mikrofoon opneem."</string> <string name="permlab_sim_communication" msgid="2935852302216852065">"stuur bevele na die SIM"</string> <string name="permdesc_sim_communication" msgid="5725159654279639498">"Laat die program toe om bevele na die SIM te stuur. Dit is baie gevaarlik."</string> <string name="permlab_camera" msgid="3616391919559751192">"neem foto\'s en video\'s"</string> - <!-- no translation found for permdesc_camera (5392231870049240670) --> - <skip /> + <string name="permdesc_camera" msgid="5392231870049240670">"Hierdie program kan enige tyd met die kamera foto\'s neem en video\'s opneem."</string> <string name="permlab_vibrate" msgid="7696427026057705834">"beheer vibrasie"</string> <string name="permdesc_vibrate" msgid="6284989245902300945">"Laat die program toe om die vibrator te beheer."</string> <string name="permlab_callPhone" msgid="3925836347681847954">"skakel foonnommers direk"</string> diff --git a/core/res/res/values-am/strings.xml b/core/res/res/values-am/strings.xml index 875b6d217ab9..feac09c5b5a1 100644 --- a/core/res/res/values-am/strings.xml +++ b/core/res/res/values-am/strings.xml @@ -182,10 +182,8 @@ <string name="work_profile_deleted_description" msgid="6305147513054341102">"በጎደለ የአስተዳዳሪ መተግበሪያ ምክንያት የስራ መገለጫ ተሰርዟል።"</string> <string name="work_profile_deleted_details" msgid="226615743462361248">"የስራ መገለጫ አስተዳዳሪ መተግበሪያው ወይም ይጎድላል ወይም ተበላሽቷል። በዚህ ምክንያት የስራ መገለጫዎ እና ተዛማጅ ውሂብ ተሰርዘዋል። እርዳታን ለማግኘት አስተዳዳሪዎን ያነጋግሩ።"</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="6019770344820507579">"የስራ መገለጫዎ ከዚህ በኋላ በዚህ መሳሪያ ላይ አይገኝም።"</string> - <!-- no translation found for network_logging_notification_title (1805392571290161924) --> - <skip /> - <!-- no translation found for network_logging_notification_text (4448072433371155729) --> - <skip /> + <string name="network_logging_notification_title" msgid="1805392571290161924">"የአውታረ መረብ ክትትል እየተደረገበት ነው"</string> + <string name="network_logging_notification_text" msgid="4448072433371155729">"ተጨማሪ ዝርዝሮችን ለማግኘት መታ ያድርጉ"</string> <string name="factory_reset_warning" msgid="5423253125642394387">"የእርስዎ መሣሪያ ይደመሰሳል"</string> <string name="factory_reset_message" msgid="4905025204141900666">"የአስተዳዳሪ መተግበሪያው ክፍሎች ይጎድሉታል ወይም ተበላሽቷል፣ እና ስራ ላይ መዋል አይችልም። የእርስዎ መሣሪያ አሁን ይደመሰሳል። እርዳታ ለማግኘት አስተዳዳሪዎን ያነጋግሩ።"</string> <string name="me" msgid="6545696007631404292">"እኔ"</string> diff --git a/core/res/res/values-ar/strings.xml b/core/res/res/values-ar/strings.xml index aac7591c19a6..6f58ee432ca4 100644 --- a/core/res/res/values-ar/strings.xml +++ b/core/res/res/values-ar/strings.xml @@ -46,8 +46,7 @@ <string name="defaultMsisdnAlphaTag" msgid="2850889754919584674">"MSISDN1"</string> <string name="mmiError" msgid="5154499457739052907">"حدثت مشكلة في الاتصال أو أن كود MMI غير صحيح."</string> <string name="mmiFdnError" msgid="5224398216385316471">"تم تقييد التشغيل لأرقام الاتصال الثابت فقط."</string> - <!-- no translation found for mmiErrorWhileRoaming (762488890299284230) --> - <skip /> + <string name="mmiErrorWhileRoaming" msgid="762488890299284230">"يتعذر تغيير إعدادات إعادة توجيه المكالمات من هاتفك أثناء التجوال."</string> <string name="serviceEnabled" msgid="8147278346414714315">"تم تمكين الخدمة."</string> <string name="serviceEnabledFor" msgid="6856228140453471041">"تم تمكين الخدمة لـ:"</string> <string name="serviceDisabled" msgid="1937553226592516411">"تم تعطيل الخدمة."</string> @@ -102,10 +101,8 @@ <string name="RestrictedOnVoiceData" msgid="996636487106171320">"خدمات الصوت/البيانات محظورة."</string> <string name="RestrictedOnVoiceSms" msgid="1888588152792023873">"خدمات الصوت/الرسائل القصيرة SMS محظورة."</string> <string name="RestrictedOnAll" msgid="5643028264466092821">"جميع خدمات الصوت/البيانات/الرسائل القصيرة SMS محظورة."</string> - <!-- no translation found for NetworkPreferenceSwitchTitle (4008877505368566980) --> - <skip /> - <!-- no translation found for NetworkPreferenceSwitchSummary (7335915397439759249) --> - <skip /> + <string name="NetworkPreferenceSwitchTitle" msgid="4008877505368566980">"يتعذر الوصول إلى الشبكة"</string> + <string name="NetworkPreferenceSwitchSummary" msgid="7335915397439759249">"لتحسين الاستقبال، يمكنك تجربة تغيير النوع المحدّد في الإعدادات > شبكات الجوّال > نوع الشبكة المفضَّل."</string> <string name="peerTtyModeFull" msgid="6165351790010341421">"طلب النظير وضع TTY الكامل"</string> <string name="peerTtyModeHco" msgid="5728602160669216784">"طلب النظير وضع TTY على HCO"</string> <string name="peerTtyModeVco" msgid="1742404978686538049">"طلب النظير وضع TTY على VCO"</string> @@ -193,10 +190,8 @@ <string name="work_profile_deleted_description" msgid="6305147513054341102">"تم حذف الملف الشخصي للعمل نتيجة فقد تطبيق المشرف."</string> <string name="work_profile_deleted_details" msgid="226615743462361248">"تطبيق المشرف للملف الشخصي للعمل مفقود أو تالف لذا تم حذف الملف والبيانات ذات الصلة. اتصل بالمشرف للحصول على المساعدة."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="6019770344820507579">"لم يعد ملفك الشخصي للعمل متاحًا على هذا الجهاز."</string> - <!-- no translation found for network_logging_notification_title (1805392571290161924) --> - <skip /> - <!-- no translation found for network_logging_notification_text (4448072433371155729) --> - <skip /> + <string name="network_logging_notification_title" msgid="1805392571290161924">"تتم مراقبة حركة بيانات الشبكة"</string> + <string name="network_logging_notification_text" msgid="4448072433371155729">"انقر للحصول على المزيد من التفاصيل"</string> <string name="factory_reset_warning" msgid="5423253125642394387">"سيتم محو بيانات جهازك."</string> <string name="factory_reset_message" msgid="4905025204141900666">"تطبيق المشرف فاقد لمكونات أو تالف ويتعذر استخدامه. سيتم محو بيانات جهازك الآن. اتصل بالمشرف للحصول على المساعدة."</string> <string name="me" msgid="6545696007631404292">"أنا"</string> @@ -318,12 +313,9 @@ <string name="permlab_sendSms" msgid="7544599214260982981">"إرسال رسائل قصيرة SMS وعرضها"</string> <string name="permdesc_sendSms" msgid="7094729298204937667">"للسماح للتطبيق بإرسال رسائل قصيرة SMS. وقد يؤدي هذا إلى تحمل رسوم غير متوقعة. وقد تكلفك التطبيقات الضارة أموالاً من خلال إرسال رسائل بدون موافقة منك."</string> <string name="permlab_readSms" msgid="8745086572213270480">"قراءة الرسائل النصية (الرسائل القصيرة SMS أو رسائل الوسائط المتعددة)"</string> - <!-- no translation found for permdesc_readSms (4741697454888074891) --> - <skip /> - <!-- no translation found for permdesc_readSms (5796670395641116592) --> - <skip /> - <!-- no translation found for permdesc_readSms (6826832415656437652) --> - <skip /> + <string name="permdesc_readSms" product="tablet" msgid="4741697454888074891">"يمكن لهذا التطبيق قراءة جميع الرسائل النصية القصيرة (SMS) المخزّنة على الجهاز اللوحي."</string> + <string name="permdesc_readSms" product="tv" msgid="5796670395641116592">"يمكن لهذا التطبيق قراءة جميع الرسائل النصية القصيرة (SMS) المخزّنة على التلفزيون."</string> + <string name="permdesc_readSms" product="default" msgid="6826832415656437652">"يمكن لهذا التطبيق قراءة جميع الرسائل النصية القصيرة (SMS) المخزّنة على الهاتف."</string> <string name="permlab_receiveWapPush" msgid="5991398711936590410">"تلقي رسائل نصية (WAP)"</string> <string name="permdesc_receiveWapPush" msgid="748232190220583385">"للسماح للتطبيق بتلقي رسائل WAP ومعالجتها. ويتضمن هذا الإذن إمكانية مراقبة الرسائل التي يتم إرسالها إليك أو حذفها بدون عرضها لك."</string> <string name="permlab_getTasks" msgid="6466095396623933906">"استرداد التطبيقات التي قيد التشغيل"</string> @@ -336,10 +328,8 @@ <string name="permdesc_enableCarMode" msgid="4853187425751419467">"للسماح للتطبيق بتمكين وضع السيارة."</string> <string name="permlab_killBackgroundProcesses" msgid="3914026687420177202">"إغلاق التطبيقات الأخرى"</string> <string name="permdesc_killBackgroundProcesses" msgid="4593353235959733119">"للسماح للتطبيق بإنهاء عمليات التطبيقات الأخرى في الخلفية. وقد يؤدي هذا إلى توقف تطبيقات أخرى عن العمل."</string> - <!-- no translation found for permlab_systemAlertWindow (7238805243128138690) --> - <skip /> - <!-- no translation found for permdesc_systemAlertWindow (2393776099672266188) --> - <skip /> + <string name="permlab_systemAlertWindow" msgid="7238805243128138690">"يمكن لهذا التطبيق الظهور في مقدمة التطبيقات الأخرى"</string> + <string name="permdesc_systemAlertWindow" msgid="2393776099672266188">"يمكن لهذا التطبيق الظهور في مقدمة التطبيقات أو أجزاء الشاشة الأخرى. وقد يتداخل هذا مع الاستخدام العادي للتطبيقات أو يؤدي إلى تغيير طريقة ظهور التطبيقات الأخرى."</string> <string name="permlab_persistentActivity" msgid="8841113627955563938">"تشغيل التطبيق دائمًا"</string> <string name="permdesc_persistentActivity" product="tablet" msgid="8525189272329086137">"للسماح للتطبيق بجعل أجزاء منه ثابتة في الذاكرة. وقد يؤدي هذا إلى تقييد الذاكرة المتاحة للتطبيقات الأخرى مما يؤدي إلى حدوث بطء في الجهاز اللوحي."</string> <string name="permdesc_persistentActivity" product="tv" msgid="5086862529499103587">"يتيح للتطبيق تعيين أجزاء من التطبيق نفسه لتظل ثابتة في الذاكرة. وقد يقيد هذا من الذاكرة المتاحة للتطبيقات الأخرى، مما يؤدي إلى بطء في التلفزيون."</string> @@ -365,51 +355,37 @@ <string name="permdesc_writeContacts" product="tv" msgid="5438230957000018959">"يتيح للتطبيق تعديل البيانات حول جهات الاتصال المخزنة على التلفزيون، بما في ذلك مدى تكرار اتصالك بجهات اتصال بعينها أو مراسلتها عبر البريد الإلكتروني أو التواصل معها بأية طريقة أخرى خلافًا لذلك. ويتيح هذا الإذن للتطبيقات حذف بيانات جهات الاتصال."</string> <string name="permdesc_writeContacts" product="default" msgid="589869224625163558">"للسماح للتطبيق بتعديل البيانات حول جهات الاتصال المخزنة على هاتفك، بما في ذلك مدى تكرار اتصالك بجهات اتصال بعينها أو مراسلتها عبر البريد الإلكتروني أو التواصل معها بأية طريقة أخرى خلافًا لذلك. وقد يتيح هذا الإذن للتطبيقات حذف بيانات جهات الاتصال."</string> <string name="permlab_readCallLog" msgid="3478133184624102739">"قراءة سجل المكالمات"</string> - <!-- no translation found for permdesc_readCallLog (3204122446463552146) --> - <skip /> + <string name="permdesc_readCallLog" msgid="3204122446463552146">"يمكن لهذا التطبيق قراءة سجل المكالمات."</string> <string name="permlab_writeCallLog" msgid="8552045664743499354">"كتابة سجل المكالمات"</string> <string name="permdesc_writeCallLog" product="tablet" msgid="6661806062274119245">"للسماح للتطبيق بتعديل سجل مكالمات الجهاز اللوحي، بما في ذلك البيانات عن المكالمات الواردة والصادرة. وربما تستخدم التطبيقات الضارة هذا لمسح سجل المكالمات أو تعديله."</string> <string name="permdesc_writeCallLog" product="tv" msgid="4225034892248398019">"يتيح للتطبيق تعديل سجل مكالمات التلفزيون، بما في ذلك البيانات عن المكالمات الواردة والصادرة. وربما تستخدم التطبيقات الضارة هذا لمسح سجل المكالمات أو تعديله."</string> <string name="permdesc_writeCallLog" product="default" msgid="683941736352787842">"للسماح للتطبيق بتعديل سجل مكالمات الهاتف، بما في ذلك البيانات عن المكالمات الواردة والصادرة. وربما تستخدم التطبيقات الضارة هذا لمحو سجل المكالمات أو تعديله."</string> <string name="permlab_bodySensors" msgid="4683341291818520277">"الوصول إلى أجهزة استشعار الجسم (مثل شاشات معدل ضربات القلب)"</string> <string name="permdesc_bodySensors" product="default" msgid="4380015021754180431">"للسماح للتطبيق بالدخول إلى البيانات من المستشعرات التي تراقب الحالة البدنية، مثل معدل نبضات القلب."</string> - <!-- no translation found for permlab_readCalendar (6716116972752441641) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (4993979255403945892) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (8837931557573064315) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (4373978642145196715) --> - <skip /> + <string name="permlab_readCalendar" msgid="6716116972752441641">"قراءة أحداث التقويم والتفاصيل"</string> + <string name="permdesc_readCalendar" product="tablet" msgid="4993979255403945892">"يمكن لهذا التطبيق قراءة جميع أحداث التقويم المخزَّنة على الجهاز اللوحي ومشاركة بيانات التقويم أو حفظها."</string> + <string name="permdesc_readCalendar" product="tv" msgid="8837931557573064315">"يمكن لهذا التطبيق قراءة جميع أحداث التقويم المخزَّنة على التلفزيون ومشاركة بيانات التقويم أو حفظها."</string> + <string name="permdesc_readCalendar" product="default" msgid="4373978642145196715">"يمكن لهذا التطبيق قراءة جميع أحداث التقويم المخزَّنة على الهاتف ومشاركة بيانات التقويم أو حفظها."</string> <string name="permlab_writeCalendar" msgid="8438874755193825647">"إضافة أو تعديل أحداث التقويم وإرسال رسالة إلكترونية إلى المدعوين بدون معرفة المالكين"</string> - <!-- no translation found for permdesc_writeCalendar (1675270619903625982) --> - <skip /> - <!-- no translation found for permdesc_writeCalendar (9017809326268135866) --> - <skip /> - <!-- no translation found for permdesc_writeCalendar (7592791790516943173) --> - <skip /> + <string name="permdesc_writeCalendar" product="tablet" msgid="1675270619903625982">"يمكن لهذا التطبيق إضافة أحداث تقويم أو إزالتها أو تغييرها على الجهاز اللوحي. كما يمكنه إرسال رسائل يبدو أنها واردة من مالكي التقويم، ويمكنه كذلك تغيير الأحداث بدون إشعار مالكيها."</string> + <string name="permdesc_writeCalendar" product="tv" msgid="9017809326268135866">"يمكن لهذا التطبيق إضافة أحداث تقويم أو إزالتها أو تغييرها على التلفزيون. كما يمكنه إرسال رسائل تبدو أنها من أصحاب التقويم، أو تغيير الأحداث بدون إشعار مالكيها."</string> + <string name="permdesc_writeCalendar" product="default" msgid="7592791790516943173">"يمكن لهذا التطبيق إضافة أحداث تقويم أو إزالتها أو تغييرها على الهاتف. كما يمكنه إرسال رسائل يبدو أنها واردة من مالكي التقويم، ويمكنه كذلك تغيير الأحداث بدون إشعار مالكيها."</string> <string name="permlab_accessLocationExtraCommands" msgid="2836308076720553837">"الدخول إلى المزيد من أوامر موفر الموقع"</string> <string name="permdesc_accessLocationExtraCommands" msgid="6078307221056649927">"للسماح للتطبيق بالدخول إلى أوامر إضافية لموفر الموقع. قد يتيح هذا للتطبيق التداخل مع تشغيل تقنية نظام تحديد المواقع العالمي (GPS) أو مصادر الموقع الأخرى."</string> <string name="permlab_accessFineLocation" msgid="251034415460950944">"الوصول إلى الموقع الدقيق (استنادًا إلى نظام تحديد المواقع العالمي \"GPS\" والشبكة)"</string> - <!-- no translation found for permdesc_accessFineLocation (5821994817969957884) --> - <skip /> + <string name="permdesc_accessFineLocation" msgid="5821994817969957884">"يمكن لهذا التطبيق معرفة موقعك من خلال نظام تحديد المواقع العالمي (GPS) أو مصادر مواقع الشبكات مثل أبراج الجوّال وشبكات Wi-Fi. ويجب تشغيل خدمات المواقع هذه وأن تكون متاحة على الهاتف حتى يتمكن التطبيق من استخدامها. وقد يؤدي هذا إلى زيادة استهلاك طاقة البطارية."</string> <string name="permlab_accessCoarseLocation" msgid="7715277613928539434">"الوصول إلى الموقع التقريبي (استنادًا إلى الشبكة)"</string> - <!-- no translation found for permdesc_accessCoarseLocation (3373266766487862426) --> - <skip /> - <!-- no translation found for permdesc_accessCoarseLocation (1884022719818788511) --> - <skip /> - <!-- no translation found for permdesc_accessCoarseLocation (7788009094906196995) --> - <skip /> + <string name="permdesc_accessCoarseLocation" product="tablet" msgid="3373266766487862426">"يمكن لهذا التطبيق معرفة موقعك من خلال مصادر الشبكات مثل أبراج الجوّال وشبكات Wi-Fi. ويجب تشغيل خدمات المواقع هذه وأن تكون متاحة على الجهاز اللوحي حتى يتمكن التطبيق من استخدامها."</string> + <string name="permdesc_accessCoarseLocation" product="tv" msgid="1884022719818788511">"يمكن لهذا التطبيق معرفة موقعك من خلال مصادر الشبكات مثل أبراج الجوّال وشبكات Wi-Fi. ويجب تشغيل خدمات المواقع هذه وأن تكون متاحة على جهاز التلفزيون حتى يتمكن التطبيق من استخدامها."</string> + <string name="permdesc_accessCoarseLocation" product="default" msgid="7788009094906196995">"يمكن لهذا التطبيق معرفة موقعك من خلال مصادر الشبكات مثل أبراج الجوّال وشبكات Wi-Fi. ويجب تشغيل خدمات المواقع هذه وأن تكون متاحة على الهاتف حتى يتمكن التطبيق من استخدامها."</string> <string name="permlab_modifyAudioSettings" msgid="6095859937069146086">"تغيير إعداداتك الصوتية"</string> <string name="permdesc_modifyAudioSettings" msgid="3522565366806248517">"للسماح للتطبيق بتعديل إعدادات الصوت العامة مثل مستوى الصوت وأي السماعات يتم استخدامها للاستماع."</string> <string name="permlab_recordAudio" msgid="3876049771427466323">"تسجيل الصوت"</string> - <!-- no translation found for permdesc_recordAudio (4245930455135321433) --> - <skip /> + <string name="permdesc_recordAudio" msgid="4245930455135321433">"يمكن لهذا التطبيق تسجيل الصوت باستخدام الميكروفون في أي وقت."</string> <string name="permlab_sim_communication" msgid="2935852302216852065">"إرسال أوامر إلى شريحة SIM"</string> <string name="permdesc_sim_communication" msgid="5725159654279639498">"السماح للتطبيق بإرسال أوامر إلى شريحة SIM. وهذا أمر بالغ الخطورة."</string> <string name="permlab_camera" msgid="3616391919559751192">"التقاط صور ومقاطع فيديو"</string> - <!-- no translation found for permdesc_camera (5392231870049240670) --> - <skip /> + <string name="permdesc_camera" msgid="5392231870049240670">"يمكن لهذا التطبيق التقاط صور وتسجيل مقاطع فيديو باستخدام الكاميرا في أي وقت."</string> <string name="permlab_vibrate" msgid="7696427026057705834">"التحكم في الاهتزاز"</string> <string name="permdesc_vibrate" msgid="6284989245902300945">"للسماح للتطبيق بالتحكم في الهزّاز."</string> <string name="permlab_callPhone" msgid="3925836347681847954">"اتصال مباشر بأرقام الهواتف"</string> diff --git a/core/res/res/values-az-rAZ/strings.xml b/core/res/res/values-az-rAZ/strings.xml index ef2e78940138..7c71be259583 100644 --- a/core/res/res/values-az-rAZ/strings.xml +++ b/core/res/res/values-az-rAZ/strings.xml @@ -46,8 +46,7 @@ <string name="defaultMsisdnAlphaTag" msgid="2850889754919584674">"MSISDN1"</string> <string name="mmiError" msgid="5154499457739052907">"Bağlantı problemi və ya yalnış MM kodu."</string> <string name="mmiFdnError" msgid="5224398216385316471">"Əməliyyat yalnız sabit nömrələrə yığımla məhdudlaşıb."</string> - <!-- no translation found for mmiErrorWhileRoaming (762488890299284230) --> - <skip /> + <string name="mmiErrorWhileRoaming" msgid="762488890299284230">"Roaminqdə olarkən zəng yönləndirmə ayarlarını telefonunuzdan dəyişə bilməz."</string> <string name="serviceEnabled" msgid="8147278346414714315">"Servis işə salındı."</string> <string name="serviceEnabledFor" msgid="6856228140453471041">"Xidmət aktiv edilmişdir:"</string> <string name="serviceDisabled" msgid="1937553226592516411">"Xidmət deaktiv edilib."</string> @@ -98,10 +97,8 @@ <string name="RestrictedOnVoiceData" msgid="996636487106171320">"Səs/data xidmətləri bloklanıb."</string> <string name="RestrictedOnVoiceSms" msgid="1888588152792023873">"Səs/SMS xidmətləri bloklanıb."</string> <string name="RestrictedOnAll" msgid="5643028264466092821">"Bütün səs/data/SMS xidmətləri bağlıdır."</string> - <!-- no translation found for NetworkPreferenceSwitchTitle (4008877505368566980) --> - <skip /> - <!-- no translation found for NetworkPreferenceSwitchSummary (7335915397439759249) --> - <skip /> + <string name="NetworkPreferenceSwitchTitle" msgid="4008877505368566980">"Şəbəkəyə daxil olmaq mümkün deyil"</string> + <string name="NetworkPreferenceSwitchSummary" msgid="7335915397439759249">"Qəbulu inkişaf etdirmək üçün, Ayarlar > Mobil Şəbəkə > Tərcih edilən şəbəkə növü bölməsindən seçilmiş növü dəyişməyə çalışın."</string> <string name="peerTtyModeFull" msgid="6165351790010341421">"Eskpert TTY Rejimi FULL-u sorğuladı"</string> <string name="peerTtyModeHco" msgid="5728602160669216784">"Ekspert TTY Rejimi HCO-nu sorğuladı"</string> <string name="peerTtyModeVco" msgid="1742404978686538049">"Ekspert TTY Rejimi VCO-nu sorğuladı"</string> @@ -185,10 +182,8 @@ <string name="work_profile_deleted_description" msgid="6305147513054341102">"İnzibatçı proqramı olmadığından iş profili silindi."</string> <string name="work_profile_deleted_details" msgid="226615743462361248">"İnzibatçı proqramın iş profili ya yoxdur, ya da korlanıb. Nəticədə iş profiliniz və onunla bağlı məlumatlar silinib. Yardım üçün inzibatçınızla əlaqə saxlayın."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="6019770344820507579">"İş profiliniz daha bu cihazda əlçatan deyil."</string> - <!-- no translation found for network_logging_notification_title (1805392571290161924) --> - <skip /> - <!-- no translation found for network_logging_notification_text (4448072433371155729) --> - <skip /> + <string name="network_logging_notification_title" msgid="1805392571290161924">"Şəbəkə trafikinə nəzarət edilir"</string> + <string name="network_logging_notification_text" msgid="4448072433371155729">"Ətraflı məlumat üçün klikləyin"</string> <string name="factory_reset_warning" msgid="5423253125642394387">"Cihazınız təmizlənəcəkdir"</string> <string name="factory_reset_message" msgid="4905025204141900666">"İnzibatçı proqramında komponentlər yoxdur və ya korlanıb və istifadə oluna bilməz. Cihazınız indi təmizlənəcəkdir. Yardım üçün inzibatçınızla əlaqə saxlayın."</string> <string name="me" msgid="6545696007631404292">"Mən"</string> @@ -306,12 +301,9 @@ <string name="permlab_sendSms" msgid="7544599214260982981">"göndərin və SMS mesajlarına baxın"</string> <string name="permdesc_sendSms" msgid="7094729298204937667">"Tətbiqə SMS mesajı göndərmə icazəsi verir. Bu gözlənilməyən ödənişlərə səbəb ola bilər. Zərərli tətbiqlər sizin təsdiqiniz olmadan mesaj göndərməklə sizə ödənişə səbəb ola bilərlər."</string> <string name="permlab_readSms" msgid="8745086572213270480">"tekst mesajlarınızı oxuyur (SMS və ya MMS)"</string> - <!-- no translation found for permdesc_readSms (4741697454888074891) --> - <skip /> - <!-- no translation found for permdesc_readSms (5796670395641116592) --> - <skip /> - <!-- no translation found for permdesc_readSms (6826832415656437652) --> - <skip /> + <string name="permdesc_readSms" product="tablet" msgid="4741697454888074891">"Bu tətbiq, planşetdə yadda saxlanmış bütün SMS (mətn) mesajlarını oxuya bilər."</string> + <string name="permdesc_readSms" product="tv" msgid="5796670395641116592">"Bu tətbiq, TV\'də yadda saxlanmış bütün SMS (mətn) mesajlarını oxuya bilər."</string> + <string name="permdesc_readSms" product="default" msgid="6826832415656437652">"Bu tətbiq, telefonda yadda saxlanmış bütün SMS (mətn) mesajlarını oxuya bilər."</string> <string name="permlab_receiveWapPush" msgid="5991398711936590410">"mətn mesajları qəbul etmək (WAP)"</string> <string name="permdesc_receiveWapPush" msgid="748232190220583385">"Tətbiqə WAP mesajlar göndərmək və ya qəbul etmək imkanı verir. Buna mesajları izləmək və Sizə xəbər vermədən silmək imkanları da daxildir."</string> <string name="permlab_getTasks" msgid="6466095396623933906">"işlənən tətbiqlər əldə etmək"</string> @@ -324,10 +316,8 @@ <string name="permdesc_enableCarMode" msgid="4853187425751419467">"Tətbiqə avtomobil rejimini aktivləşdirməyə imkan verir."</string> <string name="permlab_killBackgroundProcesses" msgid="3914026687420177202">"digər tətbiqləri qapatmaq"</string> <string name="permdesc_killBackgroundProcesses" msgid="4593353235959733119">"Tətbiqə başqa tətbiqlərin arxafon proseslərini dayandırmaq icazəsi verir. Bu digər tətbiqlərin dayanmasına səbəb ola bilər."</string> - <!-- no translation found for permlab_systemAlertWindow (7238805243128138690) --> - <skip /> - <!-- no translation found for permdesc_systemAlertWindow (2393776099672266188) --> - <skip /> + <string name="permlab_systemAlertWindow" msgid="7238805243128138690">"Bu tətbiq digər tətbiqlərin üzərində görünə bilər"</string> + <string name="permdesc_systemAlertWindow" msgid="2393776099672266188">"Bu tətbiq digər tətbiqlərin və ya ekran hissələrinin üzərində görünə bilər. Bu, normal tətbiq istifadəsinə müdaxilə edə və digər tətbiqlərin görünüşünün dəyişməsinə səbəb ola bilər."</string> <string name="permlab_persistentActivity" msgid="8841113627955563938">"təbiqi həmişə çalışdır"</string> <string name="permdesc_persistentActivity" product="tablet" msgid="8525189272329086137">"Tətbiqə öz komponentlərini yaddaşda saxlama icazəsi verir. Bu planşetin sürətini zəiflətməklə, digər tətbiqlər üçün mövcud olan yaddaşı limitləyə bilər."</string> <string name="permdesc_persistentActivity" product="tv" msgid="5086862529499103587">"Proqrama öz hissələrini yaddaşda davamlı etmək imkanı verir. Bu TV-ni zəiflədərək başqa proqramlar üçün mövcud olan yaddaşı məhdudlaşdıra bilər."</string> @@ -353,51 +343,37 @@ <string name="permdesc_writeContacts" product="tv" msgid="5438230957000018959">"Proqrama TV-nizdə saxlanan əlaqələr haqqında məlumatları, o cümlədən zəng etdiyiniz, e-poçt məktubu göndərdiyiniz və ya konkret şəxslərlə başqa şəkildə ünsiyyət qurduğunuz tezliyi dəyişdirmək imkanı verir. Bu icazə proqramlara əlaqə məlumatlarınızı silmək imkanı verir."</string> <string name="permdesc_writeContacts" product="default" msgid="589869224625163558">"Tətbiqə Sizin zəng etmək tezliyiniz, elektron poçtlarınız, ünsiyyətləriniz haqqında məlumatları dəyişməyə imkan verir. Buna kontaktların silinməsi imkanı də daxildir."</string> <string name="permlab_readCallLog" msgid="3478133184624102739">"zəng qeydiyyatını oxu"</string> - <!-- no translation found for permdesc_readCallLog (3204122446463552146) --> - <skip /> + <string name="permdesc_readCallLog" msgid="3204122446463552146">"Bu tətbiq zəng tarixçənizi oxuya bilər."</string> <string name="permlab_writeCallLog" msgid="8552045664743499354">"zəng loqu yazır"</string> <string name="permdesc_writeCallLog" product="tablet" msgid="6661806062274119245">"Tətbiqə planşetinizdəki zəng jurnalını, həmçinin gedən və gələn zənglərin siyahısını dəyişməyə imkan verir. Zərərli tətbiqlər bundan istifadə edərək, zəng jurnalınıza dəyişiklik edə bilər."</string> <string name="permdesc_writeCallLog" product="tv" msgid="4225034892248398019">"Proqrama TV-nizin zəng jurnalını, o cümlədən daxil olan və çıxan zənglərlə bağlı məlumatları dəyişdirmək imkanı verə bilər. Zərərli proqramlar zəng jurnalınızı silmək və ya dəyişdirmək üçün bundan istifadə edə bilər."</string> <string name="permdesc_writeCallLog" product="default" msgid="683941736352787842">"Tətbiqə sizin daxil olan və gedən zənglər daxil olmaqla telefon zəngi loqlarınızı redaktə etmək icazəsi verir. Zərərli tətbiqlər bundan telefon loqlarınızı silmək və ya redaktə etmək üçün istifadə edə bilər."</string> <string name="permlab_bodySensors" msgid="4683341291818520277">"bədən sensorlarına (ürək döyüntüsü monitorları kimi) giriş"</string> <string name="permdesc_bodySensors" product="default" msgid="4380015021754180431">"Tətbiqə ürək döyüntüsü kimi fiziki durumunuzu izləməyən sensorların datasına daxil olmağa icazə verir."</string> - <!-- no translation found for permlab_readCalendar (6716116972752441641) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (4993979255403945892) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (8837931557573064315) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (4373978642145196715) --> - <skip /> + <string name="permlab_readCalendar" msgid="6716116972752441641">"Təqvim təqdirləri və detallarını oxuyun"</string> + <string name="permdesc_readCalendar" product="tablet" msgid="4993979255403945892">"Bu tətbiq planşetdə yerləşdirilmiş və təqvim datasında yadda saxlanmış bütün təqvim tədbirlərini oxuya bilər."</string> + <string name="permdesc_readCalendar" product="tv" msgid="8837931557573064315">"Bu tətbiq TV\'də yerləşdirilmiş və təqvim datasında yadda saxlanmış bütün təqvim tədbirlərini oxuya bilər."</string> + <string name="permdesc_readCalendar" product="default" msgid="4373978642145196715">"Bu tətbiq telefonda yerləşdirilmiş və təqvim datasında yadda saxlanmış bütün təqvim tədbirlərini oxuya bilər."</string> <string name="permlab_writeCalendar" msgid="8438874755193825647">"cihaz sahibinin icazəsi olmadan təqvim tədbirləri əlavə etmək və ya dəyişmək, bunun haqqında bildirişlər göndərmək"</string> - <!-- no translation found for permdesc_writeCalendar (1675270619903625982) --> - <skip /> - <!-- no translation found for permdesc_writeCalendar (9017809326268135866) --> - <skip /> - <!-- no translation found for permdesc_writeCalendar (7592791790516943173) --> - <skip /> + <string name="permdesc_writeCalendar" product="tablet" msgid="1675270619903625982">"Bu tətbiq planşetinizdə təqvim tədbirləri əlavə edə, silə və ya dəyişiklik edə bilər. Həmçinin bu tətbiq təqvim sahiblərindən gəlmə ehtimalı olan mesajları göndərə və ya sahiblərinə bildirmədən tədbirlərdə dəyişiklik edə bilər."</string> + <string name="permdesc_writeCalendar" product="tv" msgid="9017809326268135866">"Bu tətbiq TV\'də təqvim tədbirləri əlavə edə, silə və ya dəyişiklik edə bilər. Həmçinin bu tətbiq təqvim sahiblərindən gəlmə ehtimalı olan mesajları göndərə və ya sahiblərinə bildirmədən tədbirlərdə dəyişiklik edə bilər."</string> + <string name="permdesc_writeCalendar" product="default" msgid="7592791790516943173">"Bu tətbiq telefonunuzda təqvim tədbirləri əlavə edə, silə və ya dəyişiklik edə bilər. Həmçinin bu tətbiq təqvim sahiblərindən gəlmə ehtimalı olan mesajları göndərə və ya sahiblərinə bildirmədən tədbirlərdə dəyişiklik edə bilər."</string> <string name="permlab_accessLocationExtraCommands" msgid="2836308076720553837">"əlavə məkan provayderi əmrlərinə çıxış"</string> <string name="permdesc_accessLocationExtraCommands" msgid="6078307221056649927">"Tətbiqə ekstra məkan provayder əmrlərinə girişə imkan verir. Bu, tətbiqə GPS və ya digər lokal mənbələrlə əməliyyata müdaxiləyə imkan verə bilər."</string> <string name="permlab_accessFineLocation" msgid="251034415460950944">"dəqiq məkana (GPS və şəbəkə əsasında) giriş"</string> - <!-- no translation found for permdesc_accessFineLocation (5821994817969957884) --> - <skip /> + <string name="permdesc_accessFineLocation" msgid="5821994817969957884">"Bu tətbiq mobil qüllələr və Wi-Fi şəbəkələri kimi şəbəkə mənbələrinin əassında əkanınızı əldə edə bilər. Bu məkan xidmətləri aktiv edilməlidir və telefonda tətbiq tərəfindən istifadə üçün əlçatan olmalıdır. Bu, batareya sərfiyyatını artıra bilər."</string> <string name="permlab_accessCoarseLocation" msgid="7715277613928539434">"təxmini məkana (şəbəkə əsaslı) giriş"</string> - <!-- no translation found for permdesc_accessCoarseLocation (3373266766487862426) --> - <skip /> - <!-- no translation found for permdesc_accessCoarseLocation (1884022719818788511) --> - <skip /> - <!-- no translation found for permdesc_accessCoarseLocation (7788009094906196995) --> - <skip /> + <string name="permdesc_accessCoarseLocation" product="tablet" msgid="3373266766487862426">"Bu tətbiq mobil qüllələr və Wi-Fi şəbəkələri kimi şəbəkə mənbələrinin əassında əkanınızı əldə edə bilər. Bu məkan xidmətləri aktiv edilməlidir və planşetdə tətbiq tərəfindən istifadə üçün əlçatan olmalıdır."</string> + <string name="permdesc_accessCoarseLocation" product="tv" msgid="1884022719818788511">"Bu tətbiq mobil qüllələr və Wi-Fi şəbəkələri kimi şəbəkə mənbələrinin əassında əkanınızı əldə edə bilər. Bu məkan xidmətləri aktiv edilməlidir və TV\'də tətbiq tərəfindən istifadə üçün əlçatan olmalıdır."</string> + <string name="permdesc_accessCoarseLocation" product="default" msgid="7788009094906196995">"Bu tətbiq mobil qüllələr və Wi-Fi şəbəkələri kimi şəbəkə mənbələrinin əassında əkanınızı əldə edə bilər. Bu məkan xidmətləri aktiv edilməlidir və telefonda tətbiq tərəfindən istifadə üçün əlçatan olmalıdır."</string> <string name="permlab_modifyAudioSettings" msgid="6095859937069146086">"audio ayarlarınızı dəyişir"</string> <string name="permdesc_modifyAudioSettings" msgid="3522565366806248517">"Tətbiqə səs və hansı spikerin çıxış üçün istifadə olunduğu kimi qlobal səs ayarlarını dəyişdirməyə imkan verir."</string> <string name="permlab_recordAudio" msgid="3876049771427466323">"səs yaz"</string> - <!-- no translation found for permdesc_recordAudio (4245930455135321433) --> - <skip /> + <string name="permdesc_recordAudio" msgid="4245930455135321433">"Bu tətbiq istədiyiniz zaman mikrofonu istifadə edərək audio qeyd edə bilər."</string> <string name="permlab_sim_communication" msgid="2935852302216852065">"əmrləri SIM\'ə göndərin"</string> <string name="permdesc_sim_communication" msgid="5725159654279639498">"Tətbiqə SIM-ə əmrlər göndərməyə imkan verir. Bu, çox təhlükəlidir."</string> <string name="permlab_camera" msgid="3616391919559751192">"şəkil və video çəkmək"</string> - <!-- no translation found for permdesc_camera (5392231870049240670) --> - <skip /> + <string name="permdesc_camera" msgid="5392231870049240670">"Bu tətbiq istədiyiniz zaman kameranı istifadə edərək şəkil çəkə və video qeydə ala bilər."</string> <string name="permlab_vibrate" msgid="7696427026057705834">"vibrasiyaya nəzarət edir"</string> <string name="permdesc_vibrate" msgid="6284989245902300945">"Tətbiqə vibratoru idarə etmə icazəsi verir."</string> <string name="permlab_callPhone" msgid="3925836347681847954">"telefon nömrələrinə birbaşa zəng edir"</string> diff --git a/core/res/res/values-b+sr+Latn/strings.xml b/core/res/res/values-b+sr+Latn/strings.xml index a98634bf9486..6d31e32b0ee8 100644 --- a/core/res/res/values-b+sr+Latn/strings.xml +++ b/core/res/res/values-b+sr+Latn/strings.xml @@ -46,8 +46,7 @@ <string name="defaultMsisdnAlphaTag" msgid="2850889754919584674">"MSISDN1"</string> <string name="mmiError" msgid="5154499457739052907">"Problemi sa vezom ili nevažeći MMI kôd."</string> <string name="mmiFdnError" msgid="5224398216385316471">"Rad je ograničen samo na brojeve fiksnog biranja."</string> - <!-- no translation found for mmiErrorWhileRoaming (762488890299284230) --> - <skip /> + <string name="mmiErrorWhileRoaming" msgid="762488890299284230">"Ne možete da promenite podešavanja preusmeravanja poziva sa telefona dok ste u romingu."</string> <string name="serviceEnabled" msgid="8147278346414714315">"Usluga je omogućena."</string> <string name="serviceEnabledFor" msgid="6856228140453471041">"Usluga je omogućena za:"</string> <string name="serviceDisabled" msgid="1937553226592516411">"Usluga je onemogućena."</string> @@ -99,10 +98,8 @@ <string name="RestrictedOnVoiceData" msgid="996636487106171320">"Glasovna usluga/usluga prenosa podataka su blokirane."</string> <string name="RestrictedOnVoiceSms" msgid="1888588152792023873">"Glasovna usluga i SMS usluga su blokirane."</string> <string name="RestrictedOnAll" msgid="5643028264466092821">"Sve glasovne i SMS usluge, kao i usluge prenosa podataka su blokirane."</string> - <!-- no translation found for NetworkPreferenceSwitchTitle (4008877505368566980) --> - <skip /> - <!-- no translation found for NetworkPreferenceSwitchSummary (7335915397439759249) --> - <skip /> + <string name="NetworkPreferenceSwitchTitle" msgid="4008877505368566980">"Povezivanje sa mrežom nije uspelo"</string> + <string name="NetworkPreferenceSwitchSummary" msgid="7335915397439759249">"Da biste poboljšali prijem, probajte da promenite izabrani tip u odeljku Podešavanja > Mobilne mreže > Željeni tip mreže."</string> <string name="peerTtyModeFull" msgid="6165351790010341421">"Korisnik zahteva POTPUN režim TTY"</string> <string name="peerTtyModeHco" msgid="5728602160669216784">"Korisnik zahteva PRENOS ZVUKA za režim TTY"</string> <string name="peerTtyModeVco" msgid="1742404978686538049">"Korisnik zahteva PRENOS GLASA za režim TTY"</string> @@ -187,10 +184,8 @@ <string name="work_profile_deleted_description" msgid="6305147513054341102">"Poslovni profil je izbrisan jer nedostaje administratorska aplikacija."</string> <string name="work_profile_deleted_details" msgid="226615743462361248">"Administratorska aplikacija poslovnog profila nedostaje ili je oštećena. Zbog toga su vaš poslovni profil i povezani podaci izbrisani. Obratite se administratoru za pomoć."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="6019770344820507579">"Profil za Work više nije dostupan na ovom uređaju."</string> - <!-- no translation found for network_logging_notification_title (1805392571290161924) --> - <skip /> - <!-- no translation found for network_logging_notification_text (4448072433371155729) --> - <skip /> + <string name="network_logging_notification_title" msgid="1805392571290161924">"Mrežni saobraćaj se prati"</string> + <string name="network_logging_notification_text" msgid="4448072433371155729">"Dodirnite za više detalja"</string> <string name="factory_reset_warning" msgid="5423253125642394387">"Uređaj će biti obrisan"</string> <string name="factory_reset_message" msgid="4905025204141900666">"Administratorskoj aplikaciji nedostaju neke komponente ili je oštećena i ne može da se koristi. Uređaj će sada biti obrisan. Obratite se administratoru za pomoć."</string> <string name="me" msgid="6545696007631404292">"Ja"</string> @@ -309,12 +304,9 @@ <string name="permlab_sendSms" msgid="7544599214260982981">"šalje i pregleda SMS poruke"</string> <string name="permdesc_sendSms" msgid="7094729298204937667">"Dozvoljava aplikaciji da šalje SMS poruke. Ovo može da dovede do neočekivanih troškova. Zlonamerne aplikacije mogu da šalju poruke bez vaše potvrde, što može da izazove troškove."</string> <string name="permlab_readSms" msgid="8745086572213270480">"čitanje tekstualnih poruka (SMS ili MMS)"</string> - <!-- no translation found for permdesc_readSms (4741697454888074891) --> - <skip /> - <!-- no translation found for permdesc_readSms (5796670395641116592) --> - <skip /> - <!-- no translation found for permdesc_readSms (6826832415656437652) --> - <skip /> + <string name="permdesc_readSms" product="tablet" msgid="4741697454888074891">"Ova aplikacija može da čita sve SMS (tekstualne) poruke koje se čuvaju na tabletu."</string> + <string name="permdesc_readSms" product="tv" msgid="5796670395641116592">"Ova aplikacija može da čita sve SMS (tekstualne) poruke koje se čuvaju na TV-u."</string> + <string name="permdesc_readSms" product="default" msgid="6826832415656437652">"Ova aplikacija može da čita sve SMS (tekstualne) poruke koje se čuvaju na telefonu."</string> <string name="permlab_receiveWapPush" msgid="5991398711936590410">"prijem tekstualnih poruka (WAP)"</string> <string name="permdesc_receiveWapPush" msgid="748232190220583385">"Dozvoljava aplikaciji da prima i obrađuje WAP poruke. Ova dozvola uključuje mogućnost praćenja ili brisanja poruka koje vam se šalju, a koje vam se ne prikazuju."</string> <string name="permlab_getTasks" msgid="6466095396623933906">"preuzimanje pokrenutih aplikacija"</string> @@ -327,10 +319,8 @@ <string name="permdesc_enableCarMode" msgid="4853187425751419467">"Dozvoljava aplikaciji da omogući režim rada u automobilu."</string> <string name="permlab_killBackgroundProcesses" msgid="3914026687420177202">"zatvaranje drugih aplikacija"</string> <string name="permdesc_killBackgroundProcesses" msgid="4593353235959733119">"Dozvoljava aplikaciji da zaustavi pozadinske procese drugih aplikacija. Ovo može da zaustavi druge aplikacije."</string> - <!-- no translation found for permlab_systemAlertWindow (7238805243128138690) --> - <skip /> - <!-- no translation found for permdesc_systemAlertWindow (2393776099672266188) --> - <skip /> + <string name="permlab_systemAlertWindow" msgid="7238805243128138690">"Ova aplikacija može da se prikazuje preko drugih aplikacija"</string> + <string name="permdesc_systemAlertWindow" msgid="2393776099672266188">"Ova aplikacija može da se prikazuje preko drugih aplikacija ili drugih delova delova ekrana. To može da ometa standardno korišćenje aplikacija i način na koji se druge aplikacije prikazuju."</string> <string name="permlab_persistentActivity" msgid="8841113627955563938">"omogućavanje neprekidne aktivnosti aplikacije"</string> <string name="permdesc_persistentActivity" product="tablet" msgid="8525189272329086137">"Dozvoljava aplikaciji da učini sopstvene komponente trajnim u memoriji. Ovo može da ograniči memoriju dostupnu drugim aplikacijama i uspori tablet."</string> <string name="permdesc_persistentActivity" product="tv" msgid="5086862529499103587">"Dozvoljava aplikaciji da neke svoje delove trajno zadrži u memoriji. To može da ograniči memoriju dostupnu drugim aplikacijama i uspori TV."</string> @@ -356,51 +346,37 @@ <string name="permdesc_writeContacts" product="tv" msgid="5438230957000018959">"Dozvoljava aplikaciji da menja podatke o kontaktima koje čuvate na TV-u, uključujući koliko često ste zvali, slali imejlove ili na druge načine komunicirali sa određenim kontaktima. Ova dozvola omogućava aplikacijama da brišu podatke o kontaktima."</string> <string name="permdesc_writeContacts" product="default" msgid="589869224625163558">"Dozvoljava aplikaciji da menja podatke o kontaktima uskladištene na telefonu, uključujući podatke o tome koliko često zovete određene kontakte, šaljete im poruke e-pošte ili na drugi način komunicirate sa njima. Ova dozvola omogućava aplikacijama da brišu podatke o kontaktima."</string> <string name="permlab_readCallLog" msgid="3478133184624102739">"čitanje evidencije poziva"</string> - <!-- no translation found for permdesc_readCallLog (3204122446463552146) --> - <skip /> + <string name="permdesc_readCallLog" msgid="3204122446463552146">"Ova aplikacija može da čita istoriju poziva."</string> <string name="permlab_writeCallLog" msgid="8552045664743499354">"pisanje evidencije poziva"</string> <string name="permdesc_writeCallLog" product="tablet" msgid="6661806062274119245">"Dozvoljava aplikaciji da menja evidenciju poziva na tabletu, uključujući podatke o dolaznim i odlaznim pozivima. Zlonamerne aplikacije mogu ovo da koriste da bi brisale ili menjale evidenciju poziva."</string> <string name="permdesc_writeCallLog" product="tv" msgid="4225034892248398019">"Dozvoljava aplikaciji da menja evidenciju poziva na TV-u, uključujući podatke o dolaznim i odlaznim pozivima. Zlonamerne aplikacije mogu ovo da koriste da bi brisale ili menjale evidenciju poziva."</string> <string name="permdesc_writeCallLog" product="default" msgid="683941736352787842">"Dozvoljava aplikaciji da menja evidenciju poziva na telefonu, uključujući podatke o dolaznim i odlaznim pozivima. Zlonamerne aplikacije mogu ovo da koriste da bi brisale ili menjale evidenciju poziva."</string> <string name="permlab_bodySensors" msgid="4683341291818520277">"pristup senzorima na telu (poput monitora za praćenje pulsa)"</string> <string name="permdesc_bodySensors" product="default" msgid="4380015021754180431">"Dozvoljava aplikaciji da pristupa podacima sa senzora koji nadgledaju fizičku kondiciju, kao što je broj otkucaja srca."</string> - <!-- no translation found for permlab_readCalendar (6716116972752441641) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (4993979255403945892) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (8837931557573064315) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (4373978642145196715) --> - <skip /> + <string name="permlab_readCalendar" msgid="6716116972752441641">"Čitanje događaja i podataka iz kalendara"</string> + <string name="permdesc_readCalendar" product="tablet" msgid="4993979255403945892">"Ova aplikacija može da čita sve događaje iz kalendara koje čuvate na tabletu, kao i da deli ili čuva podatke iz kalendara."</string> + <string name="permdesc_readCalendar" product="tv" msgid="8837931557573064315">"Ova aplikacija može da čita sve događaje iz kalendara koje čuvate na TV-u, kao i da deli ili čuva podatke iz kalendara."</string> + <string name="permdesc_readCalendar" product="default" msgid="4373978642145196715">"Ova aplikacija može da čita sve događaje iz kalendara koje čuvate na telefonu, kao i da deli ili čuva podatke iz kalendara."</string> <string name="permlab_writeCalendar" msgid="8438874755193825647">"dodavanje ili izmena kalendarskih događaja i slanje poruka e-pošte gostima bez znanja vlasnika"</string> - <!-- no translation found for permdesc_writeCalendar (1675270619903625982) --> - <skip /> - <!-- no translation found for permdesc_writeCalendar (9017809326268135866) --> - <skip /> - <!-- no translation found for permdesc_writeCalendar (7592791790516943173) --> - <skip /> + <string name="permdesc_writeCalendar" product="tablet" msgid="1675270619903625982">"Ova aplikaciji može da dodaje, uklanja ili menja događaje iz kalendara na tabletu. Ova aplikacija može da šalje poruke koje izgledaju kao da ih šalju vlasnici kalendara ili da menja događaje bez znanja vlasnika."</string> + <string name="permdesc_writeCalendar" product="tv" msgid="9017809326268135866">"Ova aplikaciji može da dodaje, uklanja ili menja događaje iz kalendara na TV-u. Ova aplikacija može da šalje poruke koje izgledaju kao da ih šalju vlasnici kalendara ili da menja događaje bez znanja vlasnika."</string> + <string name="permdesc_writeCalendar" product="default" msgid="7592791790516943173">"Ova aplikaciji može da dodaje, uklanja ili menja događaje iz kalendara na telefonu. Ova aplikacija može da šalje poruke koje izgledaju kao da ih šalju vlasnici kalendara ili da menja događaje bez znanja vlasnika."</string> <string name="permlab_accessLocationExtraCommands" msgid="2836308076720553837">"pristup dodatnim komandama dobavljača lokacije"</string> <string name="permdesc_accessLocationExtraCommands" msgid="6078307221056649927">"Omogućava aplikaciji da pristupa dodatnim komandama davaoca usluga lokacije. To može da omogući aplikaciji da utiče na rad GPS-a ili drugih izvora lokacije."</string> <string name="permlab_accessFineLocation" msgid="251034415460950944">"pristup preciznoj lokaciji (utvrđena preko mreže i GPS-a)"</string> - <!-- no translation found for permdesc_accessFineLocation (5821994817969957884) --> - <skip /> + <string name="permdesc_accessFineLocation" msgid="5821994817969957884">"Ova aplikacija može da pristupi vašoj lokaciji pomoću GPS-a ili mrežnih izvora lokacija, kao što su mobilni predajnici i Wi-Fi mreže. Ove usluge lokacije moraju da budu uključene i dostupne na telefonu da bi aplikacija mogla da ih koristi. To može da poveća potrošnju baterije."</string> <string name="permlab_accessCoarseLocation" msgid="7715277613928539434">"pristup približnoj lokaciji (utvrđena preko mreže)"</string> - <!-- no translation found for permdesc_accessCoarseLocation (3373266766487862426) --> - <skip /> - <!-- no translation found for permdesc_accessCoarseLocation (1884022719818788511) --> - <skip /> - <!-- no translation found for permdesc_accessCoarseLocation (7788009094906196995) --> - <skip /> + <string name="permdesc_accessCoarseLocation" product="tablet" msgid="3373266766487862426">"Ova aplikacija može da pristupi vašoj lokaciji pomoću izvora mreže, kao što su mobilni predajnici i Wi-Fi mreže. Ove usluge lokacije moraju da budu uključene i dostupne na tabletu da bi aplikacija mogla da ih koristi."</string> + <string name="permdesc_accessCoarseLocation" product="tv" msgid="1884022719818788511">"Ova aplikacija može da pristupi vašoj lokaciji pomoću izvora mreže, kao što su mobilni predajnici i Wi-Fi mreže. Ove usluge lokacije moraju da budu uključene i dostupne na TV-u da bi aplikacija mogla da ih koristi."</string> + <string name="permdesc_accessCoarseLocation" product="default" msgid="7788009094906196995">"Ova aplikacija može da pristupi vašoj lokaciji pomoću izvora mreže, kao što su mobilni predajnici i Wi-Fi mreže. Ove usluge lokacije moraju da budu uključene i dostupne na telefonu da bi aplikacija mogla da ih koristi."</string> <string name="permlab_modifyAudioSettings" msgid="6095859937069146086">"promena audio podešavanja"</string> <string name="permdesc_modifyAudioSettings" msgid="3522565366806248517">"Dozvoljava aplikaciji da menja globalna audio podešavanja kao što su jačina zvuka i izbor zvučnika koji se koristi kao izlaz."</string> <string name="permlab_recordAudio" msgid="3876049771427466323">"snimanje audio zapisa"</string> - <!-- no translation found for permdesc_recordAudio (4245930455135321433) --> - <skip /> + <string name="permdesc_recordAudio" msgid="4245930455135321433">"Ova aplikacija može da snima zvuk pomoću mikrofona u bilo kom trenutku."</string> <string name="permlab_sim_communication" msgid="2935852302216852065">"slanje komandi na SIM"</string> <string name="permdesc_sim_communication" msgid="5725159654279639498">"Omogućava aplikaciji da šalje komande SIM kartici. To je veoma opasno."</string> <string name="permlab_camera" msgid="3616391919559751192">"snimanje fotografija i video snimaka"</string> - <!-- no translation found for permdesc_camera (5392231870049240670) --> - <skip /> + <string name="permdesc_camera" msgid="5392231870049240670">"Ova aplikacija može da snima fotografije i video snimke pomoću kamere u bilo kom trenutku."</string> <string name="permlab_vibrate" msgid="7696427026057705834">"kontrola vibracije"</string> <string name="permdesc_vibrate" msgid="6284989245902300945">"Dozvoljava aplikaciji da kontroliše vibraciju."</string> <string name="permlab_callPhone" msgid="3925836347681847954">"direktno pozivanje brojeva telefona"</string> diff --git a/core/res/res/values-be-rBY/strings.xml b/core/res/res/values-be-rBY/strings.xml index e5e39e732211..a5ad1e5811b7 100644 --- a/core/res/res/values-be-rBY/strings.xml +++ b/core/res/res/values-be-rBY/strings.xml @@ -186,10 +186,8 @@ <string name="work_profile_deleted_description" msgid="6305147513054341102">"Рабочы профіль выдалены з-за адсутнасці праграмы адміністравання."</string> <string name="work_profile_deleted_details" msgid="226615743462361248">"Праграма для адміністравання рабочага профілю адсутнічае або пашкоджана. У выніку гэтага ваш рабочы профіль і звязаныя з ім даныя былі выдаленыя. Звярніцеся па дапамогу да адміністратара."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="6019770344820507579">"Ваш працоўны профіль больш не даступны на гэтай прыладзе."</string> - <!-- no translation found for network_logging_notification_title (1805392571290161924) --> - <skip /> - <!-- no translation found for network_logging_notification_text (4448072433371155729) --> - <skip /> + <string name="network_logging_notification_title" msgid="1805392571290161924">"Сеткавы трафік адсочваецца"</string> + <string name="network_logging_notification_text" msgid="4448072433371155729">"Дакраніцеся для атрымання больш падрабязнай інфармацыі"</string> <string name="factory_reset_warning" msgid="5423253125642394387">"Даныя вашай прылады будуць сцерты"</string> <string name="factory_reset_message" msgid="4905025204141900666">"Праграма для адміністравання не можа быць выкарыстана, таму што ў яе адсутнічаюць кампаненты або яна пашкоджана. Зараз даныя вашай прылады будуць сцерты. Звярніцеся па дапамогу да адміністратара."</string> <string name="me" msgid="6545696007631404292">"Я"</string> diff --git a/core/res/res/values-bg/strings.xml b/core/res/res/values-bg/strings.xml index 3f98c9f82080..5770142ca136 100644 --- a/core/res/res/values-bg/strings.xml +++ b/core/res/res/values-bg/strings.xml @@ -46,8 +46,7 @@ <string name="defaultMsisdnAlphaTag" msgid="2850889754919584674">"MSISDN1"</string> <string name="mmiError" msgid="5154499457739052907">"Има проблем с връзката или MMI кодът е невалиден."</string> <string name="mmiFdnError" msgid="5224398216385316471">"Операцията е ограничена само до фиксираните номера за набиране."</string> - <!-- no translation found for mmiErrorWhileRoaming (762488890299284230) --> - <skip /> + <string name="mmiErrorWhileRoaming" msgid="762488890299284230">"Докато сте в режим на роуминг, настройките за пренасочване на обажданията не могат да се променят от телефона ви."</string> <string name="serviceEnabled" msgid="8147278346414714315">"Услугата бе активирана."</string> <string name="serviceEnabledFor" msgid="6856228140453471041">"Услугата бе активирана за:"</string> <string name="serviceDisabled" msgid="1937553226592516411">"Услугата бе деактивирана."</string> @@ -98,10 +97,8 @@ <string name="RestrictedOnVoiceData" msgid="996636487106171320">"Услугите за глас или данни са блокирани."</string> <string name="RestrictedOnVoiceSms" msgid="1888588152792023873">"Услугите за глас и SMS са блокирани."</string> <string name="RestrictedOnAll" msgid="5643028264466092821">"Всички услуги за глас/данни/SMS са блокирани."</string> - <!-- no translation found for NetworkPreferenceSwitchTitle (4008877505368566980) --> - <skip /> - <!-- no translation found for NetworkPreferenceSwitchSummary (7335915397439759249) --> - <skip /> + <string name="NetworkPreferenceSwitchTitle" msgid="4008877505368566980">"Не може да се установи връзка с мрежата"</string> + <string name="NetworkPreferenceSwitchSummary" msgid="7335915397439759249">"За да подобрите сигнала, променете избрания тип от „Настройки“ > „Клетъчни мрежи“ > „Предпочитан тип мрежа“."</string> <string name="peerTtyModeFull" msgid="6165351790010341421">"Отсрещният потребител заяви пълен TTY режим (FULL)"</string> <string name="peerTtyModeHco" msgid="5728602160669216784">"Отсрещният потребител заяви TTY режим с пренос на слух (HCO)"</string> <string name="peerTtyModeVco" msgid="1742404978686538049">"Отсрещният потребител заяви TTY режим с пренос на глас (VCО)"</string> @@ -185,10 +182,8 @@ <string name="work_profile_deleted_description" msgid="6305147513054341102">"Служебният потребителски профил е изтрит поради липса на администраторско приложение."</string> <string name="work_profile_deleted_details" msgid="226615743462361248">"Администраторското приложение на служебния потребителски профил липсва или е повредено. В резултат на това той и свързаните с него данни са изтрити. За съдействие се свържете с администратора си."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="6019770344820507579">"Служебният ви потребителски профил вече не е налице на това устройство."</string> - <!-- no translation found for network_logging_notification_title (1805392571290161924) --> - <skip /> - <!-- no translation found for network_logging_notification_text (4448072433371155729) --> - <skip /> + <string name="network_logging_notification_title" msgid="1805392571290161924">"Трафикът в мрежата се следи"</string> + <string name="network_logging_notification_text" msgid="4448072433371155729">"Докоснете за още подробности"</string> <string name="factory_reset_warning" msgid="5423253125642394387">"Данните на устройството ви ще бъдат изтрити"</string> <string name="factory_reset_message" msgid="4905025204141900666">"В администраторското приложение липсват компоненти или то е невалидно и не може да се използва. Сега данните на устройството ви ще бъдат изтрити. Свържете се с администратора си за съдействие."</string> <string name="me" msgid="6545696007631404292">"Аз"</string> @@ -306,12 +301,9 @@ <string name="permlab_sendSms" msgid="7544599214260982981">"изпращане и преглед на SMS съобщения"</string> <string name="permdesc_sendSms" msgid="7094729298204937667">"Разрешава на приложението да изпраща SMS съобщения. Това може да доведе до неочаквано таксуване. Злонамерените приложения могат да ви въвлекат в разходи, като изпращат съобщения без потвърждение от ваша страна."</string> <string name="permlab_readSms" msgid="8745086572213270480">"четене на текстовите ви съобщения (SMS или MMS)"</string> - <!-- no translation found for permdesc_readSms (4741697454888074891) --> - <skip /> - <!-- no translation found for permdesc_readSms (5796670395641116592) --> - <skip /> - <!-- no translation found for permdesc_readSms (6826832415656437652) --> - <skip /> + <string name="permdesc_readSms" product="tablet" msgid="4741697454888074891">"Това приложение може да чете всички съхранявани на таблета ви текстови съобщения (SMS)."</string> + <string name="permdesc_readSms" product="tv" msgid="5796670395641116592">"Това приложение може да чете всички съхранявани на телевизора ви текстови съобщения (SMS)."</string> + <string name="permdesc_readSms" product="default" msgid="6826832415656437652">"Това приложение може да чете всички съхранявани на телефона ви текстови съобщения (SMS)."</string> <string name="permlab_receiveWapPush" msgid="5991398711936590410">"получаване на текстови съобщения (WAP)"</string> <string name="permdesc_receiveWapPush" msgid="748232190220583385">"Разрешава на приложението да получава и обработва WAP съобщения. Това разрешение включва възможността да наблюдава или изтрива изпратените до вас, без да ви ги покаже."</string> <string name="permlab_getTasks" msgid="6466095396623933906">"извличане на изпълняваните приложения"</string> @@ -324,10 +316,8 @@ <string name="permdesc_enableCarMode" msgid="4853187425751419467">"Разрешава на приложението да активира моторежима."</string> <string name="permlab_killBackgroundProcesses" msgid="3914026687420177202">"затваряне на другите приложения"</string> <string name="permdesc_killBackgroundProcesses" msgid="4593353235959733119">"Разрешава на приложението да прекратява намиращи се на заден план процеси на други приложения. Това може да доведе до спиране на тяхното изпълняване."</string> - <!-- no translation found for permlab_systemAlertWindow (7238805243128138690) --> - <skip /> - <!-- no translation found for permdesc_systemAlertWindow (2393776099672266188) --> - <skip /> + <string name="permlab_systemAlertWindow" msgid="7238805243128138690">"Това приложение може да се показва върху други приложения"</string> + <string name="permdesc_systemAlertWindow" msgid="2393776099672266188">"Това приложение може да се показва върху други приложения или други части от екрана. Така може да се попречи на нормалната употреба на приложенията и да се промени начинът, по който се показват други приложения."</string> <string name="permlab_persistentActivity" msgid="8841113627955563938">"задаване на постоянно изпълнение на приложението"</string> <string name="permdesc_persistentActivity" product="tablet" msgid="8525189272329086137">"Разрешава на приложението да прави части от себе си постоянни в паметта. Това може да ограничи наличната за другите приложения, забавяйки таблета."</string> <string name="permdesc_persistentActivity" product="tv" msgid="5086862529499103587">"Разрешава на приложението да прави части от себе си постоянни в паметта. Това може да ограничи наличната памет за останалите приложения и да забави телевизора."</string> @@ -353,51 +343,37 @@ <string name="permdesc_writeContacts" product="tv" msgid="5438230957000018959">"Разрешава на приложението да променя данните за съхраняваните в телевизора ви контакти, включително колко често сте се обаждали на конкретни хора, изпращали сте им имейли или сте общували с тях по други начини. Това позволява на приложенията да изтриват данните за контактите."</string> <string name="permdesc_writeContacts" product="default" msgid="589869224625163558">"Разрешава на приложението да променя данните за съхранените на телефона ви контакти, включително честотата на обаждане, изпращане на имейли или общуване по друг начин с конкретни контакти. Това разрешение му позволява да изтрива информацията за тях."</string> <string name="permlab_readCallLog" msgid="3478133184624102739">"четене на списъка с обаждания"</string> - <!-- no translation found for permdesc_readCallLog (3204122446463552146) --> - <skip /> + <string name="permdesc_readCallLog" msgid="3204122446463552146">"Това приложение може да чете историята на обажданията ви."</string> <string name="permlab_writeCallLog" msgid="8552045664743499354">"запис на списъка с обаждания"</string> <string name="permdesc_writeCallLog" product="tablet" msgid="6661806062274119245">"Разрешава на приложението да променя списъка с обаждания на таблета ви, включително данните за входящите и изходящите обаждания. Злонамерените приложения могат да използват това, за да изтрият или променят този списък."</string> <string name="permdesc_writeCallLog" product="tv" msgid="4225034892248398019">"Разрешава на приложението да променя списъка с обажданията на телевизора ви, включително данните за входящите и изходящите повиквания. Злонамерените приложения може да използват това, за да изтрият или променят списъка с обажданията ви."</string> <string name="permdesc_writeCallLog" product="default" msgid="683941736352787842">"Разрешава на приложението да променя списъка с обаждания на телефона ви, включително данните за входящите и изходящите обаждания. Злонамерените приложения могат да използват това, за да изтрият или променят този списък."</string> <string name="permlab_bodySensors" msgid="4683341291818520277">"достъп до телесните сензори (напр. пулсомери)"</string> <string name="permdesc_bodySensors" product="default" msgid="4380015021754180431">"Разрешава на приложението да осъществява достъп до данните от сензорите, които следят физическото ви състояние, като например сърдечния ви ритъм."</string> - <!-- no translation found for permlab_readCalendar (6716116972752441641) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (4993979255403945892) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (8837931557573064315) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (4373978642145196715) --> - <skip /> + <string name="permlab_readCalendar" msgid="6716116972752441641">"Четене на събития и подробности от календара"</string> + <string name="permdesc_readCalendar" product="tablet" msgid="4993979255403945892">"Това приложение може да чете всички съхранявани на таблета ви събития в календара и да споделя или запазва данни в календара ви."</string> + <string name="permdesc_readCalendar" product="tv" msgid="8837931557573064315">"Това приложение може да чете всички съхранявани на телевизора ви събития в календара и да споделя или запазва данни в календара ви."</string> + <string name="permdesc_readCalendar" product="default" msgid="4373978642145196715">"Това приложение може да чете всички съхранявани на телефона ви събития в календара и да споделя или запазва данни в календара ви."</string> <string name="permlab_writeCalendar" msgid="8438874755193825647">"добавяне или промяна на събития от календари и изпращане на имейл до гости без знанието на собствениците"</string> - <!-- no translation found for permdesc_writeCalendar (1675270619903625982) --> - <skip /> - <!-- no translation found for permdesc_writeCalendar (9017809326268135866) --> - <skip /> - <!-- no translation found for permdesc_writeCalendar (7592791790516943173) --> - <skip /> + <string name="permdesc_writeCalendar" product="tablet" msgid="1675270619903625982">"Това приложение може да добавя, премахва или променя събития в календара на таблета ви. То е в състояние да изпраща съобщения от името на собственици на календари или да променя събития, без да уведомява собствениците."</string> + <string name="permdesc_writeCalendar" product="tv" msgid="9017809326268135866">"Това приложение може да добавя, премахва или променя събития в календара на телевизора ви. То е в състояние да изпраща съобщения от името на собственици на календари или да променя събития, без да уведомява собствениците."</string> + <string name="permdesc_writeCalendar" product="default" msgid="7592791790516943173">"Това приложение може да добавя, премахва или променя събития в календара на телефона ви. То е в състояние да изпраща съобщения от името на собственици на календари или да променя събития, без да уведомява собствениците."</string> <string name="permlab_accessLocationExtraCommands" msgid="2836308076720553837">"достъп до допълнителни команди на доставчика на местоположение"</string> <string name="permdesc_accessLocationExtraCommands" msgid="6078307221056649927">"Разрешава на приложението достъп до допълнителни команди на доставчика на местоположение. Това може да позволи на приложението да смущава работата на GPS или на другите източници на местоположение."</string> <string name="permlab_accessFineLocation" msgid="251034415460950944">"достъп до точното местоположение (въз основа на GPS и мрежата)"</string> - <!-- no translation found for permdesc_accessFineLocation (5821994817969957884) --> - <skip /> + <string name="permdesc_accessFineLocation" msgid="5821994817969957884">"Приложението може да получава данни за местоположението ви въз основа на GPS или съответните мрежови източници, като клетъчни кули и Wi-Fi. Тези услуги за местоположение трябва да са включени и налице на телефона ви, за да могат да се използват от приложението. Това може да увеличи потреблението на батерията."</string> <string name="permlab_accessCoarseLocation" msgid="7715277613928539434">"достъп до приблизителното местоположение (въз основа на мрежата)"</string> - <!-- no translation found for permdesc_accessCoarseLocation (3373266766487862426) --> - <skip /> - <!-- no translation found for permdesc_accessCoarseLocation (1884022719818788511) --> - <skip /> - <!-- no translation found for permdesc_accessCoarseLocation (7788009094906196995) --> - <skip /> + <string name="permdesc_accessCoarseLocation" product="tablet" msgid="3373266766487862426">"Приложението може да получава данни за местоположението ви въз основа на мрежови източници, като клетъчни кули и Wi-Fi. Тези услуги за местоположение трябва да са включени и налице на таблета ви, за да могат да се използват от приложението."</string> + <string name="permdesc_accessCoarseLocation" product="tv" msgid="1884022719818788511">"Приложението може да получава данни за местоположението ви въз основа на мрежови източници, като клетъчни кули и Wi-Fi. Тези услуги за местоположение трябва да са включени и налице на телевизора ви, за да могат да се използват от приложението."</string> + <string name="permdesc_accessCoarseLocation" product="default" msgid="7788009094906196995">"Приложението може да получава данни за местоположението ви въз основа на мрежови източници, като клетъчни кули и Wi-Fi. Тези услуги за местоположение трябва да са включени и налице на телефона ви, за да могат да се използват от приложението."</string> <string name="permlab_modifyAudioSettings" msgid="6095859937069146086">"промяна на настройките ви за звука"</string> <string name="permdesc_modifyAudioSettings" msgid="3522565366806248517">"Разрешава на приложението да променя глобалните настройки за звука, като например силата и това, кой високоговорител се използва за изход."</string> <string name="permlab_recordAudio" msgid="3876049771427466323">"записва звук"</string> - <!-- no translation found for permdesc_recordAudio (4245930455135321433) --> - <skip /> + <string name="permdesc_recordAudio" msgid="4245930455135321433">"Това приложение може по всяко време да записва звук посредством микрофона."</string> <string name="permlab_sim_communication" msgid="2935852302216852065">"изпращане на команди до SIM картата"</string> <string name="permdesc_sim_communication" msgid="5725159654279639498">"Разрешава на приложението да изпраща команди до SIM картата. Това е много опасно."</string> <string name="permlab_camera" msgid="3616391919559751192">"правене на снимки и видеоклипове"</string> - <!-- no translation found for permdesc_camera (5392231870049240670) --> - <skip /> + <string name="permdesc_camera" msgid="5392231870049240670">"Това приложение може по всяко време да прави снимки и да записва видеоклипове посредством камерата."</string> <string name="permlab_vibrate" msgid="7696427026057705834">"контролиране на вибрирането"</string> <string name="permdesc_vibrate" msgid="6284989245902300945">"Разрешава на приложението да контролира устройството за вибрация."</string> <string name="permlab_callPhone" msgid="3925836347681847954">"директно обаждане до телефонни номера"</string> diff --git a/core/res/res/values-bn-rBD/strings.xml b/core/res/res/values-bn-rBD/strings.xml index 12c6a41c8032..83552090876c 100644 --- a/core/res/res/values-bn-rBD/strings.xml +++ b/core/res/res/values-bn-rBD/strings.xml @@ -46,8 +46,7 @@ <string name="defaultMsisdnAlphaTag" msgid="2850889754919584674">"MSISDN1"</string> <string name="mmiError" msgid="5154499457739052907">"সংযোগ সমস্যা বা অবৈধ MMI কোড৷"</string> <string name="mmiFdnError" msgid="5224398216385316471">"নির্দিষ্ট নম্বরে ডায়ালযোগ্য হিসাবে প্রক্রিয়াটি সীমিত করা হয়েছে৷"</string> - <!-- no translation found for mmiErrorWhileRoaming (762488890299284230) --> - <skip /> + <string name="mmiErrorWhileRoaming" msgid="762488890299284230">"আপনি রোমিংয়ে থাকাকালীন আপনার ফোন থেকে \'কল ফরওয়ার্ড করার সেটিংস\' পরিবর্তন করা যাবে না৷"</string> <string name="serviceEnabled" msgid="8147278346414714315">"পরিষেবা সক্ষম করা ছিল৷"</string> <string name="serviceEnabledFor" msgid="6856228140453471041">"এর জন্য পরিষেবার সক্ষম করা ছিল:"</string> <string name="serviceDisabled" msgid="1937553226592516411">"পরিষেবা অক্ষম করা হয়েছে৷"</string> @@ -98,10 +97,8 @@ <string name="RestrictedOnVoiceData" msgid="996636487106171320">"ভয়েস/ডেটা পরিষেবাগুলি অবরুদ্ধ করা হয়েছে৷"</string> <string name="RestrictedOnVoiceSms" msgid="1888588152792023873">"ভয়েস/SMS পরিষেবা অবরুদ্ধ করা আছে৷"</string> <string name="RestrictedOnAll" msgid="5643028264466092821">"সমস্ত ভয়েস/ডেটা/SMS পরিষেবা অবরুদ্ধ করা হয়েছে৷"</string> - <!-- no translation found for NetworkPreferenceSwitchTitle (4008877505368566980) --> - <skip /> - <!-- no translation found for NetworkPreferenceSwitchSummary (7335915397439759249) --> - <skip /> + <string name="NetworkPreferenceSwitchTitle" msgid="4008877505368566980">"নেটওয়ার্কের সিগন্যাল নেই"</string> + <string name="NetworkPreferenceSwitchSummary" msgid="7335915397439759249">"রিসেপশন উন্নত করতে সেটিংস > সেলুলার নেটওয়ার্ক > পছন্দের নেটওয়ার্কের প্রকার এ নির্বাচিত প্রকারটি পরিবর্তন করার চেষ্টা করুন৷"</string> <string name="peerTtyModeFull" msgid="6165351790010341421">"পির TTY মোড FULL অনুরোধ করেছে"</string> <string name="peerTtyModeHco" msgid="5728602160669216784">"পির TTY মোড HCO অনুরোধ করেছে"</string> <string name="peerTtyModeVco" msgid="1742404978686538049">"পির TTY মোড VCO অনুরোধ করেছে"</string> @@ -185,10 +182,8 @@ <string name="work_profile_deleted_description" msgid="6305147513054341102">"প্রশাসক অ্যাপ্লিকেশান অনুপস্থিত থাকায় কাজের প্রোফাইল মুছে ফেলা হয়েছে৷"</string> <string name="work_profile_deleted_details" msgid="226615743462361248">"কাজের প্রোফাইলের প্রশাসক অ্যাপ্লিকেশান হয় অনুপস্থিত বা ক্ষতিগ্রস্ত হয়েছে৷ এর ফলস্বরূপ আপনার কাজের প্রোফাইল এবং সম্পর্কিত ডেটা মুছে দেওয়া হয়েছে৷ সহায়তার জন্য আপনার প্রশাসকের সাথে যোগাযোগ করুন৷"</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="6019770344820507579">"আপনার কাজের প্রোফাইল এই ডিভাইসে আর উপলব্ধ নেই।"</string> - <!-- no translation found for network_logging_notification_title (1805392571290161924) --> - <skip /> - <!-- no translation found for network_logging_notification_text (4448072433371155729) --> - <skip /> + <string name="network_logging_notification_title" msgid="1805392571290161924">"নেটওয়ার্ক ট্রাফিক মনিটর করা হচ্ছে"</string> + <string name="network_logging_notification_text" msgid="4448072433371155729">"আরো বিশদ বিবরণের জন্য আলতো চাপ দিন"</string> <string name="factory_reset_warning" msgid="5423253125642394387">"আপনার ডিভাইসটি মুছে ফেলা হবে"</string> <string name="factory_reset_message" msgid="4905025204141900666">"প্রশাসক অ্যাপকেশানটিতে উপাদান অনুপস্থিত বা ক্ষতিগ্রস্ত হয়েছে এবং ব্যবহার করা যাবে না৷ আপনার ডিভাইস এখন মুছে ফেলা হবে৷ সহায়তার জন্য আপনার প্রশাসকের সাথে যোগাযোগ করুন৷"</string> <string name="me" msgid="6545696007631404292">"আমাকে"</string> @@ -306,12 +301,9 @@ <string name="permlab_sendSms" msgid="7544599214260982981">"SMS পাঠানো ও দেখা,আপনি কি পরিচিতি কে এগুলি করার অনুমতি দেবেন?"</string> <string name="permdesc_sendSms" msgid="7094729298204937667">"অ্যাপ্লিকেশানটিকে SMS বার্তাগুলি পাঠাতে অনুমতি দেয়৷ এর জন্য অপ্রত্যাশিত চার্জ কাটা হতে পারে৷ ক্ষতিকারক অ্যাপ্লিকেশানগুলি আপনার নিশ্চিতকরণ ছাড়া বার্তা পাঠানোর মাধ্যমে আপনাকে অর্থ চার্জ করতে পারে৷"</string> <string name="permlab_readSms" msgid="8745086572213270480">"আপনার পাঠ্য বার্তা পড়ুন (SMS বা MMS)"</string> - <!-- no translation found for permdesc_readSms (4741697454888074891) --> - <skip /> - <!-- no translation found for permdesc_readSms (5796670395641116592) --> - <skip /> - <!-- no translation found for permdesc_readSms (6826832415656437652) --> - <skip /> + <string name="permdesc_readSms" product="tablet" msgid="4741697454888074891">"এই অ্যাপটি আপনার ট্যাবলেটে সংরক্ষিত সমস্ত SMS (পাঠ্য) বার্তা পড়তে পারে৷"</string> + <string name="permdesc_readSms" product="tv" msgid="5796670395641116592">"এই অ্যাপটি আপনার টিভিতে সংরক্ষিত সমস্ত SMS (পাঠ্য) বার্তা পড়তে পারে৷"</string> + <string name="permdesc_readSms" product="default" msgid="6826832415656437652">"এই অ্যাপটি আপনার ফোনে সংরক্ষিত সমস্ত SMS (পাঠ্য) বার্তা পড়তে পারে৷"</string> <string name="permlab_receiveWapPush" msgid="5991398711936590410">"পাঠ্য বার্তা পান (WAP)"</string> <string name="permdesc_receiveWapPush" msgid="748232190220583385">"অ্যাপ্লিকেশানটিকে WAP বার্তা প্রাপ্ত করার এবং প্রক্রিয়া করার অনুমতি দেয়৷ এর মানে হল অ্যাপ্লিকেশানটি আপনার ডিভাইস থেকে পাঠানো বার্তাগুলিকে পর্যবেক্ষণ করতে পারে এবং মুছতে পারে সেগুলিকে আপনাকে না দেখিয়ে৷"</string> <string name="permlab_getTasks" msgid="6466095396623933906">"চলমান অ্যাপ্লিকেশান উদ্ধার করে"</string> @@ -324,10 +316,8 @@ <string name="permdesc_enableCarMode" msgid="4853187425751419467">"অ্যাপ্লিকেশানকে গাড়ি কোড সক্ষম করতে দেয়৷"</string> <string name="permlab_killBackgroundProcesses" msgid="3914026687420177202">"অন্যান্য অ্যাপ্লিকেশানগুলিকে বন্ধ করুন"</string> <string name="permdesc_killBackgroundProcesses" msgid="4593353235959733119">"অন্যান্য অ্যাপ্লিকেশানগুলির নেপথ্যে চলা প্রক্রিয়াগুলির সমাপ্তি ঘটাতে অ্যাপ্লিকেশানটিকে মঞ্জুর করে৷ এর ফলে অন্যান্য অ্যাপ্লিকেশানগুলি বন্ধ হয়ে যেতে পারে৷"</string> - <!-- no translation found for permlab_systemAlertWindow (7238805243128138690) --> - <skip /> - <!-- no translation found for permdesc_systemAlertWindow (2393776099672266188) --> - <skip /> + <string name="permlab_systemAlertWindow" msgid="7238805243128138690">"এই অ্যাপটি অন্যান্য অ্যাপের উপরে প্রদর্শিত পারে"</string> + <string name="permdesc_systemAlertWindow" msgid="2393776099672266188">"এই অ্যাপটি অন্যান্য অ্যাপের উপরে বা স্ক্রীনের অন্যান্য অংশে উপস্থিত হতে পারে৷ এটি সাধারণ অ্যাপ ব্যবহারের ক্ষেত্রে হস্তক্ষেপ করতে এবং অন্যান্য অ্যাপের প্রদর্শিত হওয়ার অবস্থাকে পরিবর্তিত করতে পারে৷"</string> <string name="permlab_persistentActivity" msgid="8841113627955563938">"অ্যাপ্লিকেশানকে সবসময় চালিত রাখে"</string> <string name="permdesc_persistentActivity" product="tablet" msgid="8525189272329086137">"মেমরিতে নিজের জন্য প্রয়োজনীয় জায়গা আলাদা করে রাখতে অ্যাপ্লিকেশানটিকে মঞ্জুর করে৷ এর ফলে অন্যান্য অ্যাপ্লিকেশানগুলির জায়গা সীমিত হয়ে পড়তে পারে ও ট্যাবলেটটি অপেক্ষাকৃত ধীরগতির হয়ে পড়তে পারে৷"</string> <string name="permdesc_persistentActivity" product="tv" msgid="5086862529499103587">"অ্যাপ্লিকেশানটিকে মেমোরিতে থাকা সেটির নিজস্ব অধিকৃত স্থানের অংশগুলিকে অবিরত রাখতে করার অনুমতি দেয়৷ এটি টিভিকে ধীর করে এমন অন্য অ্যাপ্লিকেশানগুলির জন্য উপলব্ধ মেমোরি সীমিত করতে পারে৷"</string> @@ -353,51 +343,37 @@ <string name="permdesc_writeContacts" product="tv" msgid="5438230957000018959">"অ্যাপ্লিকেশানটিকে কোনো বিশেষ পরিচিতির সাথে আপনি কত ঘন ঘন কল, ইমেল বা অন্যভাবে যোগাযোগ করেন সেইরূপ তথ্য সমেত আপনার টিভিতে সংরক্ষিত পরিচিতিগুলির সম্পর্কে ডেটা পড়ার অনুমতি দেয়৷ এই অনুমতিটি অ্যাপ্লিকেশানগুলিকে পরিচিতির ডেটা মোছার অনুমতি দেয়৷"</string> <string name="permdesc_writeContacts" product="default" msgid="589869224625163558">"অ্যাপ্লিকেশানটিকে আপনি নির্দিষ্ট একজন পরিচিতির সঙ্গে যে ফ্রিকোয়েন্সিতে কল, ইমেল বা যোগাযোগ করেছেন তা সহ আপনার ফোনে সঞ্চিত পরিচিতিগুলি সম্পর্কে ডেটা পরিবর্তন করতে অনুমতি দেয়৷ এই অনুমতি অ্যাপ্লিকেশানগুলিকে আপনার পরিচিতি ডেটা মুছতে দেয়৷"</string> <string name="permlab_readCallLog" msgid="3478133184624102739">"কল লগ পড়ুন"</string> - <!-- no translation found for permdesc_readCallLog (3204122446463552146) --> - <skip /> + <string name="permdesc_readCallLog" msgid="3204122446463552146">"এই অ্যাপটি আপনার কলের ইতিহাস পড়তে পারে৷"</string> <string name="permlab_writeCallLog" msgid="8552045664743499354">"কল লগ লিখুন"</string> <string name="permdesc_writeCallLog" product="tablet" msgid="6661806062274119245">"ইনকামিং ও আউটগোয়িং কলগুলি সম্পর্কিত ডেটা সহ আপনার ট্যাবলেটের কল লগ পরিবর্তন করতে দেয়৷ ক্ষতিকারক অ্যাপ্লিকেশানগুলি এটিকে আপনার কল লগ মুছে দিতে বা পরিবর্তন করতে ব্যবহার করতে পারে৷"</string> <string name="permdesc_writeCallLog" product="tv" msgid="4225034892248398019">"ইনকামিং ও আউটগোয়িং কলগুলি সম্পর্কিত ডেটা সহ আপনার টিভির কল লগ পরিবর্তন করতে দেয়৷ ক্ষতিকারক অ্যাপ্লিকেশানগুলি এটিকে আপনার কল লগ মুছে দিতে বা পরিবর্তন করতে ব্যবহার করতে পারে৷"</string> <string name="permdesc_writeCallLog" product="default" msgid="683941736352787842">"ইনকামিং ও আউটগোয়িং কলগুলি সম্পর্কিত ডেটা সহ আপনার ফোনের কল লগ পরিবর্তন করতে দেয়৷ ক্ষতিকারক অ্যাপ্লিকেশানগুলি এটিকে আপনার কল লগ মুছে দিতে বা পরিবর্তন করতে ব্যবহার করতে পারে৷"</string> <string name="permlab_bodySensors" msgid="4683341291818520277">"শরীরের সেন্সর (হার্ট রেট মনিটারের মত) অ্যাক্সেস করুন"</string> <string name="permdesc_bodySensors" product="default" msgid="4380015021754180431">"অ্যাপ্লিকেশানটিকে আপনার শারীরিক অবস্থা যেমন, আপনার হৃৎস্পন্দন পর্যবেক্ষণ করে এমন সেন্সরগুলি অ্যাক্সেস করতে মঞ্জুরি দেয়।"</string> - <!-- no translation found for permlab_readCalendar (6716116972752441641) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (4993979255403945892) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (8837931557573064315) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (4373978642145196715) --> - <skip /> + <string name="permlab_readCalendar" msgid="6716116972752441641">"ক্যালেন্ডারের ইভেন্ট এবং বিশদ বিবরণ পড়ুন"</string> + <string name="permdesc_readCalendar" product="tablet" msgid="4993979255403945892">"এই অ্যাপটি আপনার ট্যাবলেটে সংরক্ষিত সমস্ত ক্যালেন্ডার ইভেন্ট পড়তে এবং আপনার ক্যালেন্ডারের ডেটা শেয়ার বা সংরক্ষণ করতে পারে৷"</string> + <string name="permdesc_readCalendar" product="tv" msgid="8837931557573064315">"এই অ্যাপটি আপনার টিভিতে সংরক্ষিত সমস্ত ক্যালেন্ডার ইভেন্ট পড়তে এবং আপনার ক্যালেন্ডারের ডেটা শেয়ার বা সংরক্ষণ করতে পারে৷"</string> + <string name="permdesc_readCalendar" product="default" msgid="4373978642145196715">"এই অ্যাপটি আপনার ফোনে সংরক্ষিত সমস্ত ক্যালেন্ডার ইভেন্ট পড়তে এবং আপনার ক্যালেন্ডারের ডেটা শেয়ার বা সংরক্ষণ করতে পারে৷"</string> <string name="permlab_writeCalendar" msgid="8438874755193825647">"ক্যালেন্ডারে ইভেন্ট যোগ বা পরিবর্তন করে এবং মালিকদের অজ্ঞাতেই অতিথিদের ইমেল পাঠায়"</string> - <!-- no translation found for permdesc_writeCalendar (1675270619903625982) --> - <skip /> - <!-- no translation found for permdesc_writeCalendar (9017809326268135866) --> - <skip /> - <!-- no translation found for permdesc_writeCalendar (7592791790516943173) --> - <skip /> + <string name="permdesc_writeCalendar" product="tablet" msgid="1675270619903625982">"এই অ্যাপটি আপনার ট্যাবলেটে ক্যালেন্ডার ইভেন্টগুলি যোগ করতে, সরাতে বা পরিবর্তিত করতে পারে৷ এই অ্যাপটি বার্তা পাঠাতে পারে যা ক্যালেন্ডারের মাললিকের থেকে এসেছে বলে মনে হয় বা ইভেন্টগুলিকে তাদের মালিকদের না জানিয়েই পরিবর্তিত করতে পারে৷"</string> + <string name="permdesc_writeCalendar" product="tv" msgid="9017809326268135866">"এই অ্যাপটি আপনার টিভিতে ক্যালেন্ডার ইভেন্টগুলি যোগ করতে, সরাতে বা পরিবর্তিত করতে পারে৷ এই অ্যাপটি বার্তা পাঠাতে পারে যা ক্যালেন্ডারের মাললিকের থেকে এসেছে বলে মনে হয় বা ইভেন্টগুলিকে তাদের মালিকদের না জানিয়েই পরিবর্তিত করতে পারে৷"</string> + <string name="permdesc_writeCalendar" product="default" msgid="7592791790516943173">"এই অ্যাপটি আপনার ফোনে ক্যালেন্ডার ইভেন্টগুলি যোগ করতে, সরাতে বা পরিবর্তিত করতে পারে৷ এই অ্যাপটি বার্তা পাঠাতে পারে যা ক্যালেন্ডারের মাললিকের থেকে এসেছে বলে মনে হয় বা ইভেন্টগুলিকে তাদের মালিকদের না জানিয়েই পরিবর্তিত করতে পারে৷"</string> <string name="permlab_accessLocationExtraCommands" msgid="2836308076720553837">"অতিরিক্ত অবস্থান প্রদানকারী কমান্ডগুলি অ্যাক্সেস করে"</string> <string name="permdesc_accessLocationExtraCommands" msgid="6078307221056649927">"অবস্থানের সাথে সম্পর্কিত তথ্য প্রদানকারীর অতিরিক্ত কম্যান্ডগুলিকে অ্যাপ্লিকেশানটিকে মঞ্জুর করে৷ এটি অ্যাপ্লিকেশানটিকে GPS অথবা অন্যান্য অবস্থান নির্ণয়ের সাথে সম্পর্কিত উৎসগুলির ক্রিয়াপ্রণালীর নিয়ন্ত্রণকে মঞ্জুর করতে পারে৷"</string> <string name="permlab_accessFineLocation" msgid="251034415460950944">"সুনির্দিষ্ট অবস্থান (GPS এবং নেটওয়ার্ক-ভিত্তিক) অ্যাক্সেস করুন"</string> - <!-- no translation found for permdesc_accessFineLocation (5821994817969957884) --> - <skip /> + <string name="permdesc_accessFineLocation" msgid="5821994817969957884">"মোবাইল টাওয়ার এবং ওয়াই-ফাই নেটওয়ার্কগুলির মত নেটওয়ার্ক অবস্থান উৎসগুলি বা GPS এর উপর ভিত্তি করে এই অ্যাপটি আপনার অবস্থান সনাক্ত করতে পারে৷ এই অবস্থান পরিষেবাগুলি অবশ্যই চালু রাখতে হবে এবং অ্যাপটি যাতে সেগুলি ব্যবহার করতে পারে সেজন্য সেগুলিকে আপনার ফোনে উপলব্ধ করে রাখতে হবে৷ এর জন্য অতিরিক্ত ব্যাটারি খরচ হতে পারে৷"</string> <string name="permlab_accessCoarseLocation" msgid="7715277613928539434">"আনুমানিক অবস্থান (নেটওয়ার্ক-ভিত্তিক) অ্যাক্সেস করুন"</string> - <!-- no translation found for permdesc_accessCoarseLocation (3373266766487862426) --> - <skip /> - <!-- no translation found for permdesc_accessCoarseLocation (1884022719818788511) --> - <skip /> - <!-- no translation found for permdesc_accessCoarseLocation (7788009094906196995) --> - <skip /> + <string name="permdesc_accessCoarseLocation" product="tablet" msgid="3373266766487862426">"মোবাইল টাওয়ার এবং ওয়াই-ফাই নেটওয়ার্কগুলির মত নেটওয়ার্ক উৎসগুলির উপর ভিত্তি করে এই অ্যাপটি আপনার অবস্থান সনাক্ত করতে পারে৷ এই অবস্থান পরিষেবাগুলি অবশ্যই চালু রাখতে হবে এবং অ্যাপটি যাতে সেগুলি ব্যবহার করতে পারে সেজন্য সেগুলিকে আপনার ট্যাবলেটে উপলব্ধ করে রাখতে হবে৷"</string> + <string name="permdesc_accessCoarseLocation" product="tv" msgid="1884022719818788511">"মোবাইল টাওয়ার এবং ওয়াই-ফাই নেটওয়ার্কগুলির মত নেটওয়ার্কের উৎসগুলির উপর ভিত্তি করে এই অ্যাপটি আপনার অবস্থান সনাক্ত করতে পারে৷ এই অবস্থান পরিষেবাগুলি অবশ্যই চালু রাখতে হবে এবং অ্যাপটি যাতে সেগুলি ব্যবহার করতে পারে সেজন্য সেগুলিকে আপনার টিভিতে উপলব্ধ করে রাখতে হবে৷"</string> + <string name="permdesc_accessCoarseLocation" product="default" msgid="7788009094906196995">"মোবাইল টাওয়ার এবং ওয়াই-ফাই নেটওয়ার্কগুলির মত নেটওয়ার্ক উৎসগুলির উপর ভিত্তি করে এই অ্যাপটি আপনার অবস্থান সনাক্ত করতে পারে৷ এই অবস্থান পরিষেবাগুলি অবশ্যই চালু রাখতে হবে এবং অ্যাপটি যাতে সেগুলি ব্যবহার করতে পারে সেজন্য সেগুলিকে আপনার ফোনে উপলব্ধ করে রাখতে হবে৷"</string> <string name="permlab_modifyAudioSettings" msgid="6095859937069146086">"আপনার অডিও সেটিংস পরিবর্তন করে"</string> <string name="permdesc_modifyAudioSettings" msgid="3522565366806248517">"ভলিউম এবং যেখানে স্পিকার আউটপুট সামগ্রী হিসাবে ব্যবহৃত হয় সেই সব ক্ষেত্রে গ্লোবাল অডিও সেটিংসের সংশোধন করতে অ্যাপ্লিকেশানটিকে মঞ্জুর করে৷"</string> <string name="permlab_recordAudio" msgid="3876049771427466323">"অডিও রেকর্ড"</string> - <!-- no translation found for permdesc_recordAudio (4245930455135321433) --> - <skip /> + <string name="permdesc_recordAudio" msgid="4245930455135321433">"এই অ্যাপটি মাইক্রোফোন ব্যবহার করে যে কোনো সময় অডিও রেকর্ড করতে পারে৷"</string> <string name="permlab_sim_communication" msgid="2935852302216852065">"SIM এ আদেশগুলি পাঠান"</string> <string name="permdesc_sim_communication" msgid="5725159654279639498">"অ্যাপ্লিকেশানটিকে সিম কার্ডে কমান্ডগুলি পাঠানোর অনুমতি দেয়৷ এটি খুবই বিপজ্জনক৷"</string> <string name="permlab_camera" msgid="3616391919559751192">"ছবি এবং ভিডিও তোলে"</string> - <!-- no translation found for permdesc_camera (5392231870049240670) --> - <skip /> + <string name="permdesc_camera" msgid="5392231870049240670">"এই অ্যাপটি যে কোনো সময় ক্যামেরা ব্যবহার করে ছবি তুলতে বা ভিডিও রেকর্ড করতে পারে৷"</string> <string name="permlab_vibrate" msgid="7696427026057705834">"কম্পন নিয়ন্ত্রণ করুন"</string> <string name="permdesc_vibrate" msgid="6284989245902300945">"অ্যাপ্লিকেশানকে কম্পক নিয়ন্ত্রণ করতে দেয়৷"</string> <string name="permlab_callPhone" msgid="3925836347681847954">"সরাসরি ফোন নম্বরগুলিতে কল করে"</string> diff --git a/core/res/res/values-bs-rBA/strings.xml b/core/res/res/values-bs-rBA/strings.xml index bd5e7bcab29b..5936d3af4c77 100644 --- a/core/res/res/values-bs-rBA/strings.xml +++ b/core/res/res/values-bs-rBA/strings.xml @@ -46,8 +46,7 @@ <string name="defaultMsisdnAlphaTag" msgid="2850889754919584674">"MSISDN1"</string> <string name="mmiError" msgid="5154499457739052907">"Problem sa povezivanjem ili nevažeći MMI kôd."</string> <string name="mmiFdnError" msgid="5224398216385316471">"Operacija je ograničena samo na brojeve fiksnog biranja."</string> - <!-- no translation found for mmiErrorWhileRoaming (762488890299284230) --> - <skip /> + <string name="mmiErrorWhileRoaming" msgid="762488890299284230">"Nije moguće promijeniti postavke za preusmjeravanje poziva s vašeg telefona dok ste u romingu."</string> <string name="serviceEnabled" msgid="8147278346414714315">"Usluga je omogućena."</string> <string name="serviceEnabledFor" msgid="6856228140453471041">"Usluga je omogućena za:"</string> <string name="serviceDisabled" msgid="1937553226592516411">"Usluga je onemogućena."</string> @@ -99,10 +98,8 @@ <string name="RestrictedOnVoiceData" msgid="996636487106171320">"Blokirane su govorne usluge i usluge prijenosa podataka."</string> <string name="RestrictedOnVoiceSms" msgid="1888588152792023873">"Blokirane su govorne/SMS usluge."</string> <string name="RestrictedOnAll" msgid="5643028264466092821">"Blokirane su sve govorne i SMS usluge te usluge prijenosa podataka."</string> - <!-- no translation found for NetworkPreferenceSwitchTitle (4008877505368566980) --> - <skip /> - <!-- no translation found for NetworkPreferenceSwitchSummary (7335915397439759249) --> - <skip /> + <string name="NetworkPreferenceSwitchTitle" msgid="4008877505368566980">"Nije moguće dosegnuti mrežu"</string> + <string name="NetworkPreferenceSwitchSummary" msgid="7335915397439759249">"Da poboljšate prijem, pokušajte promijeniti odabranu vrstu mreže u meniju Postavke > Mobilne mreže > Preferirana vrsta mreže."</string> <string name="peerTtyModeFull" msgid="6165351790010341421">"Ravnopravni uređaj zatražio TTY PUNI način rada"</string> <string name="peerTtyModeHco" msgid="5728602160669216784">"Ravnopravni uređaj zatražio TTY HCO način rada"</string> <string name="peerTtyModeVco" msgid="1742404978686538049">"Ravnopravni uređaj zatražio TTY VCO način rada"</string> @@ -187,10 +184,8 @@ <string name="work_profile_deleted_description" msgid="6305147513054341102">"Poslovni profil je obrisan jer nedostaje aplikacija administratora."</string> <string name="work_profile_deleted_details" msgid="226615743462361248">"Aplikacija administratora za poslovni profil nedostaje ili je neispravna. Zbog toga su vaš poslovni profil i vezani podaci obrisani. Za pomoć se obratite administratoru."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="6019770344820507579">"Profil za posao više nije dostupan na ovom uređaju."</string> - <!-- no translation found for network_logging_notification_title (1805392571290161924) --> - <skip /> - <!-- no translation found for network_logging_notification_text (4448072433371155729) --> - <skip /> + <string name="network_logging_notification_title" msgid="1805392571290161924">"Mrežni saobraćaj se nadgleda"</string> + <string name="network_logging_notification_text" msgid="4448072433371155729">"Dodirnite za više detalja"</string> <string name="factory_reset_warning" msgid="5423253125642394387">"Uređaj će biti izbrisan"</string> <string name="factory_reset_message" msgid="4905025204141900666">"Aplikaciji administratora nedostaju komponente ili je neispravna, i ne može se koristiti. Vaš uređaj će sada biti izbrisan. Za pomoć se obratite administratoru."</string> <string name="me" msgid="6545696007631404292">"Ja"</string> @@ -309,12 +304,9 @@ <string name="permlab_sendSms" msgid="7544599214260982981">"slanje i pregledanje SMS poruka"</string> <string name="permdesc_sendSms" msgid="7094729298204937667">"Omogućava aplikaciji slanje SMS poruka. Ovo može dovesti do neočekivanih troškova. Zlonamjerne aplikacije mogu trošiti vaš novac tako što će slati poruke bez vašeg znanja."</string> <string name="permlab_readSms" msgid="8745086572213270480">"čitanje vaših tekstualnih poruka (SMS ili MMS)"</string> - <!-- no translation found for permdesc_readSms (4741697454888074891) --> - <skip /> - <!-- no translation found for permdesc_readSms (5796670395641116592) --> - <skip /> - <!-- no translation found for permdesc_readSms (6826832415656437652) --> - <skip /> + <string name="permdesc_readSms" product="tablet" msgid="4741697454888074891">"Ova aplikacija može čitati sve SMS (tekstualne) poruke pohranjene na vašem tabletu."</string> + <string name="permdesc_readSms" product="tv" msgid="5796670395641116592">"Ova aplikacija može čitati sve SMS (tekstualne) poruke pohranjene na vašem TV-u."</string> + <string name="permdesc_readSms" product="default" msgid="6826832415656437652">"Ova aplikacija može čitati sve SMS (tekstualne) poruke pohranjene na vašem telefonu."</string> <string name="permlab_receiveWapPush" msgid="5991398711936590410">"primanje tekstualnih poruka (WAP)"</string> <string name="permdesc_receiveWapPush" msgid="748232190220583385">"Omogućava aplikaciji primanje i obradu WAP poruka. Ovo znači da aplikacija može pratiti ili brisati poruke poslane na vaš uređaj, a da vam ih pritom ne prikazuje."</string> <string name="permlab_getTasks" msgid="6466095396623933906">"preuzimanje informacija o pokrenutim aplikacijama"</string> @@ -327,10 +319,8 @@ <string name="permdesc_enableCarMode" msgid="4853187425751419467">"Dozvoljava aplikaciji da omogući način rada u autu."</string> <string name="permlab_killBackgroundProcesses" msgid="3914026687420177202">"zatvaranje drugih aplikacija"</string> <string name="permdesc_killBackgroundProcesses" msgid="4593353235959733119">"Omogućava aplikaciji prekid pozadinskih procesa drugih aplikacija. Ovo može dovesti do prestanka rada drugih aplikacija."</string> - <!-- no translation found for permlab_systemAlertWindow (7238805243128138690) --> - <skip /> - <!-- no translation found for permdesc_systemAlertWindow (2393776099672266188) --> - <skip /> + <string name="permlab_systemAlertWindow" msgid="7238805243128138690">"Ova aplikacija se može pojaviti iznad drugih aplikacija"</string> + <string name="permdesc_systemAlertWindow" msgid="2393776099672266188">"Aplikacija se može pojaviti iznad ostalih aplikacija ili drugih dijelova ekrana. To može uticati na normalno korištenje aplikacije i promijeniti izgled drugih aplikacija."</string> <string name="permlab_persistentActivity" msgid="8841113627955563938">"podešavanje aplikacije tako da je uvijek pokrenuta"</string> <string name="permdesc_persistentActivity" product="tablet" msgid="8525189272329086137">"Omogućava aplikaciji da neke svoje dijelove pohrani trajno u memoriji. Ovo može ograničiti veličinu raspoložive memorije za druge aplikacije i tako usporiti tablet."</string> <string name="permdesc_persistentActivity" product="tv" msgid="5086862529499103587">"Dozvoljava aplikaciji da jednim dijelom trajno ostaje u memoriji. Time se ostalim aplikacijama dostupna memorija može ograničiti te usporiti rad TV-a."</string> @@ -356,51 +346,37 @@ <string name="permdesc_writeContacts" product="tv" msgid="5438230957000018959">"Dozvoljava aplikaciji izmjenu podataka o vašim kontaktima pohranjenim na TV-u, uključujući učestalost poziva, slanja e-pošte ili komuniciranja na bilo koji način s određenim kontaktima. Ovom dozvolom aplikacijama se omogućava brisanje podataka o kontaktima."</string> <string name="permdesc_writeContacts" product="default" msgid="589869224625163558">"Omogućava aplikaciji da izmijeni podatke o kontaktima koji su pohranjeni na vašem telefonu, uključujući učestalost vaših poziva, slanje e-pošte, ili neki drugi vid komunikacije sa određenim kontaktima. Ova dozvola omogućava aplikaciji da izbriše podatke o kontaktima."</string> <string name="permlab_readCallLog" msgid="3478133184624102739">"čitanje zapisnika poziva"</string> - <!-- no translation found for permdesc_readCallLog (3204122446463552146) --> - <skip /> + <string name="permdesc_readCallLog" msgid="3204122446463552146">"Ova aplikacija može čitati historiju vaših poziva."</string> <string name="permlab_writeCallLog" msgid="8552045664743499354">"pisanje zapisnika poziva"</string> <string name="permdesc_writeCallLog" product="tablet" msgid="6661806062274119245">"Omogućava aplikaciji da izmijeni zapisnik poziva sa vašeg tableta, uključujući podatke o dolaznim i odlaznim pozivima. Zlonamjerne aplikacije mogu to iskoristiti za brisanje ili izmjenu vašeg zapisnika poziva."</string> <string name="permdesc_writeCallLog" product="tv" msgid="4225034892248398019">"Dozvoljava aplikaciji izmjenu evidencije poziva s TV-a, uključujući podatke o dolaznim i odlaznim pozivima. Zlonamjerne aplikacije mogu to iskoristiti za brisanje ili izmjenu evidencije poziva."</string> <string name="permdesc_writeCallLog" product="default" msgid="683941736352787842">"Omogućava aplikaciji da izmijeni zapisnik poziva sa vašeg telefona, uključujući podatke o dolaznim i odlaznim pozivima. Zlonamjerne aplikacije mogu to iskoristiti za brisanje ili izmjenu vašeg zapisnika poziva."</string> <string name="permlab_bodySensors" msgid="4683341291818520277">"pristup tjelesnim senzorima (poput monitora za puls)"</string> <string name="permdesc_bodySensors" product="default" msgid="4380015021754180431">"Dozvoljava aplikaciji pristup podacima sa senzora koji prate fizičke pokazatelje kao što je vaš puls."</string> - <!-- no translation found for permlab_readCalendar (6716116972752441641) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (4993979255403945892) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (8837931557573064315) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (4373978642145196715) --> - <skip /> + <string name="permlab_readCalendar" msgid="6716116972752441641">"Čitanje događaja kalendara i detalja"</string> + <string name="permdesc_readCalendar" product="tablet" msgid="4993979255403945892">"Ova aplikacija može čitati sve događaje u kalendaru pohranjene na vašem tabletu i sačuvati podatke kalendara."</string> + <string name="permdesc_readCalendar" product="tv" msgid="8837931557573064315">"Ova aplikacija može čitati sve događaje u kalendaru na vašem TV-u i dijeliti ili sačuvati podatke kalendara."</string> + <string name="permdesc_readCalendar" product="default" msgid="4373978642145196715">"Ova aplikacija može čitati sve događaje u kalendaru pohranjene na vašem telefonu i sačuvati podatke kalendara."</string> <string name="permlab_writeCalendar" msgid="8438874755193825647">"dodavanje ili izmjena kalendarskih događaja i slanje e-pošte gostima bez znanja vlasnika"</string> - <!-- no translation found for permdesc_writeCalendar (1675270619903625982) --> - <skip /> - <!-- no translation found for permdesc_writeCalendar (9017809326268135866) --> - <skip /> - <!-- no translation found for permdesc_writeCalendar (7592791790516943173) --> - <skip /> + <string name="permdesc_writeCalendar" product="tablet" msgid="1675270619903625982">"Ova aplikacija može dodavati, uklanjati ili mijenjati događaje u kalendaru na vašem tabletu. Aplikacija može slati poruke koje mogu izgledati kao da dolazi od vlasnika kalendara ili promijeniti događaje bez obavještenja vlasnika."</string> + <string name="permdesc_writeCalendar" product="tv" msgid="9017809326268135866">"Ova aplikacija može dodavati, uklanjati ili mijenjati događaje u kalendaru na vašem TV-u. Aplikacija može slati poruke koje mogu izgledati kao da dolazi od vlasnika kalendara ili promijeniti događaje bez obavještenja vlasnika."</string> + <string name="permdesc_writeCalendar" product="default" msgid="7592791790516943173">"Ova aplikacija može dodavati, uklanjati ili mijenjati događaje u kalendaru na vašem telefonu. Aplikacija može slati poruke koje mogu izgledati kao da dolazi od vlasnika kalendara ili promijeniti događaje bez obavještenja vlasnika."</string> <string name="permlab_accessLocationExtraCommands" msgid="2836308076720553837">"pristup dodatnim informacijama o lokaciji"</string> <string name="permdesc_accessLocationExtraCommands" msgid="6078307221056649927">"Dozvoljava aplikaciji pristup dodatnim naredbama pružatelja lokacija. Ovim se aplikaciji može dozvoliti da ometa rad GPS-a ili drugih izvora lokacija."</string> <string name="permlab_accessFineLocation" msgid="251034415460950944">"pristup preciznoj lokaciji (utvrđena preko mreže i GPS-a)"</string> - <!-- no translation found for permdesc_accessFineLocation (5821994817969957884) --> - <skip /> + <string name="permdesc_accessFineLocation" msgid="5821994817969957884">"Ova aplikacija može odrediti vašu lokaciju na osnovu GPS sistema ili mrežnih izvora za određivanje lokacije kao što su predajnici za mobilnu mrežu i Wi-Fi mreže. Ove usluge za određivanje lokacije moraju biti uključene i omogućene na vašem telefonu kako bi ih aplikacija mogla koristiti. To može uzrokovati veću potrošnju baterije."</string> <string name="permlab_accessCoarseLocation" msgid="7715277613928539434">"pristup približnoj lokaciji (utvrđena preko mreže)"</string> - <!-- no translation found for permdesc_accessCoarseLocation (3373266766487862426) --> - <skip /> - <!-- no translation found for permdesc_accessCoarseLocation (1884022719818788511) --> - <skip /> - <!-- no translation found for permdesc_accessCoarseLocation (7788009094906196995) --> - <skip /> + <string name="permdesc_accessCoarseLocation" product="tablet" msgid="3373266766487862426">"Ova aplikacija može odrediti vašu lokaciju na osnovu izvora mreže kao što su predajnici za mobilnu mrežu i Wi-Fi mreže. Ove usluge za određivanje lokacije moraju biti uključene i omogućene na vašem tabletu kako bi ih aplikacija mogla koristiti."</string> + <string name="permdesc_accessCoarseLocation" product="tv" msgid="1884022719818788511">"Ova aplikacija može odrediti vašu lokaciju na osnovu izvora mreže kao što su predajnici za mobilnu mrežu i Wi-Fi mreže. Ove usluge za određivanje lokacije moraju biti uključene i omogućene na vašem TV-u kako bi ih aplikacija mogla koristiti."</string> + <string name="permdesc_accessCoarseLocation" product="default" msgid="7788009094906196995">"Ova aplikacija može odrediti vašu lokaciju na osnovu izvora mreže kao što su predajnici za mobilnu mrežu i Wi-Fi mreže. Ove usluge za određivanje lokacije moraju biti uključene i omogućene na vašem telefonu kako bi ih aplikacija mogla koristiti."</string> <string name="permlab_modifyAudioSettings" msgid="6095859937069146086">"izmjene postavki zvuka"</string> <string name="permdesc_modifyAudioSettings" msgid="3522565366806248517">"Omogućava aplikaciji izmjenu općih postavki zvuka, kao što su jačina zvuka i izbor izlaznog zvučnika."</string> <string name="permlab_recordAudio" msgid="3876049771427466323">"snimanje audiozapisa"</string> - <!-- no translation found for permdesc_recordAudio (4245930455135321433) --> - <skip /> + <string name="permdesc_recordAudio" msgid="4245930455135321433">"Ova aplikacija može u svakom trenutku snimati zvuk koristeći mikrofon."</string> <string name="permlab_sim_communication" msgid="2935852302216852065">"slanje komandi SIM kartici"</string> <string name="permdesc_sim_communication" msgid="5725159654279639498">"Omogućava aplikaciji slanje naredbi na SIM. Ovo je vrlo opasno."</string> <string name="permlab_camera" msgid="3616391919559751192">"snimanje slika i videozapisa"</string> - <!-- no translation found for permdesc_camera (5392231870049240670) --> - <skip /> + <string name="permdesc_camera" msgid="5392231870049240670">"Ova aplikacija može slikati fotografije i snimati videozapise koristeći kameru bilo kada."</string> <string name="permlab_vibrate" msgid="7696427026057705834">"kontrola vibriranja"</string> <string name="permdesc_vibrate" msgid="6284989245902300945">"Dozvoljava aplikaciji upravljanje vibracijom."</string> <string name="permlab_callPhone" msgid="3925836347681847954">"izravno zvanje telefonskih brojeva"</string> diff --git a/core/res/res/values-ca/strings.xml b/core/res/res/values-ca/strings.xml index 4194c82df83e..4a61fc13fdb8 100644 --- a/core/res/res/values-ca/strings.xml +++ b/core/res/res/values-ca/strings.xml @@ -46,8 +46,7 @@ <string name="defaultMsisdnAlphaTag" msgid="2850889754919584674">"MSISDN1"</string> <string name="mmiError" msgid="5154499457739052907">"Problema de connexió o codi MMI no vàlid."</string> <string name="mmiFdnError" msgid="5224398216385316471">"L\'operació està restringida a números de marcatge fixos."</string> - <!-- no translation found for mmiErrorWhileRoaming (762488890299284230) --> - <skip /> + <string name="mmiErrorWhileRoaming" msgid="762488890299284230">"No es pot canviar la configuració de desviació de trucades del telèfon quan estàs en itinerància."</string> <string name="serviceEnabled" msgid="8147278346414714315">"El servei s\'ha activat."</string> <string name="serviceEnabledFor" msgid="6856228140453471041">"S\'ha activat el servei per a:"</string> <string name="serviceDisabled" msgid="1937553226592516411">"El servei s\'ha desactivat."</string> @@ -98,10 +97,8 @@ <string name="RestrictedOnVoiceData" msgid="996636487106171320">"Els serveis de veu/dades estan bloquejats."</string> <string name="RestrictedOnVoiceSms" msgid="1888588152792023873">"Els serveis de veu/SMS estan bloquejats."</string> <string name="RestrictedOnAll" msgid="5643028264466092821">"Tots els serveis de veu/dades/SMS estan bloquejats."</string> - <!-- no translation found for NetworkPreferenceSwitchTitle (4008877505368566980) --> - <skip /> - <!-- no translation found for NetworkPreferenceSwitchSummary (7335915397439759249) --> - <skip /> + <string name="NetworkPreferenceSwitchTitle" msgid="4008877505368566980">"No es pot accedir a la xarxa"</string> + <string name="NetworkPreferenceSwitchSummary" msgid="7335915397439759249">"Per millorar la recepció, prova de canviar-ne el tipus a Configuració > Xarxes mòbils > Tipus de xarxa preferit."</string> <string name="peerTtyModeFull" msgid="6165351790010341421">"L\'altre dispositiu ha sol·licitat el mode TTY COMPLET."</string> <string name="peerTtyModeHco" msgid="5728602160669216784">"L\'altre dispositiu ha sol·licitat el mode TTY HCO."</string> <string name="peerTtyModeVco" msgid="1742404978686538049">"L\'altre dispositiu ha sol·licitat el mode TTY VCO."</string> @@ -185,10 +182,8 @@ <string name="work_profile_deleted_description" msgid="6305147513054341102">"S\'ha suprimit el perfil professional perquè no s\'ha detectat cap aplicació d\'administració."</string> <string name="work_profile_deleted_details" msgid="226615743462361248">"L\'aplicació d\'administració del perfil professional està malmesa o no es detecta. Com a conseqüència, el perfil professional i les dades relacionades s\'han suprimit. Contacta amb l\'administrador per obtenir ajuda."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="6019770344820507579">"El perfil professional ja no està disponible en aquest dispositiu."</string> - <!-- no translation found for network_logging_notification_title (1805392571290161924) --> - <skip /> - <!-- no translation found for network_logging_notification_text (4448072433371155729) --> - <skip /> + <string name="network_logging_notification_title" msgid="1805392571290161924">"El trànsit de xarxa s\'està supervisant"</string> + <string name="network_logging_notification_text" msgid="4448072433371155729">"Toca per obtenir més informació"</string> <string name="factory_reset_warning" msgid="5423253125642394387">"El contingut del dispositiu s\'esborrarà"</string> <string name="factory_reset_message" msgid="4905025204141900666">"L\'aplicació d\'administració està malmesa o hi falten components, i no es pot fer servir. El contingut del dispositiu s\'esborrarà. Contacta amb l\'administrador per obtenir ajuda."</string> <string name="me" msgid="6545696007631404292">"Mi"</string> @@ -306,12 +301,9 @@ <string name="permlab_sendSms" msgid="7544599214260982981">"envia i llegeix missatges SMS"</string> <string name="permdesc_sendSms" msgid="7094729298204937667">"Permet que l\'aplicació enviï missatges SMS. Aquesta acció pot provocar càrrecs inesperats. Les aplicacions malicioses poden enviar missatges sense la teva confirmació, cosa que et pot fer gastar diners."</string> <string name="permlab_readSms" msgid="8745086572213270480">"lectura dels missatges de text (SMS o MMS)"</string> - <!-- no translation found for permdesc_readSms (4741697454888074891) --> - <skip /> - <!-- no translation found for permdesc_readSms (5796670395641116592) --> - <skip /> - <!-- no translation found for permdesc_readSms (6826832415656437652) --> - <skip /> + <string name="permdesc_readSms" product="tablet" msgid="4741697454888074891">"Aquesta aplicació pot llegir tots els SMS (missatges de text) emmagatzemats a la tauleta."</string> + <string name="permdesc_readSms" product="tv" msgid="5796670395641116592">"Aquesta aplicació pot llegir tots els SMS (missatges de text) emmagatzemats al televisor."</string> + <string name="permdesc_readSms" product="default" msgid="6826832415656437652">"Aquesta aplicació pot llegir tots els SMS (missatges de text) emmagatzemats al telèfon."</string> <string name="permlab_receiveWapPush" msgid="5991398711936590410">"recepció de missatges de text (WAP)"</string> <string name="permdesc_receiveWapPush" msgid="748232190220583385">"Permet que l\'aplicació rebi i processi missatges WAP. Aquest permís inclou la capacitat de controlar o de suprimir missatges que s\'han enviat al teu dispositiu sense mostrar-te\'ls."</string> <string name="permlab_getTasks" msgid="6466095396623933906">"recupera les aplicacions en execució"</string> @@ -324,10 +316,8 @@ <string name="permdesc_enableCarMode" msgid="4853187425751419467">"Permet que l\'aplicació activi el mode de cotxe."</string> <string name="permlab_killBackgroundProcesses" msgid="3914026687420177202">"tancament d\'altres aplicacions"</string> <string name="permdesc_killBackgroundProcesses" msgid="4593353235959733119">"Permet que l\'aplicació finalitzi processos d\'altres aplicacions en segon pla. Aquesta acció pot fer que altres aplicacions deixin d\'executar-se."</string> - <!-- no translation found for permlab_systemAlertWindow (7238805243128138690) --> - <skip /> - <!-- no translation found for permdesc_systemAlertWindow (2393776099672266188) --> - <skip /> + <string name="permlab_systemAlertWindow" msgid="7238805243128138690">"Aquesta aplicació pot mostrar-se a sobre d\'altres aplicacions"</string> + <string name="permdesc_systemAlertWindow" msgid="2393776099672266188">"Aquesta aplicació pot mostrar-se a sobre d\'altres aplicacions o d\'altres parts de la pantalla. Això pot interferir en l\'ús normal de les aplicacions i alterar la manera en què es mostren."</string> <string name="permlab_persistentActivity" msgid="8841113627955563938">"fes que l\'aplicació s\'executi sempre"</string> <string name="permdesc_persistentActivity" product="tablet" msgid="8525189272329086137">"Permet que l\'aplicació faci que parts de la seva memòria siguin persistents. Aquesta acció pot limitar la memòria disponible per a altres aplicacions i alentir la tauleta."</string> <string name="permdesc_persistentActivity" product="tv" msgid="5086862529499103587">"Permet que l\'aplicació faci que parts de la seva memòria siguin persistents. Aquesta acció pot limitar la memòria disponible per a altres aplicacions i alentir el televisor."</string> @@ -353,51 +343,37 @@ <string name="permdesc_writeContacts" product="tv" msgid="5438230957000018959">"Permet que l\'aplicació modifiqui les dades sobre els contactes que tinguis desats al televisor, com ara la freqüència amb què has trucat, has enviat correus electrònics o t\'has comunicat d\'altres maneres amb contactes concrets. Amb aquest permís, les aplicacions poden suprimir les dades dels contactes."</string> <string name="permdesc_writeContacts" product="default" msgid="589869224625163558">"Permet que l\'aplicació modifiqui les dades sobre contactes emmagatzemades al telèfon, inclosa la freqüència amb què has trucat, has enviat correus electrònics o t\'has comunicat d\'altres maneres amb contactes concrets. Aquest permís permet que les aplicacions suprimeixin dades de contactes."</string> <string name="permlab_readCallLog" msgid="3478133184624102739">"lectura del registre de trucades"</string> - <!-- no translation found for permdesc_readCallLog (3204122446463552146) --> - <skip /> + <string name="permdesc_readCallLog" msgid="3204122446463552146">"Aquesta aplicació pot llegir el teu historial de trucades."</string> <string name="permlab_writeCallLog" msgid="8552045664743499354">"escriptura del registre de trucades"</string> <string name="permdesc_writeCallLog" product="tablet" msgid="6661806062274119245">"Permet que l\'aplicació modifiqui el registre de trucades de la teva tauleta, incloses les dades de les trucades entrants i sortints. És possible que les aplicacions malicioses ho utilitzin per eliminar o per modificar el teu registre de trucades."</string> <string name="permdesc_writeCallLog" product="tv" msgid="4225034892248398019">"Permet que l\'aplicació modifiqui el registre de trucades del televisor, com ara les dades de les trucades entrants i sortints. És possible que les aplicacions malicioses l\'utilitzin per esborrar o modificar les dades del registre de trucades."</string> <string name="permdesc_writeCallLog" product="default" msgid="683941736352787842">"Permet que l\'aplicació modifiqui el registre de trucades del teu telèfon, incloses les dades de les trucades entrants i sortints. És possible que les aplicacions malicioses ho utilitzin per eliminar o per modificar el teu registre de trucades."</string> <string name="permlab_bodySensors" msgid="4683341291818520277">"accedir a sensors corporals (p. ex., monitors de freqüència cardíaca)"</string> <string name="permdesc_bodySensors" product="default" msgid="4380015021754180431">"Permet que l\'aplicació accedeixi a les dades dels sensors que supervisen el teu estat físic, com ara la freqüència cardíaca."</string> - <!-- no translation found for permlab_readCalendar (6716116972752441641) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (4993979255403945892) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (8837931557573064315) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (4373978642145196715) --> - <skip /> + <string name="permlab_readCalendar" msgid="6716116972752441641">"Aquesta aplicació pot llegir els esdeveniments i la informació del calendari"</string> + <string name="permdesc_readCalendar" product="tablet" msgid="4993979255403945892">"Aquesta aplicació pot llegir tots els esdeveniments del calendari emmagatzemats a la tauleta i compartir o desar les dades del teu calendari."</string> + <string name="permdesc_readCalendar" product="tv" msgid="8837931557573064315">"Aquesta aplicació pot llegir tots els esdeveniments del calendari emmagatzemats al televisor i compartir o desar les dades del teu calendari."</string> + <string name="permdesc_readCalendar" product="default" msgid="4373978642145196715">"Aquesta aplicació pot llegir tots els esdeveniments del calendari emmagatzemats al telèfon i compartir o desar les dades del teu calendari."</string> <string name="permlab_writeCalendar" msgid="8438874755193825647">"afegeix o modifica els esdeveniments del calendari i envia correus electrònics als clients sense el coneixement dels propietaris"</string> - <!-- no translation found for permdesc_writeCalendar (1675270619903625982) --> - <skip /> - <!-- no translation found for permdesc_writeCalendar (9017809326268135866) --> - <skip /> - <!-- no translation found for permdesc_writeCalendar (7592791790516943173) --> - <skip /> + <string name="permdesc_writeCalendar" product="tablet" msgid="1675270619903625982">"Aquesta aplicació pot afegir, suprimir i canviar esdeveniments del calendari a la tauleta. També pot enviar missatges que sembli que provenen dels propietaris del calendari o canviar esdeveniments sense notificar-los-ho."</string> + <string name="permdesc_writeCalendar" product="tv" msgid="9017809326268135866">"Aquesta aplicació pot afegir, suprimir i canviar esdeveniments del calendari al televisor. També pot enviar missatges que sembli que provenen dels propietaris del calendari o canviar esdeveniments sense notificar-los-ho."</string> + <string name="permdesc_writeCalendar" product="default" msgid="7592791790516943173">"Aquesta aplicació pot afegir, suprimir i canviar esdeveniments del calendari al telèfon. També pot enviar missatges que sembli que provenen dels propietaris del calendari o canviar esdeveniments sense notificar-los-ho."</string> <string name="permlab_accessLocationExtraCommands" msgid="2836308076720553837">"accedir a ordres del proveïdor d\'ubicació addicionals"</string> <string name="permdesc_accessLocationExtraCommands" msgid="6078307221056649927">"Permet que l\'aplicació accedeixi a ordres addicionals del proveïdor d\'ubicacions; per tant, és possible que l\'aplicació pugui interferir en el funcionament del GPS o d\'altres fonts d\'ubicacions."</string> <string name="permlab_accessFineLocation" msgid="251034415460950944">"accedir a la ubicació precisa (basada en el GPS i en la xarxa)"</string> - <!-- no translation found for permdesc_accessFineLocation (5821994817969957884) --> - <skip /> + <string name="permdesc_accessFineLocation" msgid="5821994817969957884">"Aquesta aplicació pot obtenir la teva ubicació a partir de sistemes GPS i de fonts de xarxa, com ara torres de telefonia mòbil i xarxes Wi-Fi. Aquests serveis d\'ubicació han d\'estar activats i disponibles al telèfon perquè l\'aplicació els pugui utilitzar, i això pot fer que el consum de bateria augmenti."</string> <string name="permlab_accessCoarseLocation" msgid="7715277613928539434">"accedir a la ubicació aproximada (basada en la xarxa)"</string> - <!-- no translation found for permdesc_accessCoarseLocation (3373266766487862426) --> - <skip /> - <!-- no translation found for permdesc_accessCoarseLocation (1884022719818788511) --> - <skip /> - <!-- no translation found for permdesc_accessCoarseLocation (7788009094906196995) --> - <skip /> + <string name="permdesc_accessCoarseLocation" product="tablet" msgid="3373266766487862426">"Aquesta aplicació pot obtenir la teva ubicació a partir de fonts de xarxa, com ara torres de telefonia mòbil i xarxes Wi-Fi. Aquests serveis d\'ubicació han d\'estar activats i disponibles a la tauleta perquè l\'aplicació els pugui utilitzar."</string> + <string name="permdesc_accessCoarseLocation" product="tv" msgid="1884022719818788511">"Aquesta aplicació pot obtenir la teva ubicació a partir de fonts de xarxa, com ara torres de telefonia mòbil i xarxes Wi-Fi. Aquests serveis d\'ubicació han d\'estar activats i disponibles al televisor perquè l\'aplicació els pugui utilitzar."</string> + <string name="permdesc_accessCoarseLocation" product="default" msgid="7788009094906196995">"Aquesta aplicació pot obtenir la teva ubicació a partir de fonts de xarxa, com ara torres de telefonia mòbil i xarxes Wi-Fi. Aquests serveis d\'ubicació han d\'estar activats i disponibles al telèfon perquè l\'aplicació els pugui utilitzar."</string> <string name="permlab_modifyAudioSettings" msgid="6095859937069146086">"canviar la configuració d\'àudio"</string> <string name="permdesc_modifyAudioSettings" msgid="3522565366806248517">"Permet que l\'aplicació modifiqui la configuració d\'àudio general, com ara el volum i l\'altaveu de sortida que es fa servir."</string> <string name="permlab_recordAudio" msgid="3876049771427466323">"enregistrar àudio"</string> - <!-- no translation found for permdesc_recordAudio (4245930455135321433) --> - <skip /> + <string name="permdesc_recordAudio" msgid="4245930455135321433">"Aquesta aplicació pot enregistrar àudio amb el micròfon en qualsevol moment."</string> <string name="permlab_sim_communication" msgid="2935852302216852065">"enviar ordres a la SIM"</string> <string name="permdesc_sim_communication" msgid="5725159654279639498">"Permet que l\'aplicació enviï ordres a la SIM. Això és molt perillós."</string> <string name="permlab_camera" msgid="3616391919559751192">"fer fotos i vídeos"</string> - <!-- no translation found for permdesc_camera (5392231870049240670) --> - <skip /> + <string name="permdesc_camera" msgid="5392231870049240670">"Aquesta aplicació pot fer fotos i enregistrar vídeos amb la càmera en qualsevol moment."</string> <string name="permlab_vibrate" msgid="7696427026057705834">"controlar la vibració"</string> <string name="permdesc_vibrate" msgid="6284989245902300945">"Permet que l\'aplicació controli el vibrador."</string> <string name="permlab_callPhone" msgid="3925836347681847954">"trucar directament a números de telèfon"</string> diff --git a/core/res/res/values-cs/strings.xml b/core/res/res/values-cs/strings.xml index 4a4f4945ec15..d5619f9853b6 100644 --- a/core/res/res/values-cs/strings.xml +++ b/core/res/res/values-cs/strings.xml @@ -46,8 +46,7 @@ <string name="defaultMsisdnAlphaTag" msgid="2850889754919584674">"MSISDN1"</string> <string name="mmiError" msgid="5154499457739052907">"Problém s připojením nebo neplatný kód MMI."</string> <string name="mmiFdnError" msgid="5224398216385316471">"Operace je omezena pouze na povolená telefonní čísla."</string> - <!-- no translation found for mmiErrorWhileRoaming (762488890299284230) --> - <skip /> + <string name="mmiErrorWhileRoaming" msgid="762488890299284230">"Když je aktivní roaming, nastavení přesměrování hovorů z telefonu nelze změnit."</string> <string name="serviceEnabled" msgid="8147278346414714315">"Služba byla zapnuta."</string> <string name="serviceEnabledFor" msgid="6856228140453471041">"Služba byla zapnuta pro:"</string> <string name="serviceDisabled" msgid="1937553226592516411">"Služba byla vypnuta."</string> @@ -100,10 +99,8 @@ <string name="RestrictedOnVoiceData" msgid="996636487106171320">"Hlasové a datové služby jsou zablokovány."</string> <string name="RestrictedOnVoiceSms" msgid="1888588152792023873">"Hlasové služby a služby SMS jsou zablokovány."</string> <string name="RestrictedOnAll" msgid="5643028264466092821">"Veškeré hlasové a datové služby a služby SMS jsou zablokovány."</string> - <!-- no translation found for NetworkPreferenceSwitchTitle (4008877505368566980) --> - <skip /> - <!-- no translation found for NetworkPreferenceSwitchSummary (7335915397439759249) --> - <skip /> + <string name="NetworkPreferenceSwitchTitle" msgid="4008877505368566980">"K síti se nelze připojit"</string> + <string name="NetworkPreferenceSwitchSummary" msgid="7335915397439759249">"Chcete-li zlepšit příjem, zkuste v Nastavení > Mobilní sítě > Preferovaný typ sítě změnit vybraný typ."</string> <string name="peerTtyModeFull" msgid="6165351790010341421">"Partner požádal o přechod na režim TTY FULL"</string> <string name="peerTtyModeHco" msgid="5728602160669216784">"Partner požádal o přechod na režim TTY HCO"</string> <string name="peerTtyModeVco" msgid="1742404978686538049">"Partner požádal o přechod na režim TTY VCO"</string> @@ -189,10 +186,8 @@ <string name="work_profile_deleted_description" msgid="6305147513054341102">"Pracovní profil byl smazán, protože není k dispozici aplikace pro správu."</string> <string name="work_profile_deleted_details" msgid="226615743462361248">"Aplikace pro správu pracovního profilu chybí nebo je poškozena. Váš pracovní profil a související data proto byla smazána. Kontaktujte svého administrátora a požádejte jej o pomoc."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="6019770344820507579">"Váš pracovní profil v tomto zařízení již není k dispozici."</string> - <!-- no translation found for network_logging_notification_title (1805392571290161924) --> - <skip /> - <!-- no translation found for network_logging_notification_text (4448072433371155729) --> - <skip /> + <string name="network_logging_notification_title" msgid="1805392571290161924">"Síťový provoz je monitorován"</string> + <string name="network_logging_notification_text" msgid="4448072433371155729">"Klepnutím zobrazíte další podrobnosti"</string> <string name="factory_reset_warning" msgid="5423253125642394387">"Zařízení bude vymazáno"</string> <string name="factory_reset_message" msgid="4905025204141900666">"V aplikaci pro správu chybí některé součásti nebo je poškozená, a proto ji nelze použít. Zařízení nyní bude vymazáno. Kontaktujte svého administrátora a požádejte jej o pomoc."</string> <string name="me" msgid="6545696007631404292">"Já"</string> @@ -312,12 +307,9 @@ <string name="permlab_sendSms" msgid="7544599214260982981">"odesílání a zobrazování zpráv SMS"</string> <string name="permdesc_sendSms" msgid="7094729298204937667">"Umožňuje aplikaci odesílat zprávy SMS. Může to mít za následek účtování neočekávaných poplatků. Škodlivé aplikace vás mohou připravit o peníze odesíláním zpráv bez vašeho svolení."</string> <string name="permlab_readSms" msgid="8745086572213270480">"čtení textových zpráv (SMS nebo MMS)"</string> - <!-- no translation found for permdesc_readSms (4741697454888074891) --> - <skip /> - <!-- no translation found for permdesc_readSms (5796670395641116592) --> - <skip /> - <!-- no translation found for permdesc_readSms (6826832415656437652) --> - <skip /> + <string name="permdesc_readSms" product="tablet" msgid="4741697454888074891">"Tato aplikace může číst všechny SMS (textové zprávy) uložené v tabletu."</string> + <string name="permdesc_readSms" product="tv" msgid="5796670395641116592">"Tato aplikace může číst všechny SMS (textové zprávy) uložené v televizi."</string> + <string name="permdesc_readSms" product="default" msgid="6826832415656437652">"Tato aplikace může číst všechny SMS (textové zprávy) uložené v telefonu."</string> <string name="permlab_receiveWapPush" msgid="5991398711936590410">"příjem textových zpráv (WAP)"</string> <string name="permdesc_receiveWapPush" msgid="748232190220583385">"Umožňuje aplikaci přijmout a zpracovat zprávy WAP. Toto oprávnění umožňuje sledovat přijaté zprávy nebo je smazat, aniž by se vám zobrazily."</string> <string name="permlab_getTasks" msgid="6466095396623933906">"načtení spuštěných aplikací"</string> @@ -330,10 +322,8 @@ <string name="permdesc_enableCarMode" msgid="4853187425751419467">"Umožňuje aplikaci aktivovat režim V autě."</string> <string name="permlab_killBackgroundProcesses" msgid="3914026687420177202">"zavření ostatních aplikací"</string> <string name="permdesc_killBackgroundProcesses" msgid="4593353235959733119">"Umožňuje aplikaci ukončit procesy na pozadí ostatních aplikací. Mohlo by dojít k zastavení ostatních aplikací."</string> - <!-- no translation found for permlab_systemAlertWindow (7238805243128138690) --> - <skip /> - <!-- no translation found for permdesc_systemAlertWindow (2393776099672266188) --> - <skip /> + <string name="permlab_systemAlertWindow" msgid="7238805243128138690">"Zobrazení přes ostatní aplikace"</string> + <string name="permdesc_systemAlertWindow" msgid="2393776099672266188">"Tato aplikace se může zobrazit přes ostatní aplikace a další části obrazovky. Může tak omezit použitelnost aplikací a změnit způsob jejich zobrazení."</string> <string name="permlab_persistentActivity" msgid="8841113627955563938">"trvalé spuštění aplikace"</string> <string name="permdesc_persistentActivity" product="tablet" msgid="8525189272329086137">"Umožňuje aplikaci uložit některé své části trvale do paměti. Může to omezit paměť dostupnou pro ostatní aplikace a zpomalit tak tablet."</string> <string name="permdesc_persistentActivity" product="tv" msgid="5086862529499103587">"Umožňuje aplikaci zapsat své jednotlivé části natrvalo do paměti. To může omezit paměť dostupnou pro ostatní aplikace a zpomalit tak televizi."</string> @@ -359,51 +349,37 @@ <string name="permdesc_writeContacts" product="tv" msgid="5438230957000018959">"Umožňuje aplikaci upravit údaje o kontaktech uložených v televizi včetně toho, jak často voláte, posíláte e-maily nebo jinými způsoby komunikujete s konkrétními kontakty. Toto oprávnění aplikacím umožňuje mazat údaje o kontaktech."</string> <string name="permdesc_writeContacts" product="default" msgid="589869224625163558">"Umožňuje aplikaci upravit údaje o kontaktech uložených v telefonu včetně toho, jak často voláte, posíláte e-maily nebo komunikujete jinými způsoby s konkrétními kontakty. Toto oprávnění aplikacím umožňuje mazat údaje o kontaktech."</string> <string name="permlab_readCallLog" msgid="3478133184624102739">"čtení seznamu hovorů"</string> - <!-- no translation found for permdesc_readCallLog (3204122446463552146) --> - <skip /> + <string name="permdesc_readCallLog" msgid="3204122446463552146">"Tato aplikace může číst historii volání."</string> <string name="permlab_writeCallLog" msgid="8552045664743499354">"zápis do seznamu hovorů"</string> <string name="permdesc_writeCallLog" product="tablet" msgid="6661806062274119245">"Umožňuje aplikaci upravovat seznam hovorů vašeho tabletu, včetně dat o příchozích a odchozích hovorech. Škodlivé aplikace to mohou zneužít k vymazání nebo změnám seznamu hovorů."</string> <string name="permdesc_writeCallLog" product="tv" msgid="4225034892248398019">"Umožňuje aplikaci upravovat seznam hovorů vaší televize včetně dat o příchozích a odchozích hovorech. Škodlivé aplikace to mohou zneužít k vymazání nebo změnám seznamu hovorů."</string> <string name="permdesc_writeCallLog" product="default" msgid="683941736352787842">"Umožňuje aplikaci upravovat seznam hovorů vašeho telefonu, včetně dat o příchozích a odchozích hovorech. Škodlivé aplikace to mohou zneužít k vymazání nebo změnám seznamu hovorů."</string> <string name="permlab_bodySensors" msgid="4683341291818520277">"přístup k tělesným senzorům (např. snímače tepu)"</string> <string name="permdesc_bodySensors" product="default" msgid="4380015021754180431">"Umožňuje aplikaci používat data ze senzorů, které sledují vaši fyzickou kondici, například tepovou frekvenci."</string> - <!-- no translation found for permlab_readCalendar (6716116972752441641) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (4993979255403945892) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (8837931557573064315) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (4373978642145196715) --> - <skip /> + <string name="permlab_readCalendar" msgid="6716116972752441641">"Čtení událostí v kalendáři včetně podrobností"</string> + <string name="permdesc_readCalendar" product="tablet" msgid="4993979255403945892">"Tato aplikace může číst všechny události v kalendáři uložené v tabletu a sdílet či ukládat data kalendáře."</string> + <string name="permdesc_readCalendar" product="tv" msgid="8837931557573064315">"Tato aplikace může číst všechny události v kalendáři uložené v televizi a sdílet či ukládat data kalendáře."</string> + <string name="permdesc_readCalendar" product="default" msgid="4373978642145196715">"Tato aplikace může číst všechny události v kalendáři uložené v telefonu a sdílet či ukládat data kalendáře."</string> <string name="permlab_writeCalendar" msgid="8438874755193825647">"přidávání a upravování událostí kalendářů a odesílání e-mailů bez vědomí vlastníka"</string> - <!-- no translation found for permdesc_writeCalendar (1675270619903625982) --> - <skip /> - <!-- no translation found for permdesc_writeCalendar (9017809326268135866) --> - <skip /> - <!-- no translation found for permdesc_writeCalendar (7592791790516943173) --> - <skip /> + <string name="permdesc_writeCalendar" product="tablet" msgid="1675270619903625982">"Tato aplikace může přidat, odstranit či změnit události v kalendáři uložené v tabletu. Může také odesílat zprávy, které budou zdánlivě přicházet od vlastníka kalendáře, nebo upravovat události bez vědomí vlastníka."</string> + <string name="permdesc_writeCalendar" product="tv" msgid="9017809326268135866">"Tato aplikace může přidat, odstranit či změnit události v kalendáři uložené v televizi. Může také odesílat zprávy, které budou zdánlivě přicházet od vlastníka kalendáře, nebo upravovat události bez vědomí vlastníka."</string> + <string name="permdesc_writeCalendar" product="default" msgid="7592791790516943173">"Tato aplikace může přidat, odstranit či změnit události v kalendáři uložené v telefonu. Může také odesílat zprávy, které budou zdánlivě přicházet od vlastníka kalendáře, nebo upravovat události bez vědomí vlastníka."</string> <string name="permlab_accessLocationExtraCommands" msgid="2836308076720553837">"přístup k dalším příkazům poskytovatele polohy"</string> <string name="permdesc_accessLocationExtraCommands" msgid="6078307221056649927">"Umožňuje aplikaci přístup k dalším příkazům poskytovatele polohy. To aplikaci umožní zasahovat do fungování systému GPS a dalších zdrojů polohy."</string> <string name="permlab_accessFineLocation" msgid="251034415460950944">"přístup k přesné poloze (pomocí GPS a sítě)"</string> - <!-- no translation found for permdesc_accessFineLocation (5821994817969957884) --> - <skip /> + <string name="permdesc_accessFineLocation" msgid="5821994817969957884">"Tato aplikace může zjistit vaši polohu podle GPS a zdrojů polohy sítě, jako jsou vysílací věže nebo sítě Wi-Fi. Aby tyto služby určování polohy mohla aplikace používat, musí být v telefonu dostupné a musí být zapnuté. Tyto služby mohou způsobit rychlejší vybíjení baterie."</string> <string name="permlab_accessCoarseLocation" msgid="7715277613928539434">"přístup k přibližné poloze (pomocí sítě)"</string> - <!-- no translation found for permdesc_accessCoarseLocation (3373266766487862426) --> - <skip /> - <!-- no translation found for permdesc_accessCoarseLocation (1884022719818788511) --> - <skip /> - <!-- no translation found for permdesc_accessCoarseLocation (7788009094906196995) --> - <skip /> + <string name="permdesc_accessCoarseLocation" product="tablet" msgid="3373266766487862426">"Tato aplikace může zjistit vaši polohu podle zdrojů sítě, jako jsou vysílací věže nebo sítě Wi-Fi. Aby tyto služby určování polohy mohla aplikace používat, musí být v tabletu dostupné a musí být zapnuté."</string> + <string name="permdesc_accessCoarseLocation" product="tv" msgid="1884022719818788511">"Tato aplikace může zjistit vaši polohu podle zdrojů sítě, jako jsou vysílací věže nebo sítě Wi-Fi. Aby tyto služby určování polohy mohla aplikace používat, musí být v televizi dostupné a musí být zapnuté."</string> + <string name="permdesc_accessCoarseLocation" product="default" msgid="7788009094906196995">"Tato aplikace může zjistit vaši polohu podle zdrojů sítě, jako jsou vysílací věže nebo sítě Wi-Fi. Aby tyto služby určování polohy mohla aplikace používat, musí být v telefonu dostupné a musí být zapnuté."</string> <string name="permlab_modifyAudioSettings" msgid="6095859937069146086">"změna nastavení zvuku"</string> <string name="permdesc_modifyAudioSettings" msgid="3522565366806248517">"Umožňuje aplikaci změnit globální nastavení zvuku, například hlasitost či reproduktor pro výstup zvuku."</string> <string name="permlab_recordAudio" msgid="3876049771427466323">"nahrávání zvuku"</string> - <!-- no translation found for permdesc_recordAudio (4245930455135321433) --> - <skip /> + <string name="permdesc_recordAudio" msgid="4245930455135321433">"Tato aplikace může pomocí mikrofonu kdykoli zaznamenat zvuk."</string> <string name="permlab_sim_communication" msgid="2935852302216852065">"odesílání příkazů do SIM karty"</string> <string name="permdesc_sim_communication" msgid="5725159654279639498">"Umožňuje aplikaci odesílat příkazy na kartu SIM. Toto oprávnění je velmi nebezpečné."</string> <string name="permlab_camera" msgid="3616391919559751192">"pořizování fotografií a videí"</string> - <!-- no translation found for permdesc_camera (5392231870049240670) --> - <skip /> + <string name="permdesc_camera" msgid="5392231870049240670">"Tato aplikace může pomocí fotoaparátu kdykoli pořídit snímek nebo nahrát video."</string> <string name="permlab_vibrate" msgid="7696427026057705834">"ovládání vibrací"</string> <string name="permdesc_vibrate" msgid="6284989245902300945">"Umožňuje aplikaci ovládat vibrace."</string> <string name="permlab_callPhone" msgid="3925836347681847954">"přímé volání na telefonní čísla"</string> diff --git a/core/res/res/values-da/strings.xml b/core/res/res/values-da/strings.xml index e3b0a0fb7b6c..89b546f57974 100644 --- a/core/res/res/values-da/strings.xml +++ b/core/res/res/values-da/strings.xml @@ -182,10 +182,8 @@ <string name="work_profile_deleted_description" msgid="6305147513054341102">"Arbejdsprofilen blev slettet, fordi der mangler en administrationsapp."</string> <string name="work_profile_deleted_details" msgid="226615743462361248">"Administrationsappen til arbejdsprofilen mangler eller er beskadiget. Derfor er din arbejdsprofil og dine relaterede data blevet slettet. Kontakt din administrator for at få hjælp."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="6019770344820507579">"Din arbejdsprofil er ikke længere tilgængelig på denne enhed."</string> - <!-- no translation found for network_logging_notification_title (1805392571290161924) --> - <skip /> - <!-- no translation found for network_logging_notification_text (4448072433371155729) --> - <skip /> + <string name="network_logging_notification_title" msgid="1805392571290161924">"Netværkstrafikken overvåges"</string> + <string name="network_logging_notification_text" msgid="4448072433371155729">"Tryk for at få flere oplysninger"</string> <string name="factory_reset_warning" msgid="5423253125642394387">"Enheden slettes"</string> <string name="factory_reset_message" msgid="4905025204141900666">"Administrationsappen mangler komponenter eller er beskadiget og kan ikke bruges. Enheden vil nu blive slettet. Kontakt din administrator for at få hjælp."</string> <string name="me" msgid="6545696007631404292">"Mig"</string> diff --git a/core/res/res/values-de/strings.xml b/core/res/res/values-de/strings.xml index 751e5c970f61..79152fa5c440 100644 --- a/core/res/res/values-de/strings.xml +++ b/core/res/res/values-de/strings.xml @@ -46,8 +46,7 @@ <string name="defaultMsisdnAlphaTag" msgid="2850889754919584674">"MSISDN1"</string> <string name="mmiError" msgid="5154499457739052907">"Verbindungsproblem oder ungültiger MMI-Code."</string> <string name="mmiFdnError" msgid="5224398216385316471">"Der Vorgang ist nur für deine zugelassenen Rufnummern möglich."</string> - <!-- no translation found for mmiErrorWhileRoaming (762488890299284230) --> - <skip /> + <string name="mmiErrorWhileRoaming" msgid="762488890299284230">"Die Einstellungen für die Anrufweiterleitung von deinem Smartphone können während des Roamings nicht geändert werden."</string> <string name="serviceEnabled" msgid="8147278346414714315">"Dienst wurde aktiviert."</string> <string name="serviceEnabledFor" msgid="6856228140453471041">"Dienst wurde aktiviert für:"</string> <string name="serviceDisabled" msgid="1937553226592516411">"Dienst wurde deaktiviert."</string> @@ -98,10 +97,8 @@ <string name="RestrictedOnVoiceData" msgid="996636487106171320">"Sprach-/Datendienste sind gesperrt."</string> <string name="RestrictedOnVoiceSms" msgid="1888588152792023873">"Sprach-/SMS-Dienste sind gesperrt."</string> <string name="RestrictedOnAll" msgid="5643028264466092821">"Alle Sprach-/Daten-/SMS-Dienste sind gesperrt."</string> - <!-- no translation found for NetworkPreferenceSwitchTitle (4008877505368566980) --> - <skip /> - <!-- no translation found for NetworkPreferenceSwitchSummary (7335915397439759249) --> - <skip /> + <string name="NetworkPreferenceSwitchTitle" msgid="4008877505368566980">"Netzwerk nicht erreichbar"</string> + <string name="NetworkPreferenceSwitchSummary" msgid="7335915397439759249">"Der Empfang lässt sich möglicherweise verbessern, indem du unter \"Einstellungen\" > \"Mobilfunknetze\" > \"Bevorzugter Netzwerktyp\" einen anderen Typ auswählst."</string> <string name="peerTtyModeFull" msgid="6165351790010341421">"Peer hat TTY-Modus \"Vollständig\" angefordert."</string> <string name="peerTtyModeHco" msgid="5728602160669216784">"Peer hat TTY-Modus \"HCO\" angefordert."</string> <string name="peerTtyModeVco" msgid="1742404978686538049">"Peer hat TTY-Modus \"VC\" angefordert."</string> @@ -185,10 +182,8 @@ <string name="work_profile_deleted_description" msgid="6305147513054341102">"Arbeitsprofil aufgrund fehlender Admin-App gelöscht"</string> <string name="work_profile_deleted_details" msgid="226615743462361248">"Die Admin-App für das Arbeitsprofil fehlt oder ist beschädigt. Daher wurden dein Arbeitsprofil und alle zugehörigen Daten gelöscht. Wende dich für weitere Hilfe an deinen Administrator."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="6019770344820507579">"Dein Arbeitsprofil ist auf diesem Gerät nicht mehr verfügbar."</string> - <!-- no translation found for network_logging_notification_title (1805392571290161924) --> - <skip /> - <!-- no translation found for network_logging_notification_text (4448072433371155729) --> - <skip /> + <string name="network_logging_notification_title" msgid="1805392571290161924">"Der Netzwerkverkehr wird protokolliert"</string> + <string name="network_logging_notification_text" msgid="4448072433371155729">"Für weitere Details antippen"</string> <string name="factory_reset_warning" msgid="5423253125642394387">"Die Daten auf deinem Gerät werden gelöscht."</string> <string name="factory_reset_message" msgid="4905025204141900666">"Die Admin-App kann nicht verwendet werden, da sie beschädigt wurde oder Komponenten fehlen. Die Daten auf deinem Gerät werden nun gelöscht. Wende dich für weitere Hilfe an deinen Administrator."</string> <string name="me" msgid="6545696007631404292">"Eigene"</string> @@ -306,12 +301,9 @@ <string name="permlab_sendSms" msgid="7544599214260982981">"SMS senden und abrufen"</string> <string name="permdesc_sendSms" msgid="7094729298204937667">"Ermöglicht der App, SMS zu senden. Dies kann zu unerwarteten Kosten führen. Schädliche Apps können Kosten verursachen, indem sie Nachrichten ohne deine Bestätigung senden."</string> <string name="permlab_readSms" msgid="8745086572213270480">"SMS oder MMS lesen"</string> - <!-- no translation found for permdesc_readSms (4741697454888074891) --> - <skip /> - <!-- no translation found for permdesc_readSms (5796670395641116592) --> - <skip /> - <!-- no translation found for permdesc_readSms (6826832415656437652) --> - <skip /> + <string name="permdesc_readSms" product="tablet" msgid="4741697454888074891">"Diese App kann alle auf deinem Tablet gespeicherten SMS lesen."</string> + <string name="permdesc_readSms" product="tv" msgid="5796670395641116592">"Diese App kann alle auf deinem Fernseher gespeicherten SMS lesen."</string> + <string name="permdesc_readSms" product="default" msgid="6826832415656437652">"Diese App kann alle auf deinem Smartphone gespeicherten SMS lesen."</string> <string name="permlab_receiveWapPush" msgid="5991398711936590410">"Textnachrichten (WAP) empfangen"</string> <string name="permdesc_receiveWapPush" msgid="748232190220583385">"Ermöglicht der App, WAP-Nachrichten zu empfangen und zu verarbeiten. Mit der Berechtigung können Nachrichten, die an dich gesendet wurden, überwacht und gelöscht werden, bevor sie dir angezeigt werden."</string> <string name="permlab_getTasks" msgid="6466095396623933906">"Aktive Apps abrufen"</string> @@ -324,10 +316,8 @@ <string name="permdesc_enableCarMode" msgid="4853187425751419467">"Ermöglicht der App, den Automodus zu aktivieren"</string> <string name="permlab_killBackgroundProcesses" msgid="3914026687420177202">"Andere Apps schließen"</string> <string name="permdesc_killBackgroundProcesses" msgid="4593353235959733119">"Ermöglicht der App, Hintergrundprozesse anderer Apps zu beenden. Das kann dazu führen, dass andere Apps nicht mehr ausgeführt werden."</string> - <!-- no translation found for permlab_systemAlertWindow (7238805243128138690) --> - <skip /> - <!-- no translation found for permdesc_systemAlertWindow (2393776099672266188) --> - <skip /> + <string name="permlab_systemAlertWindow" msgid="7238805243128138690">"App kann über anderen Apps erscheinen"</string> + <string name="permdesc_systemAlertWindow" msgid="2393776099672266188">"Diese App kann über anderen Apps oder anderen Teilen des Bildschirms erscheinen. Dies kann sich auf die normale App-Nutzung und die Darstellung anderer Apps auswirken."</string> <string name="permlab_persistentActivity" msgid="8841113627955563938">"App permanent ausführen"</string> <string name="permdesc_persistentActivity" product="tablet" msgid="8525189272329086137">"Ermöglicht der App, Teile der eigenen App dauerhaft im Speicher abzulegen. Dies kann dazu führen, dass anderen Apps weniger Arbeitsspeicher zur Verfügung steht und das Tablet langsamer wird."</string> <string name="permdesc_persistentActivity" product="tv" msgid="5086862529499103587">"Ermöglicht der App, Teile der eigenen App dauerhaft im Speicher abzulegen. Dies kann dazu führen, dass anderen Apps weniger Arbeitsspeicher zur Verfügung steht und der Fernseher langsamer wird."</string> @@ -353,51 +343,37 @@ <string name="permdesc_writeContacts" product="tv" msgid="5438230957000018959">"Ermöglicht der App, Daten zu den auf deinem Fernseher gespeicherten Kontakten zu ändern, einschließlich der Häufigkeit, mit der du bestimmte Kontakte angerufen, diesen E-Mails gesendet oder anderweitig mit ihnen kommuniziert hast. Die Berechtigung erlaubt Apps, Kontaktdaten zu löschen."</string> <string name="permdesc_writeContacts" product="default" msgid="589869224625163558">"Ermöglicht der App, Daten zu Kontakten, die auf deinem Telefon gespeichert sind, zu ändern, einschließlich der Häufigkeit, mit der du bestimmte Kontakte angerufen, diesen E-Mails gesendet oder anderweitig mit ihnen kommuniziert hast. Die Berechtigung erlaubt Apps, Kontaktdaten zu löschen."</string> <string name="permlab_readCallLog" msgid="3478133184624102739">"Anrufliste lesen"</string> - <!-- no translation found for permdesc_readCallLog (3204122446463552146) --> - <skip /> + <string name="permdesc_readCallLog" msgid="3204122446463552146">"Diese App kann deine Anrufliste lesen."</string> <string name="permlab_writeCallLog" msgid="8552045664743499354">"Anrufliste bearbeiten"</string> <string name="permdesc_writeCallLog" product="tablet" msgid="6661806062274119245">"Ermöglicht der App, die Anrufliste deines Tablets zu ändern, einschließlich der Daten über ein- und ausgehende Anrufe. Schädliche Apps können so deine Anrufliste löschen oder ändern."</string> <string name="permdesc_writeCallLog" product="tv" msgid="4225034892248398019">"Ermöglicht der App, die Anrufliste deines Fernsehers zu ändern, einschließlich der Daten über ein- und ausgehende Anrufe. Schädliche Apps können so deine Anrufliste löschen oder ändern."</string> <string name="permdesc_writeCallLog" product="default" msgid="683941736352787842">"Ermöglicht der App, die Anrufliste deines Telefons zu ändern, einschließlich der Daten über ein- und ausgehende Anrufe. Schädliche Apps können so deine Anrufliste löschen oder ändern."</string> <string name="permlab_bodySensors" msgid="4683341291818520277">"Auf Körpersensoren wie z. B. Herzfrequenzmesser zugreifen"</string> <string name="permdesc_bodySensors" product="default" msgid="4380015021754180431">"Ermöglicht der App, auf Daten von Sensoren zuzugreifen, die deine körperliche Verfassung überwachen, beispielsweise deinen Puls"</string> - <!-- no translation found for permlab_readCalendar (6716116972752441641) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (4993979255403945892) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (8837931557573064315) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (4373978642145196715) --> - <skip /> + <string name="permlab_readCalendar" msgid="6716116972752441641">"Kalendertermine und Details lesen"</string> + <string name="permdesc_readCalendar" product="tablet" msgid="4993979255403945892">"Diese App kann alle auf deinem Tablet gespeicherten Kalendertermine lesen und deine Kalenderdaten teilen oder speichern."</string> + <string name="permdesc_readCalendar" product="tv" msgid="8837931557573064315">"Diese App kann alle auf deinem Fernseher gespeicherten Kalendertermine lesen und deine Kalenderdaten teilen oder speichern."</string> + <string name="permdesc_readCalendar" product="default" msgid="4373978642145196715">"Diese App kann alle auf deinem Smartphone gespeicherten Kalendertermine lesen und deine Kalenderdaten teilen oder speichern."</string> <string name="permlab_writeCalendar" msgid="8438874755193825647">"Ohne das Wissen der Eigentümer Kalendertermine hinzufügen oder ändern und E-Mails an Gäste senden"</string> - <!-- no translation found for permdesc_writeCalendar (1675270619903625982) --> - <skip /> - <!-- no translation found for permdesc_writeCalendar (9017809326268135866) --> - <skip /> - <!-- no translation found for permdesc_writeCalendar (7592791790516943173) --> - <skip /> + <string name="permdesc_writeCalendar" product="tablet" msgid="1675270619903625982">"Diese App kann Kalendertermine auf deinem Tablet hinzufügen, entfernen oder ändern. Diese App kann Nachrichten senden, die scheinbar von Kalendereigentümern stammen, oder Termine ohne Benachrichtigung der Eigentümer ändern."</string> + <string name="permdesc_writeCalendar" product="tv" msgid="9017809326268135866">"Diese App kann Kalendertermine auf deinem Fernseher hinzufügen, entfernen oder ändern. Diese App kann Nachrichten senden, die scheinbar von Kalendereigentümern stammen, oder Termine ohne Benachrichtigung der Eigentümer ändern."</string> + <string name="permdesc_writeCalendar" product="default" msgid="7592791790516943173">"Diese App kann Kalendertermine auf deinem Smartphone hinzufügen, entfernen oder ändern. Diese App kann Nachrichten senden, die scheinbar von Kalendereigentümern stammen, oder Termine ohne Benachrichtigung der Eigentümer ändern."</string> <string name="permlab_accessLocationExtraCommands" msgid="2836308076720553837">"Auf zusätzliche Dienstanbieterbefehle für Standort zugreifen"</string> <string name="permdesc_accessLocationExtraCommands" msgid="6078307221056649927">"Ermöglicht der App, auf zusätzliche Standortanbieterbefehle zuzugreifen. Damit könnte die App die Funktionsweise von GPS oder anderen Standortquellen beeinträchtigen."</string> <string name="permlab_accessFineLocation" msgid="251034415460950944">"Auf genauen Standort zugreifen (GPS- und netzwerkbasiert)"</string> - <!-- no translation found for permdesc_accessFineLocation (5821994817969957884) --> - <skip /> + <string name="permdesc_accessFineLocation" msgid="5821994817969957884">"Diese App kann deinen Standort über GPS oder mithilfe von Netzwerkstandortquellen wie Mobilfunkmasten und WLAN ermitteln. Die App kann diese Standortdienste nur verwenden, wenn sie auf deinem Smartphone aktiviert und verfügbar sind. Hierdurch kann sich der Akkuverbrauch erhöhen."</string> <string name="permlab_accessCoarseLocation" msgid="7715277613928539434">"Auf den ungefähren Standort zugreifen (netzwerkbasiert)"</string> - <!-- no translation found for permdesc_accessCoarseLocation (3373266766487862426) --> - <skip /> - <!-- no translation found for permdesc_accessCoarseLocation (1884022719818788511) --> - <skip /> - <!-- no translation found for permdesc_accessCoarseLocation (7788009094906196995) --> - <skip /> + <string name="permdesc_accessCoarseLocation" product="tablet" msgid="3373266766487862426">"Diese App kann deinen Standort mithilfe von Netzwerkquellen wie Mobilfunkmasten und WLAN ermitteln. Die App kann diese Standortdienste nur verwenden, wenn sie auf deinem Tablet aktiviert und verfügbar sind."</string> + <string name="permdesc_accessCoarseLocation" product="tv" msgid="1884022719818788511">"Diese App kann deinen Standort mithilfe von Netzwerkquellen wie Mobilfunkmasten und WLAN ermitteln. Die App kann diese Standortdienste nur verwenden, wenn sie auf deinem Fernseher aktiviert und verfügbar sind."</string> + <string name="permdesc_accessCoarseLocation" product="default" msgid="7788009094906196995">"Diese App kann deinen Standort mithilfe von Netzwerkquellen wie Mobilfunkmasten und WLAN ermitteln. Die App kann diese Standortdienste nur verwenden, wenn sie auf deinem Smartphone aktiviert und verfügbar sind."</string> <string name="permlab_modifyAudioSettings" msgid="6095859937069146086">"Audio-Einstellungen ändern"</string> <string name="permdesc_modifyAudioSettings" msgid="3522565366806248517">"Ermöglicht der App, globale Audio-Einstellungen zu ändern, etwa die Lautstärke und den Lautsprecher für die Ausgabe."</string> <string name="permlab_recordAudio" msgid="3876049771427466323">"Audio aufnehmen"</string> - <!-- no translation found for permdesc_recordAudio (4245930455135321433) --> - <skip /> + <string name="permdesc_recordAudio" msgid="4245930455135321433">"Diese App kann jederzeit Ton über das Mikrofon aufnehmen."</string> <string name="permlab_sim_communication" msgid="2935852302216852065">"Befehle an die SIM senden"</string> <string name="permdesc_sim_communication" msgid="5725159654279639498">"Ermöglicht der App das Senden von Befehlen an die SIM-Karte. Dies ist äußerst risikoreich."</string> <string name="permlab_camera" msgid="3616391919559751192">"Bilder und Videos aufnehmen"</string> - <!-- no translation found for permdesc_camera (5392231870049240670) --> - <skip /> + <string name="permdesc_camera" msgid="5392231870049240670">"Diese App kann mit der Kamera jederzeit Bilder und Videos aufnehmen."</string> <string name="permlab_vibrate" msgid="7696427026057705834">"Vibrationsalarm steuern"</string> <string name="permdesc_vibrate" msgid="6284989245902300945">"Ermöglicht der App, den Vibrationsalarm zu steuern"</string> <string name="permlab_callPhone" msgid="3925836347681847954">"Telefonnummern direkt anrufen"</string> diff --git a/core/res/res/values-el/strings.xml b/core/res/res/values-el/strings.xml index ec7cd59a2417..d89932d330c9 100644 --- a/core/res/res/values-el/strings.xml +++ b/core/res/res/values-el/strings.xml @@ -182,10 +182,8 @@ <string name="work_profile_deleted_description" msgid="6305147513054341102">"Το προφίλ εργασίας διαγράφηκε επειδή λείπει η εφαρμογή διαχείρισης."</string> <string name="work_profile_deleted_details" msgid="226615743462361248">"Η εφαρμογή διαχείρισης προφίλ εργασίας είτε λείπει είτε είναι κατεστραμμένη. Ως αποτέλεσμα, το προφίλ εργασίας και σχετικά δεδομένα διαγράφηκαν. Επικοινωνήστε με το διαχειριστή για βοήθεια."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="6019770344820507579">"Το προφίλ σας εργασίας δεν είναι πια διαθέσιμο σε αυτήν τη συσκευή."</string> - <!-- no translation found for network_logging_notification_title (1805392571290161924) --> - <skip /> - <!-- no translation found for network_logging_notification_text (4448072433371155729) --> - <skip /> + <string name="network_logging_notification_title" msgid="1805392571290161924">"Η επισκεψιμότητα δικτύου παρακολουθείται"</string> + <string name="network_logging_notification_text" msgid="4448072433371155729">"Πατήστε για να δείτε περισσότερες λεπτομέρειες"</string> <string name="factory_reset_warning" msgid="5423253125642394387">"Η συσκευή σας θα διαγραφεί"</string> <string name="factory_reset_message" msgid="4905025204141900666">"Λείπουν στοιχεία από την εφαρμογή διαχείρισης ή είναι κατεστραμμένη, και δεν μπορεί να χρησιμοποιηθεί. Η συσκευή σας θα διαγραφεί. Επικοινωνήστε με το διαχειριστή για βοήθεια."</string> <string name="me" msgid="6545696007631404292">"Για εμένα"</string> diff --git a/core/res/res/values-en-rAU/strings.xml b/core/res/res/values-en-rAU/strings.xml index b13d67617fb7..071a302aff7e 100644 --- a/core/res/res/values-en-rAU/strings.xml +++ b/core/res/res/values-en-rAU/strings.xml @@ -46,8 +46,7 @@ <string name="defaultMsisdnAlphaTag" msgid="2850889754919584674">"MSISDN1"</string> <string name="mmiError" msgid="5154499457739052907">"Connection problem or invalid MMI code."</string> <string name="mmiFdnError" msgid="5224398216385316471">"Operation is restricted to fixed dialling numbers only."</string> - <!-- no translation found for mmiErrorWhileRoaming (762488890299284230) --> - <skip /> + <string name="mmiErrorWhileRoaming" msgid="762488890299284230">"Cannot change call forwarding settings from your phone while you are roaming."</string> <string name="serviceEnabled" msgid="8147278346414714315">"Service was enabled."</string> <string name="serviceEnabledFor" msgid="6856228140453471041">"Service was enabled for:"</string> <string name="serviceDisabled" msgid="1937553226592516411">"Service has been disabled."</string> @@ -98,10 +97,8 @@ <string name="RestrictedOnVoiceData" msgid="996636487106171320">"Voice/Data services are blocked."</string> <string name="RestrictedOnVoiceSms" msgid="1888588152792023873">"Voice/SMS services are blocked."</string> <string name="RestrictedOnAll" msgid="5643028264466092821">"All voice/data/SMS services are blocked."</string> - <!-- no translation found for NetworkPreferenceSwitchTitle (4008877505368566980) --> - <skip /> - <!-- no translation found for NetworkPreferenceSwitchSummary (7335915397439759249) --> - <skip /> + <string name="NetworkPreferenceSwitchTitle" msgid="4008877505368566980">"Can’t find network"</string> + <string name="NetworkPreferenceSwitchSummary" msgid="7335915397439759249">"To improve signal, try changing the type selected at Settings > Mobile networks > Preferred network type."</string> <string name="peerTtyModeFull" msgid="6165351790010341421">"Peer requested TTY Mode FULL"</string> <string name="peerTtyModeHco" msgid="5728602160669216784">"Peer requested TTY Mode HCO"</string> <string name="peerTtyModeVco" msgid="1742404978686538049">"Peer requested TTY Mode VCO"</string> @@ -185,10 +182,8 @@ <string name="work_profile_deleted_description" msgid="6305147513054341102">"Work profile deleted due to missing admin app."</string> <string name="work_profile_deleted_details" msgid="226615743462361248">"The work profile admin app is either missing or corrupted. As a result, your work profile and related data have been deleted. Contact your administrator for assistance."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="6019770344820507579">"Your work profile is no longer available on this device."</string> - <!-- no translation found for network_logging_notification_title (1805392571290161924) --> - <skip /> - <!-- no translation found for network_logging_notification_text (4448072433371155729) --> - <skip /> + <string name="network_logging_notification_title" msgid="1805392571290161924">"Network traffic is being monitored"</string> + <string name="network_logging_notification_text" msgid="4448072433371155729">"Tap for more details"</string> <string name="factory_reset_warning" msgid="5423253125642394387">"Your device will be erased"</string> <string name="factory_reset_message" msgid="4905025204141900666">"The admin app is missing components or corrupted, and can\'t be used. Your device will now be erased. Contact your administrator for assistance."</string> <string name="me" msgid="6545696007631404292">"Me"</string> @@ -306,12 +301,9 @@ <string name="permlab_sendSms" msgid="7544599214260982981">"send and view SMS messages"</string> <string name="permdesc_sendSms" msgid="7094729298204937667">"Allows the app to send SMS messages. This may result in unexpected charges. Malicious apps may cost you money by sending messages without your confirmation."</string> <string name="permlab_readSms" msgid="8745086572213270480">"read your text messages (SMS or MMS)"</string> - <!-- no translation found for permdesc_readSms (4741697454888074891) --> - <skip /> - <!-- no translation found for permdesc_readSms (5796670395641116592) --> - <skip /> - <!-- no translation found for permdesc_readSms (6826832415656437652) --> - <skip /> + <string name="permdesc_readSms" product="tablet" msgid="4741697454888074891">"This app can read all SMS (text) messages stored on your tablet."</string> + <string name="permdesc_readSms" product="tv" msgid="5796670395641116592">"This app can read all SMS (text) messages stored on your TV."</string> + <string name="permdesc_readSms" product="default" msgid="6826832415656437652">"This app can read all SMS (text) messages stored on your phone."</string> <string name="permlab_receiveWapPush" msgid="5991398711936590410">"receive text messages (WAP)"</string> <string name="permdesc_receiveWapPush" msgid="748232190220583385">"Allows the app to receive and process WAP messages. This permission includes the ability to monitor or delete messages sent to you without showing them to you."</string> <string name="permlab_getTasks" msgid="6466095396623933906">"retrieve running apps"</string> @@ -324,10 +316,8 @@ <string name="permdesc_enableCarMode" msgid="4853187425751419467">"Allows the app to enable the car mode."</string> <string name="permlab_killBackgroundProcesses" msgid="3914026687420177202">"close other apps"</string> <string name="permdesc_killBackgroundProcesses" msgid="4593353235959733119">"Allows the app to end background processes of other apps. This may cause other apps to stop running."</string> - <!-- no translation found for permlab_systemAlertWindow (7238805243128138690) --> - <skip /> - <!-- no translation found for permdesc_systemAlertWindow (2393776099672266188) --> - <skip /> + <string name="permlab_systemAlertWindow" msgid="7238805243128138690">"This app can appear on top of other apps"</string> + <string name="permdesc_systemAlertWindow" msgid="2393776099672266188">"This app can appear on top of other apps or other parts of the screen. This may interfere with normal app usage and change the way that other apps appear."</string> <string name="permlab_persistentActivity" msgid="8841113627955563938">"make app always run"</string> <string name="permdesc_persistentActivity" product="tablet" msgid="8525189272329086137">"Allows the app to make parts of itself persistent in memory. This can limit the memory available to other apps, slowing down the tablet."</string> <string name="permdesc_persistentActivity" product="tv" msgid="5086862529499103587">"Allows the app to make parts of itself persistent in memory. This can limit memory available to other apps slowing down the TV."</string> @@ -353,51 +343,37 @@ <string name="permdesc_writeContacts" product="tv" msgid="5438230957000018959">"Allows the app to modify the data about your contacts stored on your TV, including the frequency with which you\'ve called, emailed or communicated in other ways with specific contacts. This permission allows apps to delete contact data."</string> <string name="permdesc_writeContacts" product="default" msgid="589869224625163558">"Allows the app to modify the data about your contacts stored on your phone, including the frequency with which you\'ve called, emailed or communicated in other ways with specific contacts. This permission allows apps to delete contact data."</string> <string name="permlab_readCallLog" msgid="3478133184624102739">"read call log"</string> - <!-- no translation found for permdesc_readCallLog (3204122446463552146) --> - <skip /> + <string name="permdesc_readCallLog" msgid="3204122446463552146">"This app can read your call history."</string> <string name="permlab_writeCallLog" msgid="8552045664743499354">"write call log"</string> <string name="permdesc_writeCallLog" product="tablet" msgid="6661806062274119245">"Allows the app to modify your tablet\'s call log, including data about incoming and outgoing calls. Malicious apps may use this to erase or modify your call log."</string> <string name="permdesc_writeCallLog" product="tv" msgid="4225034892248398019">"Allows the app to modify your TV\'s call log, including data about incoming and outgoing calls. Malicious apps may use this to erase or modify your call log."</string> <string name="permdesc_writeCallLog" product="default" msgid="683941736352787842">"Allows the app to modify your phone\'s call log, including data about incoming and outgoing calls. Malicious apps may use this to erase or modify your call log."</string> <string name="permlab_bodySensors" msgid="4683341291818520277">"access body sensors (like heart rate monitors)"</string> <string name="permdesc_bodySensors" product="default" msgid="4380015021754180431">"Allows the app to access data from sensors that monitor your physical condition, such as your heart rate."</string> - <!-- no translation found for permlab_readCalendar (6716116972752441641) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (4993979255403945892) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (8837931557573064315) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (4373978642145196715) --> - <skip /> + <string name="permlab_readCalendar" msgid="6716116972752441641">"Read calendar events and details"</string> + <string name="permdesc_readCalendar" product="tablet" msgid="4993979255403945892">"This app can read all calendar events stored on your tablet and share or save your calendar data."</string> + <string name="permdesc_readCalendar" product="tv" msgid="8837931557573064315">"This app can read all calendar events stored on your TV and share or save your calendar data."</string> + <string name="permdesc_readCalendar" product="default" msgid="4373978642145196715">"This app can read all calendar events stored on your phone and share or save your calendar data."</string> <string name="permlab_writeCalendar" msgid="8438874755193825647">"add or modify calendar events and send emails to guests without owners\' knowledge"</string> - <!-- no translation found for permdesc_writeCalendar (1675270619903625982) --> - <skip /> - <!-- no translation found for permdesc_writeCalendar (9017809326268135866) --> - <skip /> - <!-- no translation found for permdesc_writeCalendar (7592791790516943173) --> - <skip /> + <string name="permdesc_writeCalendar" product="tablet" msgid="1675270619903625982">"This app can add, remove or change calendar events on your tablet. This app can send messages that may appear to come from calendar owners or change events without notifying their owners."</string> + <string name="permdesc_writeCalendar" product="tv" msgid="9017809326268135866">"This app can add, remove or change calendar events on your TV. This app can send messages that may appear to come from calendar owners or change events without notifying their owners."</string> + <string name="permdesc_writeCalendar" product="default" msgid="7592791790516943173">"This app can add, remove or change calendar events on your phone. This app can send messages that may appear to come from calendar owners or change events without notifying their owners."</string> <string name="permlab_accessLocationExtraCommands" msgid="2836308076720553837">"access extra location provider commands"</string> <string name="permdesc_accessLocationExtraCommands" msgid="6078307221056649927">"Allows the app to access extra location provider commands. This may allow the app to interfere with the operation of the GPS or other location sources."</string> <string name="permlab_accessFineLocation" msgid="251034415460950944">"access precise location (GPS and network-based)"</string> - <!-- no translation found for permdesc_accessFineLocation (5821994817969957884) --> - <skip /> + <string name="permdesc_accessFineLocation" msgid="5821994817969957884">"This app can get your location based on GPS or network location sources such as phone masts and Wi-Fi networks. These location services must be turned on and available on your phone for the app to be able to use them. This may increase battery consumption."</string> <string name="permlab_accessCoarseLocation" msgid="7715277613928539434">"access approximate location (network-based)"</string> - <!-- no translation found for permdesc_accessCoarseLocation (3373266766487862426) --> - <skip /> - <!-- no translation found for permdesc_accessCoarseLocation (1884022719818788511) --> - <skip /> - <!-- no translation found for permdesc_accessCoarseLocation (7788009094906196995) --> - <skip /> + <string name="permdesc_accessCoarseLocation" product="tablet" msgid="3373266766487862426">"This app can pick up your location based on network sources such as phone masts and Wi-Fi networks. These location services must be turned on and available on your tablet for the app to be able to use them."</string> + <string name="permdesc_accessCoarseLocation" product="tv" msgid="1884022719818788511">"This app can pick up your location based on network sources such as mobile towers and Wi-Fi networks. These location services must be turned on and available on your TV for the app to be able to use them."</string> + <string name="permdesc_accessCoarseLocation" product="default" msgid="7788009094906196995">"This app can get your location based on network sources such as phone masts and Wi-Fi networks. These location services must be turned on and available on your phone for the app to be able to use them."</string> <string name="permlab_modifyAudioSettings" msgid="6095859937069146086">"change your audio settings"</string> <string name="permdesc_modifyAudioSettings" msgid="3522565366806248517">"Allows the app to modify global audio settings such as volume and which speaker is used for output."</string> <string name="permlab_recordAudio" msgid="3876049771427466323">"record audio"</string> - <!-- no translation found for permdesc_recordAudio (4245930455135321433) --> - <skip /> + <string name="permdesc_recordAudio" msgid="4245930455135321433">"This app can record audio using the microphone at any time."</string> <string name="permlab_sim_communication" msgid="2935852302216852065">"send commands to the SIM"</string> <string name="permdesc_sim_communication" msgid="5725159654279639498">"Allows the app to send commands to the SIM. This is very dangerous."</string> <string name="permlab_camera" msgid="3616391919559751192">"take pictures and videos"</string> - <!-- no translation found for permdesc_camera (5392231870049240670) --> - <skip /> + <string name="permdesc_camera" msgid="5392231870049240670">"This app can take pictures and record videos using the camera at any time."</string> <string name="permlab_vibrate" msgid="7696427026057705834">"control vibration"</string> <string name="permdesc_vibrate" msgid="6284989245902300945">"Allows the app to control the vibrator."</string> <string name="permlab_callPhone" msgid="3925836347681847954">"directly call phone numbers"</string> diff --git a/core/res/res/values-en-rGB/strings.xml b/core/res/res/values-en-rGB/strings.xml index b13d67617fb7..071a302aff7e 100644 --- a/core/res/res/values-en-rGB/strings.xml +++ b/core/res/res/values-en-rGB/strings.xml @@ -46,8 +46,7 @@ <string name="defaultMsisdnAlphaTag" msgid="2850889754919584674">"MSISDN1"</string> <string name="mmiError" msgid="5154499457739052907">"Connection problem or invalid MMI code."</string> <string name="mmiFdnError" msgid="5224398216385316471">"Operation is restricted to fixed dialling numbers only."</string> - <!-- no translation found for mmiErrorWhileRoaming (762488890299284230) --> - <skip /> + <string name="mmiErrorWhileRoaming" msgid="762488890299284230">"Cannot change call forwarding settings from your phone while you are roaming."</string> <string name="serviceEnabled" msgid="8147278346414714315">"Service was enabled."</string> <string name="serviceEnabledFor" msgid="6856228140453471041">"Service was enabled for:"</string> <string name="serviceDisabled" msgid="1937553226592516411">"Service has been disabled."</string> @@ -98,10 +97,8 @@ <string name="RestrictedOnVoiceData" msgid="996636487106171320">"Voice/Data services are blocked."</string> <string name="RestrictedOnVoiceSms" msgid="1888588152792023873">"Voice/SMS services are blocked."</string> <string name="RestrictedOnAll" msgid="5643028264466092821">"All voice/data/SMS services are blocked."</string> - <!-- no translation found for NetworkPreferenceSwitchTitle (4008877505368566980) --> - <skip /> - <!-- no translation found for NetworkPreferenceSwitchSummary (7335915397439759249) --> - <skip /> + <string name="NetworkPreferenceSwitchTitle" msgid="4008877505368566980">"Can’t find network"</string> + <string name="NetworkPreferenceSwitchSummary" msgid="7335915397439759249">"To improve signal, try changing the type selected at Settings > Mobile networks > Preferred network type."</string> <string name="peerTtyModeFull" msgid="6165351790010341421">"Peer requested TTY Mode FULL"</string> <string name="peerTtyModeHco" msgid="5728602160669216784">"Peer requested TTY Mode HCO"</string> <string name="peerTtyModeVco" msgid="1742404978686538049">"Peer requested TTY Mode VCO"</string> @@ -185,10 +182,8 @@ <string name="work_profile_deleted_description" msgid="6305147513054341102">"Work profile deleted due to missing admin app."</string> <string name="work_profile_deleted_details" msgid="226615743462361248">"The work profile admin app is either missing or corrupted. As a result, your work profile and related data have been deleted. Contact your administrator for assistance."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="6019770344820507579">"Your work profile is no longer available on this device."</string> - <!-- no translation found for network_logging_notification_title (1805392571290161924) --> - <skip /> - <!-- no translation found for network_logging_notification_text (4448072433371155729) --> - <skip /> + <string name="network_logging_notification_title" msgid="1805392571290161924">"Network traffic is being monitored"</string> + <string name="network_logging_notification_text" msgid="4448072433371155729">"Tap for more details"</string> <string name="factory_reset_warning" msgid="5423253125642394387">"Your device will be erased"</string> <string name="factory_reset_message" msgid="4905025204141900666">"The admin app is missing components or corrupted, and can\'t be used. Your device will now be erased. Contact your administrator for assistance."</string> <string name="me" msgid="6545696007631404292">"Me"</string> @@ -306,12 +301,9 @@ <string name="permlab_sendSms" msgid="7544599214260982981">"send and view SMS messages"</string> <string name="permdesc_sendSms" msgid="7094729298204937667">"Allows the app to send SMS messages. This may result in unexpected charges. Malicious apps may cost you money by sending messages without your confirmation."</string> <string name="permlab_readSms" msgid="8745086572213270480">"read your text messages (SMS or MMS)"</string> - <!-- no translation found for permdesc_readSms (4741697454888074891) --> - <skip /> - <!-- no translation found for permdesc_readSms (5796670395641116592) --> - <skip /> - <!-- no translation found for permdesc_readSms (6826832415656437652) --> - <skip /> + <string name="permdesc_readSms" product="tablet" msgid="4741697454888074891">"This app can read all SMS (text) messages stored on your tablet."</string> + <string name="permdesc_readSms" product="tv" msgid="5796670395641116592">"This app can read all SMS (text) messages stored on your TV."</string> + <string name="permdesc_readSms" product="default" msgid="6826832415656437652">"This app can read all SMS (text) messages stored on your phone."</string> <string name="permlab_receiveWapPush" msgid="5991398711936590410">"receive text messages (WAP)"</string> <string name="permdesc_receiveWapPush" msgid="748232190220583385">"Allows the app to receive and process WAP messages. This permission includes the ability to monitor or delete messages sent to you without showing them to you."</string> <string name="permlab_getTasks" msgid="6466095396623933906">"retrieve running apps"</string> @@ -324,10 +316,8 @@ <string name="permdesc_enableCarMode" msgid="4853187425751419467">"Allows the app to enable the car mode."</string> <string name="permlab_killBackgroundProcesses" msgid="3914026687420177202">"close other apps"</string> <string name="permdesc_killBackgroundProcesses" msgid="4593353235959733119">"Allows the app to end background processes of other apps. This may cause other apps to stop running."</string> - <!-- no translation found for permlab_systemAlertWindow (7238805243128138690) --> - <skip /> - <!-- no translation found for permdesc_systemAlertWindow (2393776099672266188) --> - <skip /> + <string name="permlab_systemAlertWindow" msgid="7238805243128138690">"This app can appear on top of other apps"</string> + <string name="permdesc_systemAlertWindow" msgid="2393776099672266188">"This app can appear on top of other apps or other parts of the screen. This may interfere with normal app usage and change the way that other apps appear."</string> <string name="permlab_persistentActivity" msgid="8841113627955563938">"make app always run"</string> <string name="permdesc_persistentActivity" product="tablet" msgid="8525189272329086137">"Allows the app to make parts of itself persistent in memory. This can limit the memory available to other apps, slowing down the tablet."</string> <string name="permdesc_persistentActivity" product="tv" msgid="5086862529499103587">"Allows the app to make parts of itself persistent in memory. This can limit memory available to other apps slowing down the TV."</string> @@ -353,51 +343,37 @@ <string name="permdesc_writeContacts" product="tv" msgid="5438230957000018959">"Allows the app to modify the data about your contacts stored on your TV, including the frequency with which you\'ve called, emailed or communicated in other ways with specific contacts. This permission allows apps to delete contact data."</string> <string name="permdesc_writeContacts" product="default" msgid="589869224625163558">"Allows the app to modify the data about your contacts stored on your phone, including the frequency with which you\'ve called, emailed or communicated in other ways with specific contacts. This permission allows apps to delete contact data."</string> <string name="permlab_readCallLog" msgid="3478133184624102739">"read call log"</string> - <!-- no translation found for permdesc_readCallLog (3204122446463552146) --> - <skip /> + <string name="permdesc_readCallLog" msgid="3204122446463552146">"This app can read your call history."</string> <string name="permlab_writeCallLog" msgid="8552045664743499354">"write call log"</string> <string name="permdesc_writeCallLog" product="tablet" msgid="6661806062274119245">"Allows the app to modify your tablet\'s call log, including data about incoming and outgoing calls. Malicious apps may use this to erase or modify your call log."</string> <string name="permdesc_writeCallLog" product="tv" msgid="4225034892248398019">"Allows the app to modify your TV\'s call log, including data about incoming and outgoing calls. Malicious apps may use this to erase or modify your call log."</string> <string name="permdesc_writeCallLog" product="default" msgid="683941736352787842">"Allows the app to modify your phone\'s call log, including data about incoming and outgoing calls. Malicious apps may use this to erase or modify your call log."</string> <string name="permlab_bodySensors" msgid="4683341291818520277">"access body sensors (like heart rate monitors)"</string> <string name="permdesc_bodySensors" product="default" msgid="4380015021754180431">"Allows the app to access data from sensors that monitor your physical condition, such as your heart rate."</string> - <!-- no translation found for permlab_readCalendar (6716116972752441641) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (4993979255403945892) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (8837931557573064315) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (4373978642145196715) --> - <skip /> + <string name="permlab_readCalendar" msgid="6716116972752441641">"Read calendar events and details"</string> + <string name="permdesc_readCalendar" product="tablet" msgid="4993979255403945892">"This app can read all calendar events stored on your tablet and share or save your calendar data."</string> + <string name="permdesc_readCalendar" product="tv" msgid="8837931557573064315">"This app can read all calendar events stored on your TV and share or save your calendar data."</string> + <string name="permdesc_readCalendar" product="default" msgid="4373978642145196715">"This app can read all calendar events stored on your phone and share or save your calendar data."</string> <string name="permlab_writeCalendar" msgid="8438874755193825647">"add or modify calendar events and send emails to guests without owners\' knowledge"</string> - <!-- no translation found for permdesc_writeCalendar (1675270619903625982) --> - <skip /> - <!-- no translation found for permdesc_writeCalendar (9017809326268135866) --> - <skip /> - <!-- no translation found for permdesc_writeCalendar (7592791790516943173) --> - <skip /> + <string name="permdesc_writeCalendar" product="tablet" msgid="1675270619903625982">"This app can add, remove or change calendar events on your tablet. This app can send messages that may appear to come from calendar owners or change events without notifying their owners."</string> + <string name="permdesc_writeCalendar" product="tv" msgid="9017809326268135866">"This app can add, remove or change calendar events on your TV. This app can send messages that may appear to come from calendar owners or change events without notifying their owners."</string> + <string name="permdesc_writeCalendar" product="default" msgid="7592791790516943173">"This app can add, remove or change calendar events on your phone. This app can send messages that may appear to come from calendar owners or change events without notifying their owners."</string> <string name="permlab_accessLocationExtraCommands" msgid="2836308076720553837">"access extra location provider commands"</string> <string name="permdesc_accessLocationExtraCommands" msgid="6078307221056649927">"Allows the app to access extra location provider commands. This may allow the app to interfere with the operation of the GPS or other location sources."</string> <string name="permlab_accessFineLocation" msgid="251034415460950944">"access precise location (GPS and network-based)"</string> - <!-- no translation found for permdesc_accessFineLocation (5821994817969957884) --> - <skip /> + <string name="permdesc_accessFineLocation" msgid="5821994817969957884">"This app can get your location based on GPS or network location sources such as phone masts and Wi-Fi networks. These location services must be turned on and available on your phone for the app to be able to use them. This may increase battery consumption."</string> <string name="permlab_accessCoarseLocation" msgid="7715277613928539434">"access approximate location (network-based)"</string> - <!-- no translation found for permdesc_accessCoarseLocation (3373266766487862426) --> - <skip /> - <!-- no translation found for permdesc_accessCoarseLocation (1884022719818788511) --> - <skip /> - <!-- no translation found for permdesc_accessCoarseLocation (7788009094906196995) --> - <skip /> + <string name="permdesc_accessCoarseLocation" product="tablet" msgid="3373266766487862426">"This app can pick up your location based on network sources such as phone masts and Wi-Fi networks. These location services must be turned on and available on your tablet for the app to be able to use them."</string> + <string name="permdesc_accessCoarseLocation" product="tv" msgid="1884022719818788511">"This app can pick up your location based on network sources such as mobile towers and Wi-Fi networks. These location services must be turned on and available on your TV for the app to be able to use them."</string> + <string name="permdesc_accessCoarseLocation" product="default" msgid="7788009094906196995">"This app can get your location based on network sources such as phone masts and Wi-Fi networks. These location services must be turned on and available on your phone for the app to be able to use them."</string> <string name="permlab_modifyAudioSettings" msgid="6095859937069146086">"change your audio settings"</string> <string name="permdesc_modifyAudioSettings" msgid="3522565366806248517">"Allows the app to modify global audio settings such as volume and which speaker is used for output."</string> <string name="permlab_recordAudio" msgid="3876049771427466323">"record audio"</string> - <!-- no translation found for permdesc_recordAudio (4245930455135321433) --> - <skip /> + <string name="permdesc_recordAudio" msgid="4245930455135321433">"This app can record audio using the microphone at any time."</string> <string name="permlab_sim_communication" msgid="2935852302216852065">"send commands to the SIM"</string> <string name="permdesc_sim_communication" msgid="5725159654279639498">"Allows the app to send commands to the SIM. This is very dangerous."</string> <string name="permlab_camera" msgid="3616391919559751192">"take pictures and videos"</string> - <!-- no translation found for permdesc_camera (5392231870049240670) --> - <skip /> + <string name="permdesc_camera" msgid="5392231870049240670">"This app can take pictures and record videos using the camera at any time."</string> <string name="permlab_vibrate" msgid="7696427026057705834">"control vibration"</string> <string name="permdesc_vibrate" msgid="6284989245902300945">"Allows the app to control the vibrator."</string> <string name="permlab_callPhone" msgid="3925836347681847954">"directly call phone numbers"</string> diff --git a/core/res/res/values-en-rIN/strings.xml b/core/res/res/values-en-rIN/strings.xml index b13d67617fb7..071a302aff7e 100644 --- a/core/res/res/values-en-rIN/strings.xml +++ b/core/res/res/values-en-rIN/strings.xml @@ -46,8 +46,7 @@ <string name="defaultMsisdnAlphaTag" msgid="2850889754919584674">"MSISDN1"</string> <string name="mmiError" msgid="5154499457739052907">"Connection problem or invalid MMI code."</string> <string name="mmiFdnError" msgid="5224398216385316471">"Operation is restricted to fixed dialling numbers only."</string> - <!-- no translation found for mmiErrorWhileRoaming (762488890299284230) --> - <skip /> + <string name="mmiErrorWhileRoaming" msgid="762488890299284230">"Cannot change call forwarding settings from your phone while you are roaming."</string> <string name="serviceEnabled" msgid="8147278346414714315">"Service was enabled."</string> <string name="serviceEnabledFor" msgid="6856228140453471041">"Service was enabled for:"</string> <string name="serviceDisabled" msgid="1937553226592516411">"Service has been disabled."</string> @@ -98,10 +97,8 @@ <string name="RestrictedOnVoiceData" msgid="996636487106171320">"Voice/Data services are blocked."</string> <string name="RestrictedOnVoiceSms" msgid="1888588152792023873">"Voice/SMS services are blocked."</string> <string name="RestrictedOnAll" msgid="5643028264466092821">"All voice/data/SMS services are blocked."</string> - <!-- no translation found for NetworkPreferenceSwitchTitle (4008877505368566980) --> - <skip /> - <!-- no translation found for NetworkPreferenceSwitchSummary (7335915397439759249) --> - <skip /> + <string name="NetworkPreferenceSwitchTitle" msgid="4008877505368566980">"Can’t find network"</string> + <string name="NetworkPreferenceSwitchSummary" msgid="7335915397439759249">"To improve signal, try changing the type selected at Settings > Mobile networks > Preferred network type."</string> <string name="peerTtyModeFull" msgid="6165351790010341421">"Peer requested TTY Mode FULL"</string> <string name="peerTtyModeHco" msgid="5728602160669216784">"Peer requested TTY Mode HCO"</string> <string name="peerTtyModeVco" msgid="1742404978686538049">"Peer requested TTY Mode VCO"</string> @@ -185,10 +182,8 @@ <string name="work_profile_deleted_description" msgid="6305147513054341102">"Work profile deleted due to missing admin app."</string> <string name="work_profile_deleted_details" msgid="226615743462361248">"The work profile admin app is either missing or corrupted. As a result, your work profile and related data have been deleted. Contact your administrator for assistance."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="6019770344820507579">"Your work profile is no longer available on this device."</string> - <!-- no translation found for network_logging_notification_title (1805392571290161924) --> - <skip /> - <!-- no translation found for network_logging_notification_text (4448072433371155729) --> - <skip /> + <string name="network_logging_notification_title" msgid="1805392571290161924">"Network traffic is being monitored"</string> + <string name="network_logging_notification_text" msgid="4448072433371155729">"Tap for more details"</string> <string name="factory_reset_warning" msgid="5423253125642394387">"Your device will be erased"</string> <string name="factory_reset_message" msgid="4905025204141900666">"The admin app is missing components or corrupted, and can\'t be used. Your device will now be erased. Contact your administrator for assistance."</string> <string name="me" msgid="6545696007631404292">"Me"</string> @@ -306,12 +301,9 @@ <string name="permlab_sendSms" msgid="7544599214260982981">"send and view SMS messages"</string> <string name="permdesc_sendSms" msgid="7094729298204937667">"Allows the app to send SMS messages. This may result in unexpected charges. Malicious apps may cost you money by sending messages without your confirmation."</string> <string name="permlab_readSms" msgid="8745086572213270480">"read your text messages (SMS or MMS)"</string> - <!-- no translation found for permdesc_readSms (4741697454888074891) --> - <skip /> - <!-- no translation found for permdesc_readSms (5796670395641116592) --> - <skip /> - <!-- no translation found for permdesc_readSms (6826832415656437652) --> - <skip /> + <string name="permdesc_readSms" product="tablet" msgid="4741697454888074891">"This app can read all SMS (text) messages stored on your tablet."</string> + <string name="permdesc_readSms" product="tv" msgid="5796670395641116592">"This app can read all SMS (text) messages stored on your TV."</string> + <string name="permdesc_readSms" product="default" msgid="6826832415656437652">"This app can read all SMS (text) messages stored on your phone."</string> <string name="permlab_receiveWapPush" msgid="5991398711936590410">"receive text messages (WAP)"</string> <string name="permdesc_receiveWapPush" msgid="748232190220583385">"Allows the app to receive and process WAP messages. This permission includes the ability to monitor or delete messages sent to you without showing them to you."</string> <string name="permlab_getTasks" msgid="6466095396623933906">"retrieve running apps"</string> @@ -324,10 +316,8 @@ <string name="permdesc_enableCarMode" msgid="4853187425751419467">"Allows the app to enable the car mode."</string> <string name="permlab_killBackgroundProcesses" msgid="3914026687420177202">"close other apps"</string> <string name="permdesc_killBackgroundProcesses" msgid="4593353235959733119">"Allows the app to end background processes of other apps. This may cause other apps to stop running."</string> - <!-- no translation found for permlab_systemAlertWindow (7238805243128138690) --> - <skip /> - <!-- no translation found for permdesc_systemAlertWindow (2393776099672266188) --> - <skip /> + <string name="permlab_systemAlertWindow" msgid="7238805243128138690">"This app can appear on top of other apps"</string> + <string name="permdesc_systemAlertWindow" msgid="2393776099672266188">"This app can appear on top of other apps or other parts of the screen. This may interfere with normal app usage and change the way that other apps appear."</string> <string name="permlab_persistentActivity" msgid="8841113627955563938">"make app always run"</string> <string name="permdesc_persistentActivity" product="tablet" msgid="8525189272329086137">"Allows the app to make parts of itself persistent in memory. This can limit the memory available to other apps, slowing down the tablet."</string> <string name="permdesc_persistentActivity" product="tv" msgid="5086862529499103587">"Allows the app to make parts of itself persistent in memory. This can limit memory available to other apps slowing down the TV."</string> @@ -353,51 +343,37 @@ <string name="permdesc_writeContacts" product="tv" msgid="5438230957000018959">"Allows the app to modify the data about your contacts stored on your TV, including the frequency with which you\'ve called, emailed or communicated in other ways with specific contacts. This permission allows apps to delete contact data."</string> <string name="permdesc_writeContacts" product="default" msgid="589869224625163558">"Allows the app to modify the data about your contacts stored on your phone, including the frequency with which you\'ve called, emailed or communicated in other ways with specific contacts. This permission allows apps to delete contact data."</string> <string name="permlab_readCallLog" msgid="3478133184624102739">"read call log"</string> - <!-- no translation found for permdesc_readCallLog (3204122446463552146) --> - <skip /> + <string name="permdesc_readCallLog" msgid="3204122446463552146">"This app can read your call history."</string> <string name="permlab_writeCallLog" msgid="8552045664743499354">"write call log"</string> <string name="permdesc_writeCallLog" product="tablet" msgid="6661806062274119245">"Allows the app to modify your tablet\'s call log, including data about incoming and outgoing calls. Malicious apps may use this to erase or modify your call log."</string> <string name="permdesc_writeCallLog" product="tv" msgid="4225034892248398019">"Allows the app to modify your TV\'s call log, including data about incoming and outgoing calls. Malicious apps may use this to erase or modify your call log."</string> <string name="permdesc_writeCallLog" product="default" msgid="683941736352787842">"Allows the app to modify your phone\'s call log, including data about incoming and outgoing calls. Malicious apps may use this to erase or modify your call log."</string> <string name="permlab_bodySensors" msgid="4683341291818520277">"access body sensors (like heart rate monitors)"</string> <string name="permdesc_bodySensors" product="default" msgid="4380015021754180431">"Allows the app to access data from sensors that monitor your physical condition, such as your heart rate."</string> - <!-- no translation found for permlab_readCalendar (6716116972752441641) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (4993979255403945892) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (8837931557573064315) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (4373978642145196715) --> - <skip /> + <string name="permlab_readCalendar" msgid="6716116972752441641">"Read calendar events and details"</string> + <string name="permdesc_readCalendar" product="tablet" msgid="4993979255403945892">"This app can read all calendar events stored on your tablet and share or save your calendar data."</string> + <string name="permdesc_readCalendar" product="tv" msgid="8837931557573064315">"This app can read all calendar events stored on your TV and share or save your calendar data."</string> + <string name="permdesc_readCalendar" product="default" msgid="4373978642145196715">"This app can read all calendar events stored on your phone and share or save your calendar data."</string> <string name="permlab_writeCalendar" msgid="8438874755193825647">"add or modify calendar events and send emails to guests without owners\' knowledge"</string> - <!-- no translation found for permdesc_writeCalendar (1675270619903625982) --> - <skip /> - <!-- no translation found for permdesc_writeCalendar (9017809326268135866) --> - <skip /> - <!-- no translation found for permdesc_writeCalendar (7592791790516943173) --> - <skip /> + <string name="permdesc_writeCalendar" product="tablet" msgid="1675270619903625982">"This app can add, remove or change calendar events on your tablet. This app can send messages that may appear to come from calendar owners or change events without notifying their owners."</string> + <string name="permdesc_writeCalendar" product="tv" msgid="9017809326268135866">"This app can add, remove or change calendar events on your TV. This app can send messages that may appear to come from calendar owners or change events without notifying their owners."</string> + <string name="permdesc_writeCalendar" product="default" msgid="7592791790516943173">"This app can add, remove or change calendar events on your phone. This app can send messages that may appear to come from calendar owners or change events without notifying their owners."</string> <string name="permlab_accessLocationExtraCommands" msgid="2836308076720553837">"access extra location provider commands"</string> <string name="permdesc_accessLocationExtraCommands" msgid="6078307221056649927">"Allows the app to access extra location provider commands. This may allow the app to interfere with the operation of the GPS or other location sources."</string> <string name="permlab_accessFineLocation" msgid="251034415460950944">"access precise location (GPS and network-based)"</string> - <!-- no translation found for permdesc_accessFineLocation (5821994817969957884) --> - <skip /> + <string name="permdesc_accessFineLocation" msgid="5821994817969957884">"This app can get your location based on GPS or network location sources such as phone masts and Wi-Fi networks. These location services must be turned on and available on your phone for the app to be able to use them. This may increase battery consumption."</string> <string name="permlab_accessCoarseLocation" msgid="7715277613928539434">"access approximate location (network-based)"</string> - <!-- no translation found for permdesc_accessCoarseLocation (3373266766487862426) --> - <skip /> - <!-- no translation found for permdesc_accessCoarseLocation (1884022719818788511) --> - <skip /> - <!-- no translation found for permdesc_accessCoarseLocation (7788009094906196995) --> - <skip /> + <string name="permdesc_accessCoarseLocation" product="tablet" msgid="3373266766487862426">"This app can pick up your location based on network sources such as phone masts and Wi-Fi networks. These location services must be turned on and available on your tablet for the app to be able to use them."</string> + <string name="permdesc_accessCoarseLocation" product="tv" msgid="1884022719818788511">"This app can pick up your location based on network sources such as mobile towers and Wi-Fi networks. These location services must be turned on and available on your TV for the app to be able to use them."</string> + <string name="permdesc_accessCoarseLocation" product="default" msgid="7788009094906196995">"This app can get your location based on network sources such as phone masts and Wi-Fi networks. These location services must be turned on and available on your phone for the app to be able to use them."</string> <string name="permlab_modifyAudioSettings" msgid="6095859937069146086">"change your audio settings"</string> <string name="permdesc_modifyAudioSettings" msgid="3522565366806248517">"Allows the app to modify global audio settings such as volume and which speaker is used for output."</string> <string name="permlab_recordAudio" msgid="3876049771427466323">"record audio"</string> - <!-- no translation found for permdesc_recordAudio (4245930455135321433) --> - <skip /> + <string name="permdesc_recordAudio" msgid="4245930455135321433">"This app can record audio using the microphone at any time."</string> <string name="permlab_sim_communication" msgid="2935852302216852065">"send commands to the SIM"</string> <string name="permdesc_sim_communication" msgid="5725159654279639498">"Allows the app to send commands to the SIM. This is very dangerous."</string> <string name="permlab_camera" msgid="3616391919559751192">"take pictures and videos"</string> - <!-- no translation found for permdesc_camera (5392231870049240670) --> - <skip /> + <string name="permdesc_camera" msgid="5392231870049240670">"This app can take pictures and record videos using the camera at any time."</string> <string name="permlab_vibrate" msgid="7696427026057705834">"control vibration"</string> <string name="permdesc_vibrate" msgid="6284989245902300945">"Allows the app to control the vibrator."</string> <string name="permlab_callPhone" msgid="3925836347681847954">"directly call phone numbers"</string> diff --git a/core/res/res/values-es-rUS/strings.xml b/core/res/res/values-es-rUS/strings.xml index 5ca1baaef202..cbff5bb88c64 100644 --- a/core/res/res/values-es-rUS/strings.xml +++ b/core/res/res/values-es-rUS/strings.xml @@ -46,8 +46,7 @@ <string name="defaultMsisdnAlphaTag" msgid="2850889754919584674">"MSISDN1"</string> <string name="mmiError" msgid="5154499457739052907">"Problema de conexión o código incorrecto de MMI."</string> <string name="mmiFdnError" msgid="5224398216385316471">"La operación está limitada a números de marcación fija."</string> - <!-- no translation found for mmiErrorWhileRoaming (762488890299284230) --> - <skip /> + <string name="mmiErrorWhileRoaming" msgid="762488890299284230">"No se puede cambiar la configuración de reenvío de llamadas de tu teléfono mientras usas el servicio de roaming."</string> <string name="serviceEnabled" msgid="8147278346414714315">"Se ha activado el servicio."</string> <string name="serviceEnabledFor" msgid="6856228140453471041">"Se activó el servicio para:"</string> <string name="serviceDisabled" msgid="1937553226592516411">"Se ha desactivado el servicio."</string> @@ -98,10 +97,8 @@ <string name="RestrictedOnVoiceData" msgid="996636487106171320">"Los servicios de voz o datos están bloqueados."</string> <string name="RestrictedOnVoiceSms" msgid="1888588152792023873">"Los servicios de voz/SMS están bloqueados."</string> <string name="RestrictedOnAll" msgid="5643028264466092821">"Todos los servicios de voz, datos o SMS están bloqueados."</string> - <!-- no translation found for NetworkPreferenceSwitchTitle (4008877505368566980) --> - <skip /> - <!-- no translation found for NetworkPreferenceSwitchSummary (7335915397439759249) --> - <skip /> + <string name="NetworkPreferenceSwitchTitle" msgid="4008877505368566980">"No se puede establecer conexión con la red"</string> + <string name="NetworkPreferenceSwitchSummary" msgid="7335915397439759249">"Para mejorar la recepción, intenta cambiar el tipo de red seleccionado en Configuración > Redes móviles > Tipo de red preferido."</string> <string name="peerTtyModeFull" msgid="6165351790010341421">"El dispositivo del mismo nivel solicitó el modo TTY FULL."</string> <string name="peerTtyModeHco" msgid="5728602160669216784">"El dispositivo del mismo nivel solicitó el modo TTY HCO."</string> <string name="peerTtyModeVco" msgid="1742404978686538049">"El dispositivo del mismo nivel solicitó el modo TTY VCO."</string> @@ -185,10 +182,8 @@ <string name="work_profile_deleted_description" msgid="6305147513054341102">"Se eliminó el perfil de trabajo debido a la falta de una aplicación de administración."</string> <string name="work_profile_deleted_details" msgid="226615743462361248">"La aplicación de administración de perfil de trabajo no se encuentra o está dañada. Por lo tanto, se eliminaron tu perfil de trabajo y los datos relacionados. Para obtener asistencia, comunícate con el administrador."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="6019770344820507579">"Tu perfil de trabajo ya no está disponible en este dispositivo."</string> - <!-- no translation found for network_logging_notification_title (1805392571290161924) --> - <skip /> - <!-- no translation found for network_logging_notification_text (4448072433371155729) --> - <skip /> + <string name="network_logging_notification_title" msgid="1805392571290161924">"Se está controlando el tráfico de red"</string> + <string name="network_logging_notification_text" msgid="4448072433371155729">"Presiona para ver más detalles"</string> <string name="factory_reset_warning" msgid="5423253125642394387">"Se borrarán los datos del dispositivo"</string> <string name="factory_reset_message" msgid="4905025204141900666">"La aplicación de administración no cuenta con algunos componentes o está dañada, de modo que no puede usarse. Se borrarán los datos del dispositivo. Para obtener asistencia, comunícate con el administrador."</string> <string name="me" msgid="6545696007631404292">"Yo"</string> @@ -306,12 +301,9 @@ <string name="permlab_sendSms" msgid="7544599214260982981">"enviar y ver mensajes SMS"</string> <string name="permdesc_sendSms" msgid="7094729298204937667">"Permite que la aplicación envíe mensajes SMS, lo que puede generar cargos inesperados. Las aplicaciones malintencionadas pueden causarte gastos imprevistos al enviar mensajes sin tu confirmación."</string> <string name="permlab_readSms" msgid="8745086572213270480">"leer tus mensajes de texto (SMS o MMS)"</string> - <!-- no translation found for permdesc_readSms (4741697454888074891) --> - <skip /> - <!-- no translation found for permdesc_readSms (5796670395641116592) --> - <skip /> - <!-- no translation found for permdesc_readSms (6826832415656437652) --> - <skip /> + <string name="permdesc_readSms" product="tablet" msgid="4741697454888074891">"Esta app puede leer todos los mensajes de texto (SMS) almacenados en tu tablet."</string> + <string name="permdesc_readSms" product="tv" msgid="5796670395641116592">"Esta app puede leer todos los mensajes de texto (SMS) almacenados en tu TV."</string> + <string name="permdesc_readSms" product="default" msgid="6826832415656437652">"Esta app puede leer todos los mensajes de texto (SMS) almacenados en tu teléfono."</string> <string name="permlab_receiveWapPush" msgid="5991398711936590410">"recibir mensajes de texto (WAP)"</string> <string name="permdesc_receiveWapPush" msgid="748232190220583385">"Permite que la aplicación reciba y procese mensajes WAP, lo que significa que podría controlar o eliminar mensajes enviados al usuario sin mostrártelos."</string> <string name="permlab_getTasks" msgid="6466095396623933906">"recuperar aplicaciones en ejecución"</string> @@ -324,10 +316,8 @@ <string name="permdesc_enableCarMode" msgid="4853187425751419467">"Permite que la aplicación habilite el modo automóvil."</string> <string name="permlab_killBackgroundProcesses" msgid="3914026687420177202">"cerrar otras aplicaciones"</string> <string name="permdesc_killBackgroundProcesses" msgid="4593353235959733119">"Este permiso autoriza a la aplicación a interrumpir procesos en segundo plano de otras aplicaciones y puede hacer, por lo tanto, que esas aplicaciones dejen de ejecutarse."</string> - <!-- no translation found for permlab_systemAlertWindow (7238805243128138690) --> - <skip /> - <!-- no translation found for permdesc_systemAlertWindow (2393776099672266188) --> - <skip /> + <string name="permlab_systemAlertWindow" msgid="7238805243128138690">"Esta app puede superponerse a otras apps"</string> + <string name="permdesc_systemAlertWindow" msgid="2393776099672266188">"Esta app puede aparecer sobre otras apps o partes de la pantalla, lo que puede interferir con el uso normal de la app y cambiar la forma en que aparecen otras apps."</string> <string name="permlab_persistentActivity" msgid="8841113627955563938">"hacer que la aplicación se ejecute siempre"</string> <string name="permdesc_persistentActivity" product="tablet" msgid="8525189272329086137">"Permite que la aplicación haga que algunas de sus partes se mantengan persistentes en la memoria. Esto puede limitar la memoria disponible para otras aplicaciones y ralentizar la tablet."</string> <string name="permdesc_persistentActivity" product="tv" msgid="5086862529499103587">"Permite que la aplicación cree partes de sí misma que queden en la memoria. Esta opción puede limitar la memoria disponible para otras aplicaciones y reducir la velocidad de la TV."</string> @@ -353,51 +343,37 @@ <string name="permdesc_writeContacts" product="tv" msgid="5438230957000018959">"Permite que la aplicación modifique datos sobre los contactos almacenados en la TV, lo que incluye la frecuencia de llamadas, correos electrónicos u otro tipo de comunicaciones con contactos específicos. Las aplicaciones pueden usar este permiso para eliminar datos de contactos."</string> <string name="permdesc_writeContacts" product="default" msgid="589869224625163558">"Permite que la aplicación modifique los datos de los contactos almacenados en el dispositivo, incluida la frecuencia con la que los has llamado, les has enviado correos o te has puesto en contacto con ellos de otro modo. Las aplicaciones pueden utilizar este permiso para eliminar datos de contactos."</string> <string name="permlab_readCallLog" msgid="3478133184624102739">"leer el registro de llamadas"</string> - <!-- no translation found for permdesc_readCallLog (3204122446463552146) --> - <skip /> + <string name="permdesc_readCallLog" msgid="3204122446463552146">"Esta app puede leer tu historial de llamadas."</string> <string name="permlab_writeCallLog" msgid="8552045664743499354">"escribir en el registro de llamadas"</string> <string name="permdesc_writeCallLog" product="tablet" msgid="6661806062274119245">"Permite que la aplicación modifique el registro de llamadas de la tablet, incluidos los datos sobre llamadas entrantes y salientes. Las aplicaciones malintencionadas pueden usar este permiso para borrar o modificar el registro de llamadas."</string> <string name="permdesc_writeCallLog" product="tv" msgid="4225034892248398019">"Permite que la aplicación modifique el registro de llamadas de la TV, incluidos los datos sobre llamadas entrantes y salientes. Las aplicaciones malintencionadas pueden usar este permiso para borrar o modificar el registro de llamadas."</string> <string name="permdesc_writeCallLog" product="default" msgid="683941736352787842">"Permite que la aplicación modifique el registro de llamadas del dispositivo, incluidos los datos sobre llamadas entrantes y salientes. Las aplicaciones malintencionadas pueden usar este permiso para borrar o modificar el registro de llamadas."</string> <string name="permlab_bodySensors" msgid="4683341291818520277">"acceder a los sensores corporales (como los monitores de frecuencia cardíaca)"</string> <string name="permdesc_bodySensors" product="default" msgid="4380015021754180431">"Permite que la aplicación acceda a datos de sensores que controlan tu condición física, como el ritmo cardíaco."</string> - <!-- no translation found for permlab_readCalendar (6716116972752441641) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (4993979255403945892) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (8837931557573064315) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (4373978642145196715) --> - <skip /> + <string name="permlab_readCalendar" msgid="6716116972752441641">"Leer eventos y detalles del calendario"</string> + <string name="permdesc_readCalendar" product="tablet" msgid="4993979255403945892">"Esta app puede leer todos los eventos del calendario de tu tablet y compartir o guardar los datos correspondientes."</string> + <string name="permdesc_readCalendar" product="tv" msgid="8837931557573064315">"Esta app puede leer todos los eventos del calendario de tu TV y compartir o guardar los datos correspondientes."</string> + <string name="permdesc_readCalendar" product="default" msgid="4373978642145196715">"Esta app puede leer todos los eventos del calendario de tu teléfono y compartir o guardar los datos correspondientes."</string> <string name="permlab_writeCalendar" msgid="8438874755193825647">"Agregar o modificar los eventos de calendario y enviar un correo a los invitados sin que los propietarios lo sepan"</string> - <!-- no translation found for permdesc_writeCalendar (1675270619903625982) --> - <skip /> - <!-- no translation found for permdesc_writeCalendar (9017809326268135866) --> - <skip /> - <!-- no translation found for permdesc_writeCalendar (7592791790516943173) --> - <skip /> + <string name="permdesc_writeCalendar" product="tablet" msgid="1675270619903625982">"Esta app puede agregar, quitar o cambiar eventos del calendario en tu tablet. Puede enviar mensajes que parecen proceder de propietarios del calendario o cambiar eventos sin notificarlos."</string> + <string name="permdesc_writeCalendar" product="tv" msgid="9017809326268135866">"Esta app puede agregar, quitar o cambiar eventos del calendario en tu TV. Puede enviar mensajes que parecen proceder de propietarios del calendario o cambiar eventos sin notificarlos."</string> + <string name="permdesc_writeCalendar" product="default" msgid="7592791790516943173">"Esta app puede agregar, quitar o cambiar eventos del calendario en tu teléfono. Puede enviar mensajes que parecen proceder de propietarios del calendario o cambiar eventos sin notificarlos."</string> <string name="permlab_accessLocationExtraCommands" msgid="2836308076720553837">"acceder a comandos adicionales del proveedor del lugar"</string> <string name="permdesc_accessLocationExtraCommands" msgid="6078307221056649927">"Permite que la aplicación acceda a comandos adicionales del proveedor de ubicación. Esto puede permitirle a la aplicación interferir con el funcionamiento del GPS o de otras fuentes de ubicación."</string> <string name="permlab_accessFineLocation" msgid="251034415460950944">"acceder a la ubicación precisa (según el GPS y la red)"</string> - <!-- no translation found for permdesc_accessFineLocation (5821994817969957884) --> - <skip /> + <string name="permdesc_accessFineLocation" msgid="5821994817969957884">"Esta app puede obtener tu ubicación a través de GPS o servicios de ubicación que usan fuentes de ubicación de red, como torres de telefonía móvil y redes Wi-Fi. Estos servicios de ubicación deben estar activados y disponibles en tu teléfono para que la app pueda usarlos. Al hacerlo, es posible que se consuma más batería."</string> <string name="permlab_accessCoarseLocation" msgid="7715277613928539434">"acceder a la ubicación aproximada (según la red)"</string> - <!-- no translation found for permdesc_accessCoarseLocation (3373266766487862426) --> - <skip /> - <!-- no translation found for permdesc_accessCoarseLocation (1884022719818788511) --> - <skip /> - <!-- no translation found for permdesc_accessCoarseLocation (7788009094906196995) --> - <skip /> + <string name="permdesc_accessCoarseLocation" product="tablet" msgid="3373266766487862426">"Esta app puede obtener tu ubicación a través de fuentes de red, como torres de telefonía móvil y redes Wi-Fi. Estos servicios de ubicación deben estar activados y disponibles en tu tablet para que la app pueda usarlos."</string> + <string name="permdesc_accessCoarseLocation" product="tv" msgid="1884022719818788511">"Esta app puede obtener tu ubicación a través de fuentes de red, telefonía móvil y redes Wi-Fi. Estos servicios de ubicación deben estar activados y disponibles en tu TV para que la app pueda usarlos."</string> + <string name="permdesc_accessCoarseLocation" product="default" msgid="7788009094906196995">"Esta app puede obtener tu ubicación a través de fuentes de red, como torres de celulares y redes Wi-Fi. Estos servicios de ubicación deben estar activados y disponibles en tu teléfono para que la app pueda usarlos."</string> <string name="permlab_modifyAudioSettings" msgid="6095859937069146086">"cambiar tu configuración de audio"</string> <string name="permdesc_modifyAudioSettings" msgid="3522565366806248517">"Permite que la aplicación modifique la configuración de audio global, por ejemplo, el volumen y el altavoz de salida."</string> <string name="permlab_recordAudio" msgid="3876049771427466323">"grabar audio"</string> - <!-- no translation found for permdesc_recordAudio (4245930455135321433) --> - <skip /> + <string name="permdesc_recordAudio" msgid="4245930455135321433">"Esta app puede grabar audio con el micrófono en cualquier momento."</string> <string name="permlab_sim_communication" msgid="2935852302216852065">"enviar comandos a la tarjeta SIM"</string> <string name="permdesc_sim_communication" msgid="5725159654279639498">"Permite que la aplicación envíe comandos a la tarjeta SIM. Usar este permiso es peligroso."</string> <string name="permlab_camera" msgid="3616391919559751192">"tomar fotografías y grabar videos"</string> - <!-- no translation found for permdesc_camera (5392231870049240670) --> - <skip /> + <string name="permdesc_camera" msgid="5392231870049240670">"Esta app puede tomar fotos y grabar videos con la cámara en cualquier momento."</string> <string name="permlab_vibrate" msgid="7696427026057705834">"controlar la vibración"</string> <string name="permdesc_vibrate" msgid="6284989245902300945">"Permite que la aplicación controle la vibración."</string> <string name="permlab_callPhone" msgid="3925836347681847954">"llamar directamente a números de teléfono"</string> diff --git a/core/res/res/values-es/strings.xml b/core/res/res/values-es/strings.xml index 8736b0ef37cc..93c30796f765 100644 --- a/core/res/res/values-es/strings.xml +++ b/core/res/res/values-es/strings.xml @@ -182,10 +182,8 @@ <string name="work_profile_deleted_description" msgid="6305147513054341102">"Perfil de trabajo eliminado porque falta la aplicación de administración."</string> <string name="work_profile_deleted_details" msgid="226615743462361248">"La aplicación de administración del perfil de trabajo falta o está dañada. Como consecuencia, se han eliminado tu perfil de trabajo y todos los datos asociados. Si necesitas ayuda, ponte en contacto con tu administrador."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="6019770344820507579">"Tu perfil de trabajo ya no está disponible en este dispositivo."</string> - <!-- no translation found for network_logging_notification_title (1805392571290161924) --> - <skip /> - <!-- no translation found for network_logging_notification_text (4448072433371155729) --> - <skip /> + <string name="network_logging_notification_title" msgid="1805392571290161924">"Se está controlando el tráfico de la red"</string> + <string name="network_logging_notification_text" msgid="4448072433371155729">"Toca la notificación para ver más detalles"</string> <string name="factory_reset_warning" msgid="5423253125642394387">"Tu dispositivo se borrará"</string> <string name="factory_reset_message" msgid="4905025204141900666">"La aplicación de administración no se puede usar porque está dañada o le faltan componentes. Tu dispositivo se borrará. Si necesitas ayuda, ponte en contacto con tu administrador."</string> <string name="me" msgid="6545696007631404292">"Yo"</string> diff --git a/core/res/res/values-et-rEE/strings.xml b/core/res/res/values-et-rEE/strings.xml index fad900dab970..7c6c5626d7d9 100644 --- a/core/res/res/values-et-rEE/strings.xml +++ b/core/res/res/values-et-rEE/strings.xml @@ -46,8 +46,7 @@ <string name="defaultMsisdnAlphaTag" msgid="2850889754919584674">"MSISDN1"</string> <string name="mmiError" msgid="5154499457739052907">"Ühendusprobleem või kehtetu MMI-kood."</string> <string name="mmiFdnError" msgid="5224398216385316471">"Toiming on ainult fikseeritud valimisnumbritele."</string> - <!-- no translation found for mmiErrorWhileRoaming (762488890299284230) --> - <skip /> + <string name="mmiErrorWhileRoaming" msgid="762488890299284230">"Kõne suunamise seadeid ei saa rändluse ajal teie telefonis muuta."</string> <string name="serviceEnabled" msgid="8147278346414714315">"Teenus on lubatud."</string> <string name="serviceEnabledFor" msgid="6856228140453471041">"Teenus oli lubatud järgmisele:"</string> <string name="serviceDisabled" msgid="1937553226592516411">"Teenus on keelatud."</string> @@ -98,10 +97,8 @@ <string name="RestrictedOnVoiceData" msgid="996636487106171320">"Hääl-/andmeteenused on blokeeritud."</string> <string name="RestrictedOnVoiceSms" msgid="1888588152792023873">"Hääl-/SMS-teenused on blokeeritud."</string> <string name="RestrictedOnAll" msgid="5643028264466092821">"Kõik hääl-/andme-/SMS-teenused on blokeeritud."</string> - <!-- no translation found for NetworkPreferenceSwitchTitle (4008877505368566980) --> - <skip /> - <!-- no translation found for NetworkPreferenceSwitchSummary (7335915397439759249) --> - <skip /> + <string name="NetworkPreferenceSwitchTitle" msgid="4008877505368566980">"Võrguga ei saa ühendust"</string> + <string name="NetworkPreferenceSwitchSummary" msgid="7335915397439759249">"Vastuvõtu parandamiseks muutke menüüs Seaded > Mobiilsidevõrgud > Eelistatud võrgutüüp valitud tüüpi."</string> <string name="peerTtyModeFull" msgid="6165351790010341421">"Partner taotles TTY-režiimi TÄIELIK"</string> <string name="peerTtyModeHco" msgid="5728602160669216784">"Partner taotles TTY-režiimi HCO"</string> <string name="peerTtyModeVco" msgid="1742404978686538049">"Partner taotles TTY-režiimi VCO"</string> @@ -185,10 +182,8 @@ <string name="work_profile_deleted_description" msgid="6305147513054341102">"Tööprofiil on kustutatud puuduva administraatori rakenduse tõttu."</string> <string name="work_profile_deleted_details" msgid="226615743462361248">"Tööprofiili administraatori rakendus puudub või on rikutud. Seetõttu on teie tööprofiil ja seotud andmed kustutatud. Abi saamiseks võtke ühendust administraatoriga."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="6019770344820507579">"Teie tööprofiil pole selles seadmes enam saadaval."</string> - <!-- no translation found for network_logging_notification_title (1805392571290161924) --> - <skip /> - <!-- no translation found for network_logging_notification_text (4448072433371155729) --> - <skip /> + <string name="network_logging_notification_title" msgid="1805392571290161924">"Võrguliiklust jälgitakse"</string> + <string name="network_logging_notification_text" msgid="4448072433371155729">"Puudutage üksikasjade vaatamiseks"</string> <string name="factory_reset_warning" msgid="5423253125642394387">"Seade kustutatakse"</string> <string name="factory_reset_message" msgid="4905025204141900666">"Administraatori rakendusel on puuduvaid osi või on see rikutud ja seda ei saa kasutada. Seade kustutatakse. Abi saamiseks võtke ühendust administraatoriga."</string> <string name="me" msgid="6545696007631404292">"Mina"</string> @@ -306,12 +301,9 @@ <string name="permlab_sendSms" msgid="7544599214260982981">"saata ja vaadata SMS-sõnumeid"</string> <string name="permdesc_sendSms" msgid="7094729298204937667">"Võimaldab rakendusel saata SMS-sõnumeid. See võib kaasa tuua ootamatuid tasusid. Pahatahtlikud rakendused võivad teile tekitada kulusid, saates sõnumeid teie kinnituseta."</string> <string name="permlab_readSms" msgid="8745086572213270480">"lugege oma tekstisõnumeid (SMS või MMS)"</string> - <!-- no translation found for permdesc_readSms (4741697454888074891) --> - <skip /> - <!-- no translation found for permdesc_readSms (5796670395641116592) --> - <skip /> - <!-- no translation found for permdesc_readSms (6826832415656437652) --> - <skip /> + <string name="permdesc_readSms" product="tablet" msgid="4741697454888074891">"See rakendus saab kõiki teie tahvelarvutisse salvestatud SMS-e (tekstsõnumeid) lugeda."</string> + <string name="permdesc_readSms" product="tv" msgid="5796670395641116592">"See rakendus saab kõiki teie telerisse salvestatud SMS-e (tekstsõnumeid) lugeda."</string> + <string name="permdesc_readSms" product="default" msgid="6826832415656437652">"See rakendus saab kõiki teie telefoni salvestatud SMS-e (tekstsõnumeid) lugeda."</string> <string name="permlab_receiveWapPush" msgid="5991398711936590410">"võtke vastu tekstisõnumeid (WAP)"</string> <string name="permdesc_receiveWapPush" msgid="748232190220583385">"Võimaldab rakendusel vastu võtta ja töödelda WAP-sõnumeid. See luba hõlmab võimet jälgida või kustutada teile saadetud sõnumeid neid teile näitamata."</string> <string name="permlab_getTasks" msgid="6466095396623933906">"Käitatud rakenduste toomine"</string> @@ -324,10 +316,8 @@ <string name="permdesc_enableCarMode" msgid="4853187425751419467">"Võimaldab rakendusel autorežiimi lubada."</string> <string name="permlab_killBackgroundProcesses" msgid="3914026687420177202">"sulgege teised rakendused"</string> <string name="permdesc_killBackgroundProcesses" msgid="4593353235959733119">"Võimaldab rakendusel lõpetada teiste rakenduste taustaprotsesse. See võib peatada teiste rakenduste töö."</string> - <!-- no translation found for permlab_systemAlertWindow (7238805243128138690) --> - <skip /> - <!-- no translation found for permdesc_systemAlertWindow (2393776099672266188) --> - <skip /> + <string name="permlab_systemAlertWindow" msgid="7238805243128138690">"See rakendus võidakse kuvada teiste rakenduste peal"</string> + <string name="permdesc_systemAlertWindow" msgid="2393776099672266188">"See rakendus võidakse kuvada teiste rakenduste või muude ekraani osade peal. See võib häirida tavapärast rakenduste kasutust ja muuta seda, kuidas teisi rakendusi kuvatakse."</string> <string name="permlab_persistentActivity" msgid="8841113627955563938">"Rakenduste pidev töös hoidmine"</string> <string name="permdesc_persistentActivity" product="tablet" msgid="8525189272329086137">"Võimaldab rakendusel muuta oma osi mälus püsivaks. See võib piirata teistele (tahvelarvutit aeglasemaks muutvatele) rakendustele saadaolevat mälu."</string> <string name="permdesc_persistentActivity" product="tv" msgid="5086862529499103587">"Lubab rakendusel muuta enda osasid mälus püsiüksusteks. See võib piirata teistele rakendustele saadaolevat mälumahtu ja muuta teleri aeglasemaks."</string> @@ -353,51 +343,37 @@ <string name="permdesc_writeContacts" product="tv" msgid="5438230957000018959">"Lubab rakendusel muuta telefoni salvestatud kontaktide andmeid, sealhulgas seda, kui tihti olete konkreetsetele kontaktidele helistanud, meilinud või nendega muul viisil suhelnud. See luba võimaldab rakendustel kustutada kontaktandmeid."</string> <string name="permdesc_writeContacts" product="default" msgid="589869224625163558">"Võimaldab rakendusel muuta telefoni salvestatud kontaktide andmeid, sealhulgas seda, kui tihti olete konkreetsetele kontaktidele helistanud, meilinud või nendega muul viisil suhelnud. See luba võimaldab rakendustel kustutada kontaktandmeid."</string> <string name="permlab_readCallLog" msgid="3478133184624102739">"kõnelogi lugemine"</string> - <!-- no translation found for permdesc_readCallLog (3204122446463552146) --> - <skip /> + <string name="permdesc_readCallLog" msgid="3204122446463552146">"See rakendus saab teie kõneajalugu lugeda."</string> <string name="permlab_writeCallLog" msgid="8552045664743499354">"kõnelogi kirjutamine"</string> <string name="permdesc_writeCallLog" product="tablet" msgid="6661806062274119245">"Lubab rakendusel muuta tahvelarvuti kõnelogi, sh sissetulevate ja väljaminevate kõnede andmeid. Pahatahtlikud rakendused võivad kasutada seda kõnelogi kustutamiseks või muutmiseks."</string> <string name="permdesc_writeCallLog" product="tv" msgid="4225034892248398019">"Lubab rakendusel muuta teleri kõnelogi, sh sissetulevate ja väljaminevate kõnede andmeid. Pahatahtlikud rakendused võivad kasutada seda kõnelogi kustutamiseks või muutmiseks."</string> <string name="permdesc_writeCallLog" product="default" msgid="683941736352787842">"Lubab rakendusel muuta telefoni kõnelogi, sh sissetulevate ja väljaminevate kõnede andmeid. Pahatahtlikud rakendused võivad kasutada seda kõnelogi kustutamiseks või muutmiseks."</string> <string name="permlab_bodySensors" msgid="4683341291818520277">"juurdepääs kehaanduritele (nt pulsilugeja)"</string> <string name="permdesc_bodySensors" product="default" msgid="4380015021754180431">"Lubab rakendusel hankida juurdepääsu andmetele anduritest, mis jälgivad teie füüsilist seisundit, nt südame löögisagedust."</string> - <!-- no translation found for permlab_readCalendar (6716116972752441641) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (4993979255403945892) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (8837931557573064315) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (4373978642145196715) --> - <skip /> + <string name="permlab_readCalendar" msgid="6716116972752441641">"Kalendrisündmuste ja üksikasjade lugemine"</string> + <string name="permdesc_readCalendar" product="tablet" msgid="4993979255403945892">"See rakendus saab kõiki teie tahvelarvutisse salvestatud kalendrisündmusi lugeda ja teie kalendriandmeid jagada või salvestada."</string> + <string name="permdesc_readCalendar" product="tv" msgid="8837931557573064315">"See rakendus saab kõiki teie telerisse salvestatud kalendrisündmusi lugeda ja teie kalendriandmeid jagada või salvestada."</string> + <string name="permdesc_readCalendar" product="default" msgid="4373978642145196715">"See rakendus saab kõiki teie telefoni salvestatud kalendrisündmusi lugeda ja teie kalendriandmeid jagada või salvestada."</string> <string name="permlab_writeCalendar" msgid="8438874755193825647">"kalendrisündmuste lisamine või muutmine ja külalistele omanike teadmata meili saatmine"</string> - <!-- no translation found for permdesc_writeCalendar (1675270619903625982) --> - <skip /> - <!-- no translation found for permdesc_writeCalendar (9017809326268135866) --> - <skip /> - <!-- no translation found for permdesc_writeCalendar (7592791790516943173) --> - <skip /> + <string name="permdesc_writeCalendar" product="tablet" msgid="1675270619903625982">"See rakendus võib teie tahvelarvutisse kalendrisündmusi lisada, neid eemaldada või muuta. See rakendus võib saata sõnumeid, mis näivad pärinevat kalendri omanikelt, või muuta sündmusi ilma omanikke teavitamata."</string> + <string name="permdesc_writeCalendar" product="tv" msgid="9017809326268135866">"See rakendus võib teie telerisse kalendrisündmusi lisada, neid eemaldada või muuta. See rakendus võib saata sõnumeid, mis näivad pärinevat kalendri omanikelt, või muuta sündmusi ilma omanikke teavitamata."</string> + <string name="permdesc_writeCalendar" product="default" msgid="7592791790516943173">"See rakendus võib teie telefoni kalendrisündmusi lisada, neid eemaldada või muuta. See rakendus võib saata sõnumeid, mis näivad pärinevat kalendri omanikelt, või muuta sündmusi ilma omanikke teavitamata."</string> <string name="permlab_accessLocationExtraCommands" msgid="2836308076720553837">"juurdepääs asukohapakkuja lisakäskudele"</string> <string name="permdesc_accessLocationExtraCommands" msgid="6078307221056649927">"Võimaldab rakendusel juurde pääseda asukohapakkuja erikäskudele. See võib lubada rakendusel mõjutada GPS-i või muude asukohaallikate tööd."</string> <string name="permlab_accessFineLocation" msgid="251034415460950944">"juurdepääs täpsele asukohale (GPS-i ja võrgupõhine)"</string> - <!-- no translation found for permdesc_accessFineLocation (5821994817969957884) --> - <skip /> + <string name="permdesc_accessFineLocation" msgid="5821994817969957884">"See rakendus näeb GPS-i või võrguasukoha allikate (nt mobiilimastid ja WiFi-võrgud) abil teie asukohta. Need asukohateenused peavad olema sisse lülitatud ja teie telefonis saadaval, et rakendus neid kasutada saaks. See võib suurendada akutoite tarbimist."</string> <string name="permlab_accessCoarseLocation" msgid="7715277613928539434">"juurdepääs ligikaudsele asukohale (võrgupõhine)"</string> - <!-- no translation found for permdesc_accessCoarseLocation (3373266766487862426) --> - <skip /> - <!-- no translation found for permdesc_accessCoarseLocation (1884022719818788511) --> - <skip /> - <!-- no translation found for permdesc_accessCoarseLocation (7788009094906196995) --> - <skip /> + <string name="permdesc_accessCoarseLocation" product="tablet" msgid="3373266766487862426">"See rakendus näeb võrguallikate (nt mobiilimastid ja WiFi-võrgud) abil teie asukohta. Need asukohateenused peavad olema sisse lülitatud ja teie tahvelarvutis saadaval, et rakendus neid kasutada saaks."</string> + <string name="permdesc_accessCoarseLocation" product="tv" msgid="1884022719818788511">"See rakendus näeb võrguallikate (nt mobiilimastid ja WiFi-võrgud) abil teie asukohta. Need asukohateenused peavad olema sisse lülitatud ja teie teleris saadaval, et rakendus neid kasutada saaks."</string> + <string name="permdesc_accessCoarseLocation" product="default" msgid="7788009094906196995">"See rakendus näeb võrguallikate (nt mobiilimastid ja WiFi-võrgud) abil teie asukohta. Need asukohateenused peavad olema sisse lülitatud ja teie telefonis saadaval, et rakendus neid kasutada saaks."</string> <string name="permlab_modifyAudioSettings" msgid="6095859937069146086">"muuda heliseadeid"</string> <string name="permdesc_modifyAudioSettings" msgid="3522565366806248517">"Võimaldab rakendusel muuta üldiseid heliseadeid, näiteks helitugevust ja seda, millist kõlarit kasutatakse väljundiks."</string> <string name="permlab_recordAudio" msgid="3876049771427466323">"salvesta heli"</string> - <!-- no translation found for permdesc_recordAudio (4245930455135321433) --> - <skip /> + <string name="permdesc_recordAudio" msgid="4245930455135321433">"See rakendus saab mikrofoni kasutades mis tahes ajal heli salvestada."</string> <string name="permlab_sim_communication" msgid="2935852302216852065">"SIM-kaardile käskluste saatmine"</string> <string name="permdesc_sim_communication" msgid="5725159654279639498">"Lubab rakendusel saata käske SIM-kaardile. See on väga ohtlik."</string> <string name="permlab_camera" msgid="3616391919559751192">"piltide ja videote tegemine"</string> - <!-- no translation found for permdesc_camera (5392231870049240670) --> - <skip /> + <string name="permdesc_camera" msgid="5392231870049240670">"See rakendus saab mis tahes ajal kaameraga pildistada ja videoid salvestada."</string> <string name="permlab_vibrate" msgid="7696427026057705834">"juhtige vibreerimist"</string> <string name="permdesc_vibrate" msgid="6284989245902300945">"Võimaldab rakendusel juhtida vibreerimist."</string> <string name="permlab_callPhone" msgid="3925836347681847954">"helista otse telefoninumbritele"</string> diff --git a/core/res/res/values-eu-rES/strings.xml b/core/res/res/values-eu-rES/strings.xml index 59c66f51ddd9..98f007291861 100644 --- a/core/res/res/values-eu-rES/strings.xml +++ b/core/res/res/values-eu-rES/strings.xml @@ -46,8 +46,7 @@ <string name="defaultMsisdnAlphaTag" msgid="2850889754919584674">"MSISDN1"</string> <string name="mmiError" msgid="5154499457739052907">"Konexio-arazoren bat gertatu da edo MMI kodea baliogabea da."</string> <string name="mmiFdnError" msgid="5224398216385316471">"Eragiketa markatze finkoko zenbakietara murriztua dago."</string> - <!-- no translation found for mmiErrorWhileRoaming (762488890299284230) --> - <skip /> + <string name="mmiErrorWhileRoaming" msgid="762488890299284230">"Ezin dira aldatu deiak desbideratzeko ezarpenak telefonoa ibiltaritzan dagoenean."</string> <string name="serviceEnabled" msgid="8147278346414714315">"Zerbitzua gaitu da."</string> <string name="serviceEnabledFor" msgid="6856228140453471041">"Zerbitzua honetarako gaitu da:"</string> <string name="serviceDisabled" msgid="1937553226592516411">"Zerbitzua desgaitu da."</string> @@ -98,10 +97,8 @@ <string name="RestrictedOnVoiceData" msgid="996636487106171320">"Ahots- eta datu-zerbitzuak blokeatuta daude."</string> <string name="RestrictedOnVoiceSms" msgid="1888588152792023873">"Ahots eta SMS zerbitzuak blokeatuta daude."</string> <string name="RestrictedOnAll" msgid="5643028264466092821">"Ahotsaren, datuen eta SMSen zerbitzuak blokeatuta daude."</string> - <!-- no translation found for NetworkPreferenceSwitchTitle (4008877505368566980) --> - <skip /> - <!-- no translation found for NetworkPreferenceSwitchSummary (7335915397439759249) --> - <skip /> + <string name="NetworkPreferenceSwitchTitle" msgid="4008877505368566980">"Ezin da konektatu sarera"</string> + <string name="NetworkPreferenceSwitchSummary" msgid="7335915397439759249">"Seinalea hobea izan dadin, aldatu hautatutako mota Ezarpenak > Sare mugikorrak > Sare mota hobetsia atalean."</string> <string name="peerTtyModeFull" msgid="6165351790010341421">"Beste gailuak TTY osagarria FULL moduan erabiltzea eskatu du"</string> <string name="peerTtyModeHco" msgid="5728602160669216784">"Beste gailuak TTY osagarria HCO moduan erabiltzea eskatu du"</string> <string name="peerTtyModeVco" msgid="1742404978686538049">"Beste gailuak TTY osagarria VCO moduan erabiltzea eskatu du"</string> @@ -185,10 +182,8 @@ <string name="work_profile_deleted_description" msgid="6305147513054341102">"Laneko profila ezabatu egin da hura administratzeko aplikazioa falta delako."</string> <string name="work_profile_deleted_details" msgid="226615743462361248">"Laneko profila administratzeko aplikazioa falta da edo hondatuta dago. Ondorioz, laneko profila eta horrekin erlazionatutako datuak ezabatu egin dira. Laguntza lortzeko, jarri administratzailearekin harremanetan."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="6019770344820507579">"Work profila ez dago erabilgarri gailu honetan."</string> - <!-- no translation found for network_logging_notification_title (1805392571290161924) --> - <skip /> - <!-- no translation found for network_logging_notification_text (4448072433371155729) --> - <skip /> + <string name="network_logging_notification_title" msgid="1805392571290161924">"Sareko trafikoa gainbegiratzen da"</string> + <string name="network_logging_notification_text" msgid="4448072433371155729">"Xehetasun gehiago lortzeko, sakatu hau"</string> <string name="factory_reset_warning" msgid="5423253125642394387">"Gailuko datuak ezabatu egingo dira"</string> <string name="factory_reset_message" msgid="4905025204141900666">"Administrazio-aplikazioaren osagai batzuk falta dira edo aplikazioa hondatuta dago eta ezin da erabili. Gailuko datuak ezabatu egingo dira. Laguntza lortzeko, jarri administratzailearekin harremanetan."</string> <string name="me" msgid="6545696007631404292">"Ni"</string> @@ -306,12 +301,9 @@ <string name="permlab_sendSms" msgid="7544599214260982981">"bidali eta ikusi SMS mezuak"</string> <string name="permdesc_sendSms" msgid="7094729298204937667">"SMS mezuak bidaltzeko baimena ematen die aplikazioei. Horrela, ustekabeko gastuak eragin daitezke. Aplikazio gaiztoek erabil dezakete zuk berretsi gabeko mezuak bidalita gastuak eragiteko."</string> <string name="permlab_readSms" msgid="8745086572213270480">"testu-mezuak (SMSak edo MMSak) irakurtzea"</string> - <!-- no translation found for permdesc_readSms (4741697454888074891) --> - <skip /> - <!-- no translation found for permdesc_readSms (5796670395641116592) --> - <skip /> - <!-- no translation found for permdesc_readSms (6826832415656437652) --> - <skip /> + <string name="permdesc_readSms" product="tablet" msgid="4741697454888074891">"Aplikazioak tabletan gordetako SMS mezu (testu-mezu) guztiak irakur ditzake."</string> + <string name="permdesc_readSms" product="tv" msgid="5796670395641116592">"Aplikazioak telebistan gordetako SMS mezu (testu-mezu) guztiak irakur ditzake."</string> + <string name="permdesc_readSms" product="default" msgid="6826832415656437652">"Aplikazioak telefonoan gordetako SMS mezu (testu-mezu) guztiak irakur ditzake."</string> <string name="permlab_receiveWapPush" msgid="5991398711936590410">"testu-mezuak (WAP bidezkoak) jasotzea"</string> <string name="permdesc_receiveWapPush" msgid="748232190220583385">"WAP mezuak jasotzeko eta prozesatzeko baimena ematen die aplikazioei. Horrela, aplikazioak, besteak beste, gailura bidalitako mezuak kontrola eta ezaba ditzake zuri erakutsi gabe."</string> <string name="permlab_getTasks" msgid="6466095396623933906">"Eskuratu abian diren aplikazioak"</string> @@ -324,10 +316,8 @@ <string name="permdesc_enableCarMode" msgid="4853187425751419467">"Auto modua gaitzea baimentzen die aplikazioei."</string> <string name="permlab_killBackgroundProcesses" msgid="3914026687420177202">"beste aplikazioak ixtea"</string> <string name="permdesc_killBackgroundProcesses" msgid="4593353235959733119">"Beste aplikazioen atzeko planoko prozesuak amaitzeko baimena ematen die aplikazioei. Horrela, agian aplikazio batzuk exekutatzeari utziko zaio."</string> - <!-- no translation found for permlab_systemAlertWindow (7238805243128138690) --> - <skip /> - <!-- no translation found for permdesc_systemAlertWindow (2393776099672266188) --> - <skip /> + <string name="permlab_systemAlertWindow" msgid="7238805243128138690">"Agertu beste aplikazio batzuen gainean"</string> + <string name="permdesc_systemAlertWindow" msgid="2393776099672266188">"Beste aplikazio batzuen edo pantailako beste zati batzuen gainean ager daiteke aplikazioa. Aplikazioaren funtzionamendu normala oztopa dezake eta beste aplikazio batzuen itxura alda dezake."</string> <string name="permlab_persistentActivity" msgid="8841113627955563938">"Izan aplikazioa beti abian"</string> <string name="permdesc_persistentActivity" product="tablet" msgid="8525189272329086137">"Beren zati batzuk memoria modu iraunkorrean ezartzeko baimena ematen die aplikazioei. Horrela, beste aplikazioek erabilgarri duten memoria murritz daiteke eta tableta motel daiteke."</string> <string name="permdesc_persistentActivity" product="tv" msgid="5086862529499103587">"Beren zati batzuk memorian modu iraunkorrean aktibo uztea baimentzen die aplikazioei. Horrela, beste aplikazioek memoria gutxiago izan lezakete erabilgarri eta telebistak motelago funtziona lezake."</string> @@ -353,51 +343,37 @@ <string name="permdesc_writeContacts" product="tv" msgid="5438230957000018959">"Telebistan gordetako kontaktuei buruzko datuak aldatzea baimentzen die aplikazioei, besteak beste, kontaktu zehatzei zer maiztasunekin deitu diezun, mezu elektronikoak bidali dizkiezun ala ez, edo haiekin harremanetan zer beste modutara jarri zaren. Baimen horrekin, kontaktuen datuak ezaba ditzakete aplikazioek."</string> <string name="permdesc_writeContacts" product="default" msgid="589869224625163558">"Telefonoan gordetako kontaktuei buruzko datuak aldatzeko baimena ematen die aplikazioei, besteak beste, kontatu zehatzei zer maiztasunekin deitu diezun, mezu elektronikoak bidali dizkiezun edo haiekin harremanetan beste modutara nola jarri zaren. Baimen horrekin, aplikazioek kontaktuen datuak ezaba ditzakete."</string> <string name="permlab_readCallLog" msgid="3478133184624102739">"deien erregistroa irakurtzea"</string> - <!-- no translation found for permdesc_readCallLog (3204122446463552146) --> - <skip /> + <string name="permdesc_readCallLog" msgid="3204122446463552146">"Aplikazioak deien historia irakur dezake."</string> <string name="permlab_writeCallLog" msgid="8552045664743499354">"deien erregistroa idaztea"</string> <string name="permdesc_writeCallLog" product="tablet" msgid="6661806062274119245">"Tabletaren deien erregistroa aldatzeko baimena ematen die aplikazioei, sarrerako eta irteerako deiei buruzko datuak barne. Aplikazio gaiztoek deien erregistroa ezabatzeko edo aldatzeko erabil dezakete."</string> <string name="permdesc_writeCallLog" product="tv" msgid="4225034892248398019">"Telebistako deien erregistroa aldatzea baimentzen die aplikazioei, sarrerako eta irteerako deiei buruzko datuak barne. Aplikazio gaiztoek deien erregistroa ezabatzeko edo aldatzeko erabil dezakete."</string> <string name="permdesc_writeCallLog" product="default" msgid="683941736352787842">"Telefonoaren deien erregistroa aldatzeko baimena ematen die aplikazioei, sarrerako eta irteerako deiei buruzko datuak barne. Aplikazio gaiztoek deien erregistroa ezabatzeko edo aldatzeko erabil dezakete."</string> <string name="permlab_bodySensors" msgid="4683341291818520277">"Atzitu gorputzaren sentsoreak (adibidez, bihotz-maiztasunarenak)"</string> <string name="permdesc_bodySensors" product="default" msgid="4380015021754180431">"Zure egoera fisikoa kontrolatzen duten sentsoreetako datuak (adibidez, bihotz-maiztasuna) atzitzea baimentzen die aplikazioei."</string> - <!-- no translation found for permlab_readCalendar (6716116972752441641) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (4993979255403945892) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (8837931557573064315) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (4373978642145196715) --> - <skip /> + <string name="permlab_readCalendar" msgid="6716116972752441641">"Irakurri egutegiko gertaerak eta xehetasunak"</string> + <string name="permdesc_readCalendar" product="tablet" msgid="4993979255403945892">"Aplikazioak tabletan gordetako egutegiko gertaerak irakur ditzake eta egutegiko datuak parteka eta gorde ditzake."</string> + <string name="permdesc_readCalendar" product="tv" msgid="8837931557573064315">"Aplikazioak telebistan gordetako egutegiko gertaerak irakur ditzake eta egutegiko datuak parteka eta gorde ditzake."</string> + <string name="permdesc_readCalendar" product="default" msgid="4373978642145196715">"Aplikazioak telefonoan gordetako egutegiko gertaerak irakur ditzake eta egutegiko datuak parteka eta gorde ditzake."</string> <string name="permlab_writeCalendar" msgid="8438874755193825647">"gehitu edo aldatu egutegiko gertaerak eta bidali mezu elektronikoak gonbidatuei jabeek jakin gabe"</string> - <!-- no translation found for permdesc_writeCalendar (1675270619903625982) --> - <skip /> - <!-- no translation found for permdesc_writeCalendar (9017809326268135866) --> - <skip /> - <!-- no translation found for permdesc_writeCalendar (7592791790516943173) --> - <skip /> + <string name="permdesc_writeCalendar" product="tablet" msgid="1675270619903625982">"Tabletako gertaerak gehitzeko, kentzeko edo aldatzeko aukera du aplikazioak. Gainera, egutegien jabeenak diruditen mezuak bidal ditzake, eta gertaerak alda ditzake jabeei beraiei jakinarazi gabe."</string> + <string name="permdesc_writeCalendar" product="tv" msgid="9017809326268135866">"Telebistako gertaerak gehitzeko, kentzeko edo aldatzeko aukera du aplikazioak. Gainera, egutegien jabeenak diruditen mezuak bidal ditzake, eta gertaerak alda ditzake jabeei beraiei jakinarazi gabe."</string> + <string name="permdesc_writeCalendar" product="default" msgid="7592791790516943173">"Telefonoko gertaerak gehitzeko, kentzeko edo aldatzeko aukera du aplikazioak. Gainera, egutegien jabeenak diruditen mezuak bidal ditzake, eta gertaerak alda ditzake jabeei beraiei jakinarazi gabe."</string> <string name="permlab_accessLocationExtraCommands" msgid="2836308076720553837">"atzitu kokapen-hornitzaileen komando gehigarriak"</string> <string name="permdesc_accessLocationExtraCommands" msgid="6078307221056649927">"Kokapen-hornitzailearen agindu gehigarriak atzitzea baimentzen die aplikazioei. Horrela, agian aplikazioek GPSaren edo bestelako kokapenaren iturburuen funtzionamenduan eragina izan dezakete."</string> <string name="permlab_accessFineLocation" msgid="251034415460950944">"Atzitu kokapen zehatza (GPS sisteman eta sarean oinarrituta)"</string> - <!-- no translation found for permdesc_accessFineLocation (5821994817969957884) --> - <skip /> + <string name="permdesc_accessFineLocation" msgid="5821994817969957884">"Aplikazioak zure kokapenaren berri izan dezake GPS sistema edo sareen iturburuak (adibidez, telefonia mugikorreko dorreak eta Wi-Fi sareak) erabilita. Kokapen-zerbitzu horiek aktibatuta eta erabilgarri izan behar dituzu telefonoan, aplikazioak erabil ditzan. Baliteke bateria gehiago erabiltzea."</string> <string name="permlab_accessCoarseLocation" msgid="7715277613928539434">"Atzitu gutxi gorabeherako kokapena (sarean oinarrituta)"</string> - <!-- no translation found for permdesc_accessCoarseLocation (3373266766487862426) --> - <skip /> - <!-- no translation found for permdesc_accessCoarseLocation (1884022719818788511) --> - <skip /> - <!-- no translation found for permdesc_accessCoarseLocation (7788009094906196995) --> - <skip /> + <string name="permdesc_accessCoarseLocation" product="tablet" msgid="3373266766487862426">"Aplikazioak zure kokapenaren berri izan dezake sareen iturburuak (adibidez, telefonia mugikorreko dorreak eta Wi-Fi sareak) erabilita. Kokapen-zerbitzu horiek aktibatuta eta erabilgarri izan behar dituzu tabletan, aplikazioak erabil ditzan."</string> + <string name="permdesc_accessCoarseLocation" product="tv" msgid="1884022719818788511">"Aplikazioak zure kokapenaren berri izan dezake sareen iturburuak (adibidez, telefonia mugikorreko dorreak eta Wi-Fi sareak) erabilita. Kokapen-zerbitzu horiek aktibatuta eta erabilgarri izan behar dituzu telebistan, aplikazioak erabil ditzan."</string> + <string name="permdesc_accessCoarseLocation" product="default" msgid="7788009094906196995">"Aplikazioak zure kokapenaren berri izan dezake sareen iturburuak (adibidez, telefonia mugikorreko dorreak eta Wi-Fi sareak) erabilita. Kokapen-zerbitzu horiek aktibatuta eta erabilgarri izan behar dituzu telefonoan, aplikazioak erabil ditzan."</string> <string name="permlab_modifyAudioSettings" msgid="6095859937069146086">"aldatu audio-ezarpenak"</string> <string name="permdesc_modifyAudioSettings" msgid="3522565366806248517">"Audio-ezarpen orokorrak aldatzeko baimena ematen dio; besteak beste, bolumena eta irteerarako zer bozgorailu erabiltzen den."</string> <string name="permlab_recordAudio" msgid="3876049771427466323">"grabatu audioa"</string> - <!-- no translation found for permdesc_recordAudio (4245930455135321433) --> - <skip /> + <string name="permdesc_recordAudio" msgid="4245930455135321433">"Aplikazioak edonoiz erabil dezake mikrofonoa audioa grabatzeko."</string> <string name="permlab_sim_communication" msgid="2935852302216852065">"Bidali aginduak SIM txartelera"</string> <string name="permdesc_sim_communication" msgid="5725159654279639498">"SIM txartelera aginduak bidaltzeko aukera ematen die aplikazioei. Oso arriskutsua da."</string> <string name="permlab_camera" msgid="3616391919559751192">"atera argazkiak eta grabatu bideoak"</string> - <!-- no translation found for permdesc_camera (5392231870049240670) --> - <skip /> + <string name="permdesc_camera" msgid="5392231870049240670">"Aplikazioak edonoiz erabil dezake kamera argazkiak ateratzeko eta bideoak grabatzeko."</string> <string name="permlab_vibrate" msgid="7696427026057705834">"Kontrolatu dardara"</string> <string name="permdesc_vibrate" msgid="6284989245902300945">"Bibragailua kontrolatzea baimentzen die aplikazioei."</string> <string name="permlab_callPhone" msgid="3925836347681847954">"deitu zuzenean telefono-zenbakietara"</string> diff --git a/core/res/res/values-fa/strings.xml b/core/res/res/values-fa/strings.xml index c4d94e52cd3e..0e6a9828214f 100644 --- a/core/res/res/values-fa/strings.xml +++ b/core/res/res/values-fa/strings.xml @@ -46,8 +46,7 @@ <string name="defaultMsisdnAlphaTag" msgid="2850889754919584674">"MSISDN1"</string> <string name="mmiError" msgid="5154499457739052907">"مشکل در اتصال یا کد MMI نامعتبر."</string> <string name="mmiFdnError" msgid="5224398216385316471">"عملکرد فقط به شمارههای شمارهگیری ثابت محدود است."</string> - <!-- no translation found for mmiErrorWhileRoaming (762488890299284230) --> - <skip /> + <string name="mmiErrorWhileRoaming" msgid="762488890299284230">"وقتی درحال رومینگ هستید، نمیتوانید تنظیمات هدایت تماس را از تلفنتان تغییر دهید."</string> <string name="serviceEnabled" msgid="8147278346414714315">"سرویس فعال شد."</string> <string name="serviceEnabledFor" msgid="6856228140453471041">"سرویس فعال شد برای:"</string> <string name="serviceDisabled" msgid="1937553226592516411">"سرویس غیرفعال شده است."</string> @@ -98,10 +97,8 @@ <string name="RestrictedOnVoiceData" msgid="996636487106171320">"سرویسهای صدا/داده مسدود شدند."</string> <string name="RestrictedOnVoiceSms" msgid="1888588152792023873">"سرویسهای صوتی/پیامک مسدود شدهاند"</string> <string name="RestrictedOnAll" msgid="5643028264466092821">"تمام سرویسهای صدا/داده/ پیامک مسدود هستند."</string> - <!-- no translation found for NetworkPreferenceSwitchTitle (4008877505368566980) --> - <skip /> - <!-- no translation found for NetworkPreferenceSwitchSummary (7335915397439759249) --> - <skip /> + <string name="NetworkPreferenceSwitchTitle" msgid="4008877505368566980">"شبکه دردسترس نیست"</string> + <string name="NetworkPreferenceSwitchSummary" msgid="7335915397439759249">"برای بهبود دریافت، نوع شبکهای را که انتخاب کردهاید در «تنظیمات > شبکههای تلفن همراه & gt؛ نوع شبکه ترجیحی» تغییر دهید."</string> <string name="peerTtyModeFull" msgid="6165351790010341421">"دستگاه مرتبط درخواست TTY حالت FULL کرد"</string> <string name="peerTtyModeHco" msgid="5728602160669216784">"دستگاه مرتبط درخواست TTY حالت HCO کرد"</string> <string name="peerTtyModeVco" msgid="1742404978686538049">"دستگاه مرتبط درخواست TTY حالت VCO کرد"</string> @@ -185,10 +182,8 @@ <string name="work_profile_deleted_description" msgid="6305147513054341102">"به دلیل نداشتن برنامه سرپرست، نمایه کار حذف شده است."</string> <string name="work_profile_deleted_details" msgid="226615743462361248">"برنامه سرپرست نمایه کار وجود ندارد یا خراب است. در نتیجه، نمایه کاریتان و اطلاعات مرتبط حذف شده است. برای دریافت راهنمایی با سرپرستتان تماس بگیرید."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="6019770344820507579">"نمایه کاری شما دیگر در این دستگاه در دسترس نیست."</string> - <!-- no translation found for network_logging_notification_title (1805392571290161924) --> - <skip /> - <!-- no translation found for network_logging_notification_text (4448072433371155729) --> - <skip /> + <string name="network_logging_notification_title" msgid="1805392571290161924">"ترافیک شبکه، تحت نظارت است"</string> + <string name="network_logging_notification_text" msgid="4448072433371155729">"برای جزئیات بیشتر ضربه بزنید"</string> <string name="factory_reset_warning" msgid="5423253125642394387">"دستگاهتان پاک خواهد شد"</string> <string name="factory_reset_message" msgid="4905025204141900666">"برنامه سرپرست بخشهایی را ندارد یا خراب است، و نمیتواند استفاده شود. دستگاهتان اکنون پاک میشود. برای این که راهنمایی شوید، با سرپرستتان تماس بگیرید."</string> <string name="me" msgid="6545696007631404292">"من"</string> @@ -306,12 +301,9 @@ <string name="permlab_sendSms" msgid="7544599214260982981">"ارسال و نمایش پیامهای پیامک"</string> <string name="permdesc_sendSms" msgid="7094729298204937667">"به برنامه اجازه میدهد پیامکها را ارسال کند. این باعث ایجاد هزینههای پیشبینی نشده میشود. برنامههای مخرب ممکن است با ارسال پیام بدون تأیید شما هزینههایی را برای شما ایجاد کنند."</string> <string name="permlab_readSms" msgid="8745086572213270480">"خواندن پیامهای نوشتاری شما (پیامک یا فراپیام)"</string> - <!-- no translation found for permdesc_readSms (4741697454888074891) --> - <skip /> - <!-- no translation found for permdesc_readSms (5796670395641116592) --> - <skip /> - <!-- no translation found for permdesc_readSms (6826832415656437652) --> - <skip /> + <string name="permdesc_readSms" product="tablet" msgid="4741697454888074891">"این برنامه میتواند همه پیامکهای ذخیرهشده در رایانه لوحی شما را بخواند."</string> + <string name="permdesc_readSms" product="tv" msgid="5796670395641116592">"این برنامه میتواند همه پیامکهای ذخیرهشده در تلویزیون شما را بخواند."</string> + <string name="permdesc_readSms" product="default" msgid="6826832415656437652">"این برنامه میتواند همه پیامکهای ذخیرهشده در تلفن شما را بخواند."</string> <string name="permlab_receiveWapPush" msgid="5991398711936590410">"دریافت پیامهای نوشتاری (WAP)"</string> <string name="permdesc_receiveWapPush" msgid="748232190220583385">"به برنامه اجازه میدهد پیامهای WAP را دریافت و پردازش کند. این مجوز میتواند پیامهای ارسالی به شما را بدون نمایش آنها به شما حذف یا کنترل کند."</string> <string name="permlab_getTasks" msgid="6466095396623933906">"بازیابی برنامههای در حال اجرا"</string> @@ -324,10 +316,8 @@ <string name="permdesc_enableCarMode" msgid="4853187425751419467">"به برنامه اجازه میدهد تا حالت خودرو را فعال کند."</string> <string name="permlab_killBackgroundProcesses" msgid="3914026687420177202">"بستن سایر برنامهها"</string> <string name="permdesc_killBackgroundProcesses" msgid="4593353235959733119">"به برنامه امکان میدهد به فرآیندهای پسزمینه سایر برنامهها پایان دهد. این ممکن است باعث شود سایر برنامهها متوقف شوند."</string> - <!-- no translation found for permlab_systemAlertWindow (7238805243128138690) --> - <skip /> - <!-- no translation found for permdesc_systemAlertWindow (2393776099672266188) --> - <skip /> + <string name="permlab_systemAlertWindow" msgid="7238805243128138690">"این برنامه میتواند روی برنامههای دیگر ظاهر شود"</string> + <string name="permdesc_systemAlertWindow" msgid="2393776099672266188">"این برنامه میتواند روی برنامههای دیگر یا سایر قسمتهای صفحه ظاهر شود. ممکن است در عملکرد معمول برنامههای دیگر اختلال ایجاد کند و شیوه نمایش آنها را تغییر دهد."</string> <string name="permlab_persistentActivity" msgid="8841113627955563938">"همیشه برنامه اجرا شود"</string> <string name="permdesc_persistentActivity" product="tablet" msgid="8525189272329086137">"به برنامه امکان میدهد قسمتهایی از خود را در حافظه دائمی کند. این کار حافظه موجود را برای سایر برنامهها محدود کرده و باعث کندی رایانهٔ لوحی میشود."</string> <string name="permdesc_persistentActivity" product="tv" msgid="5086862529499103587">"به برنامه اجازه میدهد تا بخشهایی از خودش را در حافظه پایدار کند. ممکن است حافظه در دسترس سایر برنامهها را محدود کند که باعث کند شدن تلویزیون میشود."</string> @@ -353,51 +343,37 @@ <string name="permdesc_writeContacts" product="tv" msgid="5438230957000018959">"به برنامه اجازه میدهد دادههای مربوط به مخاطبین ذخیره شده در تلویزیون شما را از جمله تعداد تماسهایی که برقرار کردهاید، ایمیلهایی که ارسال کردهاید یا ارتباطاتی را که به هر شکل با مخاطبین خاصی برقرار کردید تغییر دهد. این مجوز به برنامه اجازه میدهد دادههای مخاطب را حذف نماید."</string> <string name="permdesc_writeContacts" product="default" msgid="589869224625163558">"به برنامه اجازه میدهد دادههای مربوط به مخاطبین ذخیره شده در تلفن شما را از جمله تعداد تماسهایی که برقرار کردهاید، ایمیلهایی که ارسال کردهاید یا ارتباطاتی را که به هر شکل با مخاطبین خاصی برقرار کردید تغییر دهد. این مجوز به برنامه اجازه میدهد دادههای مخاطب را حذف نماید."</string> <string name="permlab_readCallLog" msgid="3478133184624102739">"خواندن گزارش تماس"</string> - <!-- no translation found for permdesc_readCallLog (3204122446463552146) --> - <skip /> + <string name="permdesc_readCallLog" msgid="3204122446463552146">"این برنامه میتواند سابقه تماس شما را بخواند."</string> <string name="permlab_writeCallLog" msgid="8552045664743499354">"نوشتن گزارش تماس"</string> <string name="permdesc_writeCallLog" product="tablet" msgid="6661806062274119245">"به برنامه اجازه میدهد گزارشات تماس رایانهٔ لوحی شما، از جمله دادههایی درمورد تماسهای ورودی و خروجی را تغییر دهد. برنامههای مخرب ممکن است از این ویژگی برای پاک کردن یا تغییر گزارش تماس شما استفاده کنند."</string> <string name="permdesc_writeCallLog" product="tv" msgid="4225034892248398019">"به برنامه اجازه میدهد گزارشات تماس تلویزیون شما، از جمله دادههایی درمورد تماسهای ورودی و خروجی را تغییر دهد. برنامههای مخرب شاید از این ویژگی برای پاک کردن یا تغییر گزارش تماس شما استفاده کنند."</string> <string name="permdesc_writeCallLog" product="default" msgid="683941736352787842">"به برنامه اجازه میدهد گزارشات تماس تلفنی شما، از جمله دادههایی درمورد تماسهای ورودی و خروجی را تغییر دهد. برنامههای مخرب ممکن است از این ویژگی برای پاک کردن یا تغییر گزارش تماس شما استفاده کنند."</string> <string name="permlab_bodySensors" msgid="4683341291818520277">"دسترسی به حسگرهای بدن (مانند پایشگرهای ضربان قلب)"</string> <string name="permdesc_bodySensors" product="default" msgid="4380015021754180431">"به برنامه امکان میدهد به اطلاعات حسگرهایی که بر شرایط فیزیکی شما مانند ضربان قلبتان، نظارت دارند، دسترسی داشته باشد."</string> - <!-- no translation found for permlab_readCalendar (6716116972752441641) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (4993979255403945892) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (8837931557573064315) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (4373978642145196715) --> - <skip /> + <string name="permlab_readCalendar" msgid="6716116972752441641">"خواندن رویدادها و جزئیات تقویم"</string> + <string name="permdesc_readCalendar" product="tablet" msgid="4993979255403945892">"این برنامه میتواند همه رویدادهای تقویم ذخیرهشده در رایانه لوحی شما را بخواند و دادههای تقویم شما را به اشتراک بگذارد یا ذخیره کند."</string> + <string name="permdesc_readCalendar" product="tv" msgid="8837931557573064315">"این برنامه میتواند همه رویدادهای تقویم ذخیرهشده در تلویزیون شما را بخواند و دادههای تقویم شما را به اشتراک بگذارد یا ذخیره کند."</string> + <string name="permdesc_readCalendar" product="default" msgid="4373978642145196715">"این برنامه میتواند همه رویدادهای تقویم ذخیرهشده در تلفن شما را بخواند و دادههای تقویم شما را به اشتراک بگذارد یا ذخیره کند."</string> <string name="permlab_writeCalendar" msgid="8438874755193825647">"افزودن یا تغییر رویدادهای تقویم و ارسال رایانامه به مهمانان بدون دخالت مالک"</string> - <!-- no translation found for permdesc_writeCalendar (1675270619903625982) --> - <skip /> - <!-- no translation found for permdesc_writeCalendar (9017809326268135866) --> - <skip /> - <!-- no translation found for permdesc_writeCalendar (7592791790516943173) --> - <skip /> + <string name="permdesc_writeCalendar" product="tablet" msgid="1675270619903625982">"این برنامه میتواند در رایانه لوحی شما رویدادهای تقویم اضافه کند، آنها را حذف کند یا تغییر دهد. این برنامه میتواند پیامهایی ارسال کند که گویی از طرف مالکان تقویم هستند یا رویدادها را بدون اطلاع مالکان تغییر دهد."</string> + <string name="permdesc_writeCalendar" product="tv" msgid="9017809326268135866">"این برنامه میتواند در تلویزیون شما رویدادهای تقویم اضافه کند، آنها را حذف کند یا تغییر دهد. این برنامه میتواند پیامهایی ارسال کند که گویی از طرف مالکان تقویم هستند یا رویدادها را بدون اطلاع مالکان تغییر دهد."</string> + <string name="permdesc_writeCalendar" product="default" msgid="7592791790516943173">"این برنامه میتواند در تلفن شما رویدادهای تقویم اضافه کند، آنها را حذف کند یا تغییر دهد. این برنامه میتواند پیامهایی ارسال کند که گویی از طرف مالکان تقویم هستند یا رویدادها را بدون اطلاع مالکان تغییر دهد."</string> <string name="permlab_accessLocationExtraCommands" msgid="2836308076720553837">"دسترسی به فرمانهای بیشتر ارائه دهنده مکان"</string> <string name="permdesc_accessLocationExtraCommands" msgid="6078307221056649927">"به برنامه اجازه میدهد به دستورات ارائهدهنده مکان تکمیلی دسترسی داشته باشد. این کار ممکن است به برنامه امکان دهد با کارکرد GPS یا منابع دیگر مکان تداخل داشته باشد."</string> <string name="permlab_accessFineLocation" msgid="251034415460950944">"دسترسی به مکان دقیق (مبتنی بر GPS و شبکه)"</string> - <!-- no translation found for permdesc_accessFineLocation (5821994817969957884) --> - <skip /> + <string name="permdesc_accessFineLocation" msgid="5821994817969957884">"این برنامه میتواند براساس GPS یا منابع مکان شبکه مانند دکلهای مخابراتی و شبکههای Wi-Fi، مکان شما را تشخیص دهد. این خدمات مکان باید روشن و در تلفن شما دردسترس باشند تا برنامه بتواند از آنها استفاده کند. این کار میتواند مصرف باتری را افزایش دهد."</string> <string name="permlab_accessCoarseLocation" msgid="7715277613928539434">"دسترسی به مکان تقریبی (مبتنی بر شبکه)"</string> - <!-- no translation found for permdesc_accessCoarseLocation (3373266766487862426) --> - <skip /> - <!-- no translation found for permdesc_accessCoarseLocation (1884022719818788511) --> - <skip /> - <!-- no translation found for permdesc_accessCoarseLocation (7788009094906196995) --> - <skip /> + <string name="permdesc_accessCoarseLocation" product="tablet" msgid="3373266766487862426">"این برنامه میتواند براساس منابع شبکه مانند دکلهای مخابراتی و شبکههای Wi-Fi، مکان شما را تشخیص دهد. این خدمات مکان باید روشن و در رایانه لوحی شما دردسترس باشند تا برنامه بتواند از آنها استفاده کند."</string> + <string name="permdesc_accessCoarseLocation" product="tv" msgid="1884022719818788511">"این برنامه میتواند براساس منابع شبکه مانند دکلهای مخابراتی و شبکههای Wi-Fi، مکان شما را تشخیص دهد. این خدمات مکان باید روشن و در تلویزیون شما دردسترس باشند تا برنامه بتواند از آنها استفاده کند."</string> + <string name="permdesc_accessCoarseLocation" product="default" msgid="7788009094906196995">"این برنامه میتواند براساس منابع شبکه مانند دکلهای مخابراتی و شبکههای Wi-Fi، مکان شما را تشخیص دهد. این خدمات مکان باید روشن و در تلفن شما دردسترس باشند تا برنامه بتواند از آنها استفاده کند."</string> <string name="permlab_modifyAudioSettings" msgid="6095859937069146086">"تغییر تنظیمات صوتی"</string> <string name="permdesc_modifyAudioSettings" msgid="3522565366806248517">"به برنامه امکان میدهد تنظیمات صوتی کلی مانند میزان صدا و بلندگوی مورد استفاده برای پخش صدا را اصلاح کند."</string> <string name="permlab_recordAudio" msgid="3876049771427466323">"ضبط صدا"</string> - <!-- no translation found for permdesc_recordAudio (4245930455135321433) --> - <skip /> + <string name="permdesc_recordAudio" msgid="4245930455135321433">"این برنامه میتواند در هرزمانی با استفاده از میکروفون صدا ضبط کند."</string> <string name="permlab_sim_communication" msgid="2935852302216852065">"ارسال فرمان به سیم کارت"</string> <string name="permdesc_sim_communication" msgid="5725159654279639498">"به برنامه اجازه ارسال دستورات به سیم کارت را میدهد. این بسیار خطرناک است."</string> <string name="permlab_camera" msgid="3616391919559751192">"عکسبرداری و فیلمبرداری"</string> - <!-- no translation found for permdesc_camera (5392231870049240670) --> - <skip /> + <string name="permdesc_camera" msgid="5392231870049240670">"این برنامه میتواند در هرزمانی با استفاده از دوربین عکس و فیلم بگیرد."</string> <string name="permlab_vibrate" msgid="7696427026057705834">"کنترل لرزش"</string> <string name="permdesc_vibrate" msgid="6284989245902300945">"به برنامه اجازه میدهد تا لرزاننده را کنترل کند."</string> <string name="permlab_callPhone" msgid="3925836347681847954">"تماس مستقیم با شماره تلفنها"</string> diff --git a/core/res/res/values-fi/strings.xml b/core/res/res/values-fi/strings.xml index 80d39dc94447..74b4c8b1cfff 100644 --- a/core/res/res/values-fi/strings.xml +++ b/core/res/res/values-fi/strings.xml @@ -182,10 +182,8 @@ <string name="work_profile_deleted_description" msgid="6305147513054341102">"Työprofiili poistettiin, koska laitteelta puuttuu järjestelmänvalvojasovellus."</string> <string name="work_profile_deleted_details" msgid="226615743462361248">"Työprofiilin järjestelmänvalvojasovellus puuttuu tai se on vioittunut. Tästä syystä työprofiilisi ja siihen liittyvät tiedot on poistettu. Pyydä ohjeita järjestelmänvalvojaltasi."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="6019770344820507579">"Työprofiilisi ei ole enää käytettävissä tällä laitteella."</string> - <!-- no translation found for network_logging_notification_title (1805392571290161924) --> - <skip /> - <!-- no translation found for network_logging_notification_text (4448072433371155729) --> - <skip /> + <string name="network_logging_notification_title" msgid="1805392571290161924">"Verkkoliikennettä seurataan"</string> + <string name="network_logging_notification_text" msgid="4448072433371155729">"Katso lisätietoja napauttamalla."</string> <string name="factory_reset_warning" msgid="5423253125642394387">"Laitteen tiedot poistetaan"</string> <string name="factory_reset_message" msgid="4905025204141900666">"Järjestelmänvalvojasovelluksesta puuttuu osia tai se on vioittunut, eikä sitä voi käyttää. Laitteen tiedot poistetaan. Pyydä ohjeita järjestelmänvalvojaltasi."</string> <string name="me" msgid="6545696007631404292">"Minä"</string> diff --git a/core/res/res/values-fr-rCA/strings.xml b/core/res/res/values-fr-rCA/strings.xml index b23c126d38b6..cd2376249f88 100644 --- a/core/res/res/values-fr-rCA/strings.xml +++ b/core/res/res/values-fr-rCA/strings.xml @@ -46,8 +46,7 @@ <string name="defaultMsisdnAlphaTag" msgid="2850889754919584674">"MSISDN1"</string> <string name="mmiError" msgid="5154499457739052907">"Problème de connexion ou code IHM incorrect"</string> <string name="mmiFdnError" msgid="5224398216385316471">"Opération réservée aux numéros autorisés"</string> - <!-- no translation found for mmiErrorWhileRoaming (762488890299284230) --> - <skip /> + <string name="mmiErrorWhileRoaming" msgid="762488890299284230">"Impossible de modifier les paramètres de transfert d\'appel sur votre téléphone lorsque vous êtes en itinérance."</string> <string name="serviceEnabled" msgid="8147278346414714315">"Le service a été activé."</string> <string name="serviceEnabledFor" msgid="6856228140453471041">"Ce service a été activé pour :"</string> <string name="serviceDisabled" msgid="1937553226592516411">"Ce service a été désactivé."</string> @@ -98,10 +97,8 @@ <string name="RestrictedOnVoiceData" msgid="996636487106171320">"Les services vocaux/de données sont bloqués."</string> <string name="RestrictedOnVoiceSms" msgid="1888588152792023873">"Les services voix/SMS sont bloqués."</string> <string name="RestrictedOnAll" msgid="5643028264466092821">"Tous les services vocaux/de données/SMS sont bloqués."</string> - <!-- no translation found for NetworkPreferenceSwitchTitle (4008877505368566980) --> - <skip /> - <!-- no translation found for NetworkPreferenceSwitchSummary (7335915397439759249) --> - <skip /> + <string name="NetworkPreferenceSwitchTitle" msgid="4008877505368566980">"Impossible de joindre le réseau"</string> + <string name="NetworkPreferenceSwitchSummary" msgid="7335915397439759249">"Pour améliorer la réception, essayez de changer le type de réseau sélectionné, sous Paramètres > Réseaux cellulaires > Type de réseau préféré."</string> <string name="peerTtyModeFull" msgid="6165351790010341421">"Mode TTY COMPLET demandé par un pair"</string> <string name="peerTtyModeHco" msgid="5728602160669216784">"Mode TTY HCO demandé par un pair"</string> <string name="peerTtyModeVco" msgid="1742404978686538049">"Mode TTY VCO demandé par un pair"</string> @@ -185,10 +182,8 @@ <string name="work_profile_deleted_description" msgid="6305147513054341102">"Profil professionnel supprimé en raison de l\'application d\'administration manquante."</string> <string name="work_profile_deleted_details" msgid="226615743462361248">"Le profil professionnel de l\'application d\'administration est manquant ou corrompu. Votre profil professionnel et ses données connexes ont donc été supprimés. Communiquez avec votre administrateur pour obtenir de l\'assistance."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="6019770344820507579">"Votre profil professionnel n\'est plus accessible sur cet appareil."</string> - <!-- no translation found for network_logging_notification_title (1805392571290161924) --> - <skip /> - <!-- no translation found for network_logging_notification_text (4448072433371155729) --> - <skip /> + <string name="network_logging_notification_title" msgid="1805392571290161924">"Le trafic réseau est surveillé"</string> + <string name="network_logging_notification_text" msgid="4448072433371155729">"Touchez ici pour obtenir plus de détails"</string> <string name="factory_reset_warning" msgid="5423253125642394387">"Le contenu de votre appareil sera effacé"</string> <string name="factory_reset_message" msgid="4905025204141900666">"Des éléments de l\'application d\'administration sont manquants ou celle-ci est corrompue, ce qui la rend inutilisable. Le contenu de votre appareil sera maintenant effacé. Communiquez avec votre administrateur pour obtenir de l\'assistance."</string> <string name="me" msgid="6545696007631404292">"Moi"</string> @@ -306,12 +301,9 @@ <string name="permlab_sendSms" msgid="7544599214260982981">"envoyer et afficher des messages texte"</string> <string name="permdesc_sendSms" msgid="7094729298204937667">"Permet à l\'application d\'envoyer des messages texte. Cette autorisation peut entraîner des frais inattendus. Des applications malveillantes peuvent générer des frais en envoyant des messages sans votre consentement."</string> <string name="permlab_readSms" msgid="8745086572213270480">"voir les messages texte ou multimédias"</string> - <!-- no translation found for permdesc_readSms (4741697454888074891) --> - <skip /> - <!-- no translation found for permdesc_readSms (5796670395641116592) --> - <skip /> - <!-- no translation found for permdesc_readSms (6826832415656437652) --> - <skip /> + <string name="permdesc_readSms" product="tablet" msgid="4741697454888074891">"Cette application peut lire tous les messages texte stockés sur votre tablette."</string> + <string name="permdesc_readSms" product="tv" msgid="5796670395641116592">"Cette application peut lire tous les messages texte stockés sur votre téléviseur."</string> + <string name="permdesc_readSms" product="default" msgid="6826832415656437652">"Cette application peut lire tous les messages texte stockés sur votre téléphone."</string> <string name="permlab_receiveWapPush" msgid="5991398711936590410">"recevoir des messages WAP"</string> <string name="permdesc_receiveWapPush" msgid="748232190220583385">"Permet à l\'application de recevoir et de traiter les messages WAP. Cette autorisation lui donne la possibilité de surveiller ou de supprimer les messages envoyés à votre appareil sans vous les montrer."</string> <string name="permlab_getTasks" msgid="6466095396623933906">"récupérer les données des applications en cours d\'exécution"</string> @@ -324,10 +316,8 @@ <string name="permdesc_enableCarMode" msgid="4853187425751419467">"Permet à l\'application d\'activer le mode Voiture."</string> <string name="permlab_killBackgroundProcesses" msgid="3914026687420177202">"fermer les autres applications"</string> <string name="permdesc_killBackgroundProcesses" msgid="4593353235959733119">"Permet à l\'application de mettre fin aux processus d\'autres applications exécutés en arrière-plan. Cette autorisation peut interrompre l\'exécution d\'autres applications."</string> - <!-- no translation found for permlab_systemAlertWindow (7238805243128138690) --> - <skip /> - <!-- no translation found for permdesc_systemAlertWindow (2393776099672266188) --> - <skip /> + <string name="permlab_systemAlertWindow" msgid="7238805243128138690">"Cette application peut s\'afficher par-dessus d\'autres applications"</string> + <string name="permdesc_systemAlertWindow" msgid="2393776099672266188">"Cette application peut s\'afficher par-dessus d\'autres applications ou parties de l\'écran. Cela pourrait interférer avec l\'utilisation normale des applications et modifier la manière dont les autres applications s\'affichent à l\'écran."</string> <string name="permlab_persistentActivity" msgid="8841113627955563938">"exécuter l\'application en continu"</string> <string name="permdesc_persistentActivity" product="tablet" msgid="8525189272329086137">"Permet à l\'application de rendre certains de ces composants persistants dans la mémoire. Cette autorisation peut limiter la mémoire disponible pour d\'autres applications et ralentir la tablette."</string> <string name="permdesc_persistentActivity" product="tv" msgid="5086862529499103587">"Permet à l\'application de placer certaines de ses parties en permanence dans la mémoire. Cela peut limiter la mémoire disponible pour les autres applications et ralentir le téléviseur."</string> @@ -353,51 +343,37 @@ <string name="permdesc_writeContacts" product="tv" msgid="5438230957000018959">"Permet à l\'application de modifier les données relatives aux contacts stockés sur votre téléviseur, y compris la fréquence à laquelle vous avez appelé certaines personnes, leur avez envoyé des courriels ou avez communiqué avec elles par d\'autres moyens. Cette autorisation permet aux applications de supprimer ces données."</string> <string name="permdesc_writeContacts" product="default" msgid="589869224625163558">"Permet à l\'application de modifier les données relatives aux contacts stockés sur votre téléphone, y compris la fréquence à laquelle vous avez appelé des personnes spécifiques, leur avez envoyé des courriels ou avez communiqué avec elles par d\'autres moyens. Cette autorisation permet aux applications de supprimer ces données."</string> <string name="permlab_readCallLog" msgid="3478133184624102739">"lire le journal d\'appels"</string> - <!-- no translation found for permdesc_readCallLog (3204122446463552146) --> - <skip /> + <string name="permdesc_readCallLog" msgid="3204122446463552146">"Cette application peut lire votre historique d\'appel."</string> <string name="permlab_writeCallLog" msgid="8552045664743499354">"modifier le journal d\'appels"</string> <string name="permdesc_writeCallLog" product="tablet" msgid="6661806062274119245">"Permet à l\'application de lire le journal d\'appels de votre tablette, y compris les données relatives aux appels entrants et sortants. Des applications malveillantes peuvent utiliser cette fonctionnalité pour effacer ou modifier votre journal d\'appels."</string> <string name="permdesc_writeCallLog" product="tv" msgid="4225034892248398019">"Permet à l\'application de modifier le journal d\'appels de votre téléviseur, y compris les données sur les appels entrants et sortants. Des applications malveillantes pourraient utiliser cette fonctionnalité pour effacer ou modifier votre journal d\'appels."</string> <string name="permdesc_writeCallLog" product="default" msgid="683941736352787842">"Permet à l\'application de lire le journal d\'appels de votre téléphone, y compris les données relatives aux appels entrants et sortants. Des applications malveillantes peuvent utiliser cette fonctionnalité pour effacer ou modifier votre journal d\'appels."</string> <string name="permlab_bodySensors" msgid="4683341291818520277">"accéder aux capteurs corporels (comme les moniteurs de fréquence cardiaque)"</string> <string name="permdesc_bodySensors" product="default" msgid="4380015021754180431">"Permet à l\'application d\'accéder aux données des capteurs qui surveillent votre condition physique, comme votre rythme cardiaque."</string> - <!-- no translation found for permlab_readCalendar (6716116972752441641) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (4993979255403945892) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (8837931557573064315) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (4373978642145196715) --> - <skip /> + <string name="permlab_readCalendar" msgid="6716116972752441641">"Lire les événements d\'agenda et leurs détails"</string> + <string name="permdesc_readCalendar" product="tablet" msgid="4993979255403945892">"Cette application peut lire tous les événements d\'agenda stockés sur votre tablette et partager ou enregistrer les données de votre agenda."</string> + <string name="permdesc_readCalendar" product="tv" msgid="8837931557573064315">"Cette application peut lire tous les événements d\'agenda stockés sur votre téléviseur et partager ou enregistrer les données de votre agenda."</string> + <string name="permdesc_readCalendar" product="default" msgid="4373978642145196715">"Cette application peut lire tous les événements d\'agenda stockés sur votre téléphone et partager ou enregistrer les données de votre agenda."</string> <string name="permlab_writeCalendar" msgid="8438874755193825647">"ajouter ou modifier des événements d\'agenda et envoyer des courriels aux invités à l\'insu du propriétaire"</string> - <!-- no translation found for permdesc_writeCalendar (1675270619903625982) --> - <skip /> - <!-- no translation found for permdesc_writeCalendar (9017809326268135866) --> - <skip /> - <!-- no translation found for permdesc_writeCalendar (7592791790516943173) --> - <skip /> + <string name="permdesc_writeCalendar" product="tablet" msgid="1675270619903625982">"Cette application peut ajouter, supprimer et modifier des événements d\'agenda sur votre tablette. Elle peut aussi envoyer des messages qui pourraient sembler venir des propriétaires d\'agenda en question ou modifier des événements sans avertir leur propriétaire."</string> + <string name="permdesc_writeCalendar" product="tv" msgid="9017809326268135866">"Cette application peut ajouter, supprimer et modifier des événements d\'agenda sur votre téléviseur. Elle peut aussi envoyer des messages qui pourraient sembler venir des propriétaires d\'agenda en question ou modifier des événements sans avertir leur propriétaire."</string> + <string name="permdesc_writeCalendar" product="default" msgid="7592791790516943173">"Cette application peut ajouter, supprimer et modifier des événements d\'agenda sur votre téléphone. Elle peut aussi envoyer des messages qui pourraient sembler venir des propriétaires d\'agenda en question ou modifier des événements sans avertir leur propriétaire."</string> <string name="permlab_accessLocationExtraCommands" msgid="2836308076720553837">"accéder aux commandes de fournisseur de position géographique supplémentaires"</string> <string name="permdesc_accessLocationExtraCommands" msgid="6078307221056649927">"Permet à l\'application d\'accéder à des commandes de localisation supplémentaires offertes par le fournisseur. Elle est ainsi susceptible d\'interférer avec le bon fonctionnement du GPS ou de toute autre source de localisation."</string> <string name="permlab_accessFineLocation" msgid="251034415460950944">"accéder à votre position précise (GPS et réseau)"</string> - <!-- no translation found for permdesc_accessFineLocation (5821994817969957884) --> - <skip /> + <string name="permdesc_accessFineLocation" msgid="5821994817969957884">"Cette application peut déterminer votre position à l\'aide du système GPS et de différentes sources de localisation sur le réseau, comme les tours de téléphonie cellulaire et les réseaux Wi-Fi. Ces services de localisation doivent être activés et accessibles sur votre téléviseur pour que l\'application puisse les utiliser. Cela peut entraîner une utilisation accrue de la pile."</string> <string name="permlab_accessCoarseLocation" msgid="7715277613928539434">"accéder à votre position approximative (réseau)"</string> - <!-- no translation found for permdesc_accessCoarseLocation (3373266766487862426) --> - <skip /> - <!-- no translation found for permdesc_accessCoarseLocation (1884022719818788511) --> - <skip /> - <!-- no translation found for permdesc_accessCoarseLocation (7788009094906196995) --> - <skip /> + <string name="permdesc_accessCoarseLocation" product="tablet" msgid="3373266766487862426">"Cette application peut déterminer votre position à l\'aide de différentes sources de localisation sur le réseau, comme les tours de téléphonie cellulaire et les réseaux Wi-Fi. Ces services de localisation doivent être activés et accessibles sur votre tablette pour que l\'application puisse les utiliser."</string> + <string name="permdesc_accessCoarseLocation" product="tv" msgid="1884022719818788511">"Cette application peut déterminer votre position à l\'aide de différentes sources de localisation sur le réseau, comme les tours de téléphonie cellulaire et les réseaux Wi-Fi. Ces services de localisation doivent être activés et accessibles sur votre téléviseur pour que l\'application puisse les utiliser."</string> + <string name="permdesc_accessCoarseLocation" product="default" msgid="7788009094906196995">"Cette application peut déterminer votre position à l\'aide de différentes sources de localisation sur le réseau, comme les tours de téléphonie cellulaire et les réseaux Wi-Fi. Ces services de localisation doivent être activés et accessibles sur votre téléphone pour que l\'application puisse les utiliser."</string> <string name="permlab_modifyAudioSettings" msgid="6095859937069146086">"modifier vos paramètres audio"</string> <string name="permdesc_modifyAudioSettings" msgid="3522565366806248517">"Permet à l\'application de modifier les paramètres audio généraux, tels que le volume et la sortie audio utilisée."</string> <string name="permlab_recordAudio" msgid="3876049771427466323">"enregistrer des fichiers audio"</string> - <!-- no translation found for permdesc_recordAudio (4245930455135321433) --> - <skip /> + <string name="permdesc_recordAudio" msgid="4245930455135321433">"Cette application peut enregistrer de l\'audio à l\'aide du microphone en tout temps."</string> <string name="permlab_sim_communication" msgid="2935852302216852065">"envoyer des commandes à la carte SIM"</string> <string name="permdesc_sim_communication" msgid="5725159654279639498">"Permet à l\'application d\'envoyer des commandes à la carte SIM. Cette fonctionnalité est très dangereuse."</string> <string name="permlab_camera" msgid="3616391919559751192">"prendre des photos et filmer des vidéos"</string> - <!-- no translation found for permdesc_camera (5392231870049240670) --> - <skip /> + <string name="permdesc_camera" msgid="5392231870049240670">"Cette application peut prendre des photos et enregistrer des vidéos à l\'aide de l\'appareil photo en tout temps."</string> <string name="permlab_vibrate" msgid="7696427026057705834">"gérer le vibreur"</string> <string name="permdesc_vibrate" msgid="6284989245902300945">"Permet à l\'application de gérer le vibreur de l\'appareil."</string> <string name="permlab_callPhone" msgid="3925836347681847954">"appeler directement des numéros de téléphone"</string> @@ -1079,7 +1055,7 @@ <string name="volume_icon_description_notification" msgid="7044986546477282274">"Volume des notifications"</string> <string name="ringtone_default" msgid="3789758980357696936">"Sonnerie par défaut"</string> <string name="ringtone_default_with_actual" msgid="1767304850491060581">"Défaut (<xliff:g id="ACTUAL_RINGTONE">%1$s</xliff:g>)"</string> - <string name="ringtone_silent" msgid="7937634392408977062">"Aucune"</string> + <string name="ringtone_silent" msgid="7937634392408977062">"Aucun"</string> <string name="ringtone_picker_title" msgid="3515143939175119094">"Sonneries"</string> <string name="ringtone_picker_title_alarm" msgid="6473325356070549702">"Sons d\'alarme"</string> <string name="ringtone_picker_title_notification" msgid="4837740874822788802">"Sons de notification"</string> diff --git a/core/res/res/values-fr/strings.xml b/core/res/res/values-fr/strings.xml index d058ddea73ae..1e9613709756 100644 --- a/core/res/res/values-fr/strings.xml +++ b/core/res/res/values-fr/strings.xml @@ -46,8 +46,7 @@ <string name="defaultMsisdnAlphaTag" msgid="2850889754919584674">"MSISDN1"</string> <string name="mmiError" msgid="5154499457739052907">"Problème de connexion ou code IHM non valide."</string> <string name="mmiFdnError" msgid="5224398216385316471">"Opération réservée aux numéros autorisés"</string> - <!-- no translation found for mmiErrorWhileRoaming (762488890299284230) --> - <skip /> + <string name="mmiErrorWhileRoaming" msgid="762488890299284230">"Impossible de modifier les paramètres de transfert d\'appel depuis votre téléphone lorsque vous êtes en itinérance."</string> <string name="serviceEnabled" msgid="8147278346414714315">"Le service a été activé."</string> <string name="serviceEnabledFor" msgid="6856228140453471041">"Ce service a été activé pour :"</string> <string name="serviceDisabled" msgid="1937553226592516411">"Ce service a été désactivé."</string> @@ -98,10 +97,8 @@ <string name="RestrictedOnVoiceData" msgid="996636487106171320">"Les services vocaux/de données sont bloqués."</string> <string name="RestrictedOnVoiceSms" msgid="1888588152792023873">"Les services voix/SMS sont bloqués."</string> <string name="RestrictedOnAll" msgid="5643028264466092821">"Tous les services vocaux/de données/SMS sont bloqués."</string> - <!-- no translation found for NetworkPreferenceSwitchTitle (4008877505368566980) --> - <skip /> - <!-- no translation found for NetworkPreferenceSwitchSummary (7335915397439759249) --> - <skip /> + <string name="NetworkPreferenceSwitchTitle" msgid="4008877505368566980">"Impossible d\'accéder au réseau"</string> + <string name="NetworkPreferenceSwitchSummary" msgid="7335915397439759249">"Pour améliorer la réception, essayez de modifier le type sélectionné sous Paramètres > Réseaux mobiles > Type de réseau préféré."</string> <string name="peerTtyModeFull" msgid="6165351790010341421">"Mode TTY demandé par l\'interlocuteur : COMPLET"</string> <string name="peerTtyModeHco" msgid="5728602160669216784">"Mode TTY demandé par l\'interlocuteur : HCO"</string> <string name="peerTtyModeVco" msgid="1742404978686538049">"Mode TTY demandé par l\'interlocuteur : VCO"</string> @@ -185,10 +182,8 @@ <string name="work_profile_deleted_description" msgid="6305147513054341102">"Le profil professionnel a été supprimé, car une application d\'administration est manquante."</string> <string name="work_profile_deleted_details" msgid="226615743462361248">"L\'application d\'administration du profil professionnel est manquante ou endommagée. Par conséquent, votre profil professionnel et toutes les données associées ont été supprimés. Pour obtenir de l\'aide, contactez l\'administrateur."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="6019770344820507579">"Votre profil professionnel n\'est plus disponible sur cet appareil."</string> - <!-- no translation found for network_logging_notification_title (1805392571290161924) --> - <skip /> - <!-- no translation found for network_logging_notification_text (4448072433371155729) --> - <skip /> + <string name="network_logging_notification_title" msgid="1805392571290161924">"Le trafic réseau est surveillé"</string> + <string name="network_logging_notification_text" msgid="4448072433371155729">"Appuyez ici pour en savoir plus"</string> <string name="factory_reset_warning" msgid="5423253125642394387">"Les données de votre appareil vont être effacées"</string> <string name="factory_reset_message" msgid="4905025204141900666">"Certains composants de l\'application d\'administration sont manquants ou endommagés, et l\'application est donc inutilisable. Les données de votre appareil vont maintenant être effacées. Pour obtenir de l\'aide, contactez l\'administrateur."</string> <string name="me" msgid="6545696007631404292">"Moi"</string> @@ -306,12 +301,9 @@ <string name="permlab_sendSms" msgid="7544599214260982981">"envoyer et consulter des SMS"</string> <string name="permdesc_sendSms" msgid="7094729298204937667">"Permet à l\'application d\'envoyer des messages SMS. Cette autorisation peut entraîner des frais inattendus. Les applications malveillantes peuvent générer des frais en envoyant des messages sans votre consentement."</string> <string name="permlab_readSms" msgid="8745086572213270480">"voir les messages texte (SMS ou MMS)"</string> - <!-- no translation found for permdesc_readSms (4741697454888074891) --> - <skip /> - <!-- no translation found for permdesc_readSms (5796670395641116592) --> - <skip /> - <!-- no translation found for permdesc_readSms (6826832415656437652) --> - <skip /> + <string name="permdesc_readSms" product="tablet" msgid="4741697454888074891">"Cette application peut lire tous les SMS enregistrés sur votre tablette."</string> + <string name="permdesc_readSms" product="tv" msgid="5796670395641116592">"Cette application peut lire tous les SMS enregistrés sur votre téléviseur."</string> + <string name="permdesc_readSms" product="default" msgid="6826832415656437652">"Cette application peut lire tous les SMS enregistrés sur votre téléphone."</string> <string name="permlab_receiveWapPush" msgid="5991398711936590410">"recevoir des messages texte (WAP)"</string> <string name="permdesc_receiveWapPush" msgid="748232190220583385">"Permet à l\'application de recevoir et de traiter les messages WAP. Cette autorisation lui donne la possibilité de surveiller ou supprimer les messages envoyés à votre appareil sans vous les montrer."</string> <string name="permlab_getTasks" msgid="6466095396623933906">"récupérer les applications en cours d\'exécution"</string> @@ -324,10 +316,8 @@ <string name="permdesc_enableCarMode" msgid="4853187425751419467">"Permet à l\'application d\'activer le mode Voiture."</string> <string name="permlab_killBackgroundProcesses" msgid="3914026687420177202">"fermer les autres applications"</string> <string name="permdesc_killBackgroundProcesses" msgid="4593353235959733119">"Permet à l\'application de mettre fin aux processus d\'autres applications exécutés en arrière-plan. Cette autorisation peut interrompre l\'exécution d\'autres applications."</string> - <!-- no translation found for permlab_systemAlertWindow (7238805243128138690) --> - <skip /> - <!-- no translation found for permdesc_systemAlertWindow (2393776099672266188) --> - <skip /> + <string name="permlab_systemAlertWindow" msgid="7238805243128138690">"Cette application peut se superposer à d\'autres applications"</string> + <string name="permdesc_systemAlertWindow" msgid="2393776099672266188">"Cette application peut se superposer à d\'autres applications ou à d\'autres parties de l\'écran. Cela peut altérer l\'utilisation normale des applications et modifier l\'apparence des autres applications."</string> <string name="permlab_persistentActivity" msgid="8841113627955563938">"exécuter l\'application en continu"</string> <string name="permdesc_persistentActivity" product="tablet" msgid="8525189272329086137">"Permet à l\'application de rendre certains de ces composants persistants dans la mémoire. Cette autorisation peut limiter la mémoire disponible pour d\'autres applications et ralentir la tablette."</string> <string name="permdesc_persistentActivity" product="tv" msgid="5086862529499103587">"Permet à l\'application d\'activer la persistance de certains de ces composants dans la mémoire. Cette fonctionnalité peut limiter l\'espace mémoire disponible pour les autres applications et ralentir ainsi le téléviseur."</string> @@ -353,51 +343,37 @@ <string name="permdesc_writeContacts" product="tv" msgid="5438230957000018959">"Permet à l\'application de modifier les données relatives aux contacts stockés sur le téléviseur, y compris la fréquence à laquelle vous avez appelé des personnes spécifiques, leur avez envoyé des e-mails ou avez communiqué avec elles par d\'autres moyens. Cette autorisation permet aux applications de supprimer ces données."</string> <string name="permdesc_writeContacts" product="default" msgid="589869224625163558">"Permet à l\'application de modifier les données relatives aux contacts stockés sur votre téléphone, y compris la fréquence à laquelle vous avez appelé des personnes spécifiques, leur avez envoyé des e-mails ou avez communiqué avec elles par d\'autres moyens. Cette autorisation permet aux applications de supprimer ces données."</string> <string name="permlab_readCallLog" msgid="3478133184624102739">"lire le journal d\'appels"</string> - <!-- no translation found for permdesc_readCallLog (3204122446463552146) --> - <skip /> + <string name="permdesc_readCallLog" msgid="3204122446463552146">"Cette application peut lire l\'historique de vos appels."</string> <string name="permlab_writeCallLog" msgid="8552045664743499354">"modifier le journal d\'appels"</string> <string name="permdesc_writeCallLog" product="tablet" msgid="6661806062274119245">"Permet à l\'application de lire le journal d\'appels de votre tablette, y compris les données relatives aux appels entrants et sortants. Des applications malveillantes peuvent utiliser cette fonctionnalité pour effacer ou modifier votre journal d\'appels."</string> <string name="permdesc_writeCallLog" product="tv" msgid="4225034892248398019">"Permet à l\'application de lire le journal d\'appels du téléviseur, y compris les données relatives aux appels entrants et sortants. Des applications malveillantes peuvent utiliser cette fonctionnalité pour effacer ou modifier votre journal d\'appels."</string> <string name="permdesc_writeCallLog" product="default" msgid="683941736352787842">"Permet à l\'application de lire le journal d\'appels de votre téléphone, y compris les données relatives aux appels entrants et sortants. Des applications malveillantes peuvent utiliser cette fonctionnalité pour effacer ou modifier votre journal d\'appels."</string> <string name="permlab_bodySensors" msgid="4683341291818520277">"accéder capteurs corp. (ex : cardiofréquencemètres)"</string> <string name="permdesc_bodySensors" product="default" msgid="4380015021754180431">"Permet à l\'application d\'accéder aux données des capteurs qui contrôlent votre condition physique, comme votre rythme cardiaque."</string> - <!-- no translation found for permlab_readCalendar (6716116972752441641) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (4993979255403945892) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (8837931557573064315) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (4373978642145196715) --> - <skip /> + <string name="permlab_readCalendar" msgid="6716116972752441641">"Lire les événements d\'agenda et les détails associés"</string> + <string name="permdesc_readCalendar" product="tablet" msgid="4993979255403945892">"Cette application peut lire tous les événements d\'agenda enregistrés sur votre tablette et partager ou enregistrer vos données d\'agenda."</string> + <string name="permdesc_readCalendar" product="tv" msgid="8837931557573064315">"Cette application peut lire tous les événements d\'agenda enregistrés sur votre téléviseur et partager ou enregistrer vos données d\'agenda."</string> + <string name="permdesc_readCalendar" product="default" msgid="4373978642145196715">"Cette application peut lire tous les événements d\'agenda enregistrés sur votre téléphone et partager ou enregistrer vos données d\'agenda."</string> <string name="permlab_writeCalendar" msgid="8438874755193825647">"ajouter ou modifier des événements d\'agenda et envoyer des e-mails aux invités à l\'insu des propriétaires"</string> - <!-- no translation found for permdesc_writeCalendar (1675270619903625982) --> - <skip /> - <!-- no translation found for permdesc_writeCalendar (9017809326268135866) --> - <skip /> - <!-- no translation found for permdesc_writeCalendar (7592791790516943173) --> - <skip /> + <string name="permdesc_writeCalendar" product="tablet" msgid="1675270619903625982">"Cette application peut ajouter, supprimer ou modifier les événements d\'agenda enregistrés sur votre tablette. Elle peut en outre envoyer des messages qui semblent provenir du propriétaire de l\'agenda, ou modifier des événements sans en informer leur propriétaire."</string> + <string name="permdesc_writeCalendar" product="tv" msgid="9017809326268135866">"Cette application peut ajouter, supprimer ou modifier les événements d\'agenda enregistrés sur votre téléviseur. Elle peut en outre envoyer des messages qui semblent provenir du propriétaire de l\'agenda, ou modifier des événements sans en informer leur propriétaire."</string> + <string name="permdesc_writeCalendar" product="default" msgid="7592791790516943173">"Cette application peut ajouter, supprimer ou modifier les événements d\'agenda enregistrés sur votre téléphone. Elle peut en outre envoyer des messages qui semblent provenir du propriétaire de l\'agenda, ou modifier des événements sans en informer leur propriétaire."</string> <string name="permlab_accessLocationExtraCommands" msgid="2836308076720553837">"Accès aux commandes de fournisseur de position géographique supplémentaires"</string> <string name="permdesc_accessLocationExtraCommands" msgid="6078307221056649927">"Permet à l\'application d\'accéder à des commandes de localisation supplémentaires offertes par le fournisseur. Elle est ainsi susceptible d\'interférer avec le bon fonctionnement du GPS ou de toute autre source de localisation."</string> <string name="permlab_accessFineLocation" msgid="251034415460950944">"accéder à votre position précise (GPS et réseau)"</string> - <!-- no translation found for permdesc_accessFineLocation (5821994817969957884) --> - <skip /> + <string name="permdesc_accessFineLocation" msgid="5821994817969957884">"Cette application peut obtenir votre position via le GPS ou des sources de positionnement de réseau telles que les antennes-relais et les réseaux Wi-Fi. Ces services de localisation doivent être activés et disponibles sur votre téléphone pour que l\'application puisse les utiliser. Ceci peut réduire l\'autonomie de la batterie."</string> <string name="permlab_accessCoarseLocation" msgid="7715277613928539434">"accéder à votre position approximative (selon le réseau)"</string> - <!-- no translation found for permdesc_accessCoarseLocation (3373266766487862426) --> - <skip /> - <!-- no translation found for permdesc_accessCoarseLocation (1884022719818788511) --> - <skip /> - <!-- no translation found for permdesc_accessCoarseLocation (7788009094906196995) --> - <skip /> + <string name="permdesc_accessCoarseLocation" product="tablet" msgid="3373266766487862426">"Cette application peut obtenir votre position via des sources de réseau telles que les antennes-relais et les réseaux Wi-Fi. Ces services de localisation doivent être activés et disponibles sur votre tablette pour que l\'application puisse les utiliser."</string> + <string name="permdesc_accessCoarseLocation" product="tv" msgid="1884022719818788511">"Cette application peut obtenir votre position via des sources de réseau telles que les antennes-relais et les réseaux Wi-Fi. Ces services de localisation doivent être activés et disponibles sur votre téléviseur pour que l\'application puisse les utiliser."</string> + <string name="permdesc_accessCoarseLocation" product="default" msgid="7788009094906196995">"Cette application peut obtenir votre position via des sources de réseau telles que les antennes-relais et les réseaux Wi-Fi. Ces services de localisation doivent être activés et disponibles sur votre téléphone pour que l\'application puisse les utiliser."</string> <string name="permlab_modifyAudioSettings" msgid="6095859937069146086">"modifier vos paramètres audio"</string> <string name="permdesc_modifyAudioSettings" msgid="3522565366806248517">"Permet à l\'application de modifier les paramètres audio généraux, tels que le volume et la sortie audio utilisée."</string> <string name="permlab_recordAudio" msgid="3876049771427466323">"enregistrer des fichiers audio"</string> - <!-- no translation found for permdesc_recordAudio (4245930455135321433) --> - <skip /> + <string name="permdesc_recordAudio" msgid="4245930455135321433">"Cette application peut utiliser le micro pour enregistrer du contenu audio à tout moment."</string> <string name="permlab_sim_communication" msgid="2935852302216852065">"envoyer des commandes à la carte SIM"</string> <string name="permdesc_sim_communication" msgid="5725159654279639498">"Autoriser l\'envoi de commandes à la carte SIM via l\'application. Cette fonctionnalité est très risquée."</string> <string name="permlab_camera" msgid="3616391919559751192">"prendre des photos et enregistrer des vidéos"</string> - <!-- no translation found for permdesc_camera (5392231870049240670) --> - <skip /> + <string name="permdesc_camera" msgid="5392231870049240670">"Cette application peut utiliser l\'appareil photo pour prendre des photos et enregistrer des vidéos à tout moment."</string> <string name="permlab_vibrate" msgid="7696427026057705834">"contrôler le vibreur"</string> <string name="permdesc_vibrate" msgid="6284989245902300945">"Permet à l\'application de contrôler le vibreur."</string> <string name="permlab_callPhone" msgid="3925836347681847954">"appeler directement les numéros de téléphone"</string> diff --git a/core/res/res/values-gl-rES/strings.xml b/core/res/res/values-gl-rES/strings.xml index e5c73ec14a49..b59057f3a338 100644 --- a/core/res/res/values-gl-rES/strings.xml +++ b/core/res/res/values-gl-rES/strings.xml @@ -46,8 +46,7 @@ <string name="defaultMsisdnAlphaTag" msgid="2850889754919584674">"MSISDN1"</string> <string name="mmiError" msgid="5154499457739052907">"Problema de conexión ou código MMI non válido."</string> <string name="mmiFdnError" msgid="5224398216385316471">"A operación está restrinxida a números de marcación fixa."</string> - <!-- no translation found for mmiErrorWhileRoaming (762488890299284230) --> - <skip /> + <string name="mmiErrorWhileRoaming" msgid="762488890299284230">"Non se pode cambiar a configuración do desvío de chamadas desde o teléfono mentres estás en itinerancia."</string> <string name="serviceEnabled" msgid="8147278346414714315">"Activouse o servizo."</string> <string name="serviceEnabledFor" msgid="6856228140453471041">"Activouse o servizo para:"</string> <string name="serviceDisabled" msgid="1937553226592516411">"Desactivouse o servizo."</string> @@ -98,10 +97,8 @@ <string name="RestrictedOnVoiceData" msgid="996636487106171320">"Os servizos de voz/datos están bloqueados."</string> <string name="RestrictedOnVoiceSms" msgid="1888588152792023873">"Os servizos de voz/SMS están bloqueados."</string> <string name="RestrictedOnAll" msgid="5643028264466092821">"Todos os servizos de voz/datos/SMS están bloqueados."</string> - <!-- no translation found for NetworkPreferenceSwitchTitle (4008877505368566980) --> - <skip /> - <!-- no translation found for NetworkPreferenceSwitchSummary (7335915397439759249) --> - <skip /> + <string name="NetworkPreferenceSwitchTitle" msgid="4008877505368566980">"Non se pode conectar coa rede"</string> + <string name="NetworkPreferenceSwitchSummary" msgid="7335915397439759249">"Para mellorar a recepción, proba a cambiar o tipo seleccionado en Configuración > Redes móbiles > Tipo de rede preferido."</string> <string name="peerTtyModeFull" msgid="6165351790010341421">"Outro dispositivo solicitou o modo TTY COMPLETO"</string> <string name="peerTtyModeHco" msgid="5728602160669216784">"Outro dispositivo solicitou o modo TTY HCO"</string> <string name="peerTtyModeVco" msgid="1742404978686538049">"Outro dispositivo solicitou o modo TTY VCO"</string> @@ -185,10 +182,8 @@ <string name="work_profile_deleted_description" msgid="6305147513054341102">"Eliminouse o perfil de traballo porque falta a aplicación de administración."</string> <string name="work_profile_deleted_details" msgid="226615743462361248">"Falta a aplicación de administración no perfil de traballo ou ben está danada. Como resultado, eliminouse o teu perfil de traballo e os datos relacionados. Ponte en contacto co teu administrador para obter asistencia."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="6019770344820507579">"O teu perfil de traballo xa non está dispoñible neste dispositivo."</string> - <!-- no translation found for network_logging_notification_title (1805392571290161924) --> - <skip /> - <!-- no translation found for network_logging_notification_text (4448072433371155729) --> - <skip /> + <string name="network_logging_notification_title" msgid="1805392571290161924">"Estase controlando o tráfico da rede"</string> + <string name="network_logging_notification_text" msgid="4448072433371155729">"Toca para obter máis información"</string> <string name="factory_reset_warning" msgid="5423253125642394387">"Borrarase o teu dispositivo"</string> <string name="factory_reset_message" msgid="4905025204141900666">"Non se pode utilizar a aplicación de administración porque lle faltan compoñentes ou están danados. Agora borrarase o teu dispositivo. Ponte en contacto co teu administrador para obter asistencia."</string> <string name="me" msgid="6545696007631404292">"Eu"</string> @@ -306,12 +301,9 @@ <string name="permlab_sendSms" msgid="7544599214260982981">"enviar e consultar mensaxes de SMS"</string> <string name="permdesc_sendSms" msgid="7094729298204937667">"Permite á aplicación enviar mensaxes SMS. É posible que esta acción implique custos inesperados. É posible que as aplicacións maliciosas che custen diñeiro debido ao envío de mensaxes sen a túa confirmación."</string> <string name="permlab_readSms" msgid="8745086572213270480">"ler as túas mensaxes de texto (SMS ou MMS)"</string> - <!-- no translation found for permdesc_readSms (4741697454888074891) --> - <skip /> - <!-- no translation found for permdesc_readSms (5796670395641116592) --> - <skip /> - <!-- no translation found for permdesc_readSms (6826832415656437652) --> - <skip /> + <string name="permdesc_readSms" product="tablet" msgid="4741697454888074891">"Esta aplicación pode ler todas as mensaxes SMS (texto) almacenadas na túa tableta."</string> + <string name="permdesc_readSms" product="tv" msgid="5796670395641116592">"Esta aplicación pode ler todas as mensaxes SMS (texto) almacenadas na túa televisión."</string> + <string name="permdesc_readSms" product="default" msgid="6826832415656437652">"Esta aplicación pode ler todas as mensaxes SMS (texto) almacenadas no teu teléfono."</string> <string name="permlab_receiveWapPush" msgid="5991398711936590410">"recibir mensaxes de texto (WAP)"</string> <string name="permdesc_receiveWapPush" msgid="748232190220583385">"Permite á aplicación recibir e procesar mensaxes WAP. Este permiso inclúe a capacidade de supervisar ou eliminar mensaxes enviadas a ti sen mostrarchas."</string> <string name="permlab_getTasks" msgid="6466095396623933906">"recuperar aplicacións en execución"</string> @@ -324,10 +316,8 @@ <string name="permdesc_enableCarMode" msgid="4853187425751419467">"Permite á aplicación activar o modo coche."</string> <string name="permlab_killBackgroundProcesses" msgid="3914026687420177202">"pechar outras aplicacións"</string> <string name="permdesc_killBackgroundProcesses" msgid="4593353235959733119">"Permite á aplicación finalizar procesos en segundo plano doutras aplicacións. É posible que esta acción provoque que outras aplicacións deixen de funcionar."</string> - <!-- no translation found for permlab_systemAlertWindow (7238805243128138690) --> - <skip /> - <!-- no translation found for permdesc_systemAlertWindow (2393776099672266188) --> - <skip /> + <string name="permlab_systemAlertWindow" msgid="7238805243128138690">"Esta aplicación pode aparecer sobre outras"</string> + <string name="permdesc_systemAlertWindow" msgid="2393776099672266188">"Esta aplicación pode aparecer sobre outras aplicacións ou outras partes da pantalla, polo que é posible que interfira no uso normal das aplicacións e modifique a forma en que se mostran."</string> <string name="permlab_persistentActivity" msgid="8841113627955563938">"facer que a aplicación se execute sempre"</string> <string name="permdesc_persistentActivity" product="tablet" msgid="8525189272329086137">"Permite á aplicación converter partes súas como persistentes na memoria. Esta acción pode limitar a cantidade memoria dispoñible para outras aplicacións e reducir a velocidade de funcionamento da tableta."</string> <string name="permdesc_persistentActivity" product="tv" msgid="5086862529499103587">"Permite que a aplicación faga que algunhas das súas partes se manteñan na memoria. Esta acción pode limitar a cantidade de memoria dispoñible para outras aplicacións e reducir a velocidade da televisión."</string> @@ -353,51 +343,37 @@ <string name="permdesc_writeContacts" product="tv" msgid="5438230957000018959">"Permite que a aplicación modifique datos sobre contactos almacenados na televisión, incluída a frecuencia coa que os chamaches, lles enviaches un correo electrónico ou te comunicaches con eles doutra forma. Con este permiso a aplicación pode eliminar os datos de contactos."</string> <string name="permdesc_writeContacts" product="default" msgid="589869224625163558">"Permite á aplicación modificar os datos acerca dos teus contactos almacenados no teléfono, incluída a frecuencia coa que chamaches, enviaches correos electrónicos ou te comunicaches doutras maneiras con contactos específicos. Con este permiso as aplicacións poden eliminar datos de contactos."</string> <string name="permlab_readCallLog" msgid="3478133184624102739">"ler rexistro de chamadas"</string> - <!-- no translation found for permdesc_readCallLog (3204122446463552146) --> - <skip /> + <string name="permdesc_readCallLog" msgid="3204122446463552146">"Esta aplicación pode ler o teu historial de chamadas."</string> <string name="permlab_writeCallLog" msgid="8552045664743499354">"escribir no rexistro de chamadas"</string> <string name="permdesc_writeCallLog" product="tablet" msgid="6661806062274119245">"Permite á aplicación modificar o rexistro de chamadas da tableta, incluídos os datos acerca de chamadas entrantes e saíntes. É posible que aplicacións maliciosas utilicen esta acción para borrar ou modificar o teu rexistro de chamadas."</string> <string name="permdesc_writeCallLog" product="tv" msgid="4225034892248398019">"Permite que a aplicación modifique o rexistro de chamadas da televisión, incluídos os datos sobre chamadas entrantes e saíntes. As aplicacións maliciosas poden utilizar este permiso para borrar ou modificar o rexistro de chamadas."</string> <string name="permdesc_writeCallLog" product="default" msgid="683941736352787842">"Permite á aplicación modificar o rexistro de chamadas do teléfono, incluídos os datos acerca de chamadas entrantes e saíntes. É posible que aplicacións maliciosas utilicen esta acción para borrar ou modificar o teu rexistro de chamadas."</string> <string name="permlab_bodySensors" msgid="4683341291818520277">"acceder a sensores do corpo (como monitores de ritmo cardíaco)"</string> <string name="permdesc_bodySensors" product="default" msgid="4380015021754180431">"Permite que a aplicación acceda aos datos dos sensores que controlan o teu estado físico, como o ritmo cardíaco."</string> - <!-- no translation found for permlab_readCalendar (6716116972752441641) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (4993979255403945892) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (8837931557573064315) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (4373978642145196715) --> - <skip /> + <string name="permlab_readCalendar" msgid="6716116972752441641">"Ler os detalles e os eventos do calendario"</string> + <string name="permdesc_readCalendar" product="tablet" msgid="4993979255403945892">"Esta aplicación pode ler todos os eventos do calendario almacenados na túa tableta e compartir ou gardar os datos do calendario."</string> + <string name="permdesc_readCalendar" product="tv" msgid="8837931557573064315">"Esta aplicación pode ler todos os eventos do calendario almacenados na túa televisión e compartir ou gardar os datos do calendario."</string> + <string name="permdesc_readCalendar" product="default" msgid="4373978642145196715">"Esta aplicación pode ler todos os eventos do calendario almacenados no teu teléfono e compartir ou gardar os datos do calendario."</string> <string name="permlab_writeCalendar" msgid="8438874755193825647">"engadir ou modificar eventos do calendario e enviar correo electrónico aos invitados sen que o saiban os propietarios"</string> - <!-- no translation found for permdesc_writeCalendar (1675270619903625982) --> - <skip /> - <!-- no translation found for permdesc_writeCalendar (9017809326268135866) --> - <skip /> - <!-- no translation found for permdesc_writeCalendar (7592791790516943173) --> - <skip /> + <string name="permdesc_writeCalendar" product="tablet" msgid="1675270619903625982">"Esta aplicación pode engadir, quitar ou cambiar eventos do calendario almacenados na túa tableta. Tamén pode enviar mensaxes que parezan dos propietarios do calendario e cambiar eventos sen comunicárllelo aos propietarios."</string> + <string name="permdesc_writeCalendar" product="tv" msgid="9017809326268135866">"Esta aplicación pode engadir, quitar ou cambiar eventos do calendario almacenados na túa televisión. Tamén pode enviar mensaxes que parezan dos propietarios do calendario e cambiar eventos sen comunicárllelo aos propietarios."</string> + <string name="permdesc_writeCalendar" product="default" msgid="7592791790516943173">"Esta aplicación pode engadir, quitar ou cambiar eventos do calendario almacenados no teu teléfono. Tamén pode enviar mensaxes que parezan dos propietarios do calendario e cambiar eventos sen comunicárllelo aos propietarios."</string> <string name="permlab_accessLocationExtraCommands" msgid="2836308076720553837">"acceder a comandos adicionais do provedor de situación"</string> <string name="permdesc_accessLocationExtraCommands" msgid="6078307221056649927">"Permite á aplicación acceder a comandos adicionais de fornecedor de localizacións. É posible que isto provoque que a aplicación interfira co funcionamento do GPS ou doutras fontes da localización."</string> <string name="permlab_accessFineLocation" msgid="251034415460950944">"acceder á localización precisa (baseada no GPS e na rede)"</string> - <!-- no translation found for permdesc_accessFineLocation (5821994817969957884) --> - <skip /> + <string name="permdesc_accessFineLocation" msgid="5821994817969957884">"Esta aplicación pode obter a túa localización a partir do GPS ou de fontes de localización de rede como torres de telecomunicacións e redes wifi. Para que a aplicación poida utilizar os servizos de localización, deben estar activados e dispoñibles no teu teléfono. Ten en conta que con esta acción pode aumentar o consumo de batería."</string> <string name="permlab_accessCoarseLocation" msgid="7715277613928539434">"acceder á localización aproximada (baseada na rede)"</string> - <!-- no translation found for permdesc_accessCoarseLocation (3373266766487862426) --> - <skip /> - <!-- no translation found for permdesc_accessCoarseLocation (1884022719818788511) --> - <skip /> - <!-- no translation found for permdesc_accessCoarseLocation (7788009094906196995) --> - <skip /> + <string name="permdesc_accessCoarseLocation" product="tablet" msgid="3373266766487862426">"Esta aplicación pode obter a túa localización a partir de fontes de rede como torres de telecomunicacións e redes wifi. Para que a aplicación poida utilizar os servizos de localización, deben estar activados e dispoñibles na túa tableta."</string> + <string name="permdesc_accessCoarseLocation" product="tv" msgid="1884022719818788511">"Esta aplicación pode obter a túa localización a partir de fontes de rede como torres de telecomunicacións e redes wifi. Para que a aplicación poida utilizar os servizos de localización, deben estar activados e dispoñibles na túa televisión."</string> + <string name="permdesc_accessCoarseLocation" product="default" msgid="7788009094906196995">"Esta aplicación pode obter a túa localización a partir de fontes de rede como torres de telecomunicacións e redes wifi. Para que a aplicación poida utilizar os servizos de localización, deben estar activados e dispoñibles no teu teléfono."</string> <string name="permlab_modifyAudioSettings" msgid="6095859937069146086">"cambiar a configuración de son"</string> <string name="permdesc_modifyAudioSettings" msgid="3522565366806248517">"Permite á aplicación modificar a configuración de audio global, como o volume e que altofalante se utiliza para a saída."</string> <string name="permlab_recordAudio" msgid="3876049771427466323">"gravar audio"</string> - <!-- no translation found for permdesc_recordAudio (4245930455135321433) --> - <skip /> + <string name="permdesc_recordAudio" msgid="4245930455135321433">"Esta aplicación pode utilizar o micrófono en calquera momento para gravar audio."</string> <string name="permlab_sim_communication" msgid="2935852302216852065">"enviar comandos á SIM"</string> <string name="permdesc_sim_communication" msgid="5725159654279639498">"Permite á aplicación enviar comandos á SIM. Isto é moi perigoso."</string> <string name="permlab_camera" msgid="3616391919559751192">"facer fotos e vídeos"</string> - <!-- no translation found for permdesc_camera (5392231870049240670) --> - <skip /> + <string name="permdesc_camera" msgid="5392231870049240670">"Esta aplicación pode utilizar a cámara en calquera momento para sacar fotos e gravar vídeos."</string> <string name="permlab_vibrate" msgid="7696427026057705834">"controlar a vibración"</string> <string name="permdesc_vibrate" msgid="6284989245902300945">"Permite á aplicación controlar o vibrador."</string> <string name="permlab_callPhone" msgid="3925836347681847954">"chamar directamente aos números de teléfono"</string> diff --git a/core/res/res/values-gu-rIN/strings.xml b/core/res/res/values-gu-rIN/strings.xml index fe31ff4a38b1..f1140289e41a 100644 --- a/core/res/res/values-gu-rIN/strings.xml +++ b/core/res/res/values-gu-rIN/strings.xml @@ -46,8 +46,7 @@ <string name="defaultMsisdnAlphaTag" msgid="2850889754919584674">"MSISDN1"</string> <string name="mmiError" msgid="5154499457739052907">"કનેક્શન સમસ્યા અથવા અમાન્ય MMI કોડ."</string> <string name="mmiFdnError" msgid="5224398216385316471">"ઑપરેશન ફક્ત સ્થિર ડાયલિંગ નંબર્સ પર પ્રતિબંધિત છે."</string> - <!-- no translation found for mmiErrorWhileRoaming (762488890299284230) --> - <skip /> + <string name="mmiErrorWhileRoaming" msgid="762488890299284230">"તમે રોમિંગમાં હોવ તે વખતે તમારા ફોન પરથી કૉલ ફોરવર્ડિગ સેટિંગ્સ બદલી શકતાં નથી."</string> <string name="serviceEnabled" msgid="8147278346414714315">"સેવા સક્ષમ હતી."</string> <string name="serviceEnabledFor" msgid="6856228140453471041">"સેવા આ માટે સક્ષમ હતી:"</string> <string name="serviceDisabled" msgid="1937553226592516411">"સેવા અક્ષમ કરવામાં આવી છે."</string> @@ -98,10 +97,8 @@ <string name="RestrictedOnVoiceData" msgid="996636487106171320">"વૉઇસ/ડેટા સેવાઓ અવરોધિત છે."</string> <string name="RestrictedOnVoiceSms" msgid="1888588152792023873">"તમામ વૉઇસ/SMS સેવાઓ અવરોધિત છે."</string> <string name="RestrictedOnAll" msgid="5643028264466092821">"તમામ વૉઇસ/ડેટા/SMS સેવાઓ અવરોધિત છે."</string> - <!-- no translation found for NetworkPreferenceSwitchTitle (4008877505368566980) --> - <skip /> - <!-- no translation found for NetworkPreferenceSwitchSummary (7335915397439759249) --> - <skip /> + <string name="NetworkPreferenceSwitchTitle" msgid="4008877505368566980">"નેટવર્ક પર પહોંચી શકાતું નથી"</string> + <string name="NetworkPreferenceSwitchSummary" msgid="7335915397439759249">"પ્રાપ્તિને બહેતર બનાવવા માટે, સેટિંગ્સ > સેલ્યુલર નેટવર્ક્સ > પસંદગીનો નેટવર્ક પ્રકાર પર પસંદ કરેલ પ્રકારને બદલી જુઓ."</string> <string name="peerTtyModeFull" msgid="6165351790010341421">"પીઅરે TTY મોડ પૂર્ણની વિનંતી કરી"</string> <string name="peerTtyModeHco" msgid="5728602160669216784">"પીઅરે TTY મોડ HCO ની વિનંતી કરી"</string> <string name="peerTtyModeVco" msgid="1742404978686538049">"પીઅરે TTY મોડ VCO ની વિનંતી કરી"</string> @@ -185,10 +182,8 @@ <string name="work_profile_deleted_description" msgid="6305147513054341102">"ખૂટતી એડમિન એપ્લિકેશનને કારણે કાર્ય પ્રોફાઇલ કાઢી નાખી."</string> <string name="work_profile_deleted_details" msgid="226615743462361248">"કાર્ય પ્રોફાઇલ વ્યવસ્થાપક ઍપ્લિકેશન કાં તો ખૂટે છે અથવા દૂષિત છે. પરિણામે, તમારી કાર્ય પ્રોફાઇલ અને સંબંધિત ડેટા કાઢી નાખવામાં આવ્યો છે. સહાયતા માટે તમારા વ્યવસ્થાપકનો સંપર્ક કરો."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="6019770344820507579">"આ ઉપકરણ પર તમારી કાર્ય પ્રોફાઇલ હવે ઉપલબ્ધ નથી."</string> - <!-- no translation found for network_logging_notification_title (1805392571290161924) --> - <skip /> - <!-- no translation found for network_logging_notification_text (4448072433371155729) --> - <skip /> + <string name="network_logging_notification_title" msgid="1805392571290161924">"નેટવર્ક ટ્રાફિક મૉનિટર કરવામાં આવી રહ્યું છે"</string> + <string name="network_logging_notification_text" msgid="4448072433371155729">"વધુ વિગતો માટે ટૅપ કરો"</string> <string name="factory_reset_warning" msgid="5423253125642394387">"તમારું ઉપકરણ કાઢી નાખવામાં આવશે"</string> <string name="factory_reset_message" msgid="4905025204141900666">"એડમિન એપ્લિકેશનમાં ઘટકો ખૂટે છે અથવા દૂષિત છે અને વાપરી શકાશે નહીં. તમારું ઉપકરણ હવે કાઢી નાખવામાં આવશે. સહાયતા માટે તમારા વ્યવસ્થાપકનો સંપર્ક કરો."</string> <string name="me" msgid="6545696007631404292">"હું"</string> @@ -306,12 +301,9 @@ <string name="permlab_sendSms" msgid="7544599214260982981">"SMS સંદેશા મોકલો અને જુઓ"</string> <string name="permdesc_sendSms" msgid="7094729298204937667">"એપ્લિકેશનને SMS સંદેશા મોકલવાની મંજૂરી આપે છે. આના પરિણામે અનપેક્ષિત શુલ્ક લાગી શકે છે. દુર્ભાવનાપૂર્ણ ઍપ્લિકેશનો તમારી પુષ્ટિ વિના સંદેશા મોકલીને તમારા નાણા ખર્ચાવી શકે છે."</string> <string name="permlab_readSms" msgid="8745086572213270480">"તમારા ટેક્સ્ટ સંદેશા (SMS અથવા MMS) વાંચો"</string> - <!-- no translation found for permdesc_readSms (4741697454888074891) --> - <skip /> - <!-- no translation found for permdesc_readSms (5796670395641116592) --> - <skip /> - <!-- no translation found for permdesc_readSms (6826832415656437652) --> - <skip /> + <string name="permdesc_readSms" product="tablet" msgid="4741697454888074891">"આ ઍપ્લિકેશન, તમારા ટેબ્લેટ પર સંગ્રહિત તમામ SMS (ટેક્સ્ટ) સંદેશા વાંચી શકે છે."</string> + <string name="permdesc_readSms" product="tv" msgid="5796670395641116592">"આ ઍપ્લિકેશન, તમારા ટીવી પર સંગ્રહિત તમામ SMS (ટેક્સ્ટ) સંદેશા વાંચી શકે છે."</string> + <string name="permdesc_readSms" product="default" msgid="6826832415656437652">"આ ઍપ્લિકેશન, તમારા ફોન પર સંગ્રહિત તમામ SMS (ટેક્સ્ટ) સંદેશા વાંચી શકે છે."</string> <string name="permlab_receiveWapPush" msgid="5991398711936590410">"ટેક્સ્ટ સંદેશા (WAP) પ્રાપ્ત કરો"</string> <string name="permdesc_receiveWapPush" msgid="748232190220583385">"એપ્લિકેશનને WAP સંદેશા પ્રાપ્ત કરવાની અને તેના પર પ્રક્રિયા કરવાની મંજૂરી આપે છે. આ પરવાનગીમાં તમને દર્શાવ્યા વિના તમને મોકલેલ સંદેશાઓનું નિરીક્ષણ કરવાની અને કાઢી નાખવાની ક્ષમતાનો સમાવેશ થાય છે."</string> <string name="permlab_getTasks" msgid="6466095396623933906">"ચાલુ ઍપ્લિકેશનો પુનઃપ્રાપ્ત કરો"</string> @@ -324,10 +316,8 @@ <string name="permdesc_enableCarMode" msgid="4853187425751419467">"એપ્લિકેશનને કાર મોડ સક્ષમ કરવાની મંજૂરી આપે છે."</string> <string name="permlab_killBackgroundProcesses" msgid="3914026687420177202">"અન્ય ઍપ્લિકેશનો બંધ કરો"</string> <string name="permdesc_killBackgroundProcesses" msgid="4593353235959733119">"એપ્લિકેશનને અન્ય ઍપ્લિકેશનોની પૃષ્ઠભૂમિ પ્રક્રિયા સમાપ્ત કરવાની મંજૂરી આપે છે. આનાથી અન્ય ઍપ્લિકેશનો ચાલવાથી બંધ થઈ શકે છે."</string> - <!-- no translation found for permlab_systemAlertWindow (7238805243128138690) --> - <skip /> - <!-- no translation found for permdesc_systemAlertWindow (2393776099672266188) --> - <skip /> + <string name="permlab_systemAlertWindow" msgid="7238805243128138690">"આ ઍપ્લિકેશન, અન્ય ઍપ્લિકેશનોની ટોચ પર દેખાઈ શકે છે"</string> + <string name="permdesc_systemAlertWindow" msgid="2393776099672266188">"આ ઍપ્લિકેશન, અન્ય ઍપ્લિકેશોની ટોચ પર અથવા સ્ક્રીનના અન્ય ભાગોમાં દેખાઈ શકે છે. આ સામાન્ય ઍપ્લિકેશન વપરાશમાં હસ્તક્ષેપ કરી શકે છે અને અન્ય ઍપ્લિકેશનોની દેખાવાની રીતને બદલી શકે છે."</string> <string name="permlab_persistentActivity" msgid="8841113627955563938">"એપ્લિકેશનને હંમેશા શરૂ રાખો"</string> <string name="permdesc_persistentActivity" product="tablet" msgid="8525189272329086137">"એપ્લિકેશનને મેમરીમાં પોતાના ભાગ સતત બનાવવાની મંજૂરી આપે છે. આ ટેબ્લેટને ધીમું કરીને અન્ય ઍપ્લિકેશનો પર ઉપલબ્ધ મેમરીને સીમિત કરી શકે છે."</string> <string name="permdesc_persistentActivity" product="tv" msgid="5086862529499103587">"એપ્લિકેશનને મેમરીમાં પોતાના ભાગ સતત બનાવવાની મંજૂરી આપે છે. આ ટીવીને ધીમું કરીને અન્ય ઍપ્લિકેશનો પર ઉપલબ્ધ મેમરીને સીમિત કરી શકે છે."</string> @@ -353,51 +343,37 @@ <string name="permdesc_writeContacts" product="tv" msgid="5438230957000018959">"એપ્લિકેશનને તમે કઈ આવૃત્તિ પર કૉલ કર્યો, ઇમેઇલ કરી અથવા વિશિષ્ટ વ્યક્તિઓ સાથે અન્ય રીતે સંચાર કર્યો તે સહિત તમારા ટીવી પર સંગ્રહિત તમારા સંપર્કો વિશેનો ડેટા સંશોધિત કરવાની મંજૂરી આપે છે. આ પરવાનગી એપ્લિકેશન્સને સંપર્ક ડેટા કાઢી નાખવાની મંજૂરી આપે છે."</string> <string name="permdesc_writeContacts" product="default" msgid="589869224625163558">"એપ્લિકેશનને તમે કઈ આવૃત્તિ પર કૉલ કર્યો, ઇમેઇલ કરી અથવા વિશિષ્ટ સંપર્કો સાથે અન્ય રીતે સંચાર કર્યો તે સહિત તમારા ફોન પર સંગ્રહિત તમારા સંપર્કો વિશેનો ડેટા સંશોધિત કરવાની મંજૂરી આપે છે. આ પરવાનગી એપ્લિકેશન્સને સંપર્ક ડેટા કાઢી નાખવાની મંજૂરી આપે છે."</string> <string name="permlab_readCallLog" msgid="3478133184624102739">"કૉલ લૉગ વાંચો"</string> - <!-- no translation found for permdesc_readCallLog (3204122446463552146) --> - <skip /> + <string name="permdesc_readCallLog" msgid="3204122446463552146">"આ ઍપ્લિકેશન, તમારો કૉલ ઇતિહાસ વાંચી શકે છે."</string> <string name="permlab_writeCallLog" msgid="8552045664743499354">"કૉલ લૉગ લખો"</string> <string name="permdesc_writeCallLog" product="tablet" msgid="6661806062274119245">"એપ્લિકેશનને ઇનકમિંગ અને આઉટગોઇંગ કૉલ્સ વિશેનાં ડેટા સહિત, તમારા ટેબ્લેટના કૉલ લૉગને સંશોધિત કરવાની મંજૂરી આપે છે. દુર્ભાવનાપૂર્ણ ઍપ્લિકેશનો આનો ઉપયોગ તમારા કૉલ લૉગને કાઢી નાખવા અથવા સંશોધિત માટે કરી શકે છે."</string> <string name="permdesc_writeCallLog" product="tv" msgid="4225034892248398019">"એપ્લિકેશનને ઇનકમિંગ અને આઉટગોઇંગ કૉલ્સ વિશેનાં ડેટા સહિત, તમારા TV ના કૉલ લૉગને સંશોધિત કરવાની મંજૂરી આપે છે. દુર્ભાવનાપૂર્ણ ઍપ્લિકેશનો આનો ઉપયોગ તમારા કૉલ લૉગને કાઢી નાખવા અથવા સંશોધિત માટે કરી શકે છે."</string> <string name="permdesc_writeCallLog" product="default" msgid="683941736352787842">"એપ્લિકેશનને ઇનકમિંગ અને આઉટગોઇંગ કૉલ્સ વિશેનાં ડેટા સહિત, તમારા ફોનના કૉલ લૉગને સંશોધિત કરવાની મંજૂરી આપે છે. દુર્ભાવનાપૂર્ણ ઍપ્લિકેશનો આનો ઉપયોગ તમારા કૉલ લૉગને કાઢી નાખવા અથવા સંશોધિત માટે કરી શકે છે."</string> <string name="permlab_bodySensors" msgid="4683341291818520277">"બૉડીસેન્સર્સ ઍક્સેસ(જેમકે હ્રદય ગતી મૉનિટર)"</string> <string name="permdesc_bodySensors" product="default" msgid="4380015021754180431">"એપ્લિકેશનને તમારી હૃદય ગતિ જેવી તમારી શારીરિક સ્થિતિને મૉનિટર કરતાં સેન્સર્સથી ડેટા ઍક્સેસ કરવાની મંજૂરી આપે છે."</string> - <!-- no translation found for permlab_readCalendar (6716116972752441641) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (4993979255403945892) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (8837931557573064315) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (4373978642145196715) --> - <skip /> + <string name="permlab_readCalendar" msgid="6716116972752441641">"કૅલેન્ડર ઇવેન્ટ્સ અને વિગતો વાંચો"</string> + <string name="permdesc_readCalendar" product="tablet" msgid="4993979255403945892">"આ ઍપ્લિકેશન, તમારા ટેબ્લેટ પર સંગ્રહિત તમામ કૅલેન્ડર ઇવેન્ટ્સને વાંચી શકે છે અને તમારા કૅલેન્ડર ડેટાને શેર કરી અથવા સાચવી શકે છે."</string> + <string name="permdesc_readCalendar" product="tv" msgid="8837931557573064315">"આ ઍપ્લિકેશન, તમારા ટીવી પર સંગ્રહિત તમામ કૅલેન્ડર ઇવેન્ટ્સને વાંચી શકે છે અને તમારા કૅલેન્ડર ડેટાને શેર કરી અથવા સાચવી શકે છે."</string> + <string name="permdesc_readCalendar" product="default" msgid="4373978642145196715">"આ ઍપ્લિકેશન, તમારા ફોન પર સંગ્રહિત તમામ કૅલેન્ડર ઇવેન્ટ્સને વાંચી શકે છે અને તમારા કૅલેન્ડર ડેટાને શેર કરી અથવા સાચવી શકે છે."</string> <string name="permlab_writeCalendar" msgid="8438874755193825647">"કૅલેન્ડર ઇવેન્ટ્સ ઉમેરો અથવા સંશોધિત કરો અને માલિકની જાણ બહાર અતિથિઓને ઇમેઇલ મોકલો"</string> - <!-- no translation found for permdesc_writeCalendar (1675270619903625982) --> - <skip /> - <!-- no translation found for permdesc_writeCalendar (9017809326268135866) --> - <skip /> - <!-- no translation found for permdesc_writeCalendar (7592791790516943173) --> - <skip /> + <string name="permdesc_writeCalendar" product="tablet" msgid="1675270619903625982">"આ ઍપ્લિકેશન, તમારા ટેબ્લેટ પર કૅલેન્ડર ઇવેન્ટ્સ ઉમેરી, દૂર કરી અથવા બદલી શકે છે. આ ઍપ્લિકેશન, કૅલેન્ડર માલિકો તરફથી આવતાં હોય તેવા લાગતાં સંદેશા મોકલી શકે છે અથવા તેમના માલિકોને સૂચિત કર્યા વિના ઇવેન્ટ્સ બદલી શકે છે."</string> + <string name="permdesc_writeCalendar" product="tv" msgid="9017809326268135866">"આ ઍપ્લિકેશન, તમારા ટીવી પર કૅલેન્ડર ઇવેન્ટ્સ ઉમેરી, દૂર કરી અથવા બદલી શકે છે. આ ઍપ્લિકેશન, કૅલેન્ડર માલિકો તરફથી આવતાં હોય તેવા લાગતાં સંદેશા મોકલી શકે છે અથવા તેમના માલિકોને સૂચિત કર્યા વિના ઇવેન્ટ્સ બદલી શકે છે."</string> + <string name="permdesc_writeCalendar" product="default" msgid="7592791790516943173">"આ ઍપ્લિકેશન, તમારા ફોન પર કૅલેન્ડર ઇવેન્ટ્સ ઉમેરી, દૂર કરી અથવા બદલી શકે છે. આ ઍપ્લિકેશન, કૅલેન્ડર માલિકો તરફથી આવતાં હોય તેવા લાગતાં સંદેશા મોકલી શકે છે અથવા તેમના માલિકોને સૂચિત કર્યા વિના ઇવેન્ટ્સ બદલી શકે છે."</string> <string name="permlab_accessLocationExtraCommands" msgid="2836308076720553837">"વધારાના સ્થાન પ્રદાતા આદેશોને ઍક્સેસ કરો"</string> <string name="permdesc_accessLocationExtraCommands" msgid="6078307221056649927">"એપ્લિકેશનને વધારાના સ્થાન પ્રદાતા આદેશોને ઍક્સેસ કરવાની મંજૂરી આપે છે. આ એપ્લિકેશનને GPS અથવા અન્ય સ્થાન સ્રોતોના ઓપરેશનમાં દખલ કરવાની મંજૂરી આપી શકે છે."</string> <string name="permlab_accessFineLocation" msgid="251034415460950944">"નિશ્ચિત સ્થાન ઍક્સેસ કરો (GPS અને નેટવર્ક-આધારિત)"</string> - <!-- no translation found for permdesc_accessFineLocation (5821994817969957884) --> - <skip /> + <string name="permdesc_accessFineLocation" msgid="5821994817969957884">"આ ઍપ્લિકેશન, GPS અથવા સેલ ટાવર્સ અને Wi-Fi નેટવર્ક્સ જેવા નેટવર્ક સ્રોતોના આધારે તમારું સ્થાન મેળવી શકે છે. ઍપ્લિકેશન દ્વારા આ સ્થાન સેવાઓનો ઉપયોગ કરવામાં સમર્થ થવા માટે તમારા ફોન પર આ ઉપલબ્ધ અને ચાલુ હોવી આવશ્યક છે. આ બૅટરી વપરાશ વધારી શકે છે."</string> <string name="permlab_accessCoarseLocation" msgid="7715277613928539434">"અંદાજિત સ્થાન ઍક્સેસ કરો (નેટવર્ક-આધારિત)"</string> - <!-- no translation found for permdesc_accessCoarseLocation (3373266766487862426) --> - <skip /> - <!-- no translation found for permdesc_accessCoarseLocation (1884022719818788511) --> - <skip /> - <!-- no translation found for permdesc_accessCoarseLocation (7788009094906196995) --> - <skip /> + <string name="permdesc_accessCoarseLocation" product="tablet" msgid="3373266766487862426">"આ ઍપ્લિકેશન, સેલ ટાવર્સ અને Wi-Fi નેટવર્ક્સ જેવા નેટવર્ક સ્રોતોના આધારે તમારું સ્થાન મેળવી શકે છે. ઍપ્લિકેશન દ્વારા આ સ્થાન સેવાઓનો ઉપયોગ કરવામાં સમર્થ થવા માટે તમારા ટેબ્લેટ પર આ ઉપલબ્ધ અને ચાલુ હોવી આવશ્યક છે."</string> + <string name="permdesc_accessCoarseLocation" product="tv" msgid="1884022719818788511">"આ ઍપ્લિકેશન, સેલ ટાવર્સ અને Wi-Fi નેટવર્ક્સ જેવા નેટવર્ક સ્રોતોના આધારે તમારું સ્થાન મેળવી શકે છે. ઍપ્લિકેશન દ્વારા આ સ્થાન સેવાઓનો ઉપયોગ કરવામાં સમર્થ થવા માટે તમારા ટીવી પર આ ઉપલબ્ધ અને ચાલુ હોવી આવશ્યક છે."</string> + <string name="permdesc_accessCoarseLocation" product="default" msgid="7788009094906196995">"આ ઍપ્લિકેશન, સેલ ટાવર્સ અને Wi-Fi નેટવર્ક્સ જેવા નેટવર્ક સ્રોતોના આધારે તમારું સ્થાન મેળવી શકે છે. ઍપ્લિકેશન દ્વારા આ સ્થાન સેવાઓનો ઉપયોગ કરવામાં સમર્થ થવા માટે તમારા ફોન પર આ ઉપલબ્ધ અને ચાલુ હોવી આવશ્યક છે."</string> <string name="permlab_modifyAudioSettings" msgid="6095859937069146086">"તમારી ઑડિઓ સેટિંગ્સ બદલો"</string> <string name="permdesc_modifyAudioSettings" msgid="3522565366806248517">"એપ્લિકેશનને વૈશ્વિક ઑડિઓ સેટિંગ્સને સંશોધિત કરવાની મંજૂરી આપે છે, જેમ કે વોલ્યુમ અને આઉટપુટ માટે કયા સ્પીકરનો ઉપયોગ કરવો."</string> <string name="permlab_recordAudio" msgid="3876049771427466323">"ઑડિઓ રેકોર્ડ કરવાની"</string> - <!-- no translation found for permdesc_recordAudio (4245930455135321433) --> - <skip /> + <string name="permdesc_recordAudio" msgid="4245930455135321433">"આ ઍપ્લિકેશન, માઇક્રોફોનનો ઉપયોગ કરીને કોઈપણ સમયે ઑડિઓ રેકોર્ડ કરી શકે છે."</string> <string name="permlab_sim_communication" msgid="2935852302216852065">"SIM ને આદેશો મોકલો"</string> <string name="permdesc_sim_communication" msgid="5725159654279639498">"એપ્લિકેશનને SIM પરા આદેશો મોકલવાની મંજૂરી આપે છે. આ ખૂબ જ ખતરનાક છે."</string> <string name="permlab_camera" msgid="3616391919559751192">"ચિત્રો અને વિડિઓઝ લો"</string> - <!-- no translation found for permdesc_camera (5392231870049240670) --> - <skip /> + <string name="permdesc_camera" msgid="5392231870049240670">"આ ઍપ્લિકેશન, કૅમેરાનો ઉપયોગ કરીને કોઈપણ સમયે ચિત્રો લઈ અને વિડિઓઝ રેકોર્ડ કરી શકે છે."</string> <string name="permlab_vibrate" msgid="7696427026057705834">"વાઇબ્રેશન નિયંત્રિત કરો"</string> <string name="permdesc_vibrate" msgid="6284989245902300945">"એપ્લિકેશનને વાઇબ્રેટરને નિયંત્રિત કરવાની મંજૂરી આપે છે."</string> <string name="permlab_callPhone" msgid="3925836347681847954">"સીધા જ ફોન નંબર્સ પર કૉલ કરો"</string> diff --git a/core/res/res/values-hi/strings.xml b/core/res/res/values-hi/strings.xml index 95001eaae2dd..e291552b8653 100644 --- a/core/res/res/values-hi/strings.xml +++ b/core/res/res/values-hi/strings.xml @@ -46,8 +46,7 @@ <string name="defaultMsisdnAlphaTag" msgid="2850889754919584674">"MSISDN1"</string> <string name="mmiError" msgid="5154499457739052907">"कनेक्शन समस्या या अमान्य MMI कोड."</string> <string name="mmiFdnError" msgid="5224398216385316471">"कार्रवाई केवल फ़िक्स्ड डायलिंग नंबर के लिए प्रतिबंधित है."</string> - <!-- no translation found for mmiErrorWhileRoaming (762488890299284230) --> - <skip /> + <string name="mmiErrorWhileRoaming" msgid="762488890299284230">"आपके रोमिंग में होने पर आपके फ़ोन से कॉल अग्रेषण की सेटिंग नहीं बदली जा सकतीं."</string> <string name="serviceEnabled" msgid="8147278346414714315">"सेवा अक्षम थी."</string> <string name="serviceEnabledFor" msgid="6856228140453471041">"सेवा इसके लिए सक्षम की गई थी:"</string> <string name="serviceDisabled" msgid="1937553226592516411">"सेवा अक्षम कर दी गई है."</string> @@ -98,10 +97,8 @@ <string name="RestrictedOnVoiceData" msgid="996636487106171320">"ध्वनि/डेटा सेवाएं अवरोधित हैं."</string> <string name="RestrictedOnVoiceSms" msgid="1888588152792023873">"ध्वनि/SMS सेवाएं अवरोधित हैं."</string> <string name="RestrictedOnAll" msgid="5643028264466092821">"सभी ध्वनि/डेटा/SMS सेवाएं अवरोधित हैं."</string> - <!-- no translation found for NetworkPreferenceSwitchTitle (4008877505368566980) --> - <skip /> - <!-- no translation found for NetworkPreferenceSwitchSummary (7335915397439759249) --> - <skip /> + <string name="NetworkPreferenceSwitchTitle" msgid="4008877505368566980">"नेटवर्क तक नहीं पहुंच पा रहे हैं"</string> + <string name="NetworkPreferenceSwitchSummary" msgid="7335915397439759249">"रिसेप्शन बेहतर करने के लिए, सेटिंग > सेल्युलर नेटवर्क > पसंदीदा नेटवर्क प्रकार में चयनित प्रकार को बदलकर देखें."</string> <string name="peerTtyModeFull" msgid="6165351790010341421">"पीयर ने TTY मोड पूर्ण का अनुरोध किया"</string> <string name="peerTtyModeHco" msgid="5728602160669216784">"पीयर ने TTY मोड HCO का अनुरोध किया"</string> <string name="peerTtyModeVco" msgid="1742404978686538049">"पीयर ने TTY मोड VCO का अनुरोध किया"</string> @@ -185,10 +182,8 @@ <string name="work_profile_deleted_description" msgid="6305147513054341102">"अनुपलब्ध व्यवस्थापक ऐप के कारण कार्य प्रोफ़ाइल हटाई गई."</string> <string name="work_profile_deleted_details" msgid="226615743462361248">"कार्य प्रोफ़ाइल व्यवस्थापक ऐप या तो अनुपलब्ध है या दूषित है. परिणाम स्वरूप, आपकी कार्य प्रोफ़ाइल और संबंधित डेटा हटा दिया गया है. सहायता के लिए अपने नियंत्रक से संपर्क करें."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="6019770344820507579">"आपकी कार्य प्रोफ़ाइल इस डिवाइस पर उपलब्ध नहीं है."</string> - <!-- no translation found for network_logging_notification_title (1805392571290161924) --> - <skip /> - <!-- no translation found for network_logging_notification_text (4448072433371155729) --> - <skip /> + <string name="network_logging_notification_title" msgid="1805392571290161924">"नेटवर्क ट्रैफ़िक मॉनीटर किया जा रहा है"</string> + <string name="network_logging_notification_text" msgid="4448072433371155729">"अधिक विवरण के लिए टैप करें"</string> <string name="factory_reset_warning" msgid="5423253125642394387">"आपके डिवाइस को मिटा दिया जाएगा"</string> <string name="factory_reset_message" msgid="4905025204141900666">"व्यवस्थापक ऐप में घटक अनुपलब्ध हैं या वह दूषित है और उसका उपयोग नहीं किया जा सकता. आपके डिवाइस को अब मिटा दिया जाएगा. सहायता के लिए अपने नियंत्रक से संपर्क करें."</string> <string name="me" msgid="6545696007631404292">"मैं"</string> @@ -306,12 +301,9 @@ <string name="permlab_sendSms" msgid="7544599214260982981">"SMS संदेश भेजें और देखें"</string> <string name="permdesc_sendSms" msgid="7094729298204937667">"ऐप्स को SMS संदेशों को भेजने देता है. इसके परिणामस्वरूप अप्रत्याशित शुल्क लागू हो सकते हैं. दुर्भावनापूर्ण ऐप्स आपकी पुष्टि के बिना संदेश भेजकर आपका धन व्यय कर सकते हैं."</string> <string name="permlab_readSms" msgid="8745086572213270480">"अपने लेख संदेश (SMS या MMS) पढ़ें"</string> - <!-- no translation found for permdesc_readSms (4741697454888074891) --> - <skip /> - <!-- no translation found for permdesc_readSms (5796670395641116592) --> - <skip /> - <!-- no translation found for permdesc_readSms (6826832415656437652) --> - <skip /> + <string name="permdesc_readSms" product="tablet" msgid="4741697454888074891">"यह ऐप्लिकेशन आपके टैबलेट पर संग्रहीत सभी SMS (लेख) संदेश पढ़ सकता है."</string> + <string name="permdesc_readSms" product="tv" msgid="5796670395641116592">"यह ऐप्लिकेशन आपके टीवी पर संग्रहीत सभी SMS (लेख) संदेश पढ़ सकता है."</string> + <string name="permdesc_readSms" product="default" msgid="6826832415656437652">"यह ऐप्लिकेशन आपके फ़ोन पर संग्रहीत सभी SMS (लेख) संदेश पढ़ सकता है."</string> <string name="permlab_receiveWapPush" msgid="5991398711936590410">"लेख संदेश (WAP) प्राप्त करें"</string> <string name="permdesc_receiveWapPush" msgid="748232190220583385">"ऐप्स को WAP संदेशों को प्राप्त और संसाधित करने देता है. इस अनुमति में आपको भेजे गए संदेशों की निगरानी आपको दिखाए बिना करने और हटाने की क्षमता शामिल है."</string> <string name="permlab_getTasks" msgid="6466095396623933906">"चल रहे ऐप्स पुनर्प्राप्त करें"</string> @@ -324,10 +316,8 @@ <string name="permdesc_enableCarMode" msgid="4853187425751419467">"ऐप्स को कार मोड सक्षम करने देता है."</string> <string name="permlab_killBackgroundProcesses" msgid="3914026687420177202">"अन्य ऐप्स बंद करें"</string> <string name="permdesc_killBackgroundProcesses" msgid="4593353235959733119">"ऐप्स को अन्य ऐप्स की पृष्ठभूमि प्रक्रियाओं को समाप्त करने देता है. यह अन्य ऐप्स का चलना रोक सकता है."</string> - <!-- no translation found for permlab_systemAlertWindow (7238805243128138690) --> - <skip /> - <!-- no translation found for permdesc_systemAlertWindow (2393776099672266188) --> - <skip /> + <string name="permlab_systemAlertWindow" msgid="7238805243128138690">"यह ऐप्लिकेशन दूसरे ऐप्लिकेशन के ऊपर दिखाई दे सकता है"</string> + <string name="permdesc_systemAlertWindow" msgid="2393776099672266188">"यह ऐप्लिकेशन, दूसरे ऐप्लिकेशन के ऊपर या स्क्रीन के अन्य भागों पर दिखाई दे सकता है. इससे ऐप्लिकेशन के सामान्य उपयोग में बाधा आ सकती है और दूसरे ऐप्लिकेशन के दिखाई देने के तरीकों में बदलाव हो सकता है."</string> <string name="permlab_persistentActivity" msgid="8841113627955563938">"ऐप्स को हमेशा चलने वाला बनाएं"</string> <string name="permdesc_persistentActivity" product="tablet" msgid="8525189272329086137">"ऐप्स को मेमोरी में स्वयं के कुछ हिस्सों को लगातार बनाने की अनुमति देता है. यह अन्य ऐप्स के लिए उपलब्ध स्मृति को सीमित कर टेबलेट को धीमा कर सकता है."</string> <string name="permdesc_persistentActivity" product="tv" msgid="5086862529499103587">"ऐप को मेमोरी में स्वयं के दीर्घस्थायी भाग बनाने देती है. इससे अन्य ऐप्स के लिए उपलब्ध मेमोरी सीमित हो सकती है जिससे टीवी धीमा हो सकता है."</string> @@ -353,51 +343,37 @@ <string name="permdesc_writeContacts" product="tv" msgid="5438230957000018959">"ऐप को आपके टीवी पर संग्रहीत आपके संपर्कों के बारे में संग्रहीत डेटा में बदलाव करने देती है, जिसमें आपके द्वारा विशिष्ट व्यक्तियों को कॉल करने, ईमेल भेजने या अन्य तरीकों से संचार किए जाने की आवृत्ति भी शामिल है. यह अनुमति ऐप्स को संपर्क डेटा हटाने देती है."</string> <string name="permdesc_writeContacts" product="default" msgid="589869224625163558">"ऐप्स को आपके फ़ोन में संग्रहीत संपर्कों के डेटा को, साथ ही आपके द्वारा विशिष्ट व्यक्तियों को कॉल करने, ईमेल करने, या अन्य तरीके से डॉयलॉग करने की आवृत्ति को संशोधित करने देता है. यह अनुमति ऐप्स को आपके संपर्क डेटा को हटाने देती है."</string> <string name="permlab_readCallLog" msgid="3478133184624102739">"कॉल लॉग पढ़ें"</string> - <!-- no translation found for permdesc_readCallLog (3204122446463552146) --> - <skip /> + <string name="permdesc_readCallLog" msgid="3204122446463552146">"यह ऐप्लिकेशन आपका कॉल इतिहास पढ़ सकता है."</string> <string name="permlab_writeCallLog" msgid="8552045664743499354">"कॉल लॉग लिखें"</string> <string name="permdesc_writeCallLog" product="tablet" msgid="6661806062274119245">"ऐप्स को इनकमिंग और आउटगोइंग कॉल के डेटा सहित, आपके टेबलेट का कॉल लॉग संशोधित करने देता है. दुर्भावनापूर्ण ऐप्स आपके कॉल लॉग को मिटाने या संशोधित करने के लिए इसका उपयोग कर सकते हैं."</string> <string name="permdesc_writeCallLog" product="tv" msgid="4225034892248398019">"ऐप को इनकमिंग और आउटगोइंग कॉल के डेटा सहित, आपके टैबलेट के कॉल लॉग में बदलाव करने देती है. दुर्भावनापूर्ण ऐप्स आपके कॉल लॉग को मिटाने या संशोधित करने के लिए उसका उपयोग कर सकते हैं."</string> <string name="permdesc_writeCallLog" product="default" msgid="683941736352787842">"ऐप्स को इनकमिंग और आउटगोइंग कॉल के डेटा सहित, आपके फ़ोन का कॉल लॉग संशोधित करने देता है. दुर्भावनापूर्ण ऐप्स आपके कॉल लॉग को मिटाने या संशोधित करने के लिए इसका उपयोग कर सकते हैं."</string> <string name="permlab_bodySensors" msgid="4683341291818520277">"शरीर संवेदक एक्सेस करें (जैसे हृदय गति मॉनीटर)"</string> <string name="permdesc_bodySensors" product="default" msgid="4380015021754180431">"ऐप को आपकी शारीरिक स्थिति, जैसे आपकी हृदय गति पर नज़र रखने वाले संवेदकों का डेटा एक्सेस करने देती है."</string> - <!-- no translation found for permlab_readCalendar (6716116972752441641) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (4993979255403945892) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (8837931557573064315) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (4373978642145196715) --> - <skip /> + <string name="permlab_readCalendar" msgid="6716116972752441641">"कैलेंडर इवेंट और विवरण पढ़ें"</string> + <string name="permdesc_readCalendar" product="tablet" msgid="4993979255403945892">"यह ऐप्लिकेशन आपके टैबलेट पर संग्रहीत सभी कैलेंडर इवेंट पढ़ सकता है और आपका कैलेंडर डेटा साझा कर सकता है या सहेज सकता है."</string> + <string name="permdesc_readCalendar" product="tv" msgid="8837931557573064315">"यह ऐप्लिकेशन आपके टीवी पर संग्रहीत सभी कैलेंडर इवेंट पढ़ सकता है और आपका कैलेंडर डेटा साझा कर सकता है या सहेज सकता है."</string> + <string name="permdesc_readCalendar" product="default" msgid="4373978642145196715">"यह ऐप्लिकेशन आपके फ़ोन पर संग्रहीत सभी कैलेंडर इवेंट पढ़ सकता है और आपका कैलेंडर डेटा साझा कर सकता है या सहेज सकता है."</string> <string name="permlab_writeCalendar" msgid="8438874755193825647">"अपनी जानकारी के बिना कैलेंडर इवेंट जोड़ें या संशोधित करें और अतिथियों को ईमेल भेजें"</string> - <!-- no translation found for permdesc_writeCalendar (1675270619903625982) --> - <skip /> - <!-- no translation found for permdesc_writeCalendar (9017809326268135866) --> - <skip /> - <!-- no translation found for permdesc_writeCalendar (7592791790516943173) --> - <skip /> + <string name="permdesc_writeCalendar" product="tablet" msgid="1675270619903625982">"यह ऐप्लिकेशन आपके टैबलेट पर मौजूद कैलेंडर इवेंट जोड़, निकाल या बदल सकता है. यह ऐप्लिकेशन ऐसे संदेश भेज सकता है जो कैलेंडर स्वामियों से आए हुए लग सकते हैं या यह स्वामियों को सूचित किए बिना इवेंट में बदलाव कर सकता है."</string> + <string name="permdesc_writeCalendar" product="tv" msgid="9017809326268135866">"यह ऐप्लिकेशन आपके टीवी पर मौजूद कैलेंडर इवेंट जोड़, निकाल या बदल सकता है. यह ऐप्लिकेशन ऐसे संदेश भेज सकता है जो कैलेंडर स्वामियों से आए हुए लग सकते हैं या यह स्वामियों को सूचित किए बिना इवेंट में बदलाव कर सकता है."</string> + <string name="permdesc_writeCalendar" product="default" msgid="7592791790516943173">"यह ऐप्लिकेशन आपके फ़ोन पर मौजूद कैलेंडर इवेंट जोड़, निकाल या बदल सकता है. यह ऐप्लिकेशन ऐसे संदेश भेज सकता है जो कैलेंडर स्वामियों से आए हुए लग सकते हैं या यह स्वामियों को सूचित किए बिना इवेंट में बदलाव कर सकता है."</string> <string name="permlab_accessLocationExtraCommands" msgid="2836308076720553837">"अतिरिक्त स्थान प्रदाता आदेशों में पहुंचे"</string> <string name="permdesc_accessLocationExtraCommands" msgid="6078307221056649927">"ऐप्स को अतिरिक्त स्थान प्रदाता आदेशों पर पहुंचने देती है. इससे ऐप्स GPS या अन्य स्थान स्रोतों के संचालन में अवरोध पहुंचा सकता है."</string> <string name="permlab_accessFineLocation" msgid="251034415460950944">"सटीक स्थान एक्सेस करें (GPS और नेटवर्क-आधारित)"</string> - <!-- no translation found for permdesc_accessFineLocation (5821994817969957884) --> - <skip /> + <string name="permdesc_accessFineLocation" msgid="5821994817969957884">"यह ऐप्लिकेशन सेल टॉवर और वाई-फ़ाई नेटवर्क जैसे नेटवर्क स्रोतों या GPS के आधार पर आपका स्थान पता कर सकता है. ये स्थान सेवाएं आपके फ़ोन पर चालू और उपलब्ध होनी चाहिए ताकि ऐप्लिकेशन उनका उपयोग कर सके. इससे बैटरी की खपत बढ़ सकती है."</string> <string name="permlab_accessCoarseLocation" msgid="7715277613928539434">"अनुमानित स्थान एक्सेस करें (नेटवर्क-आधारित)"</string> - <!-- no translation found for permdesc_accessCoarseLocation (3373266766487862426) --> - <skip /> - <!-- no translation found for permdesc_accessCoarseLocation (1884022719818788511) --> - <skip /> - <!-- no translation found for permdesc_accessCoarseLocation (7788009094906196995) --> - <skip /> + <string name="permdesc_accessCoarseLocation" product="tablet" msgid="3373266766487862426">"यह ऐप्लिकेशन सेल टॉवर और वाई-फ़ाई नेटवर्क जैसे नेटवर्क स्रोतों के आधार पर आपका स्थान पता कर सकता है. ये स्थान सेवाएं आपके टैबलेट पर चालू और उपलब्ध होनी चाहिए ताकि ऐप्लिकेशन उनका उपयोग कर सके."</string> + <string name="permdesc_accessCoarseLocation" product="tv" msgid="1884022719818788511">"यह ऐप्लिकेशन सेल टॉवर और वाई-फ़ाई नेटवर्क जैसे नेटवर्क स्रोतों के आधार पर आपका स्थान पता कर सकता है. ये स्थान सेवाएं आपके टीवी पर चालू और उपलब्ध होनी चाहिए ताकि ऐप्लिकेशन उनका उपयोग कर सके."</string> + <string name="permdesc_accessCoarseLocation" product="default" msgid="7788009094906196995">"यह ऐप्लिकेशन सेल टॉवर और वाई-फ़ाई नेटवर्क जैसे नेटवर्क स्रोतों के आधार पर आपका स्थान पता कर सकता है. ये स्थान सेवाएं आपके फ़ोन पर चालू और उपलब्ध होनी चाहिए ताकि ऐप्लिकेशन उनका उपयोग कर सके."</string> <string name="permlab_modifyAudioSettings" msgid="6095859937069146086">"अपनी ऑडियो सेटिंग बदलें"</string> <string name="permdesc_modifyAudioSettings" msgid="3522565366806248517">"ऐप्स को वैश्विक ऑडियो सेटिंग, जैसे वॉल्यूम और कौन-सा स्पीकर आउटपुट के लिए उपयोग किया गया, संशोधित करने देता है."</string> <string name="permlab_recordAudio" msgid="3876049771427466323">"ऑडियो रिकॉर्ड करने"</string> - <!-- no translation found for permdesc_recordAudio (4245930455135321433) --> - <skip /> + <string name="permdesc_recordAudio" msgid="4245930455135321433">"यह ऐप्लिकेशन किसी भी समय माइक्रोफ़ोन का उपयोग करके ऑडियो रिकॉर्ड कर सकता है."</string> <string name="permlab_sim_communication" msgid="2935852302216852065">"SIM पर आदेश भेजें"</string> <string name="permdesc_sim_communication" msgid="5725159654279639498">"ऐप्स को सिम में आदेश भेजने देती है. यह बहुत ही खतरनाक है."</string> <string name="permlab_camera" msgid="3616391919559751192">"चित्र और वीडियो लें"</string> - <!-- no translation found for permdesc_camera (5392231870049240670) --> - <skip /> + <string name="permdesc_camera" msgid="5392231870049240670">"यह ऐप्लिकेशन किसी भी समय कैमरे का उपयोग करके चित्र ले सकता है और वीडियो रिकॉर्ड कर सकता है."</string> <string name="permlab_vibrate" msgid="7696427026057705834">"कंपन नियंत्रित करें"</string> <string name="permdesc_vibrate" msgid="6284989245902300945">"ऐप्स को कंपनकर्ता नियंत्रित करने देता है."</string> <string name="permlab_callPhone" msgid="3925836347681847954">"फ़ोन नंबर पर सीधे कॉल करें"</string> diff --git a/core/res/res/values-hr/strings.xml b/core/res/res/values-hr/strings.xml index ae236e11549d..a403769158de 100644 --- a/core/res/res/values-hr/strings.xml +++ b/core/res/res/values-hr/strings.xml @@ -46,8 +46,7 @@ <string name="defaultMsisdnAlphaTag" msgid="2850889754919584674">"MSISDN1"</string> <string name="mmiError" msgid="5154499457739052907">"Problem s vezom ili nevažeći MMI kôd."</string> <string name="mmiFdnError" msgid="5224398216385316471">"Operacija je ograničena samo na brojeve s fiksnim biranjem."</string> - <!-- no translation found for mmiErrorWhileRoaming (762488890299284230) --> - <skip /> + <string name="mmiErrorWhileRoaming" msgid="762488890299284230">"Nije moguće promijeniti postavke preusmjeravanja poziva na telefonu dok ste u roamingu."</string> <string name="serviceEnabled" msgid="8147278346414714315">"Usluga nije omogućena."</string> <string name="serviceEnabledFor" msgid="6856228140453471041">"Usluga je omogućena za korisnika:"</string> <string name="serviceDisabled" msgid="1937553226592516411">"Usluga je onemogućena."</string> @@ -99,10 +98,8 @@ <string name="RestrictedOnVoiceData" msgid="996636487106171320">"Glasovne/podatkovne usluge blokirane su."</string> <string name="RestrictedOnVoiceSms" msgid="1888588152792023873">"Glasovne/SMS usluge su blokirane."</string> <string name="RestrictedOnAll" msgid="5643028264466092821">"Sve su glasovne/podatkovne/SMS usluge blokirane."</string> - <!-- no translation found for NetworkPreferenceSwitchTitle (4008877505368566980) --> - <skip /> - <!-- no translation found for NetworkPreferenceSwitchSummary (7335915397439759249) --> - <skip /> + <string name="NetworkPreferenceSwitchTitle" msgid="4008877505368566980">"Pristup mreži nije moguć"</string> + <string name="NetworkPreferenceSwitchSummary" msgid="7335915397439759249">"Za bolji prijem pokušajte odabrati drugu vrstu mreže u odjeljku Postavke > Mobilne mreže > Željena vrsta mreže."</string> <string name="peerTtyModeFull" msgid="6165351790010341421">"Način TTY FULL koji zahtijeva paralelni uređaj"</string> <string name="peerTtyModeHco" msgid="5728602160669216784">"Način TTY HCO koji zahtijeva paralelni uređaj"</string> <string name="peerTtyModeVco" msgid="1742404978686538049">"Način TTY VCO koji zahtijeva paralelni uređaj"</string> @@ -187,10 +184,8 @@ <string name="work_profile_deleted_description" msgid="6305147513054341102">"Radni je profil izbrisan jer nedostaje administratorska aplikacija."</string> <string name="work_profile_deleted_details" msgid="226615743462361248">"Administratorska aplikacija radnog profila nedostaje ili je oštećena. Zbog toga su radni profil i povezani podaci izbrisani. Za pomoć se obratite svom administratoru."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="6019770344820507579">"Vaš poslovni profil više nije dostupan na ovom uređaju."</string> - <!-- no translation found for network_logging_notification_title (1805392571290161924) --> - <skip /> - <!-- no translation found for network_logging_notification_text (4448072433371155729) --> - <skip /> + <string name="network_logging_notification_title" msgid="1805392571290161924">"Mrežni se promet prati"</string> + <string name="network_logging_notification_text" msgid="4448072433371155729">"Dodirnite za više pojedinosti"</string> <string name="factory_reset_warning" msgid="5423253125642394387">"Uređaj će se izbrisati"</string> <string name="factory_reset_message" msgid="4905025204141900666">"Nije moguće upotrijebiti administratorsku aplikaciju jer joj nedostaju komponente ili je oštećena. Vaš će se uređaj sada izbrisati. Za pomoć se obratite svom administratoru."</string> <string name="me" msgid="6545696007631404292">"Ja"</string> @@ -309,12 +304,9 @@ <string name="permlab_sendSms" msgid="7544599214260982981">"slati i pregledavati SMS poruke"</string> <string name="permdesc_sendSms" msgid="7094729298204937667">"Aplikaciji omogućuje slanje SMS poruka. To može dovesti do neočekivanih troškova. Zlonamjerne aplikacije mogu vam uzrokovati dodatne troškove slanjem poruka bez vašeg odobrenja."</string> <string name="permlab_readSms" msgid="8745086572213270480">"čitanje tekstnih poruka (SMS ili MMS)"</string> - <!-- no translation found for permdesc_readSms (4741697454888074891) --> - <skip /> - <!-- no translation found for permdesc_readSms (5796670395641116592) --> - <skip /> - <!-- no translation found for permdesc_readSms (6826832415656437652) --> - <skip /> + <string name="permdesc_readSms" product="tablet" msgid="4741697454888074891">"Aplikacija može čitati sve SMS-ove (tekstne poruke) pohranjene na tabletu."</string> + <string name="permdesc_readSms" product="tv" msgid="5796670395641116592">"Aplikacija može čitati sve SMS-ove (tekstne poruke) pohranjene na televizoru."</string> + <string name="permdesc_readSms" product="default" msgid="6826832415656437652">"Aplikacija može čitati sve SMS-ove (tekstne poruke) pohranjene na telefonu."</string> <string name="permlab_receiveWapPush" msgid="5991398711936590410">"primanje tekstnih poruka (WAP)"</string> <string name="permdesc_receiveWapPush" msgid="748232190220583385">"Aplikaciji omogućuje primanje i obradu WAP poruka. Ta dozvola uključuje mogućnost nadziranja ili brisanja vama poslanih poruka, a da vam ih ne prikaže."</string> <string name="permlab_getTasks" msgid="6466095396623933906">"dohvaćanje pokrenutih aplikacija"</string> @@ -327,10 +319,8 @@ <string name="permdesc_enableCarMode" msgid="4853187425751419467">"Aplikaciji omogućuje uključivanje načina rada u vožnji."</string> <string name="permlab_killBackgroundProcesses" msgid="3914026687420177202">"zatvaranje ostalih aplikacija"</string> <string name="permdesc_killBackgroundProcesses" msgid="4593353235959733119">"Aplikaciji omogućuje završavanje pozadinskih procesa drugih aplikacija. To može dovesti do prekida rada drugih aplikacija."</string> - <!-- no translation found for permlab_systemAlertWindow (7238805243128138690) --> - <skip /> - <!-- no translation found for permdesc_systemAlertWindow (2393776099672266188) --> - <skip /> + <string name="permlab_systemAlertWindow" msgid="7238805243128138690">"Aplikacija se može prikazivati povrh drugih aplikacija"</string> + <string name="permdesc_systemAlertWindow" msgid="2393776099672266188">"Aplikacija se može prikazivati povrh drugih aplikacija ili drugih dijelova zaslona. To može omesti uobičajenu upotrebu aplikacija i promijeniti način prikaza drugih aplikacija."</string> <string name="permlab_persistentActivity" msgid="8841113627955563938">"trajni rad aplikacije"</string> <string name="permdesc_persistentActivity" product="tablet" msgid="8525189272329086137">"Aplikaciji omogućuje trajnu prisutnost nekih njenih dijelova u memoriji. To može ograničiti dostupnost memorije drugim aplikacijama i usporiti tabletno računalo."</string> <string name="permdesc_persistentActivity" product="tv" msgid="5086862529499103587">"Aplikaciji omogućuje trajnu ugradnju nekih svojih dijelova u memoriju. To može ograničiti memoriju raspoloživu drugim aplikacijama i usporiti televizor."</string> @@ -356,51 +346,37 @@ <string name="permdesc_writeContacts" product="tv" msgid="5438230957000018959">"Aplikaciji omogućuje izmjenu podataka o vašim kontaktima pohranjenim na televizoru, uključujući učestalost poziva, e-poruka ili drugih načina komunikacije s određenim kontaktima. To dopuštenje aplikacijama omogućuje brisanje kontaktnih podataka."</string> <string name="permdesc_writeContacts" product="default" msgid="589869224625163558">"Aplikaciji omogućuje izmjenu podataka o vašim kontaktima pohranjenim na telefonu, uključujući učestalost poziva, e-poruka ili drugih načina komunikacije s određenim kontaktima. Ta dozvola aplikacijama omogućuje brisanje kontaktnih podataka."</string> <string name="permlab_readCallLog" msgid="3478133184624102739">"čitanje dnevnika poziva"</string> - <!-- no translation found for permdesc_readCallLog (3204122446463552146) --> - <skip /> + <string name="permdesc_readCallLog" msgid="3204122446463552146">"Aplikacija može čitati vašu povijest poziva."</string> <string name="permlab_writeCallLog" msgid="8552045664743499354">"pisanje u dnevnik poziva"</string> <string name="permdesc_writeCallLog" product="tablet" msgid="6661806062274119245">"Aplikaciji omogućuje izmjenu dnevnika poziva vašeg tabletnog računala zajedno s podacima o dolaznim i odlaznim pozivima. Zlonamjerne aplikacije to mogu upotrebljavati za brisanje ili izmjenu vašeg dnevnika poziva."</string> <string name="permdesc_writeCallLog" product="tv" msgid="4225034892248398019">"Aplikaciji omogućuje izmjenu zapisnika poziva vašeg televizora zajedno s podacima o dolaznim i odlaznim pozivima. Zlonamjerne aplikacije to mogu upotrebljavati za brisanje ili izmjenu vašeg zapisnika poziva."</string> <string name="permdesc_writeCallLog" product="default" msgid="683941736352787842">"Aplikaciji omogućuje izmjenu dnevnika poziva vašeg telefona zajedno s podacima o dolaznim i odlaznim pozivima. Zlonamjerne aplikacije to mogu upotrebljavati za brisanje ili izmjenu vašeg dnevnika poziva."</string> <string name="permlab_bodySensors" msgid="4683341291818520277">"pristupati biometrijskim senzorima (kao što su monitori otkucaja srca)"</string> <string name="permdesc_bodySensors" product="default" msgid="4380015021754180431">"Omogućuje aplikaciji pristup podacima sa senzora koji nadziru vaše fizičko stanje, na primjer, broj otkucaja srca."</string> - <!-- no translation found for permlab_readCalendar (6716116972752441641) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (4993979255403945892) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (8837931557573064315) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (4373978642145196715) --> - <skip /> + <string name="permlab_readCalendar" msgid="6716116972752441641">"Čitanje događaja i pojedinosti kalendara"</string> + <string name="permdesc_readCalendar" product="tablet" msgid="4993979255403945892">"Aplikacija može čitati sve kalendarske događaje pohranjene na tabletu i dijeliti ili spremati podatke iz vašeg kalendara."</string> + <string name="permdesc_readCalendar" product="tv" msgid="8837931557573064315">"Aplikacija može čitati sve kalendarske događaje pohranjene na televizoru i dijeliti ili spremati podatke iz vašeg kalendara."</string> + <string name="permdesc_readCalendar" product="default" msgid="4373978642145196715">"Aplikacija može čitati sve kalendarske događaje pohranjene na telefonu i dijeliti ili spremati podatke iz vašeg kalendara."</string> <string name="permlab_writeCalendar" msgid="8438874755193825647">"dodajte ili izmijenite kalendarske događaje i pošaljite e-poštu gostima bez znanja vlasnika"</string> - <!-- no translation found for permdesc_writeCalendar (1675270619903625982) --> - <skip /> - <!-- no translation found for permdesc_writeCalendar (9017809326268135866) --> - <skip /> - <!-- no translation found for permdesc_writeCalendar (7592791790516943173) --> - <skip /> + <string name="permdesc_writeCalendar" product="tablet" msgid="1675270619903625982">"Aplikacija može dodavati, uklanjati ili mijenjati kalendarske događaje na tabletu. Može slati poruke koje izgledaju kao da ih je poslao vlasnik kalendara ili mijenjati događaje bez znanja vlasnika."</string> + <string name="permdesc_writeCalendar" product="tv" msgid="9017809326268135866">"Aplikacija može dodavati, uklanjati ili mijenjati kalendarske događaje na televizoru. Može slati poruke koje izgledaju kao da ih je poslao vlasnik kalendara ili mijenjati događaje bez znanja vlasnika."</string> + <string name="permdesc_writeCalendar" product="default" msgid="7592791790516943173">"Aplikacija može dodavati, uklanjati ili mijenjati kalendarske događaje na telefonu. Može slati poruke koje izgledaju kao da ih je poslao vlasnik kalendara ili mijenjati događaje bez znanja vlasnika."</string> <string name="permlab_accessLocationExtraCommands" msgid="2836308076720553837">"pristup dodatnim naredbama davatelja lokacije"</string> <string name="permdesc_accessLocationExtraCommands" msgid="6078307221056649927">"Omogućuje aplikaciji pristup dodatnim naredbama davatelja usluga lokacije. To može omogućiti aplikaciji ometanje rada GPS-a ili drugih izvora lokacije."</string> <string name="permlab_accessFineLocation" msgid="251034415460950944">"pristupati preciznoj lokaciji (na temelju GPS-a i mreža)"</string> - <!-- no translation found for permdesc_accessFineLocation (5821994817969957884) --> - <skip /> + <string name="permdesc_accessFineLocation" msgid="5821994817969957884">"Aplikacija može dohvatiti vašu lokaciju putem GPS-a ili mrežnih izvora lokacije poput baznih stanica i Wi-Fi mreža. Te usluge lokacije moraju biti uključene i dostupne na telefonu da bi ih aplikacija mogla upotrebljavati. To može povećati potrošnju baterije."</string> <string name="permlab_accessCoarseLocation" msgid="7715277613928539434">"pristupati približnoj lokaciji (na temelju mreža)"</string> - <!-- no translation found for permdesc_accessCoarseLocation (3373266766487862426) --> - <skip /> - <!-- no translation found for permdesc_accessCoarseLocation (1884022719818788511) --> - <skip /> - <!-- no translation found for permdesc_accessCoarseLocation (7788009094906196995) --> - <skip /> + <string name="permdesc_accessCoarseLocation" product="tablet" msgid="3373266766487862426">"Aplikacija može dohvatiti vašu lokaciju putem mrežnih izvora poput baznih stanica i Wi-Fi mreža. Te usluge lokacije moraju biti uključene i dostupne na tabletu da bi ih aplikacija mogla upotrebljavati."</string> + <string name="permdesc_accessCoarseLocation" product="tv" msgid="1884022719818788511">"Aplikacija može dohvatiti vašu lokaciju putem mrežnih izvora poput baznih stanica i Wi-Fi mreža. Te usluge lokacije moraju biti uključene i dostupne na televizoru da bi ih aplikacija mogla upotrebljavati."</string> + <string name="permdesc_accessCoarseLocation" product="default" msgid="7788009094906196995">"Aplikacija može dohvatiti vašu lokaciju putem mrežnih izvora poput baznih stanica i Wi-Fi mreža. Te usluge lokacije moraju biti uključene i dostupne na telefonu da bi ih aplikacija mogla upotrebljavati."</string> <string name="permlab_modifyAudioSettings" msgid="6095859937069146086">"promjena postavki zvuka"</string> <string name="permdesc_modifyAudioSettings" msgid="3522565366806248517">"Aplikaciji omogućuje izmjenu globalnih postavki zvuka, primjerice glasnoće i zvučnika koji se upotrebljava za izlaz."</string> <string name="permlab_recordAudio" msgid="3876049771427466323">"snimanje zvuka"</string> - <!-- no translation found for permdesc_recordAudio (4245930455135321433) --> - <skip /> + <string name="permdesc_recordAudio" msgid="4245930455135321433">"Aplikacija u svakom trenutku može snimati zvuk mikrofonom."</string> <string name="permlab_sim_communication" msgid="2935852302216852065">"slati naredbe SIM-u"</string> <string name="permdesc_sim_communication" msgid="5725159654279639498">"Omogućuje aplikaciji slanje naredbi SIM-u. To je vrlo opasno."</string> <string name="permlab_camera" msgid="3616391919559751192">"snimi fotografije i videozapise"</string> - <!-- no translation found for permdesc_camera (5392231870049240670) --> - <skip /> + <string name="permdesc_camera" msgid="5392231870049240670">"Aplikacija u svakom trenutku može snimati fotografije i videozapise fotoaparatom."</string> <string name="permlab_vibrate" msgid="7696427026057705834">"upravljanje vibracijom"</string> <string name="permdesc_vibrate" msgid="6284989245902300945">"Aplikaciji omogućuje nadzor nad vibratorom."</string> <string name="permlab_callPhone" msgid="3925836347681847954">"izravno pozivanje telefonskog broja"</string> diff --git a/core/res/res/values-hu/strings.xml b/core/res/res/values-hu/strings.xml index a578f0b35fa8..f29cced1e95e 100644 --- a/core/res/res/values-hu/strings.xml +++ b/core/res/res/values-hu/strings.xml @@ -46,8 +46,7 @@ <string name="defaultMsisdnAlphaTag" msgid="2850889754919584674">"MSISDN1"</string> <string name="mmiError" msgid="5154499457739052907">"Kapcsolódási probléma vagy érvénytelen MMI-kód."</string> <string name="mmiFdnError" msgid="5224398216385316471">"A művelet fix hívószámokra van korlátozva."</string> - <!-- no translation found for mmiErrorWhileRoaming (762488890299284230) --> - <skip /> + <string name="mmiErrorWhileRoaming" msgid="762488890299284230">"A hívásátirányítási beállításokat barangolás közben telefonról nem lehet módosítani."</string> <string name="serviceEnabled" msgid="8147278346414714315">"A szolgáltatás engedélyezésre került."</string> <string name="serviceEnabledFor" msgid="6856228140453471041">"Engedélyezett szolgáltatás(ok):"</string> <string name="serviceDisabled" msgid="1937553226592516411">"A szolgáltatás ki van kapcsolva."</string> @@ -98,10 +97,8 @@ <string name="RestrictedOnVoiceData" msgid="996636487106171320">"A hang- és adatszolgáltatások le vannak tiltva."</string> <string name="RestrictedOnVoiceSms" msgid="1888588152792023873">"A hang- és SMS szolgáltatások le vannak tiltva."</string> <string name="RestrictedOnAll" msgid="5643028264466092821">"Minden hang-, adat- és SMS szolgáltatás le van tiltva."</string> - <!-- no translation found for NetworkPreferenceSwitchTitle (4008877505368566980) --> - <skip /> - <!-- no translation found for NetworkPreferenceSwitchSummary (7335915397439759249) --> - <skip /> + <string name="NetworkPreferenceSwitchTitle" msgid="4008877505368566980">"A hálózat nem érhető el"</string> + <string name="NetworkPreferenceSwitchSummary" msgid="7335915397439759249">"A vétel javítása érdekében próbálja módosítani a kiválasztott hálózattípust a Beállítások > Mobilhálózatok > Preferált hálózattípus lehetőségnél."</string> <string name="peerTtyModeFull" msgid="6165351790010341421">"Partner által kért TTY-mód: FULL"</string> <string name="peerTtyModeHco" msgid="5728602160669216784">"Partner által kért TTY-mód: HCO"</string> <string name="peerTtyModeVco" msgid="1742404978686538049">"Partner által kért TTY-mód: VCO"</string> @@ -185,10 +182,8 @@ <string name="work_profile_deleted_description" msgid="6305147513054341102">"A munkahelyi profilt a rendszer a hiányzó rendszergazda alkalmazás miatt törölte."</string> <string name="work_profile_deleted_details" msgid="226615743462361248">"A munkahelyi profil rendszergazda alkalmazása hiányzik vagy sérült. A rendszer ezért törölte munkahelyi profilját, és az ahhoz kapcsolódó adatokat. Ha segítségre van szüksége, vegye fel a kapcsolatot rendszergazdájával."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="6019770344820507579">"Munkaprofilja már nem érhető el ezen az eszközön."</string> - <!-- no translation found for network_logging_notification_title (1805392571290161924) --> - <skip /> - <!-- no translation found for network_logging_notification_text (4448072433371155729) --> - <skip /> + <string name="network_logging_notification_title" msgid="1805392571290161924">"A hálózati forgalmat figyelik"</string> + <string name="network_logging_notification_text" msgid="4448072433371155729">"Koppintson, ha további információt szeretne"</string> <string name="factory_reset_warning" msgid="5423253125642394387">"A rendszer törölni fogja eszközét"</string> <string name="factory_reset_message" msgid="4905025204141900666">"A rendszergazda alkalmazás egyes részei hiányoznak, vagy az alkalmazás sérült, ezért nem használható. A rendszer most törölni fogja eszközét. Ha segítségre van szüksége, vegye fel a kapcsolatot rendszergazdájával."</string> <string name="me" msgid="6545696007631404292">"Saját"</string> @@ -306,12 +301,9 @@ <string name="permlab_sendSms" msgid="7544599214260982981">"SMS-ek küldése és megtekintése"</string> <string name="permdesc_sendSms" msgid="7094729298204937667">"Lehetővé teszi az alkalmazás számára, hogy SMS-eket küldjön. Ennek eredményeként váratlan terhelésekkel találkozhat. A rosszindulatú alkalmazások az Ön jóváhagyása nélkül küldhetnek üzeneteket, így költségek merülhetnek fel."</string> <string name="permlab_readSms" msgid="8745086572213270480">"szöveges üzenetek (SMS vagy MMS) olvasása"</string> - <!-- no translation found for permdesc_readSms (4741697454888074891) --> - <skip /> - <!-- no translation found for permdesc_readSms (5796670395641116592) --> - <skip /> - <!-- no translation found for permdesc_readSms (6826832415656437652) --> - <skip /> + <string name="permdesc_readSms" product="tablet" msgid="4741697454888074891">"Az alkalmazás olvashatja a táblagépen tárolt összes SMS-t (szöveges üzenetet)."</string> + <string name="permdesc_readSms" product="tv" msgid="5796670395641116592">"Az alkalmazás olvashatja a TV-n tárolt összes SMS-t (szöveges üzenetet)."</string> + <string name="permdesc_readSms" product="default" msgid="6826832415656437652">"Az alkalmazás olvashatja a telefonon tárolt összes SMS-t (szöveges üzenetet)."</string> <string name="permlab_receiveWapPush" msgid="5991398711936590410">"szöveges üzenetek (WAP) fogadása"</string> <string name="permdesc_receiveWapPush" msgid="748232190220583385">"Lehetővé teszi az alkalmazás számára, hogy WAP-üzeneteket fogadjon és dolgozzon fel. Ez azt is jelenti, hogy az alkalmazás megfigyelheti vagy törölheti a beérkező üzeneteket anélkül, hogy Ön látná azokat."</string> <string name="permlab_getTasks" msgid="6466095396623933906">"futó alkalmazások lekérése"</string> @@ -324,10 +316,8 @@ <string name="permdesc_enableCarMode" msgid="4853187425751419467">"Lehetővé teszi az alkalmazás számára a gépkocsi üzemmód bekapcsolását."</string> <string name="permlab_killBackgroundProcesses" msgid="3914026687420177202">"más alkalmazások bezárása"</string> <string name="permdesc_killBackgroundProcesses" msgid="4593353235959733119">"Lehetővé teszi az alkalmazás számára, hogy megszüntesse más alkalmazások háttérben zajló folyamatait. Így előfordulhat, hogy egyes alkalmazások bezárulnak."</string> - <!-- no translation found for permlab_systemAlertWindow (7238805243128138690) --> - <skip /> - <!-- no translation found for permdesc_systemAlertWindow (2393776099672266188) --> - <skip /> + <string name="permlab_systemAlertWindow" msgid="7238805243128138690">"Az alkalmazás megjelenhet más alkalmazások fölött"</string> + <string name="permdesc_systemAlertWindow" msgid="2393776099672266188">"Az alkalmazás megjelenhet más alkalmazások fölött vagy a képernyő más részein. Ez befolyásolhatja a megszokott alkalmazáshasználatot, és módosíthatja más alkalmazások megjelenésének módját."</string> <string name="permlab_persistentActivity" msgid="8841113627955563938">"az alkalmazás állandó futtatása"</string> <string name="permdesc_persistentActivity" product="tablet" msgid="8525189272329086137">"Lehetővé teszi az alkalmazás számára, hogy egyes részeit állandó jelleggel eltárolja a memóriában. Ez korlátozhatja a többi alkalmazás számára rendelkezésre álló memóriát, és lelassíthatja a táblagépet."</string> <string name="permdesc_persistentActivity" product="tv" msgid="5086862529499103587">"Lehetővé teszi az alkalmazás számára azt, hogy egyes részeit állandóan a memóriában tartsa. Ez korlátozhatja a többi alkalmazás számára elérhető memóriát, ezáltal lelassulhat a tévé."</string> @@ -353,51 +343,37 @@ <string name="permdesc_writeContacts" product="tv" msgid="5438230957000018959">"Lehetővé teszi az alkalmazás számára a tévén tárolt névjegyekre vonatkozó adatok – például az egyes személyekkel telefonon, e-mailben vagy más módon folytatott kommunikáció gyakoriságára vonatkozó adatok – módosítását. Az engedéllyel rendelkező alkalmazás törölheti a névjegyadatokat."</string> <string name="permdesc_writeContacts" product="default" msgid="589869224625163558">"Lehetővé teszi az alkalmazás számára a telefonon tárolt névjegyekre vonatkozó adatok -- például az egyes személyekkel telefonon, e-mailben vagy más módon folytatott kommunikáció gyakoriságára vonatkozó adatok -- módosítását. Az engedéllyel rendelkező alkalmazás törölheti a névjegyadatokat."</string> <string name="permlab_readCallLog" msgid="3478133184624102739">"Híváslista beolvasása"</string> - <!-- no translation found for permdesc_readCallLog (3204122446463552146) --> - <skip /> + <string name="permdesc_readCallLog" msgid="3204122446463552146">"Az alkalmazás olvashatja az Ön híváslistáját."</string> <string name="permlab_writeCallLog" msgid="8552045664743499354">"Híváslista készítése"</string> <string name="permdesc_writeCallLog" product="tablet" msgid="6661806062274119245">"Lehetővé teszi, hogy az alkalmazás módosítsa a táblagép híváslistáját, beleértve a bejövő és kimenő hívások adatait is. A rosszindulatú alkalmazások ezt arra használhatják, hogy híváslistáját töröljék vagy módosítsák."</string> <string name="permdesc_writeCallLog" product="tv" msgid="4225034892248398019">"Lehetővé teszi, hogy az alkalmazás módosítsa a tévé hívásnaplóját, így például a bejövő és kimenő hívások adatait is. A rosszindulatú alkalmazások ezt hívásnaplója törlésére vagy módosítására használhatják."</string> <string name="permdesc_writeCallLog" product="default" msgid="683941736352787842">"Lehetővé teszi, hogy az alkalmazás módosítsa a telefon híváslistáját, beleértve a bejövő és kimenő hívások adatait is. A rosszindulatú alkalmazások ezt arra használhatják, hogy híváslistáját töröljék vagy módosítsák."</string> <string name="permlab_bodySensors" msgid="4683341291818520277">"hozzáférés a testérzékelőkhöz (például pulzusmérők)"</string> <string name="permdesc_bodySensors" product="default" msgid="4380015021754180431">"Engedélyezi az alkalmazásnak, hogy hozzáférjen az Ön fizikai állapotát – például a pulzusszámát – figyelő érzékelők adataihoz."</string> - <!-- no translation found for permlab_readCalendar (6716116972752441641) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (4993979255403945892) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (8837931557573064315) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (4373978642145196715) --> - <skip /> + <string name="permlab_readCalendar" msgid="6716116972752441641">"Naptáresemények és a naptári adatok olvasása"</string> + <string name="permdesc_readCalendar" product="tablet" msgid="4993979255403945892">"Az alkalmazás olvashatja a táblagépen tárolt összes naptáreseményt, és megoszthatja vagy mentheti a naptáradatokat."</string> + <string name="permdesc_readCalendar" product="tv" msgid="8837931557573064315">"Az alkalmazás olvashatja a TV-n tárolt összes naptáreseményt, és megoszthatja vagy mentheti a naptáradatokat."</string> + <string name="permdesc_readCalendar" product="default" msgid="4373978642145196715">"Az alkalmazás olvashatja a telefonon tárolt összes naptáreseményt, és megoszthatja vagy mentheti a naptáradatokat."</string> <string name="permlab_writeCalendar" msgid="8438874755193825647">"naptári események hozzáadása vagy módosítása, e-mailek küldése a vendégeknek a tulajdonosok tudomása nélkül"</string> - <!-- no translation found for permdesc_writeCalendar (1675270619903625982) --> - <skip /> - <!-- no translation found for permdesc_writeCalendar (9017809326268135866) --> - <skip /> - <!-- no translation found for permdesc_writeCalendar (7592791790516943173) --> - <skip /> + <string name="permdesc_writeCalendar" product="tablet" msgid="1675270619903625982">"Az alkalmazás hozzáadhatja, eltávolíthatja vagy módosíthatja a táblagépen található naptáreseményeket. Az alkalmazás olyan üzeneteket küldhet, amelyekről úgy tűnhet, hogy a naptár tulajdonosaitól származnak, illetve a tulajdonosok értesítése nélkül módosíthat eseményeket."</string> + <string name="permdesc_writeCalendar" product="tv" msgid="9017809326268135866">"Az alkalmazás hozzáadhatja, eltávolíthatja vagy módosíthatja a TV-n található naptáreseményeket. Az alkalmazás olyan üzeneteket küldhet, amelyekről úgy tűnhet, hogy a naptár tulajdonosaitól származnak, illetve a tulajdonosok értesítése nélkül módosíthat eseményeket."</string> + <string name="permdesc_writeCalendar" product="default" msgid="7592791790516943173">"Az alkalmazás hozzáadhatja, eltávolíthatja vagy módosíthatja a telefonon található naptáreseményeket. Az alkalmazás olyan üzeneteket küldhet, amelyekről úgy tűnhet, hogy a naptár tulajdonosaitól származnak, illetve a tulajdonosok értesítése nélkül módosíthat eseményeket."</string> <string name="permlab_accessLocationExtraCommands" msgid="2836308076720553837">"további helyszolgáltatói parancsok elérése"</string> <string name="permdesc_accessLocationExtraCommands" msgid="6078307221056649927">"Lehetővé teszi az alkalmazás számára további helyszolgáltatói parancsok elérését. Ezáltal az alkalmazás beavatkozhat a GPS vagy más helyforrások működésébe."</string> <string name="permlab_accessFineLocation" msgid="251034415460950944">"hozzáférés a pontos (GPS- és hálózatalapú) helyadatokhoz"</string> - <!-- no translation found for permdesc_accessFineLocation (5821994817969957884) --> - <skip /> + <string name="permdesc_accessFineLocation" msgid="5821994817969957884">"Az alkalmazás hozzáférhet a GPS-en vagy hálózati helyforrásokon (például az adótornyokon és a Wi-Fi-hálózatokon) alapuló helyadataihoz. A helyszolgáltatásoknak bekapcsolt és elérhető állapotban kell lenniük a telefonon ahhoz, hogy az alkalmazás használhassa őket. Ez növelheti az akkumulátorhasználatot."</string> <string name="permlab_accessCoarseLocation" msgid="7715277613928539434">"hozzáférés a hozzávetőleges (hálózatalapú) helyadatokhoz"</string> - <!-- no translation found for permdesc_accessCoarseLocation (3373266766487862426) --> - <skip /> - <!-- no translation found for permdesc_accessCoarseLocation (1884022719818788511) --> - <skip /> - <!-- no translation found for permdesc_accessCoarseLocation (7788009094906196995) --> - <skip /> + <string name="permdesc_accessCoarseLocation" product="tablet" msgid="3373266766487862426">"Az alkalmazás hozzáférhet hálózati forrásokon (például az adótornyokon és a Wi-Fi-hálózatokon) alapuló helyadataihoz. A helyszolgáltatásoknak bekapcsolt és elérhető állapotban kell lenniük a táblagépen ahhoz, hogy az alkalmazás használhassa őket."</string> + <string name="permdesc_accessCoarseLocation" product="tv" msgid="1884022719818788511">"Az alkalmazás hozzáférhet hálózati forrásokon (például az adótornyokon és a Wi-Fi-hálózatokon) alapuló helyadataihoz. A helyszolgáltatásoknak bekapcsolt és elérhető állapotban kell lenniük a TV-n ahhoz, hogy az alkalmazás használhassa őket."</string> + <string name="permdesc_accessCoarseLocation" product="default" msgid="7788009094906196995">"Az alkalmazás hozzáférhet hálózati forrásokon (például az adótornyokon és a Wi-Fi-hálózatokon) alapuló helyadataihoz. A helyszolgáltatásoknak bekapcsolt és elérhető állapotban kell lenniük a telefonon ahhoz, hogy az alkalmazás használhassa őket."</string> <string name="permlab_modifyAudioSettings" msgid="6095859937069146086">"hangbeállítások módosítása"</string> <string name="permdesc_modifyAudioSettings" msgid="3522565366806248517">"Lehetővé teszi az alkalmazás számára az általános hangbeállítások, például a hangerő és a használni kívánt kimeneti hangszóró módosítását."</string> <string name="permlab_recordAudio" msgid="3876049771427466323">"hanganyag rögzítése"</string> - <!-- no translation found for permdesc_recordAudio (4245930455135321433) --> - <skip /> + <string name="permdesc_recordAudio" msgid="4245930455135321433">"Az alkalmazás a mikrofon használatával bármikor készíthet hangfelvételt."</string> <string name="permlab_sim_communication" msgid="2935852302216852065">"parancsok küldése a SIM-kártyára"</string> <string name="permdesc_sim_communication" msgid="5725159654279639498">"Engedélyezi, hogy az alkalmazás parancsokat küldjön a SIM kártyára. Ez rendkívül veszélyes lehet."</string> <string name="permlab_camera" msgid="3616391919559751192">"fotók és videók készítése"</string> - <!-- no translation found for permdesc_camera (5392231870049240670) --> - <skip /> + <string name="permdesc_camera" msgid="5392231870049240670">"Az alkalmazás a kamera használatával bármikor készíthet fényképeket és rögzíthet videókat."</string> <string name="permlab_vibrate" msgid="7696427026057705834">"rezgés szabályozása"</string> <string name="permdesc_vibrate" msgid="6284989245902300945">"Lehetővé teszi az alkalmazás számára a rezgés vezérlését."</string> <string name="permlab_callPhone" msgid="3925836347681847954">"telefonszámok közvetlen hívása"</string> diff --git a/core/res/res/values-hy-rAM/strings.xml b/core/res/res/values-hy-rAM/strings.xml index 530cabc4b25f..87b8d04e0c07 100644 --- a/core/res/res/values-hy-rAM/strings.xml +++ b/core/res/res/values-hy-rAM/strings.xml @@ -46,8 +46,7 @@ <string name="defaultMsisdnAlphaTag" msgid="2850889754919584674">"MSISDN1"</string> <string name="mmiError" msgid="5154499457739052907">"Միացման խնդիր կամ անվավեր MMI ծածակագիր:"</string> <string name="mmiFdnError" msgid="5224398216385316471">"Գործողությունը սահմանափակված է միայն ամրակայված հեռախոսահամարների համար:"</string> - <!-- no translation found for mmiErrorWhileRoaming (762488890299284230) --> - <skip /> + <string name="mmiErrorWhileRoaming" msgid="762488890299284230">"Ռոումինգում չեք կարող փոխել զանգի վերահասցեավորման կարգավորումները ձեր հեռախոսից։"</string> <string name="serviceEnabled" msgid="8147278346414714315">"Ծառայությունը միացված է:"</string> <string name="serviceEnabledFor" msgid="6856228140453471041">"Ծառայությունը միացված է`"</string> <string name="serviceDisabled" msgid="1937553226592516411">"Ծառայությունն անջատվել է:"</string> @@ -98,10 +97,8 @@ <string name="RestrictedOnVoiceData" msgid="996636487106171320">"Ձայնային կամ տվյալների ծառայություններն արգելափակված են:"</string> <string name="RestrictedOnVoiceSms" msgid="1888588152792023873">"Ձայնային/SMS ծառայությունները արգելափակված են:"</string> <string name="RestrictedOnAll" msgid="5643028264466092821">"Բոլոր ձայնային/տվյալների/SMS ծառայությունները արգելափակված են:"</string> - <!-- no translation found for NetworkPreferenceSwitchTitle (4008877505368566980) --> - <skip /> - <!-- no translation found for NetworkPreferenceSwitchSummary (7335915397439759249) --> - <skip /> + <string name="NetworkPreferenceSwitchTitle" msgid="4008877505368566980">"Ցանցն անհասանելի է"</string> + <string name="NetworkPreferenceSwitchSummary" msgid="7335915397439759249">"Ազդանշանի ընդունման որակը բարելավելու համար փոխեք ցանցի տեսակը՝ անցնելով Կարգավորումներ > Բջջային ցանցեր > Ցանկալի ցանցի տեսակը։"</string> <string name="peerTtyModeFull" msgid="6165351790010341421">"Բաժանորդի սարքում ընտրված է հեռատիպի ԲՈԼՈՐԸ ռեժիմը"</string> <string name="peerTtyModeHco" msgid="5728602160669216784">"Բաժանորդի սարքում ընտրված է հեռատիպի HCO ռեժիմը"</string> <string name="peerTtyModeVco" msgid="1742404978686538049">"Բաժանորդի սարքում ընտրված է հեռատիպի VCO ռեժիմը"</string> @@ -185,10 +182,8 @@ <string name="work_profile_deleted_description" msgid="6305147513054341102">"Աշխատանքային պրոֆիլը ջնջվել է ադմինիստրատորի հավելվածի բացակայության պատճառով:"</string> <string name="work_profile_deleted_details" msgid="226615743462361248">"Աշխատանքային պրոֆիլի ադմինիստրատորի հավելվածը բացակայում է կամ վնասված է: Արդյունքում ձեր աշխատանքային պրոֆիլը և առնչվող տվյալները ջնջվել են: Օգնության համար դիմեք ձեր ադմինիստրատորին:"</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="6019770344820507579">"Ձեր աշխատանքային պրոֆիլն այս սարքում այլևս հասանելի չէ:"</string> - <!-- no translation found for network_logging_notification_title (1805392571290161924) --> - <skip /> - <!-- no translation found for network_logging_notification_text (4448072433371155729) --> - <skip /> + <string name="network_logging_notification_title" msgid="1805392571290161924">"Ցանցային թրաֆիկը վերահսկվում է"</string> + <string name="network_logging_notification_text" msgid="4448072433371155729">"Հպեք՝ լրացուցիչ տեղեկություններ ստանալու համար"</string> <string name="factory_reset_warning" msgid="5423253125642394387">"Ձեր սարքը ջնջվելու է"</string> <string name="factory_reset_message" msgid="4905025204141900666">"Ադմինիստրատորի հավելվածում բացակայում են բաղադրիչներ կամ այն վնասված է և չի կարող օգտագործվել: Ձեր սարքն այժմ ջնջվելու է: Օգնություն համար դիմեք ձեր ադմինիստրատորին:"</string> <string name="me" msgid="6545696007631404292">"Իմ"</string> @@ -306,12 +301,9 @@ <string name="permlab_sendSms" msgid="7544599214260982981">"SMS հաղորդագրությունների ուղարկում և ընթերցում"</string> <string name="permdesc_sendSms" msgid="7094729298204937667">"Թույլ է տալիս հավելվածին ուղարկել SMS հաղորդագրություններ: Այն կարող է անսպասելի ծախսերի պատճառ դառնալ: Վնասարար հավելվածները կարող են ձեր հաշվից գումար ծախսել` ուղարկելով հաղորդագրություններ` առանց ձեր հաստատման:"</string> <string name="permlab_readSms" msgid="8745086572213270480">"կարդալ ձեր տեքստային հաղորդագրությունները (SMS կամ MMS)"</string> - <!-- no translation found for permdesc_readSms (4741697454888074891) --> - <skip /> - <!-- no translation found for permdesc_readSms (5796670395641116592) --> - <skip /> - <!-- no translation found for permdesc_readSms (6826832415656437652) --> - <skip /> + <string name="permdesc_readSms" product="tablet" msgid="4741697454888074891">"Այս հավելվածը կարող է կարդալ ձեր պլանշետում պահված բոլոր SMS (տեքստային) հաղորդագրությունները:"</string> + <string name="permdesc_readSms" product="tv" msgid="5796670395641116592">"Այս հավելվածը կարող է կարդալ ձեր հեռուստացույցում պահված բոլոր SMS (տեքստային) հաղորդագրությունները:"</string> + <string name="permdesc_readSms" product="default" msgid="6826832415656437652">"Այս հավելվածը կարող է կարդալ ձեր հեռախոսում պահված բոլոր SMS (տեքստային) հաղորդագրությունները:"</string> <string name="permlab_receiveWapPush" msgid="5991398711936590410">"ստանալ տեքստային հաղորդագրություններ (WAP)"</string> <string name="permdesc_receiveWapPush" msgid="748232190220583385">"Թույլ է տալիս հավելվածին ստանալ և գործարկել WAP հաղորդագրությունները: Այս թույլտվությունը ներառում է ձեզ ուղարկված հաղորդագրությունները հետևելու կամ ջնջելու կարողությունը` առանց ձեր տեսնելու:"</string> <string name="permlab_getTasks" msgid="6466095396623933906">"առբերել աշխատող հավելվածները"</string> @@ -324,10 +316,8 @@ <string name="permdesc_enableCarMode" msgid="4853187425751419467">"Թույլ է տալիս հավելվածին միացնել մեքենայի ռեժիմը:"</string> <string name="permlab_killBackgroundProcesses" msgid="3914026687420177202">"փակել այլ հավելվածները"</string> <string name="permdesc_killBackgroundProcesses" msgid="4593353235959733119">"Թույլ է տալիս հավելվածին վերջ տալ այլ հավելվածների հետնաշերտի գործընթացները: Սա կարող է պատճառ դառնալ, որ այլ հավելվածները դադարեն աշխատել:"</string> - <!-- no translation found for permlab_systemAlertWindow (7238805243128138690) --> - <skip /> - <!-- no translation found for permdesc_systemAlertWindow (2393776099672266188) --> - <skip /> + <string name="permlab_systemAlertWindow" msgid="7238805243128138690">"Այս հավելվածը կարող է ցուցադրվել այլ հավելվածների վերևում"</string> + <string name="permdesc_systemAlertWindow" msgid="2393776099672266188">"Այս հավելվածը կարող է ցուցադրվել այլ հավելվածների կամ էկրանի այլ հատվածների վերևում: Դա կարող է խոչընդոտել հավելվածի նորմալ օգտագործմանը և փոխել այլ հավելվածների տեսքը:"</string> <string name="permlab_persistentActivity" msgid="8841113627955563938">"միշտ աշխատեցնել հավելվածը"</string> <string name="permdesc_persistentActivity" product="tablet" msgid="8525189272329086137">"Թույլ է տալիս հավելվածին մնայուն դարձնել իր մասերը հիշողության մեջ: Սա կարող է սահմանափակել այլ հավելվածներին հասանելի հիշողությունը` դանդաղեցնելով պլանշետի աշխատանքը:"</string> <string name="permdesc_persistentActivity" product="tv" msgid="5086862529499103587">"Թույլ է տալիս հավելվածին պահել իր տարրերը հիշողության մեջ: Սա կարող է սահմանափակել այլ հավելվածների համար հատկացված հիշողությունը և դանդաղեցնել հեռուստացույցի աշխատանքը:"</string> @@ -353,51 +343,37 @@ <string name="permdesc_writeContacts" product="tv" msgid="5438230957000018959">"Թույլ է տալիս հավելվածին փոփոխել հեռուստացույցի մեջ պահված կոնտակտների տվյալները, այդ թվում նաև՝ թե ինչ հաճախականությամբ եք զանգեր կատարել, օգտվել էլփոստից կամ այլ կերպ հաղորդակցվել որոշակի մարդկանց հետ: Այս թույլտվությունը հնարավորություն է տալիս հավելվածներին ջնջել կոնտակտային տվյալները:"</string> <string name="permdesc_writeContacts" product="default" msgid="589869224625163558">"Թույլ է տալիս հավելվածին փոփոխել ձեր պլանշետում պահված կոնտակտների տվյալները, այդ թվում` ձեր կատարած զանգերի, գրած նամակների կամ որոշակի անհատների հետ այլ եղանակով շփման հաճախականությունը: Այս թույլտվությունը հնարավորություն է տալիս հավելվածներին ջնջել կոնտակտային տվյալները:"</string> <string name="permlab_readCallLog" msgid="3478133184624102739">"կարդալ զանգերի մատյանը"</string> - <!-- no translation found for permdesc_readCallLog (3204122446463552146) --> - <skip /> + <string name="permdesc_readCallLog" msgid="3204122446463552146">"Այս հավելվածը կարող է կարդալ ձեր զանգերի պատմությունը:"</string> <string name="permlab_writeCallLog" msgid="8552045664743499354">"տեսնել զանգերի գրանցամատյանը"</string> <string name="permdesc_writeCallLog" product="tablet" msgid="6661806062274119245">"Թույլ է տալիս հավելվածին փոփոխել ձեր պլանշետի զանգերի մատյանը, այդ թվում` մուտքային և ելքային զանգերի մասին տվյալները: Վնասարար հավելվածները կարող են սա օգտագործել` ձեր զանգերի մատյանը ջնջելու կամ փոփոխելու համար:"</string> <string name="permdesc_writeCallLog" product="tv" msgid="4225034892248398019">"Թույլ է տալիս հավելվածին փոփոխել հեռուստացույցի զանգերի մատյանը, այդ թվում` մուտքային և ելքային զանգերի մասին տվյալները: Վնասարար հավելվածները կարող են սա օգտագործել` ձեր զանգերի մատյանը ջնջելու կամ փոփոխելու համար:"</string> <string name="permdesc_writeCallLog" product="default" msgid="683941736352787842">"Թույլ է տալիս հավելվածին փոփոխել ձեր հեռախոսի զանգերի մատյանը, այդ թվում` մուտքային և ելքային զանգերի մասին տվյալները: Վնասարար հավելվածները կարող են սա օգտագործել` ձեր զանգերի մատյանը ջնջելու կամ փոփոխելու համար:"</string> <string name="permlab_bodySensors" msgid="4683341291818520277">"օգտագործել մարմնի սենսորները (օրինակ` սրտի կծկումների հաճախականության չափիչ)"</string> <string name="permdesc_bodySensors" product="default" msgid="4380015021754180431">"Հավելվածին թույլ է տալիս մուտք ունենալ սենսորների տվյալներին, որոնք վերահսկում են ձեր ֆիզիկական վիճակը, օրինակ՝ ձեր սրտի զարկերը:"</string> - <!-- no translation found for permlab_readCalendar (6716116972752441641) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (4993979255403945892) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (8837931557573064315) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (4373978642145196715) --> - <skip /> + <string name="permlab_readCalendar" msgid="6716116972752441641">"Կարդալ օրացույցի միջոցառումները և տվյալները"</string> + <string name="permdesc_readCalendar" product="tablet" msgid="4993979255403945892">"Այս հավելվածը կարող է կարդալ օրացույցի՝ ձեր պլանշետում պահված բոլոր միջոցառումները, ինչպես նաև հրապարակել կամ պահել ձեր օրացույցի տվյալները:"</string> + <string name="permdesc_readCalendar" product="tv" msgid="8837931557573064315">"Այս հավելվածը կարող է կարդալ օրացույցի՝ ձեր հեռուստացույցում պահված բոլոր միջոցառումները, ինչպես նաև հրապարակել կամ պահել ձեր օրացույցի տվյալները:"</string> + <string name="permdesc_readCalendar" product="default" msgid="4373978642145196715">"Այս հավելվածը կարող է կարդալ օրացույցի՝ ձեր հեռախոսում պահված բոլոր միջոցառումները, ինչպես նաև հրապարակել կամ պահել ձեր օրացույցի տվյալները:"</string> <string name="permlab_writeCalendar" msgid="8438874755193825647">"ավելացնել կամ փոփոխել օրացուցային միջոցառումները և ուղարկել նամակ հյուրերին` առանց սեփականատերերի իմացության"</string> - <!-- no translation found for permdesc_writeCalendar (1675270619903625982) --> - <skip /> - <!-- no translation found for permdesc_writeCalendar (9017809326268135866) --> - <skip /> - <!-- no translation found for permdesc_writeCalendar (7592791790516943173) --> - <skip /> + <string name="permdesc_writeCalendar" product="tablet" msgid="1675270619903625982">"Այս հավելվածը կարող է ավելացնել, հեռացնել կամ փոխել օրացույցի միջոցառումները ձեր պլանշետում: Այս հավելվածը կարող է ուղարկել հաղորդագրություններ օրացույցի սեփականատերերի անունից կամ փոխել միջոցառումները առանց դրանց սեփականատերերին ծանուցելու:"</string> + <string name="permdesc_writeCalendar" product="tv" msgid="9017809326268135866">"Այս հավելվածը կարող է ավելացնել, հեռացնել կամ փոխել օրացույցի միջոցառումները ձեր հեռուստացույցում: Այս հավելվածը կարող է ուղարկել հաղորդագրություններ օրացույցի սեփականատերերի անունից կամ փոխել միջոցառումները առանց դրանց սեփականատերերին ծանուցելու:"</string> + <string name="permdesc_writeCalendar" product="default" msgid="7592791790516943173">"Այս հավելվածը կարող է ավելացնել, հեռացնել կամ փոխել օրացույցի միջոցառումները ձեր հեռախոսում: Այս հավելվածը կարող է ուղարկել հաղորդագրություններ օրացույցի սեփականատերերի անունից կամ փոխել միջոցառումները առանց դրանց սեփականատերերին ծանուցելու:"</string> <string name="permlab_accessLocationExtraCommands" msgid="2836308076720553837">"օգտագործել տեղադրություն տրամադրող հավելվյալ հրամաններ"</string> <string name="permdesc_accessLocationExtraCommands" msgid="6078307221056649927">"Ծրագրին թույլ է տալիս օգտագործել տեղադրության մասին տվյալների աղբյուրների կառավարման լրացուցիչ հրահանգներ: Սա կարող է ծրագրին թույլ տալ միջամտել GPS-ի կամ տեղադրության մասին տվյալների այլ աղբյուրների գործառույթներին:"</string> <string name="permlab_accessFineLocation" msgid="251034415460950944">"օգտագործել ճշգրիտ տեղադրությունը (GPS և ցանցային)"</string> - <!-- no translation found for permdesc_accessFineLocation (5821994817969957884) --> - <skip /> + <string name="permdesc_accessFineLocation" msgid="5821994817969957884">"Այս հավելվածը կարող է ստանալ ձեր տեղադրության տվյալները GPS-ի միջոցով կամ տեղորոշման ցանցային աղբյուրներից, օրինակ՝ բջջային աշտարակներից և Wi-Fi ցանցերից: Այս տեղորոշման ծառայությունները պետք է միացված և հասանելի լինեն ձեր հեռախոսում, որպեսզի հավելվածը կարողանա օգտագործել դրանք: Դա կարող է արագացնել մարտկոցի լիցքի սպառումը:"</string> <string name="permlab_accessCoarseLocation" msgid="7715277613928539434">"օգտագործել մոտավոր տեղադրությունը (ցանցային)"</string> - <!-- no translation found for permdesc_accessCoarseLocation (3373266766487862426) --> - <skip /> - <!-- no translation found for permdesc_accessCoarseLocation (1884022719818788511) --> - <skip /> - <!-- no translation found for permdesc_accessCoarseLocation (7788009094906196995) --> - <skip /> + <string name="permdesc_accessCoarseLocation" product="tablet" msgid="3373266766487862426">"Այս հավելվածը կարող է ստանալ ձեր տեղադրության տվյալները ցանցային տարբեր աղբյուրներից, օրինակ՝ բջջային աշտարակներից և Wi-Fi ցանցերից: Այս տեղորոշման ծառայությունները պետք է միացված և հասանելի լինեն ձեր պլանշետում, որպեսզի հավելվածը կարողանա օգտագործել դրանք:"</string> + <string name="permdesc_accessCoarseLocation" product="tv" msgid="1884022719818788511">"Այս հավելվածը կարող է ստանալ ձեր տեղադրության տվյալները ցանցային տարբեր աղբյուրներից, օրինակ՝ բջջային աշտարակներից և Wi-Fi ցանցերից: Այս տեղորոշման ծառայությունները պետք է միացված և հասանելի լինեն ձեր հեռուստացույցում, որպեսզի հավելվածը կարողանա օգտագործել դրանք:"</string> + <string name="permdesc_accessCoarseLocation" product="default" msgid="7788009094906196995">"Այս հավելվածը կարող է ստանալ ձեր տեղադրության տվյալները ցանցային տարբեր աղբյուրներից, օրինակ՝ բջջային աշտարակներից և Wi-Fi ցանցերից: Այս տեղորոշման ծառայությունները պետք է միացված և հասանելի լինեն ձեր հեռախոսում, որպեսզի հավելվածը կարողանա օգտագործել դրանք:"</string> <string name="permlab_modifyAudioSettings" msgid="6095859937069146086">"փոխել ձեր աուդիո կարգավորումները"</string> <string name="permdesc_modifyAudioSettings" msgid="3522565366806248517">"Թույլ է տալիս հավելվածին փոփոխել ձայնանյութի գլոբալ կարգավորումները, ինչպես օրինակ` ձայնը և թե որ խոսափողն է օգտագործված արտածման համար:"</string> <string name="permlab_recordAudio" msgid="3876049771427466323">"ձայնագրել ձայնանյութ"</string> - <!-- no translation found for permdesc_recordAudio (4245930455135321433) --> - <skip /> + <string name="permdesc_recordAudio" msgid="4245930455135321433">"Այս հավելվածը ցանկացած պահի կարող է ձայնագրել խոսափողի օգնությամբ:"</string> <string name="permlab_sim_communication" msgid="2935852302216852065">"ուղարկել հրամաններ SIM քարտին"</string> <string name="permdesc_sim_communication" msgid="5725159654279639498">"Թույլ է տալիս հավելվածին հրամաններ ուղարկել SIM-ին: Սա շատ վտանգավոր է:"</string> <string name="permlab_camera" msgid="3616391919559751192">"լուսանկարել և տեսանկարել"</string> - <!-- no translation found for permdesc_camera (5392231870049240670) --> - <skip /> + <string name="permdesc_camera" msgid="5392231870049240670">"Այս հավելվածը կարող է ցանկացած պահի լուսանկարել և տեսագրել՝ օգտագործելով տեսախցիկը:"</string> <string name="permlab_vibrate" msgid="7696427026057705834">"կառավարել թրթռումը"</string> <string name="permdesc_vibrate" msgid="6284989245902300945">"Թույլ է տալիս հավելվածին կառավարել թրթռոցը:"</string> <string name="permlab_callPhone" msgid="3925836347681847954">"ուղղակիորեն զանգել հեռախոսահամարներին"</string> diff --git a/core/res/res/values-in/strings.xml b/core/res/res/values-in/strings.xml index cf1692803aec..1f6f1305a87a 100644 --- a/core/res/res/values-in/strings.xml +++ b/core/res/res/values-in/strings.xml @@ -182,10 +182,8 @@ <string name="work_profile_deleted_description" msgid="6305147513054341102">"Profil kerja dihapus karena tidak ada aplikasi admin."</string> <string name="work_profile_deleted_details" msgid="226615743462361248">"Aplikasi admin profil kerja tidak ada atau rusak. Akibatnya, profil kerja dan data terkait telah dihapus. Hubungi administrator untuk meminta bantuan."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="6019770344820507579">"Profil kerja tidak tersedia lagi di perangkat ini."</string> - <!-- no translation found for network_logging_notification_title (1805392571290161924) --> - <skip /> - <!-- no translation found for network_logging_notification_text (4448072433371155729) --> - <skip /> + <string name="network_logging_notification_title" msgid="1805392571290161924">"Traffic jaringan sedang dipantau"</string> + <string name="network_logging_notification_text" msgid="4448072433371155729">"Tap untuk detail selengkapnya"</string> <string name="factory_reset_warning" msgid="5423253125642394387">"Perangkat akan dihapus"</string> <string name="factory_reset_message" msgid="4905025204141900666">"Aplikasi admin kehilangan komponen atau rusak, dan tidak dapat digunakan. Perangkat sekarang akan dihapus. Hubungi administrator untuk meminta bantuan."</string> <string name="me" msgid="6545696007631404292">"Saya"</string> diff --git a/core/res/res/values-is-rIS/strings.xml b/core/res/res/values-is-rIS/strings.xml index 9a5d9549a2a1..4222c22c83ce 100644 --- a/core/res/res/values-is-rIS/strings.xml +++ b/core/res/res/values-is-rIS/strings.xml @@ -46,8 +46,7 @@ <string name="defaultMsisdnAlphaTag" msgid="2850889754919584674">"MSISDN1"</string> <string name="mmiError" msgid="5154499457739052907">"Vandamál með tengingu eða ógild MMI-kóðaskipun."</string> <string name="mmiFdnError" msgid="5224398216385316471">"Aðgerð takmarkast við fast númeraval."</string> - <!-- no translation found for mmiErrorWhileRoaming (762488890299284230) --> - <skip /> + <string name="mmiErrorWhileRoaming" msgid="762488890299284230">"Ekki er hægt að breyta stillingum fyrir framsendingu símtala úr símanum á meðan þú ert í reiki."</string> <string name="serviceEnabled" msgid="8147278346414714315">"Þjónustan var virkjuð."</string> <string name="serviceEnabledFor" msgid="6856228140453471041">"Þjónustan var virkjuð fyrir:"</string> <string name="serviceDisabled" msgid="1937553226592516411">"Þjónustan hefur verið gerð óvirk."</string> @@ -98,10 +97,8 @@ <string name="RestrictedOnVoiceData" msgid="996636487106171320">"Lokað er á radd-/gagnaþjónustu."</string> <string name="RestrictedOnVoiceSms" msgid="1888588152792023873">"Lokað er fyrir raddþjónustu/SMS-þjónustu."</string> <string name="RestrictedOnAll" msgid="5643028264466092821">"Lokað á alla radd-, gagna- og SMS-þjónustu."</string> - <!-- no translation found for NetworkPreferenceSwitchTitle (4008877505368566980) --> - <skip /> - <!-- no translation found for NetworkPreferenceSwitchSummary (7335915397439759249) --> - <skip /> + <string name="NetworkPreferenceSwitchTitle" msgid="4008877505368566980">"Ekki næst samband við símkerfi"</string> + <string name="NetworkPreferenceSwitchSummary" msgid="7335915397439759249">"Reyndu að breyta valinni gerð í Stillingar > Farsímakerfi > Valin símkerfistegund til að bæta móttökuskilyrðin."</string> <string name="peerTtyModeFull" msgid="6165351790010341421">"Jafningi bað um FULLA stillingu fjarrita"</string> <string name="peerTtyModeHco" msgid="5728602160669216784">"Jafningi bað um HCO-stillingu fjarrita"</string> <string name="peerTtyModeVco" msgid="1742404978686538049">"Jafningi bað um VCO-stillingu fjarrita"</string> @@ -185,10 +182,8 @@ <string name="work_profile_deleted_description" msgid="6305147513054341102">"Vinnusniði eytt vegna þess að stjórnunarforrit vantar."</string> <string name="work_profile_deleted_details" msgid="226615743462361248">"Stjórnunarforrit vinnusniðsins vantar eða er skemmt. Vinnusniðinu og gögnum því tengdu hefur því verið eytt. Hafðu samband við kerfisstjórann til að fá frekari aðstoð."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="6019770344820507579">"Vinnusniðið þitt er ekki lengur í boði á þessu tæki."</string> - <!-- no translation found for network_logging_notification_title (1805392571290161924) --> - <skip /> - <!-- no translation found for network_logging_notification_text (4448072433371155729) --> - <skip /> + <string name="network_logging_notification_title" msgid="1805392571290161924">"Verið er að fylgjast með netumferð"</string> + <string name="network_logging_notification_text" msgid="4448072433371155729">"Ýttu til að fá frekari upplýsingar"</string> <string name="factory_reset_warning" msgid="5423253125642394387">"Tækið verður hreinsað"</string> <string name="factory_reset_message" msgid="4905025204141900666">"Stjórnunarforritið vantar íhluti eða er skemmt og ekki er hægt að nota það. Þurrkað verður út af tækinu. Hafðu samband við kerfisstjórann til að fá aðstoð."</string> <string name="me" msgid="6545696007631404292">"Ég"</string> @@ -306,12 +301,9 @@ <string name="permlab_sendSms" msgid="7544599214260982981">"senda og skoða SMS-skilaboð"</string> <string name="permdesc_sendSms" msgid="7094729298204937667">"Leyfir forriti að senda SMS-skilaboð. Þetta getur valdið óvæntri gjaldtöku. Spilliforrit geta kostað þig peninga með því að senda skilaboð án staðfestingar frá þér."</string> <string name="permlab_readSms" msgid="8745086572213270480">"lesa textaskilaboð (SMS eða MMS)"</string> - <!-- no translation found for permdesc_readSms (4741697454888074891) --> - <skip /> - <!-- no translation found for permdesc_readSms (5796670395641116592) --> - <skip /> - <!-- no translation found for permdesc_readSms (6826832415656437652) --> - <skip /> + <string name="permdesc_readSms" product="tablet" msgid="4741697454888074891">"Þetta forrit getur lesið öll SMS-skilaboð (textaskilaboð) sem eru vistuð í spjaldtölvunni."</string> + <string name="permdesc_readSms" product="tv" msgid="5796670395641116592">"Þetta forrit getur lesið öll SMS-skilaboð (textaskilaboð) sem eru vistuð í sjónvarpinu."</string> + <string name="permdesc_readSms" product="default" msgid="6826832415656437652">"Þetta forrit getur lesið öll SMS-skilaboð (textaskilaboð) sem eru vistuð í símanum."</string> <string name="permlab_receiveWapPush" msgid="5991398711936590410">"taka á móti textaskilaboðum (WAP)"</string> <string name="permdesc_receiveWapPush" msgid="748232190220583385">"Leyfir forriti að taka á móti og vinna úr WAP-skilaboðum. Þessi heimild felur í sér möguleikann á að fylgjast með eða eyða skilaboðum sem þér eru send án þess að birta þér þau."</string> <string name="permlab_getTasks" msgid="6466095396623933906">"sækja forrit í gangi"</string> @@ -324,10 +316,8 @@ <string name="permdesc_enableCarMode" msgid="4853187425751419467">"Leyfir forriti að kveikja á bílastillingu."</string> <string name="permlab_killBackgroundProcesses" msgid="3914026687420177202">"loka öðrum forritum"</string> <string name="permdesc_killBackgroundProcesses" msgid="4593353235959733119">"Leyfir forriti að loka bakgrunnsferlum annarra forrita. Þetta getur valdið því að önnur forrit lokist."</string> - <!-- no translation found for permlab_systemAlertWindow (7238805243128138690) --> - <skip /> - <!-- no translation found for permdesc_systemAlertWindow (2393776099672266188) --> - <skip /> + <string name="permlab_systemAlertWindow" msgid="7238805243128138690">"Þetta forrit getur birst yfir öðrum forritum"</string> + <string name="permdesc_systemAlertWindow" msgid="2393776099672266188">"Þetta forrit getur birst yfir öðrum forritum eða öðrum hlutum skjásins. Þetta getur truflað venjulega notkun forrita og breytt því hvernig önnur forrit birtast."</string> <string name="permlab_persistentActivity" msgid="8841113627955563938">"láta forrit keyra stöðugt"</string> <string name="permdesc_persistentActivity" product="tablet" msgid="8525189272329086137">"Leyfir forriti að gera hluta sjálfs sín varanlega í minni. Þetta getur takmarkað það minni sem býðst öðrum forritum og þannig hægt á spjaldtölvunni."</string> <string name="permdesc_persistentActivity" product="tv" msgid="5086862529499103587">"Leyfir forriti að gera hluta sjálfs sín varanlega í minni. Þetta getur takmarkað það minni sem býðst öðrum forritum og þannig hægt á sjónvarpinu."</string> @@ -353,51 +343,37 @@ <string name="permdesc_writeContacts" product="tv" msgid="5438230957000018959">"Leyfir forriti að breyta gögnum um tengiliði sem vistuð eru í sjónvarpinu, þ. á m. um tíðni samskipta þinna við tiltekna tengiliði með símtölum, tölvupósti eða öðrum hætti. Þessi heimild gerir forritum kleift að eyða tengiliðagögnum."</string> <string name="permdesc_writeContacts" product="default" msgid="589869224625163558">"Leyfir forriti að breyta gögnum um tengiliði sem vistuð eru í símanum, þ. á m. tíðni samskipta þinna við tiltekna tengiliði með símtölum, tölvupósti eða öðrum hætti. Þessi heimild gerir forritum kleift að eyða tengiliðagögnum."</string> <string name="permlab_readCallLog" msgid="3478133184624102739">"lesa símtalaskrá"</string> - <!-- no translation found for permdesc_readCallLog (3204122446463552146) --> - <skip /> + <string name="permdesc_readCallLog" msgid="3204122446463552146">"Þetta forrit getur lesið símtalaferilinn þinn."</string> <string name="permlab_writeCallLog" msgid="8552045664743499354">"skrifa símtalaskrá"</string> <string name="permdesc_writeCallLog" product="tablet" msgid="6661806062274119245">"Leyfir forriti að breyta símtalaskrá spjaldtölvunnar, þ. á m. gögnum um hringd og móttekin símtöl. Spilliforrit geta notað þetta til að eyða eða breyta símtalaskránni."</string> <string name="permdesc_writeCallLog" product="tv" msgid="4225034892248398019">"Leyfir forriti að breyta símtalaskrá sjónvarpsins, þ. á m. gögnum um hringd og móttekin símtöl. Spilliforrit geta notað þetta til að eyða eða breyta símtalaskránni."</string> <string name="permdesc_writeCallLog" product="default" msgid="683941736352787842">"Leyfir forriti að breyta símtalaskrá símans, þ. á m. gögnum um hringd og móttekin símtöl. Spilliforrit geta notað þetta til að eyða eða breyta símtalaskránni."</string> <string name="permlab_bodySensors" msgid="4683341291818520277">"fá aðgang að líkamsskynjurum (s.s. hjartsláttarmælum)"</string> <string name="permdesc_bodySensors" product="default" msgid="4380015021754180431">"Veitir forritinu aðgang að gögnum frá skynjurum sem fylgjast með líkamsstarfsemi þinni, svo sem hjartslætti."</string> - <!-- no translation found for permlab_readCalendar (6716116972752441641) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (4993979255403945892) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (8837931557573064315) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (4373978642145196715) --> - <skip /> + <string name="permlab_readCalendar" msgid="6716116972752441641">"Lesa dagatalsviðburði og upplýsingar"</string> + <string name="permdesc_readCalendar" product="tablet" msgid="4993979255403945892">"Þetta forrit getur lesið alla dagatalsviðburði sem eru vistaðir í spjaldtölvunni og deilt eða vistað dagatalsgögnin þín."</string> + <string name="permdesc_readCalendar" product="tv" msgid="8837931557573064315">"Þetta forrit getur lesið alla dagatalsviðburði sem eru vistaðir í sjónvarpinu og deilt eða vistað dagatalsgögnin þín."</string> + <string name="permdesc_readCalendar" product="default" msgid="4373978642145196715">"Þetta forrit getur lesið alla dagatalsviðburði sem eru vistaðir í símanum og deilt eða vistað dagatalsgögnin þín."</string> <string name="permlab_writeCalendar" msgid="8438874755193825647">"bæta við eða breyta dagatalsviðburðum og senda gestum tölvupóst að eigendum forspurðum"</string> - <!-- no translation found for permdesc_writeCalendar (1675270619903625982) --> - <skip /> - <!-- no translation found for permdesc_writeCalendar (9017809326268135866) --> - <skip /> - <!-- no translation found for permdesc_writeCalendar (7592791790516943173) --> - <skip /> + <string name="permdesc_writeCalendar" product="tablet" msgid="1675270619903625982">"Þetta forrit getur bætt við, fjarlægt eða breytt dagatalsviðburðum í spjaldtölvunni. Þetta forrit getur sent skilaboð sem geta virst koma ffrá eigendum dagatala eða breytt viðburðum án þess að láta eigendurna vita."</string> + <string name="permdesc_writeCalendar" product="tv" msgid="9017809326268135866">"Þetta forrit getur bætt við, fjarlægt eða breytt dagatalsviðburðum í sjónvarpinu. Þetta forrit getur sent skilaboð sem geta virst koma ffrá eigendum dagatala eða breytt viðburðum án þess að láta eigendurna vita."</string> + <string name="permdesc_writeCalendar" product="default" msgid="7592791790516943173">"Þetta forrit getur bætt við, fjarlægt eða breytt dagatalsviðburðum í símanum. Þetta forrit getur sent skilaboð sem geta virst koma ffrá eigendum dagatala eða breytt viðburðum án þess að láta eigendurna vita."</string> <string name="permlab_accessLocationExtraCommands" msgid="2836308076720553837">"aðgangur að viðbótarskipunum staðsetningarveitu"</string> <string name="permdesc_accessLocationExtraCommands" msgid="6078307221056649927">"Leyfir forriti að fá aðgang að fleiri skipunum staðsetningarveitu. Þetta getur gert forritinu kleift að hafa áhrif á virkni GPS og annars staðsetningarbúnaðar."</string> <string name="permlab_accessFineLocation" msgid="251034415460950944">"fá aðgang að nákvæmri staðsetningu (frá GPS og símkerfi)"</string> - <!-- no translation found for permdesc_accessFineLocation (5821994817969957884) --> - <skip /> + <string name="permdesc_accessFineLocation" msgid="5821994817969957884">"Þetta forrit getur séð staðsetningu þína út frá netkerfum á borð við farsímasenda og Wi-Fi net. Það verður að vera kveikt á slíkri staðsetningarþjónustu og hún þarf að vera aðgengileg símanum til að forritið geti notað hana. Þetta getur aukið rafhlöðunotkun."</string> <string name="permlab_accessCoarseLocation" msgid="7715277613928539434">"fá aðgang að áætlaðri staðsetningu (frá símkerfi)"</string> - <!-- no translation found for permdesc_accessCoarseLocation (3373266766487862426) --> - <skip /> - <!-- no translation found for permdesc_accessCoarseLocation (1884022719818788511) --> - <skip /> - <!-- no translation found for permdesc_accessCoarseLocation (7788009094906196995) --> - <skip /> + <string name="permdesc_accessCoarseLocation" product="tablet" msgid="3373266766487862426">"Þetta forrit getur séð staðsetningu þína út frá netkerfum á borð við farsímasenda og Wi-Fi net. Það verður að vera kveikt á slíkri staðsetningarþjónustu og hún þarf að vera aðgengileg spjaldtölvunni til að forritið geti notað hana."</string> + <string name="permdesc_accessCoarseLocation" product="tv" msgid="1884022719818788511">"Þetta forrit getur séð staðsetningu þína út frá netkerfum á borð við farsímasenda og Wi-Fi net. Það verður að vera kveikt á slíkri staðsetningarþjónustu og hún þarf að vera aðgengileg sjónvarpinu til að forritið geti notað hana."</string> + <string name="permdesc_accessCoarseLocation" product="default" msgid="7788009094906196995">"Þetta forrit getur séð staðsetningu þína út frá netkerfum á borð við farsímasenda og Wi-Fi net. Það verður að vera kveikt á slíkri staðsetningarþjónustu og hún þarf að vera aðgengileg símanum til að forritið geti notað hana."</string> <string name="permlab_modifyAudioSettings" msgid="6095859937069146086">"breyta hljóðstillingum"</string> <string name="permdesc_modifyAudioSettings" msgid="3522565366806248517">"Leyfir forriti að breyta altækum hljóðstillingum, s.s. hljóðstyrk og hvaða hátalari er notaður sem úttak."</string> <string name="permlab_recordAudio" msgid="3876049771427466323">"taka upp hljóð"</string> - <!-- no translation found for permdesc_recordAudio (4245930455135321433) --> - <skip /> + <string name="permdesc_recordAudio" msgid="4245930455135321433">"Þetta forrit getur tekið upp hljóð með hljóðnemanum hvenær sem er."</string> <string name="permlab_sim_communication" msgid="2935852302216852065">"senda skipanir til SIM-kortsins"</string> <string name="permdesc_sim_communication" msgid="5725159654279639498">"Leyfir forriti að senda SIM-kortinu skipanir. Þetta er mjög hættulegt."</string> <string name="permlab_camera" msgid="3616391919559751192">"taka myndir og myndskeið"</string> - <!-- no translation found for permdesc_camera (5392231870049240670) --> - <skip /> + <string name="permdesc_camera" msgid="5392231870049240670">"Þetta forrit getur tekið myndir og tekið upp myndskeið með myndavélinni hvenær sem er."</string> <string name="permlab_vibrate" msgid="7696427026057705834">"stjórna titringi"</string> <string name="permdesc_vibrate" msgid="6284989245902300945">"Leyfir forriti að stjórna titraranum."</string> <string name="permlab_callPhone" msgid="3925836347681847954">"hringja beint í símanúmer"</string> diff --git a/core/res/res/values-it/strings.xml b/core/res/res/values-it/strings.xml index 4eb39f0ee282..472178fa45fa 100644 --- a/core/res/res/values-it/strings.xml +++ b/core/res/res/values-it/strings.xml @@ -182,10 +182,8 @@ <string name="work_profile_deleted_description" msgid="6305147513054341102">"Profilo di lavoro eliminato per app di amministrazione mancante."</string> <string name="work_profile_deleted_details" msgid="226615743462361248">"L\'app di amministrazione dei profili di lavoro manca o è danneggiata. Di conseguenza, il tuo profilo di lavoro e i relativi dati sono stati eliminati. Contatta l\'amministratore per ricevere assistenza."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="6019770344820507579">"Il tuo profilo di lavoro non è più disponibile sul dispositivo."</string> - <!-- no translation found for network_logging_notification_title (1805392571290161924) --> - <skip /> - <!-- no translation found for network_logging_notification_text (4448072433371155729) --> - <skip /> + <string name="network_logging_notification_title" msgid="1805392571290161924">"Il traffico di rete è monitorato"</string> + <string name="network_logging_notification_text" msgid="4448072433371155729">"Tocca per ulteriori dettagli"</string> <string name="factory_reset_warning" msgid="5423253125642394387">"Il dispositivo verrà resettato"</string> <string name="factory_reset_message" msgid="4905025204141900666">"L\'app di amministrazione è danneggiata o mancano componenti, pertanto non è possibile utilizzarla. Il dispositivo verrà resettato. Contatta l\'amministratore per ricevere assistenza."</string> <string name="me" msgid="6545696007631404292">"Io"</string> diff --git a/core/res/res/values-iw/strings.xml b/core/res/res/values-iw/strings.xml index 02979ebe3abc..7c908d9f439b 100644 --- a/core/res/res/values-iw/strings.xml +++ b/core/res/res/values-iw/strings.xml @@ -46,8 +46,7 @@ <string name="defaultMsisdnAlphaTag" msgid="2850889754919584674">"MSISDN1"</string> <string name="mmiError" msgid="5154499457739052907">"בעיה בחיבור או קוד MMI לא חוקי."</string> <string name="mmiFdnError" msgid="5224398216385316471">"הפעולה מוגבלת למספרי חיוג קבועים בלבד."</string> - <!-- no translation found for mmiErrorWhileRoaming (762488890299284230) --> - <skip /> + <string name="mmiErrorWhileRoaming" msgid="762488890299284230">"לא ניתן לשנות את הגדרות העברת השיחות מהטלפון שלך כשאתה במצב נדידה."</string> <string name="serviceEnabled" msgid="8147278346414714315">"השירות הופעל."</string> <string name="serviceEnabledFor" msgid="6856228140453471041">"השירות הופעל עבור:"</string> <string name="serviceDisabled" msgid="1937553226592516411">"השירות הושבת."</string> @@ -100,10 +99,8 @@ <string name="RestrictedOnVoiceData" msgid="996636487106171320">"שירותי הקול/נתונים חסומים."</string> <string name="RestrictedOnVoiceSms" msgid="1888588152792023873">"שירותי קול/SMS חסומים."</string> <string name="RestrictedOnAll" msgid="5643028264466092821">"כל השירותים של קול/נתונים/SMS חסומים."</string> - <!-- no translation found for NetworkPreferenceSwitchTitle (4008877505368566980) --> - <skip /> - <!-- no translation found for NetworkPreferenceSwitchSummary (7335915397439759249) --> - <skip /> + <string name="NetworkPreferenceSwitchTitle" msgid="4008877505368566980">"לא ניתן להתחבר לרשת"</string> + <string name="NetworkPreferenceSwitchSummary" msgid="7335915397439759249">"כדי לשפר את הקליטה, נסה לשנות את סוג הרשת באפשרות \'הגדרות\' > \'רשתות סלולריות\' > \'סוג רשת מועדף\'."</string> <string name="peerTtyModeFull" msgid="6165351790010341421">"העמית ביקש TTY במצב FULL"</string> <string name="peerTtyModeHco" msgid="5728602160669216784">"העמית ביקש TTY במצב HCO"</string> <string name="peerTtyModeVco" msgid="1742404978686538049">"העמית ביקש TTY במצב VCO"</string> @@ -189,10 +186,8 @@ <string name="work_profile_deleted_description" msgid="6305147513054341102">"פרופיל העבודה נמחק מפני שחסרה אפליקציית ניהול."</string> <string name="work_profile_deleted_details" msgid="226615743462361248">"אפליקציית הניהול של פרופיל העבודה חסרה או פגומה. כתוצאה מכך פרופיל העבודה שלך נמחק, כולל כל הנתונים הקשורים אליו. לקבלת סיוע, פנה למנהל המערכת שלך."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="6019770344820507579">"פרופיל העבודה שלך אינו זמין עוד במכשיר הזה."</string> - <!-- no translation found for network_logging_notification_title (1805392571290161924) --> - <skip /> - <!-- no translation found for network_logging_notification_text (4448072433371155729) --> - <skip /> + <string name="network_logging_notification_title" msgid="1805392571290161924">"התנועה ברשת מנוטרת"</string> + <string name="network_logging_notification_text" msgid="4448072433371155729">"הקש לקבלת פרטים נוספים"</string> <string name="factory_reset_warning" msgid="5423253125642394387">"תתבצע מחיקה של המכשיר"</string> <string name="factory_reset_message" msgid="4905025204141900666">"באפליקציית הניהול חסרים מרכיבים או שהיא פגומה ולא ניתן להשתמש בה. תתבצע כעת מחיקה של המכשיר. לקבלת סיוע, פנה למנהל המערכת שלך."</string> <string name="me" msgid="6545696007631404292">"אני"</string> @@ -312,12 +307,9 @@ <string name="permlab_sendSms" msgid="7544599214260982981">"שליחה והצגה של הודעות SMS"</string> <string name="permdesc_sendSms" msgid="7094729298204937667">"מאפשר לאפליקציה לשלוח הודעות SMS. הדבר עשוי לגרום לחיובים בלתי צפויים. אפליקציות זדוניות עלולות לגרום לעלויות על ידי שליחת הודעות ללא אישורך."</string> <string name="permlab_readSms" msgid="8745086572213270480">"קריאת הודעות הטקסט שלך (SMS או MMS)"</string> - <!-- no translation found for permdesc_readSms (4741697454888074891) --> - <skip /> - <!-- no translation found for permdesc_readSms (5796670395641116592) --> - <skip /> - <!-- no translation found for permdesc_readSms (6826832415656437652) --> - <skip /> + <string name="permdesc_readSms" product="tablet" msgid="4741697454888074891">"אפליקציה זו יכולה לקרוא את כל הודעות הטקסט (SMS) המאוחסנות בטאבלט."</string> + <string name="permdesc_readSms" product="tv" msgid="5796670395641116592">"אפליקציה זו יכולה לקרוא את כל הודעות הטקסט (SMS) המאוחסנות בטלוויזיה."</string> + <string name="permdesc_readSms" product="default" msgid="6826832415656437652">"אפליקציה זו יכולה לקרוא את כל הודעות הטקסט (SMS) המאוחסנות בטלפון."</string> <string name="permlab_receiveWapPush" msgid="5991398711936590410">"קבלת הודעות טקסט (WAP)"</string> <string name="permdesc_receiveWapPush" msgid="748232190220583385">"מאפשר לאפליקציה לקבל ולעבד הודעות WAP. אישור זה כולל את היכולת לעקוב אחר הודעות שנשלחו אליך ולמחוק אותן מבלי להציג לך אותן."</string> <string name="permlab_getTasks" msgid="6466095396623933906">"אחזור אפליקציות פעילות"</string> @@ -330,10 +322,8 @@ <string name="permdesc_enableCarMode" msgid="4853187425751419467">"מאפשר לאפליקציה לאפשר את מצב מכונית."</string> <string name="permlab_killBackgroundProcesses" msgid="3914026687420177202">"סגירת אפליקציות אחרות"</string> <string name="permdesc_killBackgroundProcesses" msgid="4593353235959733119">"מאפשר לאפליקציה להפסיק תהליכים ברקע המבוצעים על ידי אפליקציות אחרות. הדבר עשוי לגרום להפסקת פעולתם של אפליקציות אחרות."</string> - <!-- no translation found for permlab_systemAlertWindow (7238805243128138690) --> - <skip /> - <!-- no translation found for permdesc_systemAlertWindow (2393776099672266188) --> - <skip /> + <string name="permlab_systemAlertWindow" msgid="7238805243128138690">"אפליקציה זו יכולה להופיע מעל אפליקציות אחרות."</string> + <string name="permdesc_systemAlertWindow" msgid="2393776099672266188">"אפליקציה זו יכולה להופיע מעל אפליקציות אחרות או בחלקים אחרים של המסך. ייתכן שהדבר יפריע לך להשתמש באפליקציות וישנה את הופעתן."</string> <string name="permlab_persistentActivity" msgid="8841113627955563938">"הגדרת האפליקציה לפעול תמיד"</string> <string name="permdesc_persistentActivity" product="tablet" msgid="8525189272329086137">"מאפשר לאפליקציה להפוך חלקים ממנו לקבועים בזיכרון. פעולה זו עשויה להגביל את הזיכרון הזמין לאפליקציות אחרים ולהאט את פעולת הטאבלט."</string> <string name="permdesc_persistentActivity" product="tv" msgid="5086862529499103587">"מאפשרת לאפליקציה ליצור חלקים ממנה השמורים בזיכרון באופן עקבי. הדבר עלול להגביל את הזיכרון הזמין לאפליקציות אחרות וכתוצאה מכך להאט את פעולת הטלוויזיה."</string> @@ -359,51 +349,37 @@ <string name="permdesc_writeContacts" product="tv" msgid="5438230957000018959">"מאפשרת לאפליקציה לשנות נתונים לגבי אנשי הקשר שלך השמורים בטלוויזיה, כולל התדירות שבה התקשרת, שלחת אימייל או יצרת קשר בדרכים אחרות עם אנשי קשר ספציפיים. הרשאה זו מאפשרת לאפליקציות למחוק נתונים של אנשי קשר."</string> <string name="permdesc_writeContacts" product="default" msgid="589869224625163558">"מאפשר לאפליקציה לשנות את הנתונים לגבי אנשי הקשר שלך המאוחסנים בטלפון, כולל התדירות שבה התקשרת, שלחת אימייל או יצרת קשר בדרכים אחרות עם אנשי קשר ספציפיים. אישור זה מתיר לאפליקציות למחוק נתוני אנשי קשר."</string> <string name="permlab_readCallLog" msgid="3478133184624102739">"קריאת יומן שיחות"</string> - <!-- no translation found for permdesc_readCallLog (3204122446463552146) --> - <skip /> + <string name="permdesc_readCallLog" msgid="3204122446463552146">"אפליקציה זו יכולה לקרוא את היסטוריית השיחות שלך."</string> <string name="permlab_writeCallLog" msgid="8552045664743499354">"כתיבת יומן שיחות"</string> <string name="permdesc_writeCallLog" product="tablet" msgid="6661806062274119245">"מאפשר לאפליקציה לשנות את יומן השיחות של הטאבלט, כולל נתונים על שיחות נכנסות ויוצאות. אפליקציות זדוניות עלולות לעשות בכך שימוש כדי למחוק או לשנות את יומן השיחות שלך."</string> <string name="permdesc_writeCallLog" product="tv" msgid="4225034892248398019">"מאפשרת לאפליקציה לשנות את יומן השיחות של הטלוויזיה, כולל נתונים על שיחות נכנסות ויוצאות. אפליקציות זדוניות עלולות להשתמש בהרשאה זו כדי למחוק או לשנות את יומן השיחות שלך."</string> <string name="permdesc_writeCallLog" product="default" msgid="683941736352787842">"מאפשר לאפליקציה לשנות את יומן השיחות של הטלפון, כולל נתונים על שיחות נכנסות ויוצאות. אפליקציות זדוניות עלולות לעשות בכך שימוש כדי למחוק או לשנות את יומן השיחות שלך."</string> <string name="permlab_bodySensors" msgid="4683341291818520277">"גישה אל חיישני גוף (כמו מוניטורים לקצב לב)"</string> <string name="permdesc_bodySensors" product="default" msgid="4380015021754180431">"מאפשר לאפליקציה לגשת אל נתוני חיישנים העוקבים אחר מצבך הגופני, כמו קצב הלב."</string> - <!-- no translation found for permlab_readCalendar (6716116972752441641) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (4993979255403945892) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (8837931557573064315) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (4373978642145196715) --> - <skip /> + <string name="permlab_readCalendar" msgid="6716116972752441641">"קריאה של אירועי יומן ופרטיהם"</string> + <string name="permdesc_readCalendar" product="tablet" msgid="4993979255403945892">"אפליקציה זו יכולה לקרוא את כל אירועי היומן המאוחסנים בטאבלט, ולשתף או לשמור את נתוני היומן."</string> + <string name="permdesc_readCalendar" product="tv" msgid="8837931557573064315">"אפליקציה זו יכולה לקרוא את כל אירועי היומן המאוחסנים בטלוויזיה, ולשתף או לשמור את נתוני היומן."</string> + <string name="permdesc_readCalendar" product="default" msgid="4373978642145196715">"אפליקציה זו יכולה לקרוא את כל אירועי היומן המאוחסנים בטלפון, ולשתף או לשמור את נתוני היומן."</string> <string name="permlab_writeCalendar" msgid="8438874755193825647">"הוספה ושינוי של אירועי יומן ושליחת אימייל לאורחים ללא ידיעת הבעלים"</string> - <!-- no translation found for permdesc_writeCalendar (1675270619903625982) --> - <skip /> - <!-- no translation found for permdesc_writeCalendar (9017809326268135866) --> - <skip /> - <!-- no translation found for permdesc_writeCalendar (7592791790516943173) --> - <skip /> + <string name="permdesc_writeCalendar" product="tablet" msgid="1675270619903625982">"אפליקציה זו יכולה להוסיף, להסיר ולשנות אירועי יומן בטאבלט. האפליקציה יכולה לשנות אירועים בלי להודיע לבעליהם ולשלוח הודעות שעשויות להיראות כאילו נשלחו מבעלי יומנים."</string> + <string name="permdesc_writeCalendar" product="tv" msgid="9017809326268135866">"אפליקציה זו יכולה להוסיף, להסיר ולשנות אירועי יומן בטלוויזיה. האפליקציה יכולה לשנות אירועים בלי להודיע לבעליהם ולשלוח הודעות שעשויות להיראות כאילו נשלחו מבעלי יומנים."</string> + <string name="permdesc_writeCalendar" product="default" msgid="7592791790516943173">"אפליקציה זו יכולה להוסיף, להסיר ולשנות אירועי יומן בטלפון. האפליקציה יכולה לשנות אירועים בלי להודיע לבעליהם ולשלוח הודעות שעשויות להיראות כאילו נשלחו מבעלי יומנים."</string> <string name="permlab_accessLocationExtraCommands" msgid="2836308076720553837">"גישה לפקודות ספק מיקום נוספות"</string> <string name="permdesc_accessLocationExtraCommands" msgid="6078307221056649927">"מאפשרת לאפליקציה לגשת לפקודות נוספות של ספק המיקום. הרשאה זו עשויה לאפשר לאפליקציה לשבש את פעולת ה-GPS או מקורות מיקום אחרים."</string> <string name="permlab_accessFineLocation" msgid="251034415460950944">"גישה אל מיקום מדויק (מבוסס GPS ורשת)"</string> - <!-- no translation found for permdesc_accessFineLocation (5821994817969957884) --> - <skip /> + <string name="permdesc_accessFineLocation" msgid="5821994817969957884">"אפליקציה זו יכולה לזהות את המיקום שלך על סמך GPS או מקורות מיקום ברשת, כגון אנטנות סלולריות ורשתות Wi-Fi. שירותי מיקום אלה חייבים להיות מופעלים וזמינים בטלפון שלך כדי שהאפליקציה תוכל להשתמש בהם. ייתכן שהדבר יגביר את צריכת הסוללה."</string> <string name="permlab_accessCoarseLocation" msgid="7715277613928539434">"גישה אל מיקום משוער (מבוסס רשת)"</string> - <!-- no translation found for permdesc_accessCoarseLocation (3373266766487862426) --> - <skip /> - <!-- no translation found for permdesc_accessCoarseLocation (1884022719818788511) --> - <skip /> - <!-- no translation found for permdesc_accessCoarseLocation (7788009094906196995) --> - <skip /> + <string name="permdesc_accessCoarseLocation" product="tablet" msgid="3373266766487862426">"אפליקציה זו יכולה לזהות את המיקום שלך על סמך מקורות מיקום ברשת, כגון אנטנות סלולריות ורשתות Wi-Fi. שירותי מיקום אלה חייבים להיות מופעלים וזמינים בטאבלט שלך כדי שהאפליקציה תוכל להשתמש בהם."</string> + <string name="permdesc_accessCoarseLocation" product="tv" msgid="1884022719818788511">"אפליקציה זו יכולה לזהות את המיקום שלך על סמך מקורות מיקום ברשת, כגון אנטנות סלולריות ורשתות Wi-Fi. שירותי מיקום אלה חייבים להיות מופעלים וזמינים בטלוויזיה שלך כדי שהאפליקציה תוכל להשתמש בהם."</string> + <string name="permdesc_accessCoarseLocation" product="default" msgid="7788009094906196995">"אפליקציה זו יכולה לזהות את המיקום שלך על סמך מקורות מיקום ברשת, כגון אנטנות סלולריות ורשתות Wi-Fi. שירותי מיקום אלה חייבים להיות מופעלים וזמינים בטלפון שלך כדי שהאפליקציה תוכל להשתמש בהם."</string> <string name="permlab_modifyAudioSettings" msgid="6095859937069146086">"שנה את הגדרות האודיו שלך"</string> <string name="permdesc_modifyAudioSettings" msgid="3522565366806248517">"מאפשר לאפליקציה לשנות הגדרות אודיו גלובליות כמו עוצמת קול ובחירת הרמקול המשמש לפלט."</string> <string name="permlab_recordAudio" msgid="3876049771427466323">"הקלט אודיו"</string> - <!-- no translation found for permdesc_recordAudio (4245930455135321433) --> - <skip /> + <string name="permdesc_recordAudio" msgid="4245930455135321433">"אפליקציה זו יכולה להשתמש במיקרופון כדי להקליט אודיו בכל עת."</string> <string name="permlab_sim_communication" msgid="2935852302216852065">"שליחת פקודות אל ה-SIM"</string> <string name="permdesc_sim_communication" msgid="5725159654279639498">"מאפשרת ליישום לשלוח פקודות ל-SIM. זוהי הרשאה מסוכנת מאוד."</string> <string name="permlab_camera" msgid="3616391919559751192">"צלם תמונות וסרטונים"</string> - <!-- no translation found for permdesc_camera (5392231870049240670) --> - <skip /> + <string name="permdesc_camera" msgid="5392231870049240670">"אפליקציה זו יכולה להשתמש במצלמה כדי לצלם תמונות ולהקליט סרטונים בכל עת."</string> <string name="permlab_vibrate" msgid="7696427026057705834">"שליטה ברטט"</string> <string name="permdesc_vibrate" msgid="6284989245902300945">"מאפשר לאפליקציה לשלוט ברטט."</string> <string name="permlab_callPhone" msgid="3925836347681847954">"התקשר ישירות למספרי טלפון"</string> diff --git a/core/res/res/values-ja/strings.xml b/core/res/res/values-ja/strings.xml index 2ccc06c1be22..764e9cfa66ac 100644 --- a/core/res/res/values-ja/strings.xml +++ b/core/res/res/values-ja/strings.xml @@ -46,8 +46,7 @@ <string name="defaultMsisdnAlphaTag" msgid="2850889754919584674">"MSISDN1"</string> <string name="mmiError" msgid="5154499457739052907">"接続に問題があるか、MMIコードが正しくありません。"</string> <string name="mmiFdnError" msgid="5224398216385316471">"発信番号制限で指定された番号に対してのみ操作できます。"</string> - <!-- no translation found for mmiErrorWhileRoaming (762488890299284230) --> - <skip /> + <string name="mmiErrorWhileRoaming" msgid="762488890299284230">"ローミング中はスマートフォンから着信転送設定の変更はできません。"</string> <string name="serviceEnabled" msgid="8147278346414714315">"サービスが有効になりました。"</string> <string name="serviceEnabledFor" msgid="6856228140453471041">"次のサービスが有効になりました:"</string> <string name="serviceDisabled" msgid="1937553226592516411">"サービスが無効になりました。"</string> @@ -98,10 +97,8 @@ <string name="RestrictedOnVoiceData" msgid="996636487106171320">"音声/データサービスがブロックされています。"</string> <string name="RestrictedOnVoiceSms" msgid="1888588152792023873">"音声/SMSサービスがブロックされています。"</string> <string name="RestrictedOnAll" msgid="5643028264466092821">"すべての音声/データ/SMSサービスがブロックされています。"</string> - <!-- no translation found for NetworkPreferenceSwitchTitle (4008877505368566980) --> - <skip /> - <!-- no translation found for NetworkPreferenceSwitchSummary (7335915397439759249) --> - <skip /> + <string name="NetworkPreferenceSwitchTitle" msgid="4008877505368566980">"ネットワークにアクセスできません"</string> + <string name="NetworkPreferenceSwitchSummary" msgid="7335915397439759249">"受信状態を改善するには、[設定] > [モバイル ネットワーク] > [優先ネットワーク タイプ] で選択したタイプを変更してみてください。"</string> <string name="peerTtyModeFull" msgid="6165351790010341421">"ピアから、TTYモードをFULLにするようリクエストされました"</string> <string name="peerTtyModeHco" msgid="5728602160669216784">"ピアから、TTYモードをHCOにするようリクエストされました"</string> <string name="peerTtyModeVco" msgid="1742404978686538049">"ピアから、TTYモードをVCOにするようリクエストされました"</string> @@ -185,10 +182,8 @@ <string name="work_profile_deleted_description" msgid="6305147513054341102">"管理アプリがないため仕事用プロファイルが削除されました。"</string> <string name="work_profile_deleted_details" msgid="226615743462361248">"仕事用プロファイルの管理アプリがないか、破損しています。そのため仕事用プロファイルと関連データが削除されました。管理者にサポートをご依頼ください。"</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="6019770344820507579">"お使いの仕事用プロファイルはこの端末で使用できなくなりました"</string> - <!-- no translation found for network_logging_notification_title (1805392571290161924) --> - <skip /> - <!-- no translation found for network_logging_notification_text (4448072433371155729) --> - <skip /> + <string name="network_logging_notification_title" msgid="1805392571290161924">"ネットワーク トラフィックの監視中"</string> + <string name="network_logging_notification_text" msgid="4448072433371155729">"タップして詳細を表示します"</string> <string name="factory_reset_warning" msgid="5423253125642394387">"端末のデータが消去されます"</string> <string name="factory_reset_message" msgid="4905025204141900666">"管理アプリの構成要素が不足しているか、アプリが破損しているため、ご利用になれません。端末のデータはこれから消去されます。管理者にサポートをご依頼ください。"</string> <string name="me" msgid="6545696007631404292">"自分"</string> @@ -306,12 +301,9 @@ <string name="permlab_sendSms" msgid="7544599214260982981">"SMSメッセージの送信と表示"</string> <string name="permdesc_sendSms" msgid="7094729298204937667">"SMSメッセージの送信をアプリに許可します。これにより、予期せぬ料金が発生する可能性があります。悪意のあるアプリが確認なしでメッセージを送信し、料金が発生する恐れがあります。"</string> <string name="permlab_readSms" msgid="8745086572213270480">"テキストメッセージ（SMSまたはMMS）の読み取り"</string> - <!-- no translation found for permdesc_readSms (4741697454888074891) --> - <skip /> - <!-- no translation found for permdesc_readSms (5796670395641116592) --> - <skip /> - <!-- no translation found for permdesc_readSms (6826832415656437652) --> - <skip /> + <string name="permdesc_readSms" product="tablet" msgid="4741697454888074891">"このアプリは、お使いのタブレットに保存された SMS（テキスト）メッセージをすべて読み取ることができます。"</string> + <string name="permdesc_readSms" product="tv" msgid="5796670395641116592">"このアプリは、お使いのテレビに保存された SMS（テキスト）メッセージをすべて読み取ることができます。"</string> + <string name="permdesc_readSms" product="default" msgid="6826832415656437652">"このアプリは、お使いのスマートフォンに保存された SMS（テキスト）メッセージをすべて読み取ることができます。"</string> <string name="permlab_receiveWapPush" msgid="5991398711936590410">"テキストメッセージ（WAP）の受信"</string> <string name="permdesc_receiveWapPush" msgid="748232190220583385">"WAPメッセージの受信と処理をアプリに許可します。これにより、アプリが端末に届いたメッセージを表示することなく監視または削除できるようになります。"</string> <string name="permlab_getTasks" msgid="6466095396623933906">"実行中のアプリの取得"</string> @@ -324,10 +316,8 @@ <string name="permdesc_enableCarMode" msgid="4853187425751419467">"運転モードを有効にすることをアプリに許可します。"</string> <string name="permlab_killBackgroundProcesses" msgid="3914026687420177202">"他のアプリの終了"</string> <string name="permdesc_killBackgroundProcesses" msgid="4593353235959733119">"他のアプリのバックグラウンドプロセスを終了することをアプリに許可します。これを許可すると、他のアプリの実行が停止する原因になることがあります。"</string> - <!-- no translation found for permlab_systemAlertWindow (7238805243128138690) --> - <skip /> - <!-- no translation found for permdesc_systemAlertWindow (2393776099672266188) --> - <skip /> + <string name="permlab_systemAlertWindow" msgid="7238805243128138690">"他のアプリの上に重ねて表示"</string> + <string name="permdesc_systemAlertWindow" msgid="2393776099672266188">"このアプリは他のアプリの上に重ねて表示したり、画面の他の場所に表示したりできます。これにより、通常のアプリの使用が妨げられたり、他のアプリの表示が変わる場合があります。"</string> <string name="permlab_persistentActivity" msgid="8841113627955563938">"アプリの常時実行"</string> <string name="permdesc_persistentActivity" product="tablet" msgid="8525189272329086137">"アプリにその一部をメモリに常駐させることを許可します。これにより他のアプリが使用できるメモリが制限されるため、タブレットの動作が遅くなることがあります。"</string> <string name="permdesc_persistentActivity" product="tv" msgid="5086862529499103587">"アプリにその一部をメモリに常駐させることを許可します。これにより他のアプリが使用できるメモリが制限されるため、テレビの動作が遅くなることがあります。"</string> @@ -353,51 +343,37 @@ <string name="permdesc_writeContacts" product="tv" msgid="5438230957000018959">"テレビに保存されている連絡先に関するデータの変更をアプリに許可します。このデータには、電話、メール、または他の手段で特定の相手と連絡をとった頻度も含まれます。これにより、アプリが連絡先データを削除できるようになります。"</string> <string name="permdesc_writeContacts" product="default" msgid="589869224625163558">"モバイル端末に保存されている連絡先に関するデータの変更をアプリに許可します。このデータには、電話、メール、または他の手段で特定の相手と連絡をとった頻度も含まれます。これにより、アプリが連絡先データを削除できるようになります。"</string> <string name="permlab_readCallLog" msgid="3478133184624102739">"通話履歴の読み取り"</string> - <!-- no translation found for permdesc_readCallLog (3204122446463552146) --> - <skip /> + <string name="permdesc_readCallLog" msgid="3204122446463552146">"このアプリは通話履歴を読み取ることができます。"</string> <string name="permlab_writeCallLog" msgid="8552045664743499354">"通話履歴の書き込み"</string> <string name="permdesc_writeCallLog" product="tablet" msgid="6661806062274119245">"タブレットの通話履歴（着信や発信のデータなど）の変更をアプリに許可します。この許可を悪意のあるアプリに利用されると、通話履歴が消去または変更される恐れがあります。"</string> <string name="permdesc_writeCallLog" product="tv" msgid="4225034892248398019">"テレビの通話履歴（着信や発信のデータなど）の変更をアプリに許可します。この許可を悪意のあるアプリに利用されると、通話履歴が消去または変更される恐れがあります。"</string> <string name="permdesc_writeCallLog" product="default" msgid="683941736352787842">"モバイル端末の通話履歴（着信や発信のデータなど）の変更をアプリに許可します。この許可を悪意のあるアプリに利用されると、通話履歴が消去または変更される恐れがあります。"</string> <string name="permlab_bodySensors" msgid="4683341291818520277">"ボディーセンサー（心拍数モニターなど）へのアクセス"</string> <string name="permdesc_bodySensors" product="default" msgid="4380015021754180431">"心拍数など、身体状態を監視するセンサーからのデータにアクセスすることをアプリに許可します。"</string> - <!-- no translation found for permlab_readCalendar (6716116972752441641) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (4993979255403945892) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (8837931557573064315) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (4373978642145196715) --> - <skip /> + <string name="permlab_readCalendar" msgid="6716116972752441641">"カレンダーの予定と詳細を読み取り"</string> + <string name="permdesc_readCalendar" product="tablet" msgid="4993979255403945892">"このアプリは、お使いのタブレットに保存されたカレンダーの予定をすべて読み取り、カレンダーのデータを共有したり、保存したりできます。"</string> + <string name="permdesc_readCalendar" product="tv" msgid="8837931557573064315">"このアプリは、お使いのテレビに保存されたカレンダーの予定をすべて読み取り、カレンダーのデータを共有したり、保存したりできます。"</string> + <string name="permdesc_readCalendar" product="default" msgid="4373978642145196715">"このアプリは、お使いのスマートフォンに保存されたカレンダーの予定をすべて読み取り、カレンダーのデータを共有したり、保存したりできます。"</string> <string name="permlab_writeCalendar" msgid="8438874755193825647">"カレンダーの予定の変更や追加を行う、所有者に通知せずにゲストにメールを送信する場合がある"</string> - <!-- no translation found for permdesc_writeCalendar (1675270619903625982) --> - <skip /> - <!-- no translation found for permdesc_writeCalendar (9017809326268135866) --> - <skip /> - <!-- no translation found for permdesc_writeCalendar (7592791790516943173) --> - <skip /> + <string name="permdesc_writeCalendar" product="tablet" msgid="1675270619903625982">"このアプリは、お使いのタブレットでカレンダーの予定を追加、削除、変更できます。また、カレンダーの所有者から発信されたかのように表示されるメッセージを送信したり、所有者に通知することなく予定を変更したりできます。"</string> + <string name="permdesc_writeCalendar" product="tv" msgid="9017809326268135866">"このアプリは、お使いのテレビでカレンダーの予定を追加、削除、変更できます。また、カレンダーの所有者から発信されたかのように表示されるメッセージを送信したり、所有者に通知することなく予定を変更したりできます。"</string> + <string name="permdesc_writeCalendar" product="default" msgid="7592791790516943173">"このアプリは、お使いのスマートフォンでカレンダーの予定を追加、削除、変更できます。また、カレンダーの所有者から発信されたかのように表示されるメッセージを送信したり、所有者に通知することなく予定を変更したりできます。"</string> <string name="permlab_accessLocationExtraCommands" msgid="2836308076720553837">"位置情報提供者の追加コマンドアクセス"</string> <string name="permdesc_accessLocationExtraCommands" msgid="6078307221056649927">"位置情報提供元の追加のコマンドにアクセスすることをアプリに許可します。許可すると、アプリがGPSなどの位置情報源の動作を妨害する恐れがあります。"</string> <string name="permlab_accessFineLocation" msgid="251034415460950944">"正確な位置情報（GPSとネットワーク基地局）へのアクセス"</string> - <!-- no translation found for permdesc_accessFineLocation (5821994817969957884) --> - <skip /> + <string name="permdesc_accessFineLocation" msgid="5821994817969957884">"このアプリは、ネットワーク位置情報源（携帯基地局や Wi-Fi ネットワークなど）に基づいて、ユーザーの位置情報を取得します。これらの位置情報サービスは ON の状態にして、スマートフォンでアプリがサービスを利用できるようにする必要があります。これにより電池の消費量が増える可能性があります。"</string> <string name="permlab_accessCoarseLocation" msgid="7715277613928539434">"おおよその位置情報（ネットワーク基地局）へのアクセス"</string> - <!-- no translation found for permdesc_accessCoarseLocation (3373266766487862426) --> - <skip /> - <!-- no translation found for permdesc_accessCoarseLocation (1884022719818788511) --> - <skip /> - <!-- no translation found for permdesc_accessCoarseLocation (7788009094906196995) --> - <skip /> + <string name="permdesc_accessCoarseLocation" product="tablet" msgid="3373266766487862426">"このアプリは、ネットワーク位置情報源（携帯基地局や Wi-Fi ネットワークなど）に基づいて、ユーザーの位置情報を取得します。これらの位置情報サービスは ON の状態にして、タブレットでアプリがサービスを利用できるようにする必要があります。"</string> + <string name="permdesc_accessCoarseLocation" product="tv" msgid="1884022719818788511">"このアプリは、ネットワーク位置情報源（携帯基地局や Wi-Fi ネットワークなど）に基づいて、ユーザーの位置情報を取得します。これらの位置情報サービスは ON の状態にして、テレビでアプリがサービスを利用できるようにする必要があります。"</string> + <string name="permdesc_accessCoarseLocation" product="default" msgid="7788009094906196995">"このアプリは、ネットワーク位置情報源（携帯基地局や Wi-Fi ネットワークなど）に基づいて、ユーザーの位置情報を取得します。これらの位置情報サービスは ON の状態にして、スマートフォンでアプリがサービスを利用できるようにする必要があります。"</string> <string name="permlab_modifyAudioSettings" msgid="6095859937069146086">"音声設定の変更"</string> <string name="permdesc_modifyAudioSettings" msgid="3522565366806248517">"音声全般の設定（音量、出力に使用するスピーカーなど）の変更をアプリに許可します。"</string> <string name="permlab_recordAudio" msgid="3876049771427466323">"録音"</string> - <!-- no translation found for permdesc_recordAudio (4245930455135321433) --> - <skip /> + <string name="permdesc_recordAudio" msgid="4245930455135321433">"このアプリは、いつでもマイクを使用して録音できます。"</string> <string name="permlab_sim_communication" msgid="2935852302216852065">"SIMへのコマンド送信"</string> <string name="permdesc_sim_communication" msgid="5725159654279639498">"SIMにコマンドを送信することをアプリに許可します｡この許可は非常に危険です。"</string> <string name="permlab_camera" msgid="3616391919559751192">"写真と動画の撮影"</string> - <!-- no translation found for permdesc_camera (5392231870049240670) --> - <skip /> + <string name="permdesc_camera" msgid="5392231870049240670">"このアプリは、いつでもカメラを使用して写真や動画を撮影できます。"</string> <string name="permlab_vibrate" msgid="7696427026057705834">"バイブレーションの制御"</string> <string name="permdesc_vibrate" msgid="6284989245902300945">"バイブレーションの制御をアプリに許可します。"</string> <string name="permlab_callPhone" msgid="3925836347681847954">"電話番号発信"</string> diff --git a/core/res/res/values-ka-rGE/strings.xml b/core/res/res/values-ka-rGE/strings.xml index 4d8e9d90f683..f0486fa79850 100644 --- a/core/res/res/values-ka-rGE/strings.xml +++ b/core/res/res/values-ka-rGE/strings.xml @@ -46,8 +46,7 @@ <string name="defaultMsisdnAlphaTag" msgid="2850889754919584674">"MSISDN1"</string> <string name="mmiError" msgid="5154499457739052907">"კავშირის პრობლემა ან არასწორი MMI კოდი."</string> <string name="mmiFdnError" msgid="5224398216385316471">"ოპერაცია შეზღუდულია მხოლოდ დაშვებულ ნომრებზე."</string> - <!-- no translation found for mmiErrorWhileRoaming (762488890299284230) --> - <skip /> + <string name="mmiErrorWhileRoaming" msgid="762488890299284230">"ზარის გადამისამართების პარამეტრების თქვენი ტელეფონიდან შეცვლა როუმინგისას ვერ მოხერხდება."</string> <string name="serviceEnabled" msgid="8147278346414714315">"სერვისი ჩართულია."</string> <string name="serviceEnabledFor" msgid="6856228140453471041">"სერვისი ჩართულია შემდეგისთვის:"</string> <string name="serviceDisabled" msgid="1937553226592516411">"სერვისი გამორთულია."</string> @@ -98,10 +97,8 @@ <string name="RestrictedOnVoiceData" msgid="996636487106171320">"ხმის/მონაცემების სერვისები დაბლოკილია."</string> <string name="RestrictedOnVoiceSms" msgid="1888588152792023873">"ყველა ხმოვანი/SMS-ის სერვისი დაბლოკილია."</string> <string name="RestrictedOnAll" msgid="5643028264466092821">"ხმის/მონაცემების/SMS-ის ყველა სერვისი დაბლოკილია."</string> - <!-- no translation found for NetworkPreferenceSwitchTitle (4008877505368566980) --> - <skip /> - <!-- no translation found for NetworkPreferenceSwitchSummary (7335915397439759249) --> - <skip /> + <string name="NetworkPreferenceSwitchTitle" msgid="4008877505368566980">"ქსელთან დაკავშირება ვერ ხერხდება"</string> + <string name="NetworkPreferenceSwitchSummary" msgid="7335915397439759249">"მიღების გასაუმჯობესებლად ცადეთ არჩეული ტიპის შეცვლა აქ: პარამეტრები > ფიჭური ქსელები > ქსელის სასურველი ტიპი."</string> <string name="peerTtyModeFull" msgid="6165351790010341421">"მოთხოვნილია კვანძი TTY რეჟიმი FULL"</string> <string name="peerTtyModeHco" msgid="5728602160669216784">"მოთხოვნილია კვანძი TTY რეჟიმი HCO"</string> <string name="peerTtyModeVco" msgid="1742404978686538049">"მოთხოვნილია კვანძი TTY რეჟიმი VCO"</string> @@ -185,10 +182,8 @@ <string name="work_profile_deleted_description" msgid="6305147513054341102">"სამუშაო პროფილი წაშლილია ადმინისტრატორის აპლიკაციის არ ქონის გამო."</string> <string name="work_profile_deleted_details" msgid="226615743462361248">"სამუშაო პროფილის ადმინისტრატორის აპლიკაცია გამოტოვებული ან დაზიანებულია. შედეგად, თქვენი სამუშაო პროფილი და მასთან დაკავშირებული მონაცემები წაიშალა. დახმარებისათვის დაუკავშირდით თქვენს ადმინისტრატორს."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="6019770344820507579">"თქვენი სამუშაო პროფილი აღარ არის ხელმისაწვდომი ამ მოწყობილობაზე."</string> - <!-- no translation found for network_logging_notification_title (1805392571290161924) --> - <skip /> - <!-- no translation found for network_logging_notification_text (4448072433371155729) --> - <skip /> + <string name="network_logging_notification_title" msgid="1805392571290161924">"ქსელის ტრაფიკი მონიტორინგს გადის"</string> + <string name="network_logging_notification_text" msgid="4448072433371155729">"შეეხეთ დამატებითი დეტალების სანახავად"</string> <string name="factory_reset_warning" msgid="5423253125642394387">"თქვენი მოწყობილობა წაიშლება"</string> <string name="factory_reset_message" msgid="4905025204141900666">"ადმინისტრატორის აპლიკაციას კომპონენტები აკლია ან დაზიანებულია, შესაბამისად, მისი გამოყენება ვერ მოხერხდება. თქვენი მოწყობილობა წაიშლება. დახმარებისათვის დაუკავშირდით თქვენს ადმინისტრატორს."</string> <string name="me" msgid="6545696007631404292">"მე"</string> @@ -306,12 +301,9 @@ <string name="permlab_sendSms" msgid="7544599214260982981">"SMS-ის შეტყობინებების გაგზავნა და ნახვა"</string> <string name="permdesc_sendSms" msgid="7094729298204937667">"აპს შეეძლება, გაგზავნოს SMS შეტყობინებები, რამაც შეიძლება გაუთვალისწინებელი ხარჯები გამოიწვიოს. მავნე აპებმა შეიძლება დაგიხარჯონ ფული შეტყობინებების თქვენი თანხმობის გარეშე გაგზავნით."</string> <string name="permlab_readSms" msgid="8745086572213270480">"თქვენი ტექსტური შეტყობინებების (SMS ან MMS) წაკითხვა"</string> - <!-- no translation found for permdesc_readSms (4741697454888074891) --> - <skip /> - <!-- no translation found for permdesc_readSms (5796670395641116592) --> - <skip /> - <!-- no translation found for permdesc_readSms (6826832415656437652) --> - <skip /> + <string name="permdesc_readSms" product="tablet" msgid="4741697454888074891">"ამ აპს შეუძლია თქვენს ტაბლეტში შენახული ყველა SMS (ტექსტური) შეტყობინების წაკითხვა."</string> + <string name="permdesc_readSms" product="tv" msgid="5796670395641116592">"ამ აპს შეუძლია თქვენს ტელევიზორში შენახული ყველა SMS (ტექსტური) შეტყობინების წაკითხვა."</string> + <string name="permdesc_readSms" product="default" msgid="6826832415656437652">"ამ აპს შეუძლია თქვენს ტელეფონში შენახული ყველა SMS (ტექსტური) შეტყობინების წაკითხვა."</string> <string name="permlab_receiveWapPush" msgid="5991398711936590410">"ტექსტური შეტყობინებების (WAP) მიღება"</string> <string name="permdesc_receiveWapPush" msgid="748232190220583385">"აპს შეეძლება WAP შეტყობინებების მიღება და გენერირება. ამ უფლებით აპი ისე დააკვირდება და წაშლის თქვენთვის გამოგზავნილ შეტყობინებებს, რომ თქვენ ვერც ნახავთ."</string> <string name="permlab_getTasks" msgid="6466095396623933906">"მოქმედი აპების მოძიება"</string> @@ -324,10 +316,8 @@ <string name="permdesc_enableCarMode" msgid="4853187425751419467">"აპს შეეძლება მანქანის რეჟიმის ჩართვა."</string> <string name="permlab_killBackgroundProcesses" msgid="3914026687420177202">"სხვა აპების დახურვა"</string> <string name="permdesc_killBackgroundProcesses" msgid="4593353235959733119">"აპს შეეძლება, დაასრულოს სხვა აპების ფონური პროცესები. ამან შეიძლება სხვა აპების შეჩერება გამოიწვიოს."</string> - <!-- no translation found for permlab_systemAlertWindow (7238805243128138690) --> - <skip /> - <!-- no translation found for permdesc_systemAlertWindow (2393776099672266188) --> - <skip /> + <string name="permlab_systemAlertWindow" msgid="7238805243128138690">"ამ აპს შეუძლია სხვა აპების ზემოდან გამოჩენა"</string> + <string name="permdesc_systemAlertWindow" msgid="2393776099672266188">"ამ აპს შეუძლია სხვა აპების ზემოდან ან ეკრანის სხვა ნაწილებში გამოჩენა. ამან შეიძლება გავლენა იქონიოს აპის ნორმალურ გამოყენებაზე და სხვა აპების იერსახეზე."</string> <string name="permlab_persistentActivity" msgid="8841113627955563938">"დააყენოს აპი მუდმივად ჩართულად"</string> <string name="permdesc_persistentActivity" product="tablet" msgid="8525189272329086137">"აპს შეეძლება, საკუთარი ნაწილები მუდმივად ჩაწეროს მეხსიერებაში. ეს შეზღუდავს მეხსიერების ხელმისაწვდომობას სხვა აპებისთვის და შეანელებს ტაბლეტს."</string> <string name="permdesc_persistentActivity" product="tv" msgid="5086862529499103587">"ნებას რთავს აპლიკაციას, მდგრადი გახადოს მეხსიერება. ამან შესაძლოა ტელევიზორის ფუნქიონირებისა და სხვა აპლიკაციების მეხსიერების შესუსტება გამოწივიოს."</string> @@ -353,51 +343,37 @@ <string name="permdesc_writeContacts" product="tv" msgid="5438230957000018959">"ნებას რთავს აპლიაკციას, შეცვალოს ტელევიზორში შენახული საკონტაქტო მონაცემები, ასევე მონაცემები იმ შესახებ თუ ვის რა სიხშირით დაურეკეთ, ელექტრონული ფოსტა გაუგზავნეთ, თუ სხვა გზით დაუკავშირდით. ეს ნებართვა საშუალებას აძლევს აპლიკაციას, წაშალოს საკონტაქტო მონაცემთა ბაზა."</string> <string name="permdesc_writeContacts" product="default" msgid="589869224625163558">"აპს შეეძლება, შეცვალოს თქვენ ტელეფონზე შენახული კონტაქტების მონაცემები, მათ შორის ინფორმაცია კონკრეტულ ინდივიდუალებთან თქვენი დარეკვის, ელფოსტის გაგზავნის ან კომუნიკაციის სიხშირის შესახებ. ეს ნებართვა უფლებას აძლევს აპებს, წაშალოს საკონტაქტო მონაცემები. "</string> <string name="permlab_readCallLog" msgid="3478133184624102739">"ზარების ჟურნალის წაკითხვა"</string> - <!-- no translation found for permdesc_readCallLog (3204122446463552146) --> - <skip /> + <string name="permdesc_readCallLog" msgid="3204122446463552146">"ამ აპს შეუძლია თქვენი საუბრის ისტორიის წაკითხვა."</string> <string name="permlab_writeCallLog" msgid="8552045664743499354">"ზარების ჟურნალში ჩაწერა"</string> <string name="permdesc_writeCallLog" product="tablet" msgid="6661806062274119245">"აპს შეეძლება, შეცვალოს თქვენი ტაბლეტის ზარების ჟურნალი, მათ შორის შემომავალი და გამავალი ზარების მონაცემები. მავნე აპებმა შეიძლება გამოიყენონ ეს თქვენი ზარების ჟურნალის წასაშლელად ან შესაცვლელად."</string> <string name="permdesc_writeCallLog" product="tv" msgid="4225034892248398019">"ნებას რთვს აპლიკაციას, შეცვალოს თქვენი ტელევიზორის ზარების ჟურნალი, შემომავალი და გამავალი ზარების მონაცემთა ჩათვლით. მავნე აპლიკაციებს შეუძლიათ ამოშალონ ან შეცვალონ თქვენი ზარების ჟურნალი."</string> <string name="permdesc_writeCallLog" product="default" msgid="683941736352787842">"აპს შეეძლება, შეცვალოს თქვენი ტელეფონის ზარების ჟურნალი, მათ შორის შემომავალი და გამავალი ზარების მონაცემები. მავნე აპებმა შეიძლება გამოიყენონ ეს თქვენი ზარების ჟურნალის წასაშლელად ან შესაცვლელად."</string> <string name="permlab_bodySensors" msgid="4683341291818520277">"სხეულის სენსორებზე წვდომა (მაგ., გულისცემის მონიტორები)"</string> <string name="permdesc_bodySensors" product="default" msgid="4380015021754180431">"აპისთვის ნების დართვა, რათა მას ჰქონდეს წვდომა თქვენი ფიზიკური მდგომარეობის მონიტორინგის სენსორების მონაცემებზე."</string> - <!-- no translation found for permlab_readCalendar (6716116972752441641) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (4993979255403945892) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (8837931557573064315) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (4373978642145196715) --> - <skip /> + <string name="permlab_readCalendar" msgid="6716116972752441641">"კალენდრის მოვლენებისა და დეტალების წაკითხვა"</string> + <string name="permdesc_readCalendar" product="tablet" msgid="4993979255403945892">"ამ აპს შეუძლია თქვენს ტაბლეტში შენახული კალენდრის ყველა მოვლენის წაკითხვა და თქვენი კალენდრის მონაცემების გაზიარება ან შენახვა."</string> + <string name="permdesc_readCalendar" product="tv" msgid="8837931557573064315">"ამ აპს შეუძლია თქვენს ტელევიზორში შენახული კალენდრის ყველა მოვლენის წაკითხვა და თქვენი კალენდრის მონაცემების გაზიარება ან შენახვა."</string> + <string name="permdesc_readCalendar" product="default" msgid="4373978642145196715">"ამ აპს შეუძლია თქვენს ტელეფონში შენახული კალენდრის ყველა მოვლენის წაკითხვა და თქვენი კალენდრის მონაცემების გაზიარება ან შენახვა."</string> <string name="permlab_writeCalendar" msgid="8438874755193825647">"კალენდრის ღონისძიებების დამატება და შეცვლა და მფლობელის გარეშე ელფოსტის გაგზავნა სტუმრებთან."</string> - <!-- no translation found for permdesc_writeCalendar (1675270619903625982) --> - <skip /> - <!-- no translation found for permdesc_writeCalendar (9017809326268135866) --> - <skip /> - <!-- no translation found for permdesc_writeCalendar (7592791790516943173) --> - <skip /> + <string name="permdesc_writeCalendar" product="tablet" msgid="1675270619903625982">"ამ აპს შეუძლია თქვენს ტაბლეტში კალენდრის მოვლენების დამატება, ამოშლა ან შეცვლა. ამ აპს შეუძლია კალენდრების მფლობელების სახელით შეტყობინებების გაგზავნა ან მოვლენების მათი მფლობელების შეტყობინების გარეშე შეცვლა."</string> + <string name="permdesc_writeCalendar" product="tv" msgid="9017809326268135866">"ამ აპს შეუძლია თქვენს ტელევიზორში კალენდრის მოვლენების დამატება, ამოშლა ან შეცვლა. ამ აპს შეუძლია კალენდრების მფლობელების სახელით შეტყობინებების გაგზავნა ან მოვლენების მათი მფლობელების შეტყობინების გარეშე შეცვლა."</string> + <string name="permdesc_writeCalendar" product="default" msgid="7592791790516943173">"ამ აპს შეუძლია თქვენს ტელეფონში კალენდრის მოვლენების დამატება, ამოშლა ან შეცვლა. ამ აპს შეუძლია კალენდრების მფლობელების სახელით შეტყობინებების გაგზავნა ან მოვლენების მათი მფლობელების შეტყობინების გარეშე შეცვლა."</string> <string name="permlab_accessLocationExtraCommands" msgid="2836308076720553837">"მდებარეობის პროვაიდერის დამატებით ბრძანებებზე წვდომა"</string> <string name="permdesc_accessLocationExtraCommands" msgid="6078307221056649927">"აპს შეეძლება წვდომა ჰქონდეს მდებარეობის სერვისის დამატებით ბრძანებებზე. შესაძლოა აპმა ეს გამოიყენოს GPS-ისა და მდებარეობის სხვა წყაროების მუშაობის პროცესში ჩარევისთვის."</string> <string name="permlab_accessFineLocation" msgid="251034415460950944">"ზუსტ მდებარეობაზე წვდომა (GPS-ისა და ქსელის მეშვეობით)"</string> - <!-- no translation found for permdesc_accessFineLocation (5821994817969957884) --> - <skip /> + <string name="permdesc_accessFineLocation" msgid="5821994817969957884">"ამ აპს თქვენი მდებარეობის შესახებ ინფორმაციის მიღება GPS-ის ან ქსელის მდებარეობის ისეთი წყაროების მიხედვით შეუძლია, როგორიცაა მობილური კავშირგაბმულობის ანძები და Wi-Fi ქსელები. მდებარეობის აღნიშნული სერვისები თქვენს ტელეფონზე ჩართული და ხელმისაწვდომი უნდა იყოს, რათა აპმა მათი გამოყენება შეძლოს. ამან შეიძლება ბატარეის მოხმარება გაზარდოს."</string> <string name="permlab_accessCoarseLocation" msgid="7715277613928539434">"მიახლოებით მდებარეობაზე წვდომა (ქსელის მეშვეობით)"</string> - <!-- no translation found for permdesc_accessCoarseLocation (3373266766487862426) --> - <skip /> - <!-- no translation found for permdesc_accessCoarseLocation (1884022719818788511) --> - <skip /> - <!-- no translation found for permdesc_accessCoarseLocation (7788009094906196995) --> - <skip /> + <string name="permdesc_accessCoarseLocation" product="tablet" msgid="3373266766487862426">"ამ აპს თქვენი მდებარეობის შესახებ ინფორმაციის მიღება ისეთი წყაროების მეშვეობით შეუძლია, როგორიცაა მობილური კავშირგაბმულობის ანძები და Wi-Fi ქსელები. მდებარეობის აღნიშნული სერვისები თქვენს ტაბლეტზე ჩართული და ხელმისაწვდომი უნდა იყოს, რათა აპმა მათი გამოყენება შეძლოს."</string> + <string name="permdesc_accessCoarseLocation" product="tv" msgid="1884022719818788511">"ამ აპს თქვენი მდებარეობის შესახებ ინფორმაციის მიღება ისეთი წყაროების მეშვეობით შეუძლია, როგორიცაა მობილური კავშირგაბმულობის ანძები და Wi-Fi ქსელები. მდებარეობის აღნიშნული სერვისები თქვენს ტელევიზორზე ჩართული და ხელმისაწვდომი უნდა იყოს, რათა აპმა მათი გამოყენება შეძლოს."</string> + <string name="permdesc_accessCoarseLocation" product="default" msgid="7788009094906196995">"ამ აპს თქვენი მდებარეობის შესახებ ინფორმაციის მიღება ისეთი წყაროების მეშვეობით შეუძლია, როგორიცაა მობილური კავშირგაბმულობის ანძები და Wi-Fi ქსელები. მდებარეობის აღნიშნული სერვისები თქვენს ტელეფონზე ჩართული და ხელმისაწვდომი უნდა იყოს, რათა აპმა მათი გამოყენება შეძლოს."</string> <string name="permlab_modifyAudioSettings" msgid="6095859937069146086">"თქვენი აუდიო პარამეტრების შეცვლა"</string> <string name="permdesc_modifyAudioSettings" msgid="3522565366806248517">"აპს შეეძლება აუდიოს გლობალური პარამეტრების შეცვლა. მაგ.: ხმის სიმაღლე და რომელი დინამიკი გამოიყენება სიგნალის გამოსტანად."</string> <string name="permlab_recordAudio" msgid="3876049771427466323">"აუდიოს ჩაწერა"</string> - <!-- no translation found for permdesc_recordAudio (4245930455135321433) --> - <skip /> + <string name="permdesc_recordAudio" msgid="4245930455135321433">"ამ აპს ნებისმიერ დროს შეუძლია მიკროფონით აუდიოს ჩაწერა."</string> <string name="permlab_sim_communication" msgid="2935852302216852065">"ბრძანებების SIM-ზე გაგზავნა"</string> <string name="permdesc_sim_communication" msgid="5725159654279639498">"აპისთვის ნების დართვა გაუგზავნოს ბრძანებები SIM-ბარათს. ეს ძალიან საშიშია."</string> <string name="permlab_camera" msgid="3616391919559751192">"სურათებისა და ვიდეოების გადაღება"</string> - <!-- no translation found for permdesc_camera (5392231870049240670) --> - <skip /> + <string name="permdesc_camera" msgid="5392231870049240670">"ამ აპს ნებისმიერ დროს შეუძლია კამერით სურათების გადაღება და ვიდეოების ჩაწერა."</string> <string name="permlab_vibrate" msgid="7696427026057705834">"ვიბრაციის კონტროლი"</string> <string name="permdesc_vibrate" msgid="6284989245902300945">"აპს შეეძლება, მართოს ვიბრირება."</string> <string name="permlab_callPhone" msgid="3925836347681847954">"პირდაპირი დარეკვა ტელეფონის ნომრებზე"</string> diff --git a/core/res/res/values-kk-rKZ/strings.xml b/core/res/res/values-kk-rKZ/strings.xml index bedb29c9a85d..1e45115e81fa 100644 --- a/core/res/res/values-kk-rKZ/strings.xml +++ b/core/res/res/values-kk-rKZ/strings.xml @@ -182,10 +182,8 @@ <string name="work_profile_deleted_description" msgid="6305147513054341102">"Басқару қолданбасы болмағандықтан жұмыс профилі жойылды."</string> <string name="work_profile_deleted_details" msgid="226615743462361248">"Жұмыс профилінің басқару қолданбасы жоқ немесе бүлінген. Нәтижесінде жұмыс профиліңіз және қатысты деректер жойылды. Көмек алу үшін әкімшіге хабарласыңыз."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="6019770344820507579">"Жұмыс профиліңіз осы құрылғыда енді қолжетімді емес."</string> - <!-- no translation found for network_logging_notification_title (1805392571290161924) --> - <skip /> - <!-- no translation found for network_logging_notification_text (4448072433371155729) --> - <skip /> + <string name="network_logging_notification_title" msgid="1805392571290161924">"Желі трафигі бақылануда"</string> + <string name="network_logging_notification_text" msgid="4448072433371155729">"Қосымша мәліметтерді көру үшін түртіңіз"</string> <string name="factory_reset_warning" msgid="5423253125642394387">"Құрылғыңыздағы деректер өшіріледі"</string> <string name="factory_reset_message" msgid="4905025204141900666">"Басқару қолданбасында құрамдастар жетіспейді немесе ол бүлінген және оны пайдалану мүмкін емес. Құрылғыңыздағы деректер қазір өшіріледі. Көмек алу үшін әкімшіге хабарласыңыз."</string> <string name="me" msgid="6545696007631404292">"Мен"</string> diff --git a/core/res/res/values-km-rKH/strings.xml b/core/res/res/values-km-rKH/strings.xml index c84476fd7cb1..1c9ec816acc2 100644 --- a/core/res/res/values-km-rKH/strings.xml +++ b/core/res/res/values-km-rKH/strings.xml @@ -182,10 +182,8 @@ <string name="work_profile_deleted_description" msgid="6305147513054341102">"ប្រវត្តិរូបការងារត្រូវបានលុបដោយសារបាត់បង់កម្មវិធីគ្រប់គ្រង។"</string> <string name="work_profile_deleted_details" msgid="226615743462361248">"ប្រវត្តិរូបការងាររបស់អ្នកអាចបាត់បង់ ឬមានបញ្ហា។ ជាលទ្ធផល ប្រវត្តិរូបការងាររបស់អ្នក និងទិន្នន័យដែលពាក់ព័ន្ធត្រូវបានលុប។ ទំនាក់ទំនងអ្នកគ្រប់គ្រងរបស់អ្នកសម្រាប់ជំនួយ។"</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="6019770344820507579">"ប្រវត្តិរូបការងាររបស់អ្នកមិនមាននៅលើឧបករណ៍នេះទៀតទេ។"</string> - <!-- no translation found for network_logging_notification_title (1805392571290161924) --> - <skip /> - <!-- no translation found for network_logging_notification_text (4448072433371155729) --> - <skip /> + <string name="network_logging_notification_title" msgid="1805392571290161924">"កំពុងតាមដានចរាចរណ៍បណ្តាញ"</string> + <string name="network_logging_notification_text" msgid="4448072433371155729">"ចុចដើម្បីទទួលបានព័ត៌មានលម្អិតបន្ថែម"</string> <string name="factory_reset_warning" msgid="5423253125642394387">"ឧបករណ៍របស់អ្នកនឹងត្រូវបានលុប"</string> <string name="factory_reset_message" msgid="4905025204141900666">"កម្មវិធីគ្រប់គ្រងបាត់បង់សមាសធាតុ ឬមានបញ្ហា ហើយមិនអាចប្រើបានទេ។ ឧបករណ៍របស់អ្នកនឹងត្រូវបានលុបឥឡូវនេះ។ ទំនាក់ទំនងអ្នកគ្រប់គ្រងរបស់អ្នកសម្រាប់ជំនួយ។"</string> <string name="me" msgid="6545696007631404292">"ខ្ញុំ"</string> diff --git a/core/res/res/values-kn-rIN/strings.xml b/core/res/res/values-kn-rIN/strings.xml index 7810874c25b2..e79fd6f5b40e 100644 --- a/core/res/res/values-kn-rIN/strings.xml +++ b/core/res/res/values-kn-rIN/strings.xml @@ -46,8 +46,7 @@ <string name="defaultMsisdnAlphaTag" msgid="2850889754919584674">"MSISDN1"</string> <string name="mmiError" msgid="5154499457739052907">"ಸಂಪರ್ಕ ಸಮಸ್ಯೆ ಇಲ್ಲವೇ ಅಮಾನ್ಯ MMI ಕೋಡ್."</string> <string name="mmiFdnError" msgid="5224398216385316471">"ಕಾರ್ಯಾಚರಣೆಯನ್ನು ಸ್ಥಿರ ದೂರವಾಣಿ ಸಂಖ್ಯೆಗಳಿಗೆ ಮಾತ್ರ ನಿರ್ಬಂಧಿಸಲಾಗಿದೆ."</string> - <!-- no translation found for mmiErrorWhileRoaming (762488890299284230) --> - <skip /> + <string name="mmiErrorWhileRoaming" msgid="762488890299284230">"ನೀವು ರೋಮಿಂಗ್ನಲ್ಲಿರುವಾಗ ನಿಮ್ಮ ಫೋನ್ನಿಂದ ಕರೆ ಫಾರ್ವರ್ಡ್ ಮಾಡುವಿಕೆಯ ಸೆಟ್ಟಿಂಗ್ಗಳನ್ನು ಬದಲಾಯಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ."</string> <string name="serviceEnabled" msgid="8147278346414714315">"ಸೇವೆಯನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ."</string> <string name="serviceEnabledFor" msgid="6856228140453471041">"ಸೇವೆಯನ್ನು ಇವುಗಳಿಗಾಗಿ ಸಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ:"</string> <string name="serviceDisabled" msgid="1937553226592516411">"ಸೇವೆಯನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ."</string> @@ -98,10 +97,8 @@ <string name="RestrictedOnVoiceData" msgid="996636487106171320">"ಧ್ವನಿ/ಡೇಟಾ ಸೇವೆಗಳನ್ನು ನಿರ್ಬಂಧಿಸಲಾಗಿದೆ."</string> <string name="RestrictedOnVoiceSms" msgid="1888588152792023873">"ಧ್ವನಿ/SMS ಸೇವೆಗಳನ್ನು ನಿರ್ಬಂಧಿಸಲಾಗಿದೆ."</string> <string name="RestrictedOnAll" msgid="5643028264466092821">"ಎಲ್ಲಾ ದ್ವನಿ/ಡೇಟಾ/SMS ಸೇವೆಗಳನ್ನು ನಿರ್ಬಂಧಿಸಲಾಗಿದೆ."</string> - <!-- no translation found for NetworkPreferenceSwitchTitle (4008877505368566980) --> - <skip /> - <!-- no translation found for NetworkPreferenceSwitchSummary (7335915397439759249) --> - <skip /> + <string name="NetworkPreferenceSwitchTitle" msgid="4008877505368566980">"ನೆಟ್ವರ್ಕ್ ತಲುಪಲು ಸಾಧ್ಯವಿಲ್ಲ"</string> + <string name="NetworkPreferenceSwitchSummary" msgid="7335915397439759249">"ಸ್ವೀಕರಿಸುವುದನ್ನು ಸುಧಾರಿಸಲು, ಸೆಟ್ಟಿಂಗ್ಗಳು > ಸೆಲ್ಯುಲಾರ್ ನೆಟ್ವರ್ಕ್ > ಪ್ರಾಶಸ್ತ್ಯ ನೀಡಲಾದ ನೆಟ್ವರ್ಕ್ ಪ್ರಕಾರದಲ್ಲಿ ಆಯ್ಕೆ ಮಾಡಲಾದ ರೀತಿಯನ್ನು ಬದಲಾಯಿಸಲು ಪ್ರಯತ್ನಿಸಿ."</string> <string name="peerTtyModeFull" msgid="6165351790010341421">"ಪೀರ್ ವಿನಂತಿಸಿಕೊಂಡ TTY ಮೋಡ್ ಪೂರ್ಣಗೊಂಡಿದೆ"</string> <string name="peerTtyModeHco" msgid="5728602160669216784">"ಪೀರ್ ವಿನಂತಿಸಿಕೊಂಡ TTY ಮೋಡ್ HCO"</string> <string name="peerTtyModeVco" msgid="1742404978686538049">"ಪೀರ್ ವಿನಂತಿಸಿಕೊಂಡ TTY ಮೋಡ್ VCO"</string> @@ -185,10 +182,8 @@ <string name="work_profile_deleted_description" msgid="6305147513054341102">"ತಪ್ಪಿಹೋಗಿರುವ ನಿರ್ವಾಹಕ ಅಪ್ಲಿಕೇಶನ್ನಿಂದಾಗಿ ಕೆಲಸದ ಪ್ರೊಫೈಲ್ ಅನ್ನು ಅಳಿಸಲಾಗಿದೆ."</string> <string name="work_profile_deleted_details" msgid="226615743462361248">"ಕೆಲಸದ ಪ್ರೊಫೈಲ್ ನಿರ್ವಾಹಕ ಅಪ್ಲಿಕೇಶನ್ ಕಳೆದು ಹೋಗಿದೆ ಅಥವಾ ಹಾಳಾಗಿದೆ. ಇದರ ಪರಿಣಾಮವಾಗಿ ನಿಮ್ಮ ಕೆಲಸದ ಪ್ರೊಫೈಲ್ ಮತ್ತು ಅದಕ್ಕೆ ಸಂಬಂಧಿಸಿದ ಡೇಟಾವನ್ನು ಅಳಿಸಲಾಗಿದೆ. ಸಹಾಯಕ್ಕಾಗಿ ನಿಮ್ಮ ನಿರ್ವಾಹಕರನ್ನು ಸಂಪರ್ಕಿಸಿ."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="6019770344820507579">"ನಿಮ್ಮ ಕಾರ್ಯ ಪ್ರೊಫೈಲ್ ಈ ಸಾಧನದಲ್ಲಿ ಇನ್ನು ಮುಂದೆ ಲಭ್ಯವಿರುವುದಿಲ್ಲ."</string> - <!-- no translation found for network_logging_notification_title (1805392571290161924) --> - <skip /> - <!-- no translation found for network_logging_notification_text (4448072433371155729) --> - <skip /> + <string name="network_logging_notification_title" msgid="1805392571290161924">"ನೆಟ್ವರ್ಕ್ ಟ್ರಾಫಿಕ್ ಅನ್ನು ಮಾನಿಟರ್ ಮಾಡಲಾಗುತ್ತಿದೆ"</string> + <string name="network_logging_notification_text" msgid="4448072433371155729">"ಹೆಚ್ಚಿನ ಮಾಹಿತಿಗೆ ಟ್ಯಾಪ್ ಮಾಡಿ"</string> <string name="factory_reset_warning" msgid="5423253125642394387">"ನಿಮ್ಮ ಸಾಧನವನ್ನು ಅಳಿಸಲಾಗುತ್ತದೆ"</string> <string name="factory_reset_message" msgid="4905025204141900666">"ನಿರ್ವಾಹಕ ಅಪ್ಲಿಕೇಶನ್ನ ಅಂಶಗಳು ಕಾಣೆಯಾಗಿವೆ ಅಥವಾ ದೋಷಪೂರಿತವಾಗಿದೆ ಮತ್ತು ಬಳಸಲು ಸಾಧ್ಯವಿಲ್ಲ. ನಿಮ್ಮ ಸಾಧನವನ್ನು ಇದೀಗ ಅಳಿಸಲಾಗುತ್ತದೆ. ಸಹಾಯಕ್ಕಾಗಿ ನಿಮ್ಮ ನಿರ್ವಾಹಕರನ್ನು ಸಂಪರ್ಕಿಸಿ."</string> <string name="me" msgid="6545696007631404292">"ನಾನು"</string> @@ -306,12 +301,9 @@ <string name="permlab_sendSms" msgid="7544599214260982981">"SMS ಸಂದೇಶಗಳನ್ನು ಕಳುಹಿಸಲು ಮತ್ತು ನಿರ್ವಹಿಸಲು"</string> <string name="permdesc_sendSms" msgid="7094729298204937667">"SMS ಸಂದೇಶಗಳನ್ನು ಕಳುಹಿಸಲು ಅಪ್ಲಿಕೇಶನ್ಗೆ ಅವಕಾಶ ನೀಡುತ್ತದೆ. ಇದು ಅನಿರೀಕ್ಷಿತ ವೆಚ್ಚಗಳಿಗೆ ಕಾರಣವಾಗಬಹುದು. ದುರುದ್ದೇಶಪೂರಿತ ಅಪ್ಲಿಕೇಶನ್ಗಳು ನಿಮ್ಮ ದೃಢೀಕರಣವಿಲ್ಲದೆಯೇ ಸಂದೇಶಗಳನ್ನು ಕಳುಹಿಸುವ ಮೂಲಕ ನಿಮ್ಮ ಹಣವನ್ನು ವ್ಯಯಿಸಬಹುದು."</string> <string name="permlab_readSms" msgid="8745086572213270480">"ನಿಮ್ಮ ಪಠ್ಯ ಸಂದೇಶಗಳನ್ನು ಓದಿ (SMS ಅಥವಾ MMS)"</string> - <!-- no translation found for permdesc_readSms (4741697454888074891) --> - <skip /> - <!-- no translation found for permdesc_readSms (5796670395641116592) --> - <skip /> - <!-- no translation found for permdesc_readSms (6826832415656437652) --> - <skip /> + <string name="permdesc_readSms" product="tablet" msgid="4741697454888074891">"ಈ ಅಪ್ಲಿಕೇಶನ್ ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್ನಲ್ಲಿ ಸಂಗ್ರಹವಾಗಿರುವ ಎಲ್ಲಾ ಎಸ್ಎಂಎಸ್ (ಪಠ್ಯ) ಸಂದೇಶಗಳನ್ನು ಓದಬಹುದು."</string> + <string name="permdesc_readSms" product="tv" msgid="5796670395641116592">"ಈ ಅಪ್ಲಿಕೇಶನ್ ನಿಮ್ಮ ಟಿವಿಯಲ್ಲಿ ಸಂಗ್ರಹವಾಗಿರುವ ಎಲ್ಲಾ ಎಸ್ಎಂಎಸ್ (ಪಠ್ಯ) ಸಂದೇಶಗಳನ್ನು ಓದಬಹುದು."</string> + <string name="permdesc_readSms" product="default" msgid="6826832415656437652">"ಈ ಅಪ್ಲಿಕೇಶನ್ ನಿಮ್ಮ ಫೋನ್ನಲ್ಲಿ ಸಂಗ್ರಹವಾಗಿರುವ ಎಲ್ಲಾ ಎಸ್ಎಂಎಸ್ (ಪಠ್ಯ) ಸಂದೇಶಗಳನ್ನು ಓದಬಹುದು."</string> <string name="permlab_receiveWapPush" msgid="5991398711936590410">"ಪಠ್ಯ ಸಂದೇಶಗಳನ್ನು ಸ್ವೀಕರಿಸಿ (WAP)"</string> <string name="permdesc_receiveWapPush" msgid="748232190220583385">"WAP ಸಂದೇಶಗಳನ್ನು ಸ್ವೀಕರಿಸಲು ಮತ್ತು ಪ್ರಕ್ರಿಯೆಗೊಳಿಸಲು ಅಪ್ಲಿಕೇಶನ್ಗೆ ಅವಕಾಶ ಮಾಡಿಕೊಡುತ್ತದೆ. ಈ ಅನುಮತಿಯು, ನಿಮಗೆ ಕಳುಹಿಸಲಾಗಿರುವ ಸಂದೇಶಗಳನ್ನು ನಿಮಗೆ ತೋರಿಸದೆಯೇ, ಅವುಗಳನ್ನು ಮಾನಿಟರ್ ಮಾಡುವ ಅಥವಾ ಅಳಿಸುವ ಸಾಮರ್ಥ್ಯವನ್ನು ಒಳಗೊಂಡಿರುತ್ತದೆ."</string> <string name="permlab_getTasks" msgid="6466095396623933906">"ರನ್ ಆಗುತ್ತಿರುವ ಅಪ್ಲಿಕೇಶನ್ಗಳನ್ನು ಹಿಂಪಡೆಯಿರಿ"</string> @@ -324,10 +316,8 @@ <string name="permdesc_enableCarMode" msgid="4853187425751419467">"ಕಾರು ಮೋಡ್ ಸಕ್ರಿಯಗೊಳಿಸಲು ಅಪ್ಲಿಕೇಶನ್ಗೆ ಅನುಮತಿಸುತ್ತದೆ."</string> <string name="permlab_killBackgroundProcesses" msgid="3914026687420177202">"ಇತರೆ ಅಪ್ಲಿಕೇಶನ್ಗಳನ್ನು ಮುಚ್ಚಿ"</string> <string name="permdesc_killBackgroundProcesses" msgid="4593353235959733119">"ಇತರ ಅಪ್ಲಿಕೇಶನ್ಗಳ ಹಿನ್ನೆಲೆ ಪ್ರಕ್ರಿಯೆಗಳನ್ನು ಅಂತ್ಯಗೊಳಿಸಲು ಅಪ್ಲಿಕೇಶನ್ಗೆ ಅವಕಾಶ ಮಾಡಿಕೊಡುತ್ತದೆ. ಇದು ಇತರ ಅಪ್ಲಿಕೇಶನ್ಗಳ ಚಾಲನೆಯನ್ನು ನಿಲ್ಲಿಸುವುದಕ್ಕೆ ಕಾರಣವಾಗಬಹುದು."</string> - <!-- no translation found for permlab_systemAlertWindow (7238805243128138690) --> - <skip /> - <!-- no translation found for permdesc_systemAlertWindow (2393776099672266188) --> - <skip /> + <string name="permlab_systemAlertWindow" msgid="7238805243128138690">"ಈ ಅಪ್ಲಿಕೇಶನ್ ಇತರ ಅಪ್ಲಿಕೇಶನ್ಗಳ ಮೇಲೆ ಕಾಣಿಸಿಕೊಳ್ಳಬಹುದು"</string> + <string name="permdesc_systemAlertWindow" msgid="2393776099672266188">"ಈ ಅಪ್ಲಿಕೇಶನ್ ಇತರ ಅಪ್ಲಿಕೇಶನ್ಗಳ ಅಥವಾ ಪರದೆಯ ಇತರೆ ಭಾಗಗಳ ಮೇಲೆ ಕಾಣಿಸಿಕೊಳ್ಳಬಹುದು. ಇದು ಸಾಮಾನ್ಯ ಅಪ್ಲಿಕೇಶನ್ ಬಳಕೆಯ ಮೂಲಕ ಹಸ್ತಕ್ಷೇಪ ಮಾಡಬಹುದು ಮತ್ತು ಇತರೆ ಅಪ್ಲಿಕೇಶನ್ ಗೋಚರಿಸುವ ರೀತಿಯಲ್ಲಿ ಬದಲಾಯಿಸಬಹುದು."</string> <string name="permlab_persistentActivity" msgid="8841113627955563938">"ಅಪ್ಲಿಕೇಶನ್ ಅನ್ನು ಯಾವಾಗಲೂ ರನ್ ಆಗುವಂತೆ ಮಾಡಿ"</string> <string name="permdesc_persistentActivity" product="tablet" msgid="8525189272329086137">"ಸ್ಮರಣೆಯಲ್ಲಿ ನಿರಂತರವಾಗಿ ತನ್ನದೇ ಭಾಗಗಳನ್ನು ಮಾಡಲು ಅಪ್ಲಿಕೇಶನ್ಗೆ ಅವಕಾಶ ಮಾಡಿಕೊಡುತ್ತದೆ. ಇದು ಟ್ಯಾಬ್ಲೆಟ್ ಕಾರ್ಯವನ್ನು ನಿಧಾನಗೊಳಿಸುವುದರ ಮೂಲಕ ಇತರ ಅಪ್ಲಿಕೇಶನ್ಗಳಿಗೆ ಲಭ್ಯವಿರುವ ಸ್ಮರಣೆಯನ್ನು ಮಿತಿಗೊಳಿಸುತ್ತದೆ."</string> <string name="permdesc_persistentActivity" product="tv" msgid="5086862529499103587">"ಮೆಮೊರಿಯಲ್ಲಿ ಅದರ ಭಾಗಗಳನ್ನು ತಾನಾಗಿಯೇ ಮಾಡಿಕೊಳ್ಳಲು ಅನುಮತಿಸುತ್ತದೆ. ಇತರ ಅಪ್ಲಿಕೇಶನ್ಗಳಿಗೆ ಲಭ್ಯವಿರುವ ಮೆಮೊರಿಯನ್ನು ಮಿತಿಗೊಳಿಸಿ ಟಿವಿಯನ್ನು ಇದು ನಿಧಾನಗೊಳಿಸಬಹುದು."</string> @@ -353,51 +343,37 @@ <string name="permdesc_writeContacts" product="tv" msgid="5438230957000018959">"ನಿರ್ದಿಷ್ಟ ವ್ಯಕ್ತಿಗಳೊಂದಿಗೆ ಇತರ ವಿಧಾನಗಳಲ್ಲಿ ನೀವು ಕರೆ ಮಾಡಿದ, ಇಮೇಲ್ ಮಾಡಿದ ಅಥವಾ ಸಂವಹಿಸಿದ ಆವರ್ತನೆ ಸೇರಿದಂತೆ ನಿಮ್ಮ ಟಿವಿಯಲ್ಲಿ ಸಂಗ್ರಹಿಸಲಾಗಿರುವ ನಿಮ್ಮ ಸಂಪರ್ಕಗಳ ಕುರಿತಾದ ಡೇಟಾವನ್ನು ಮಾರ್ಪಡಿಸಲು ಅಪ್ಲಿಕೇಶನ್ಗೆ ಅನುಮತಿಸುತ್ತದೆ. ಈ ಅನುಮತಿಯು ಸಂಪರ್ಕ ಡೇಟಾವನ್ನು ಅಳಿಸಲು ಅಪ್ಲಿಕೇಶನ್ಗೆ ಅನುಮತಿಸುತ್ತದೆ."</string> <string name="permdesc_writeContacts" product="default" msgid="589869224625163558">"ನಿರ್ದಿಷ್ಟ ಸಂಪರ್ಕಗಳೊಂದಿಗೆ ಇತರ ಮಾರ್ಗಗಳಲ್ಲಿ ನೀವು ಕರೆ, ಇಮೇಲ್, ಅಥವಾ ಸಂವಹನ ನಡೆಸಿರುವ ಆವರ್ತನವೂ ಒಳಗೊಂಡಂತೆ, ನಿಮ್ಮ ಫೋನ್ನಲ್ಲಿ ಸಂಗ್ರಹಿಸಲಾಗಿರುವ ನಿಮ್ಮ ಸಂಪರ್ಕಗಳ ಕುರಿತಾದ ಡೇಟಾವನ್ನು ಮಾರ್ಪಡಿಸಲು ಅಪ್ಲಿಕೇಶನ್ಗೆ ಅವಕಾಶ ನೀಡುತ್ತದೆ. ಈ ಅನುಮತಿಯು ಸಂಪರ್ಕದ ಡೇಟಾವನ್ನು ಅಳಿಸಲು ಅಪ್ಲಿಕೇಶನ್ಗೆ ಅನುಮತಿಸುತ್ತದೆ."</string> <string name="permlab_readCallLog" msgid="3478133184624102739">"ಕರೆಯ ಲಾಗ್ ಓದಿ"</string> - <!-- no translation found for permdesc_readCallLog (3204122446463552146) --> - <skip /> + <string name="permdesc_readCallLog" msgid="3204122446463552146">"ಈ ಅಪ್ಲಿಕೇಶನ್ ನಿಮ್ಮ ಕರೆಯ ಇತಿಹಾಸ ಓದಬಹುದು."</string> <string name="permlab_writeCallLog" msgid="8552045664743499354">"ಕರೆ ಲಾಗ್ ಬರೆಯಿರಿ"</string> <string name="permdesc_writeCallLog" product="tablet" msgid="6661806062274119245">"ಒಳಬರುವ ಮತ್ತು ಹೊರಹೋಗುವ ಕರೆಗಳ ಕುರಿತ ಡೇಟಾ ಸೇರಿದಂತೆ, ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್ನ ಕರೆಯ ಲಾಗ್ ಅನ್ನು ಮಾರ್ಪಡಿಸಲು ಅಪ್ಲಿಕೇಶನ್ಗೆ ಅವಕಾಶ ನೀಡುತ್ತದೆ. ದುರುದ್ದೇಶಪೂರಿತ ಅಪ್ಲಿಕೇಶನ್ಗಳು ನಿಮ್ಮ ಕರೆಯ ಲಾಗ್ ಅನ್ನು ಅಳಿಸಲು ಅಥವಾ ಮಾರ್ಪಡಿಸಲು ಇದನ್ನು ಬಳಸಿಕೊಳ್ಳಬಹುದು."</string> <string name="permdesc_writeCallLog" product="tv" msgid="4225034892248398019">"ಒಳಬರುವ ಮತ್ತು ಹೊರಹೋಗುವ ಕರೆಗಳ ಕುರಿತು ಡೇಟಾ ಸೇರಿದಂತೆ ನಿಮ್ಮ ಟಿವಿಯ ಕರೆಯ ಲಾಗ್ ಅನ್ನು ಮಾರ್ಪಡಿಸಲು ಅಪ್ಲಿಕೇಶನ್ಗೆ ಅನುಮತಿಸುತ್ತದೆ. ದುರುದ್ದೇಶಪೂರಿತ ಅಪ್ಲಿಕೇಶನ್ಗಳು ನಿಮ್ಮ ಕರೆಯ ಲಾಗ್ ಅನ್ನು ಅಳಿಸಲು ಅಥವಾ ಮಾರ್ಪಡಿಸಲು ಇದನ್ನು ಬಳಸಿಕೊಳ್ಳಬಹುದು."</string> <string name="permdesc_writeCallLog" product="default" msgid="683941736352787842">"ಒಳಬರುವ ಮತ್ತು ಹೊರಹೋಗುವ ಕರೆಗಳ ಕುರಿತ ಡೇಟಾ ಸೇರಿದಂತೆ, ನಿಮ್ಮ ಫೋನ್ನ ಕರೆಯ ಲಾಗ್ ಅನ್ನು ಮಾರ್ಪಡಿಸಲು ಅಪ್ಲಿಕೇಶನ್ಗೆ ಅವಕಾಶ ನೀಡುತ್ತದೆ. ದುರುದ್ದೇಶಪೂರಿತ ಅಪ್ಲಿಕೇಶನ್ಗಳು ನಿಮ್ಮ ಕರೆಯ ಲಾಗ್ ಅನ್ನು ಅಳಿಸಲು ಅಥವಾ ಮಾರ್ಪಡಿಸಲು ಇದನ್ನು ಬಳಸಿಕೊಳ್ಳಬಹುದು."</string> <string name="permlab_bodySensors" msgid="4683341291818520277">"ದೇಹ ಸೆನ್ಸರ್ಗಳನ್ನು ಪ್ರವೇಶಿಸಿ (ಹೃದಯದ ಬಡಿತ ಮಾನಿಟರ್ಗಳಂತಹ)"</string> <string name="permdesc_bodySensors" product="default" msgid="4380015021754180431">"ನಿಮ್ಮ ಹೃದಯ ಬಡಿತದಂತಹ ನಿಮ್ಮ ದೈಹಿಕ ಸ್ಥಿತಿಯನ್ನು ಮೇಲ್ವಿಚಾರಣೆ ಮಾಡುವ ಸೆನ್ಸರ್ಗಳಿಂದ ಡೇಟಾ ಪ್ರವೇಶಿಸಲು ಅಪ್ಲಿಕೇಶನ್ ಅವಕಾಶ ಮಾಡಿಕೊಡುತ್ತದೆ."</string> - <!-- no translation found for permlab_readCalendar (6716116972752441641) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (4993979255403945892) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (8837931557573064315) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (4373978642145196715) --> - <skip /> + <string name="permlab_readCalendar" msgid="6716116972752441641">"ಕ್ಯಾಲೆಂಡರ್ ಈವೆಂಟ್ಗಳು ಮತ್ತು ವಿವರಗಳನ್ನು ಓದಿ"</string> + <string name="permdesc_readCalendar" product="tablet" msgid="4993979255403945892">"ಈ ಅಪ್ಲಿಕೇಶನ್ ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್ನಲ್ಲಿ ಸಂಗ್ರಹವಾಗಿರುವ ಎಲ್ಲಾ ಕ್ಯಾಲೆಂಡರ್ ಈವೆಂಟ್ಗಳನ್ನು ಓದಬಹುದು ಮತ್ತು ನಿಮ್ಮ ಕ್ಯಾಲೆಂಡರ್ ಡೇಟಾವನ್ನು ಹಂಚಿಕೊಳ್ಳಬಹುದು ಅಥವಾ ಉಳಿಸಬಹುದು."</string> + <string name="permdesc_readCalendar" product="tv" msgid="8837931557573064315">"ಈ ಅಪ್ಲಿಕೇಶನ್ ನಿಮ್ಮ ಟಿವಿಯಲ್ಲಿ ಸಂಗ್ರಹವಾಗಿರುವ ಎಲ್ಲಾ ಕ್ಯಾಲೆಂಡರ್ ಈವೆಂಟ್ಗಳನ್ನು ಓದಬಹುದು ಮತ್ತು ನಿಮ್ಮ ಕ್ಯಾಲೆಂಡರ್ ಡೇಟಾವನ್ನು ಹಂಚಿಕೊಳ್ಳಬಹುದು ಅಥವಾ ಉಳಿಸಬಹುದು."</string> + <string name="permdesc_readCalendar" product="default" msgid="4373978642145196715">"ಈ ಅಪ್ಲಿಕೇಶನ್ ನಿಮ್ಮ ಫೋನ್ನಲ್ಲಿ ಸಂಗ್ರಹವಾಗಿರುವ ಎಲ್ಲಾ ಕ್ಯಾಲೆಂಡರ್ ಈವೆಂಟ್ಗಳನ್ನು ಓದಬಹುದು ಮತ್ತು ನಿಮ್ಮ ಕ್ಯಾಲೆಂಡರ್ ಡೇಟಾವನ್ನು ಹಂಚಿಕೊಳ್ಳಬಹುದು ಅಥವಾ ಉಳಿಸಬಹುದು."</string> <string name="permlab_writeCalendar" msgid="8438874755193825647">"ಮಾಲೀಕರ ಗಮನಕ್ಕೆ ತರದೆಯೇ ಕ್ಯಾಲೆಂಡರ್ ಈವೆಂಟ್ಗಳನ್ನು ಸೇರಿಸಿ ಅಥವಾ ಮಾರ್ಪಡಿಸಿ ಮತ್ತು ಅತಿಥಿಗಳಿಗೆ ಇಮೇಲ್ ಕಳುಹಿಸಿ"</string> - <!-- no translation found for permdesc_writeCalendar (1675270619903625982) --> - <skip /> - <!-- no translation found for permdesc_writeCalendar (9017809326268135866) --> - <skip /> - <!-- no translation found for permdesc_writeCalendar (7592791790516943173) --> - <skip /> + <string name="permdesc_writeCalendar" product="tablet" msgid="1675270619903625982">"ಈ ಅಪ್ಲಿಕೇಶನ್ ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್ನಲ್ಲಿ ಕ್ಯಾಲೆಂಡರ್ ಈವೆಂಟ್ಗಳನ್ನು ಸೇರಿಸಬಹುದು, ತೆಗೆದುಹಾಕಬಹುದು ಅಥವಾ ಬದಲಾಯಿಸಬಹುದು. ಈ ಅಪ್ಲಿಕೇಶನ್ ಕ್ಯಾಲೆಂಡರ್ನ ಮಾಲೀಕರಿಂದ ಬಂದಿರಬಹುದಾದ ಕಾಣಿಸಿಕೊಳ್ಳುವ ಸಂದೇಶಗಳನ್ನು ಕಳುಹಿಸಬಹುದು ಅಥವಾ ಅವರ ಮಾಲೀಕರಿಗೆ ತಿಳಿಸದಂತೆ ಘಟನೆಗಳು ಬದಲಾಯಿಸುವುದು."</string> + <string name="permdesc_writeCalendar" product="tv" msgid="9017809326268135866">"ಈ ಅಪ್ಲಿಕೇಶನ್ ನಿಮ್ಮ ಟಿವಿಯಲ್ಲಿ ಕ್ಯಾಲೆಂಡರ್ ಈವೆಂಟ್ಗಳನ್ನು ಸೇರಿಸಬಹುದು, ತೆಗೆದುಹಾಕಬಹುದು ಅಥವಾ ಬದಲಾಯಿಸಬಹುದು. ಈ ಅಪ್ಲಿಕೇಶನ್ ಕ್ಯಾಲೆಂಡರ್ನ ಮಾಲೀಕರಿಂದ ಬಂದಿರಬಹುದಾದ ಕಾಣಿಸಿಕೊಳ್ಳುವ ಸಂದೇಶಗಳನ್ನು ಕಳುಹಿಸಬಹುದು ಅಥವಾ ಅವರ ಮಾಲೀಕರಿಗೆ ತಿಳಿಸದಂತೆ ಘಟನೆಗಳು ಬದಲಾಯಿಸುವುದು."</string> + <string name="permdesc_writeCalendar" product="default" msgid="7592791790516943173">"ಈ ಅಪ್ಲಿಕೇಶನ್ ನಿಮ್ಮ ಫೋನ್ನಲ್ಲಿ ಕ್ಯಾಲೆಂಡರ್ ಈವೆಂಟ್ಗಳನ್ನು ಸೇರಿಸಬಹುದು, ತೆಗೆದುಹಾಕಬಹುದು ಅಥವಾ ಬದಲಾಯಿಸಬಹುದು. ಈ ಅಪ್ಲಿಕೇಶನ್ ಕ್ಯಾಲೆಂಡರ್ನ ಮಾಲೀಕರಿಂದ ಬಂದಿರಬಹುದಾದ ಕಾಣಿಸಿಕೊಳ್ಳುವ ಸಂದೇಶಗಳನ್ನು ಕಳುಹಿಸಬಹುದು ಅಥವಾ ಅವರ ಮಾಲೀಕರಿಗೆ ತಿಳಿಸದಂತೆ ಘಟನೆಗಳು ಬದಲಾಯಿಸುವುದು."</string> <string name="permlab_accessLocationExtraCommands" msgid="2836308076720553837">"ಹೆಚ್ಚುವರಿ ಸ್ಥಾನ ಪೂರೈಕೆದಾರರ ಆದೇಶಗಳನ್ನು ಪ್ರವೇಶಿಸಿ"</string> <string name="permdesc_accessLocationExtraCommands" msgid="6078307221056649927">"ಹೆಚ್ಚಿನ ಸ್ಥಾನ ಪೂರೈಕೆದಾರ ಆದೇಶಗಳನ್ನು ಪ್ರವೇಶಿಸಲು ಅಪ್ಲಿಕೇಶನ್ಗೆ ಅವಕಾಶ ನೀಡುತ್ತದೆ. ಇದು GPS ಅಥವಾ ಇತರ ಸ್ಥಾನ ಮೂಲಗಳ ಕಾರ್ಯಾಚರಣೆಯಲ್ಲಿ ಮಧ್ಯ ಪ್ರವೇಶಿಸಲು ಅಪ್ಲಿಕೇಶನ್ಗೆ ಅನುಮತಿಸಬಹುದು."</string> <string name="permlab_accessFineLocation" msgid="251034415460950944">"ನಿಖರ ಸ್ಥಳವನ್ನು ಪ್ರವೇಶಿಸಿ (GPS ಮತ್ತು ನೆಟ್ವರ್ಕ್-ಆಧಾರಿತ)"</string> - <!-- no translation found for permdesc_accessFineLocation (5821994817969957884) --> - <skip /> + <string name="permdesc_accessFineLocation" msgid="5821994817969957884">"ಈ ಅಪ್ಲಿಕೇಶನ್ ನಿಮ್ಮ ಸ್ಥಳವನ್ನು ಸೆಲ್ ಟವರ್ಗಳು ಮತ್ತು ವೈ-ಫೈ ನೆಟ್ವರ್ಕ್ನಂತಹ GPS ಅಥವಾ ನೆಟ್ವರ್ಕ್ ಮೂಲಗಳ ಆಧಾರದ ಮೇಲೆ ಪಡೆಯಬಹುದು. ಈ ಸ್ಥಳ ಸೇವೆಗಳನ್ನು ಆನ್ ಮಾಡಿರಬೇಕು ಮತ್ತು ಅವುಗಳನ್ನು ಬಳಸಲು ಅಪ್ಲಿಕೇಶನ್ಗೆ ಸಾಧ್ಯವಾಗುವಂತೆ ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್ನಲ್ಲಿ ಅವುಗಳು ಲಭ್ಯವಿರಬೇಕು. ಇದು ಬ್ಯಾಟರಿ ಬಳಕೆಯನ್ನು ಹೆಚ್ಚಿಸಬಹುದು."</string> <string name="permlab_accessCoarseLocation" msgid="7715277613928539434">"ಅಂದಾಜು ಸ್ಥಳವನ್ನು ಪ್ರವೇಶಿಸಿ (ನೆಟ್ವರ್ಕ್-ಆಧಾರಿತ)"</string> - <!-- no translation found for permdesc_accessCoarseLocation (3373266766487862426) --> - <skip /> - <!-- no translation found for permdesc_accessCoarseLocation (1884022719818788511) --> - <skip /> - <!-- no translation found for permdesc_accessCoarseLocation (7788009094906196995) --> - <skip /> + <string name="permdesc_accessCoarseLocation" product="tablet" msgid="3373266766487862426">"ಈ ಅಪ್ಲಿಕೇಶನ್ ನಿಮ್ಮ ಸ್ಥಳವನ್ನು ಸೆಲ್ ಟವರ್ಗಳು ಮತ್ತು ವೈ-ಫೈ ನೆಟ್ವರ್ಕ್ನಂತಹ ನೆಟ್ವರ್ಕ್ ಮೂಲಗಳ ಆಧಾರದ ಮೇಲೆ ಪಡೆಯಬಹುದು. ಈ ಸ್ಥಳ ಸೇವೆಗಳನ್ನು ಆನ್ ಮಾಡಿರಬೇಕು ಮತ್ತು ಅವುಗಳನ್ನು ಬಳಸಲು ಅಪ್ಲಿಕೇಶನ್ಗೆ ಸಾಧ್ಯವಾಗುವಂತೆ ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್ನಲ್ಲಿ ಅವುಗಳು ಲಭ್ಯವಿರಬೇಕು."</string> + <string name="permdesc_accessCoarseLocation" product="tv" msgid="1884022719818788511">"ಈ ಅಪ್ಲಿಕೇಶನ್ ನಿಮ್ಮ ಸ್ಥಳವನ್ನು ಸೆಲ್ ಟವರ್ಗಳು ಮತ್ತು ವೈ-ಫೈ ನೆಟ್ವರ್ಕ್ನಂತಹ ನೆಟ್ವರ್ಕ್ ಮೂಲಗಳ ಆಧಾರದ ಮೇಲೆ ಪಡೆಯಬಹುದು. ಈ ಸ್ಥಳ ಸೇವೆಗಳನ್ನು ಆನ್ ಮಾಡಿರಬೇಕು ಮತ್ತು ಅವುಗಳನ್ನು ಬಳಸಲು ಅಪ್ಲಿಕೇಶನ್ಗೆ ಸಾಧ್ಯವಾಗುವಂತೆ ನಿಮ್ಮ ಟಿವಿಯಲ್ಲಿ ಅವುಗಳು ಲಭ್ಯವಿರಬೇಕು."</string> + <string name="permdesc_accessCoarseLocation" product="default" msgid="7788009094906196995">"ಈ ಅಪ್ಲಿಕೇಶನ್ ನಿಮ್ಮ ಸ್ಥಳವನ್ನು ಸೆಲ್ ಟವರ್ಗಳು ಮತ್ತು ವೈ-ಫೈ ನೆಟ್ವರ್ಕ್ನಂತಹ ನೆಟ್ವರ್ಕ್ ಮೂಲಗಳ ಆಧಾರದ ಮೇಲೆ ಪಡೆಯಬಹುದು. ಈ ಸ್ಥಳ ಸೇವೆಗಳನ್ನು ಆನ್ ಮಾಡಿರಬೇಕು ಮತ್ತು ಅವುಗಳನ್ನು ಬಳಸಲು ಅಪ್ಲಿಕೇಶನ್ಗೆ ಸಾಧ್ಯವಾಗುವಂತೆ ನಿಮ್ಮ ಫೋನ್ನಲ್ಲಿ ಅವುಗಳು ಲಭ್ಯವಿರಬೇಕು."</string> <string name="permlab_modifyAudioSettings" msgid="6095859937069146086">"ನಿಮ್ಮ ಆಡಿಯೊ ಸೆಟ್ಟಿಂಗ್ಗಳನ್ನು ಬದಲಾಯಿಸಿ"</string> <string name="permdesc_modifyAudioSettings" msgid="3522565366806248517">"ವಾಲ್ಯೂಮ್ ರೀತಿಯ ಮತ್ತು ಔಟ್ಪುಟ್ಗಾಗಿ ಯಾವ ಸ್ಪೀಕರ್ ಬಳಸಬೇಕು ಎಂಬ ರೀತಿಯ ಜಾಗತಿಕ ಆಡಿಯೊ ಸೆಟ್ಟಿಂಗ್ಗಳನ್ನು ಮಾರ್ಪಡಿಸಲು ಅಪ್ಲಿಕೇಶನ್ಗೆ ಅವಕಾಶ ಮಾಡಿಕೊಡುತ್ತದೆ."</string> <string name="permlab_recordAudio" msgid="3876049771427466323">"ಆಡಿಯೊ ರೆಕಾರ್ಡ್ ಮಾಡಿ"</string> - <!-- no translation found for permdesc_recordAudio (4245930455135321433) --> - <skip /> + <string name="permdesc_recordAudio" msgid="4245930455135321433">"ಈ ಅಪ್ಲಿಕೇಶನ್ ಮೈಕ್ರೋಫೋನ್ ಬಳಸುವ ಮೂಲಕ ಯಾವುದೇ ಸಮಯದಲ್ಲಾದರೂ ಆಡಿಯೊ ರೆಕಾರ್ಡ್ ಮಾಡಬಹುದು."</string> <string name="permlab_sim_communication" msgid="2935852302216852065">"ಸಿಮ್ಗೆ ಆಜ್ಞೆಗಳನ್ನು ಕಳುಹಿಸಿ"</string> <string name="permdesc_sim_communication" msgid="5725159654279639498">"ಸಿಮ್ ಗೆ ಆದೇಶಗಳನ್ನು ಕಳುಹಿಸಲು ಅಪ್ಲಿಕೇಶನ್ಗೆ ಅನುಮತಿಸುತ್ತದೆ. ಇದು ತುಂಬಾ ಅಪಾಯಕಾರಿ."</string> <string name="permlab_camera" msgid="3616391919559751192">"ಚಿತ್ರಗಳು ಮತ್ತು ವೀಡಿಯೊಗಳನ್ನು ಸೆರೆಹಿಡಿಯಿರಿ"</string> - <!-- no translation found for permdesc_camera (5392231870049240670) --> - <skip /> + <string name="permdesc_camera" msgid="5392231870049240670">"ಈ ಅಪ್ಲಿಕೇಶನ್ ಯಾವ ಸಮಯದಲ್ಲಾದರೂ ಕ್ಯಾಮರಾ ಬಳಸಿಕೊಂಡು ಚಿತ್ರಗಳು ಮತ್ತು ವಿಡಿಯೋಗಳನ್ನು ರೆಕಾರ್ಡ್ ಮಾಡಬಹುದು."</string> <string name="permlab_vibrate" msgid="7696427026057705834">"ವೈಬ್ರೇಷನ್ ನಿಯಂತ್ರಿಸಿ"</string> <string name="permdesc_vibrate" msgid="6284989245902300945">"ವೈಬ್ರೇಟರ್ ನಿಯಂತ್ರಿಸಲು ಅಪ್ಲಿಕೇಶನ್ಗೆ ಅನುಮತಿಸುತ್ತದೆ."</string> <string name="permlab_callPhone" msgid="3925836347681847954">"ಫೋನ್ ಸಂಖ್ಯೆಗಳಿಗೆ ನೇರವಾಗಿ ಕರೆ ಮಾಡಿ"</string> diff --git a/core/res/res/values-ko/strings.xml b/core/res/res/values-ko/strings.xml index 91378352d72f..b931bbb0eec8 100644 --- a/core/res/res/values-ko/strings.xml +++ b/core/res/res/values-ko/strings.xml @@ -46,8 +46,7 @@ <string name="defaultMsisdnAlphaTag" msgid="2850889754919584674">"MSISDN1"</string> <string name="mmiError" msgid="5154499457739052907">"연결에 문제가 있거나 MMI 코드가 잘못되었습니다."</string> <string name="mmiFdnError" msgid="5224398216385316471">"발신 허용 번호에서만 수행할 수 있는 작업입니다."</string> - <!-- no translation found for mmiErrorWhileRoaming (762488890299284230) --> - <skip /> + <string name="mmiErrorWhileRoaming" msgid="762488890299284230">"로밍 중에는 착신 전환 설정을 변경할 수 없습니다."</string> <string name="serviceEnabled" msgid="8147278346414714315">"서비스를 사용하도록 설정했습니다."</string> <string name="serviceEnabledFor" msgid="6856228140453471041">"사용 설정된 서비스 목록:"</string> <string name="serviceDisabled" msgid="1937553226592516411">"서비스가 사용 중지되었습니다."</string> @@ -98,10 +97,8 @@ <string name="RestrictedOnVoiceData" msgid="996636487106171320">"음성/데이터 서비스가 차단되었습니다."</string> <string name="RestrictedOnVoiceSms" msgid="1888588152792023873">"음성/SMS 서비스가 차단되었습니다."</string> <string name="RestrictedOnAll" msgid="5643028264466092821">"모든 음성/데이터/SMS 서비스가 차단되었습니다."</string> - <!-- no translation found for NetworkPreferenceSwitchTitle (4008877505368566980) --> - <skip /> - <!-- no translation found for NetworkPreferenceSwitchSummary (7335915397439759249) --> - <skip /> + <string name="NetworkPreferenceSwitchTitle" msgid="4008877505368566980">"네트워크에 연결할 수 없습니다."</string> + <string name="NetworkPreferenceSwitchSummary" msgid="7335915397439759249">"수신 상태를 개선하려면 설정 > 이동통신망 > 기본 네트워크 유형에서 선택된 유형을 변경해 보세요."</string> <string name="peerTtyModeFull" msgid="6165351790010341421">"피어가 TTY 모드 FULL을 요청했습니다."</string> <string name="peerTtyModeHco" msgid="5728602160669216784">"피어가 TTY 모드 HCO를 요청했습니다."</string> <string name="peerTtyModeVco" msgid="1742404978686538049">"피어가 TTY 모드 VCO를 요청했습니다."</string> @@ -185,10 +182,8 @@ <string name="work_profile_deleted_description" msgid="6305147513054341102">"관리 앱이 누락되어 직장 프로필이 삭제되었습니다."</string> <string name="work_profile_deleted_details" msgid="226615743462361248">"직장 프로필 관리 앱이 없거나 손상되어 직장 프로필 및 관련 데이터가 삭제되었습니다. 도움이 필요한 경우 관리자에게 문의하세요."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="6019770344820507579">"직장 프로필을 이 기기에서 더 이상 사용할 수 없습니다."</string> - <!-- no translation found for network_logging_notification_title (1805392571290161924) --> - <skip /> - <!-- no translation found for network_logging_notification_text (4448072433371155729) --> - <skip /> + <string name="network_logging_notification_title" msgid="1805392571290161924">"네트워크 트래픽이 모니터링되고 있음"</string> + <string name="network_logging_notification_text" msgid="4448072433371155729">"탭하여 세부정보 더보기"</string> <string name="factory_reset_warning" msgid="5423253125642394387">"기기가 삭제됩니다."</string> <string name="factory_reset_message" msgid="4905025204141900666">"관리 앱이 손상되었거나 구성요소가 없어서 사용할 수 없습니다. 이제 기기가 삭제됩니다. 도움이 필요한 경우 관리자에게 문의하세요."</string> <string name="me" msgid="6545696007631404292">"나"</string> @@ -306,12 +301,9 @@ <string name="permlab_sendSms" msgid="7544599214260982981">"SMS 메시지 전송 및 보기"</string> <string name="permdesc_sendSms" msgid="7094729298204937667">"앱이 SMS 메시지를 보낼 수 있도록 허용합니다. 이 경우 예상치 못한 통화 요금이 부과될 수 있습니다. 이 경우 악성 앱이 사용자의 확인 없이 메시지를 전송해 요금이 부과될 수 있습니다."</string> <string name="permlab_readSms" msgid="8745086572213270480">"내 문자 메시지 읽기(SMS 또는 MMS)"</string> - <!-- no translation found for permdesc_readSms (4741697454888074891) --> - <skip /> - <!-- no translation found for permdesc_readSms (5796670395641116592) --> - <skip /> - <!-- no translation found for permdesc_readSms (6826832415656437652) --> - <skip /> + <string name="permdesc_readSms" product="tablet" msgid="4741697454888074891">"이 앱은 태블릿에 저장된 모든 SMS(문자 메시지)를 읽을 수 있습니다."</string> + <string name="permdesc_readSms" product="tv" msgid="5796670395641116592">"이 앱은 TV에 저장된 모든 SMS(문자 메시지)를 읽을 수 있습니다."</string> + <string name="permdesc_readSms" product="default" msgid="6826832415656437652">"이 앱은 휴대전화에 저장된 모든 SMS(문자 메시지)를 읽을 수 있습니다."</string> <string name="permlab_receiveWapPush" msgid="5991398711936590410">"문자 메시지 받기(WAP)"</string> <string name="permdesc_receiveWapPush" msgid="748232190220583385">"앱이 WAP 메시지를 수신하고 처리할 수 있도록 허용합니다. 이는 앱이 사용자에게 표시하지 않고 기기로 전송된 메시지를 모니터링 또는 삭제할 수도 있다는 것을 의미합니다."</string> <string name="permlab_getTasks" msgid="6466095396623933906">"실행 중인 앱 검색"</string> @@ -324,10 +316,8 @@ <string name="permdesc_enableCarMode" msgid="4853187425751419467">"앱이 운전모드를 사용할 수 있도록 허용합니다."</string> <string name="permlab_killBackgroundProcesses" msgid="3914026687420177202">"다른 앱 종료"</string> <string name="permdesc_killBackgroundProcesses" msgid="4593353235959733119">"앱이 다른 앱의 백그라운드 프로세스를 종료할 수 있도록 허용합니다. 이 경우 다른 앱이 실행 중지될 수 있습니다."</string> - <!-- no translation found for permlab_systemAlertWindow (7238805243128138690) --> - <skip /> - <!-- no translation found for permdesc_systemAlertWindow (2393776099672266188) --> - <skip /> + <string name="permlab_systemAlertWindow" msgid="7238805243128138690">"이 앱은 다른 앱 위에 표시될 수 있음"</string> + <string name="permdesc_systemAlertWindow" msgid="2393776099672266188">"이 앱은 다른 앱이나 화면의 다른 부분 위에 표시될 수 있습니다. 이로 인해 일반적인 앱 사용이 방해받을 수 있으며 다른 앱이 표시되는 방식이 변경될 수 있습니다."</string> <string name="permlab_persistentActivity" msgid="8841113627955563938">"앱이 항상 실행되도록 설정"</string> <string name="permdesc_persistentActivity" product="tablet" msgid="8525189272329086137">"앱이 그 일부분을 영구적인 메모리로 만들 수 있도록 허용합니다. 이렇게 하면 다른 앱이 사용할 수 있는 메모리를 제한하여 태블릿의 속도를 저하시킬 수 있습니다."</string> <string name="permdesc_persistentActivity" product="tv" msgid="5086862529499103587">"앱이 메모리를 지속적으로 사용할 수 있도록 허용합니다. 이는 TV의 속도를 늦춰 다른 앱에서 사용할 수 있는 메모리를 제한할 수 있습니다."</string> @@ -353,51 +343,37 @@ <string name="permdesc_writeContacts" product="tv" msgid="5438230957000018959">"앱이 특정 연락처와 통화를 하거나 이메일을 주고받거나 다른 수단으로 연락한 횟수를 포함하여 TV에 저장된 연락처 관련 데이터를 수정할 수 있도록 허용합니다. 이 경우 앱이 연락처 데이터를 삭제할 수 있습니다."</string> <string name="permdesc_writeContacts" product="default" msgid="589869224625163558">"특정인과 전화, 이메일 또는 기타 수단으로 연락한 빈도를 포함하여 사용자 휴대전화에 저장된 연락처에 대한 데이터를 앱이 수정할 수 있도록 허용합니다. 이 권한을 사용하면 앱이 연락처 데이터를 삭제할 수 있습니다."</string> <string name="permlab_readCallLog" msgid="3478133184624102739">"통화 기록 읽기"</string> - <!-- no translation found for permdesc_readCallLog (3204122446463552146) --> - <skip /> + <string name="permdesc_readCallLog" msgid="3204122446463552146">"이 앱은 통화 기록을 읽을 수 있습니다."</string> <string name="permlab_writeCallLog" msgid="8552045664743499354">"통화 기록 쓰기"</string> <string name="permdesc_writeCallLog" product="tablet" msgid="6661806062274119245">"앱에서 수신 및 발신 통화 데이터를 포함하여 태블릿의 통화 기록을 수정할 수 있도록 허용합니다. 이 경우 악성 앱이 통화 기록을 지우거나 수정할 수 있습니다."</string> <string name="permdesc_writeCallLog" product="tv" msgid="4225034892248398019">"앱에서 수신 및 발신 통화 데이터를 포함하여 TV의 통화 기록을 수정할 수 있도록 허용합니다. 이 경우 악성 앱이 통화 기록을 삭제하거나 수정할 수도 있습니다."</string> <string name="permdesc_writeCallLog" product="default" msgid="683941736352787842">"앱에서 수신 및 발신 통화 데이터를 포함하여 휴대전화의 통화 기록을 수정할 수 있도록 허용합니다. 이 경우 악성 앱이 통화 기록을 지우거나 수정할 수 있습니다."</string> <string name="permlab_bodySensors" msgid="4683341291818520277">"신체 센서(예: 심박수 모니터)에 액세스"</string> <string name="permdesc_bodySensors" product="default" msgid="4380015021754180431">"앱이 심박수와 같은 신체 상태를 확인하는 센서의 데이터에 접근하도록 허용합니다."</string> - <!-- no translation found for permlab_readCalendar (6716116972752441641) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (4993979255403945892) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (8837931557573064315) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (4373978642145196715) --> - <skip /> + <string name="permlab_readCalendar" msgid="6716116972752441641">"캘린더 일정 및 세부정보 읽기"</string> + <string name="permdesc_readCalendar" product="tablet" msgid="4993979255403945892">"이 앱은 태블릿에 저장된 모든 캘린더 일정을 읽고 캘린더 데이터를 공유하거나 저장할 수 있습니다."</string> + <string name="permdesc_readCalendar" product="tv" msgid="8837931557573064315">"이 앱은 TV에 저장된 모든 캘린더 일정을 읽고 캘린더 데이터를 공유하거나 저장할 수 있습니다."</string> + <string name="permdesc_readCalendar" product="default" msgid="4373978642145196715">"이 앱은 휴대전화에 저장된 모든 캘린더 일정을 읽고 캘린더 데이터를 공유하거나 저장할 수 있습니다."</string> <string name="permlab_writeCalendar" msgid="8438874755193825647">"소유자에게 알리지 않고 캘린더 일정을 추가 또는 수정하고 참석자에게 이메일 전송"</string> - <!-- no translation found for permdesc_writeCalendar (1675270619903625982) --> - <skip /> - <!-- no translation found for permdesc_writeCalendar (9017809326268135866) --> - <skip /> - <!-- no translation found for permdesc_writeCalendar (7592791790516943173) --> - <skip /> + <string name="permdesc_writeCalendar" product="tablet" msgid="1675270619903625982">"이 앱은 태블릿의 캘린더 일정을 추가, 삭제, 변경할 수 있습니다. 이 앱은 발신자가 캘린더 소유자인 메시지를 전송하거나 소유자가 모르는 사이에 일정을 수정할 수 있습니다."</string> + <string name="permdesc_writeCalendar" product="tv" msgid="9017809326268135866">"이 앱은 TV의 캘린더 일정을 추가, 삭제, 변경할 수 있습니다. 이 앱은 발신자가 캘린더 소유자인 메시지를 전송하거나 소유자가 모르는 사이에 일정을 수정할 수 있습니다."</string> + <string name="permdesc_writeCalendar" product="default" msgid="7592791790516943173">"이 앱은 휴대전화의 캘린더 일정을 추가, 삭제, 변경할 수 있습니다. 이 앱은 발신자가 캘린더 소유자인 메시지를 전송하거나 소유자가 모르는 사이에 일정을 수정할 수 있습니다."</string> <string name="permlab_accessLocationExtraCommands" msgid="2836308076720553837">"추가 위치 제공업체 명령에 접근"</string> <string name="permdesc_accessLocationExtraCommands" msgid="6078307221056649927">"앱이 추가 위치 정보 제공 기능의 명령에 접근하도록 허용합니다. 이 경우 앱이 GPS 또는 기타 위치 소스의 작동을 방해할 수 있습니다."</string> <string name="permlab_accessFineLocation" msgid="251034415460950944">"정확한 위치(GPS 및 네트워크 기반)에 액세스"</string> - <!-- no translation found for permdesc_accessFineLocation (5821994817969957884) --> - <skip /> + <string name="permdesc_accessFineLocation" msgid="5821994817969957884">"이 앱은 GPS나 기지국 및 Wi-Fi 네트워크와 같은 네트워크 소스를 통해 내 위치를 알 수 있습니다. 앱에서 위치 서비스를 사용하려면 휴대전화에서 위치 서비스가 사용 설정되어 있으며 사용 가능해야 합니다. 이로 인해 배터리 사용량이 늘어날 수 있습니다."</string> <string name="permlab_accessCoarseLocation" msgid="7715277613928539434">"대략적인 위치(네트워크 기반)에 액세스"</string> - <!-- no translation found for permdesc_accessCoarseLocation (3373266766487862426) --> - <skip /> - <!-- no translation found for permdesc_accessCoarseLocation (1884022719818788511) --> - <skip /> - <!-- no translation found for permdesc_accessCoarseLocation (7788009094906196995) --> - <skip /> + <string name="permdesc_accessCoarseLocation" product="tablet" msgid="3373266766487862426">"이 앱은 기지국 및 Wi-Fi 네트워크와 같은 네트워크 소스를 통해 내 위치를 알 수 있습니다. 앱에서 위치 서비스를 사용하려면 태블릿에서 위치 서비스가 사용 설정되어 있으며 사용 가능해야 합니다."</string> + <string name="permdesc_accessCoarseLocation" product="tv" msgid="1884022719818788511">"이 앱은 기지국 및 Wi-Fi 네트워크와 같은 네트워크 소스를 통해 내 위치를 알 수 있습니다. 앱에서 위치 서비스를 사용하려면 TV에서 위치 서비스가 사용 설정되어 있으며 사용 가능해야 합니다."</string> + <string name="permdesc_accessCoarseLocation" product="default" msgid="7788009094906196995">"이 앱은 기지국 및 Wi-Fi 네트워크와 같은 네트워크 소스를 통해 내 위치를 알 수 있습니다. 앱에서 위치 서비스를 사용하려면 휴대전화에서 위치 서비스가 사용 설정되어 있으며 사용 가능해야 합니다."</string> <string name="permlab_modifyAudioSettings" msgid="6095859937069146086">"오디오 설정 변경"</string> <string name="permdesc_modifyAudioSettings" msgid="3522565366806248517">"앱이 음량이나 출력을 위해 사용하는 스피커 등 전체 오디오 설정을 변경할 수 있도록 허용합니다."</string> <string name="permlab_recordAudio" msgid="3876049771427466323">"오디오 녹음"</string> - <!-- no translation found for permdesc_recordAudio (4245930455135321433) --> - <skip /> + <string name="permdesc_recordAudio" msgid="4245930455135321433">"이 앱은 언제든지 마이크를 사용하여 오디오를 녹음할 수 있습니다."</string> <string name="permlab_sim_communication" msgid="2935852302216852065">"SIM에 명령어 보내기"</string> <string name="permdesc_sim_communication" msgid="5725159654279639498">"앱이 SIM에 명령어를 전송할 수 있도록 허용합니다. 이 기능은 매우 위험합니다."</string> <string name="permlab_camera" msgid="3616391919559751192">"사진과 동영상 찍기"</string> - <!-- no translation found for permdesc_camera (5392231870049240670) --> - <skip /> + <string name="permdesc_camera" msgid="5392231870049240670">"이 앱은 언제든지 카메라를 사용하여 사진을 촬영하고 동영상을 녹화할 수 있습니다."</string> <string name="permlab_vibrate" msgid="7696427026057705834">"진동 제어"</string> <string name="permdesc_vibrate" msgid="6284989245902300945">"앱이 진동을 제어할 수 있도록 허용합니다."</string> <string name="permlab_callPhone" msgid="3925836347681847954">"전화번호 자동 연결"</string> diff --git a/core/res/res/values-ky-rKG/strings.xml b/core/res/res/values-ky-rKG/strings.xml index 034fb7d2a62d..c89618047c4e 100644 --- a/core/res/res/values-ky-rKG/strings.xml +++ b/core/res/res/values-ky-rKG/strings.xml @@ -46,8 +46,7 @@ <string name="defaultMsisdnAlphaTag" msgid="2850889754919584674">"MSISDN1"</string> <string name="mmiError" msgid="5154499457739052907">"Туташууда көйгөй чыкты же MMI коду жараксыз."</string> <string name="mmiFdnError" msgid="5224398216385316471">"Иш-аракет туруктуу терүү номерлери менен гана чектелет."</string> - <!-- no translation found for mmiErrorWhileRoaming (762488890299284230) --> - <skip /> + <string name="mmiErrorWhileRoaming" msgid="762488890299284230">"Роуминг учурунда чалууну башка номерге багыттоонун жөндөөлөрүн телефонуңуздан өзгөртүү мүмкүн эмес."</string> <string name="serviceEnabled" msgid="8147278346414714315">"Кызмат иштетилди."</string> <string name="serviceEnabledFor" msgid="6856228140453471041">"Кызмат төмөнкү үчүн иштетилди:"</string> <string name="serviceDisabled" msgid="1937553226592516411">"Кызмат өчүрүлдү."</string> @@ -98,10 +97,8 @@ <string name="RestrictedOnVoiceData" msgid="996636487106171320">"Үн/берилиштер кызматтары бөгөттөлдү."</string> <string name="RestrictedOnVoiceSms" msgid="1888588152792023873">"Үн/SMS кызматтары бөгөттөлгөн."</string> <string name="RestrictedOnAll" msgid="5643028264466092821">"Бардык үн/берилиштер/SMS кызматтары бөгөттөлдү."</string> - <!-- no translation found for NetworkPreferenceSwitchTitle (4008877505368566980) --> - <skip /> - <!-- no translation found for NetworkPreferenceSwitchSummary (7335915397439759249) --> - <skip /> + <string name="NetworkPreferenceSwitchTitle" msgid="4008877505368566980">"Тармакка туташпай жатат"</string> + <string name="NetworkPreferenceSwitchSummary" msgid="7335915397439759249">"Кабыл алуу мүмкүнчүлүгүн жакшыртуу үчүн Жөндөөлөр > Мобилдик тармактар > Тандалган тармак бөлүмүнөн тармактын түрүн өзгөртүп көрүңүз."</string> <string name="peerTtyModeFull" msgid="6165351790010341421">"Peer TTY режимин FULL кылууну суранды"</string> <string name="peerTtyModeHco" msgid="5728602160669216784">"Peer TTY режимин HCO кылууну суранды"</string> <string name="peerTtyModeVco" msgid="1742404978686538049">"Peer TTY режимин VCO кылууну суранды"</string> @@ -185,10 +182,8 @@ <string name="work_profile_deleted_description" msgid="6305147513054341102">"Администратордун колдонмосу жок болгондуктан, жумуш профили жок кылынды."</string> <string name="work_profile_deleted_details" msgid="226615743462361248">"Жумуш профилинин администратор колдонмосу жок же бузулгандыктан, жумуш профилиңиз жана ага байланыштуу дайындар жок кылынган. Жардам алуу үчүн администраторуңузга кайрылыңыз."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="6019770344820507579">"Жумуш профилиңиз бул түзмөктө жеткиликтүү болбой калды."</string> - <!-- no translation found for network_logging_notification_title (1805392571290161924) --> - <skip /> - <!-- no translation found for network_logging_notification_text (4448072433371155729) --> - <skip /> + <string name="network_logging_notification_title" msgid="1805392571290161924">"Тармак трафиги көзөмөлдөнүүдө"</string> + <string name="network_logging_notification_text" msgid="4448072433371155729">"Кеңири маалымат алуу үчүн басыңыз"</string> <string name="factory_reset_warning" msgid="5423253125642394387">"Түзмөгүңүз тазаланат"</string> <string name="factory_reset_message" msgid="4905025204141900666">"Администратор колдонмосунун курамдары жок же бузулгандыктан, аны колдонуу мүмкүн эмес. Түзмөгүңүз азыр тазаланат. Жардам алуу үчүн администраторуңузга кайрылыңыз."</string> <string name="me" msgid="6545696007631404292">"Мен"</string> @@ -306,12 +301,9 @@ <string name="permlab_sendSms" msgid="7544599214260982981">"SMS билдирүүлөрдү жиберүү жана көрсөтүү"</string> <string name="permdesc_sendSms" msgid="7094729298204937667">"Колдонмого SMS билдирүүлөрүн жөнөтүү уруксатын берет. Бул сиз күтпөгөн чыгымдарга алып келиши мүмкүн. Зыяндуу колдонмолор сиздин ырастооңузсуз билдирүүлөрдү жөнөтүп, көп чыгымдарга себепкер болушу мүмкүн."</string> <string name="permlab_readSms" msgid="8745086572213270480">"билдирүүлөрүңүздү (SMS же MMS) окуу"</string> - <!-- no translation found for permdesc_readSms (4741697454888074891) --> - <skip /> - <!-- no translation found for permdesc_readSms (5796670395641116592) --> - <skip /> - <!-- no translation found for permdesc_readSms (6826832415656437652) --> - <skip /> + <string name="permdesc_readSms" product="tablet" msgid="4741697454888074891">"Бул колдонмо планшетиңизде сакталган SMS (текст түрүндөгү) билдирүүлөрдүн баарын окуй алат."</string> + <string name="permdesc_readSms" product="tv" msgid="5796670395641116592">"Бул колдонмо сыналгыңызда сакталган SMS (текст түрүндөгү) билдирүүлөрдүн баарын окуй алат."</string> + <string name="permdesc_readSms" product="default" msgid="6826832415656437652">"Бул колдонмо телефонуңузда сакталган SMS (текст түрүндөгү) билдирүүлөрдүн баарын окуй алат."</string> <string name="permlab_receiveWapPush" msgid="5991398711936590410">"билдирүүлөрдү (WAP) кабыл алуу"</string> <string name="permdesc_receiveWapPush" msgid="748232190220583385">"Колдонмого WAP билдирүүлөрүн кабыл алууга жана аларды иштетип чыгууга уруксат берет. Бул, колдонмо сизге билгизбестен түзмөгүңүзгө жөнөтүлгөн билдирүүлөрдү мониторлой же жок кыла алат дегенди билдирет."</string> <string name="permlab_getTasks" msgid="6466095396623933906">"иштеп жаткан колдонмолорду түшүрүп алуу"</string> @@ -324,10 +316,8 @@ <string name="permdesc_enableCarMode" msgid="4853187425751419467">"Колдонмого унаа режимин иштетүү мүмкүнчүлүгүн берет."</string> <string name="permlab_killBackgroundProcesses" msgid="3914026687420177202">"башка колдонмолорду жабуу"</string> <string name="permdesc_killBackgroundProcesses" msgid="4593353235959733119">"Колдонмого башка колдонмолордун фондо иштеп жаткан процесстерин токтотуу уруксатын берет. Бул башка колдонмолордун иштебей калышына алып келиши мүмкүн."</string> - <!-- no translation found for permlab_systemAlertWindow (7238805243128138690) --> - <skip /> - <!-- no translation found for permdesc_systemAlertWindow (2393776099672266188) --> - <skip /> + <string name="permlab_systemAlertWindow" msgid="7238805243128138690">"Бул колдонмо башка колдонмолордун үстүнөн көрүнүшү мүмкүн"</string> + <string name="permdesc_systemAlertWindow" msgid="2393776099672266188">"Бул колдонмо башка колдонмолордун же экрандын башка бөлүгүнүн үстүндө көрүнүшү мүмкүн. Ал колдонмолорду пайдаланууга же алардын көрсөтүлүшүнө тоскоолдук жаратышы мүмкүн."</string> <string name="permlab_persistentActivity" msgid="8841113627955563938">"колдонмону үзгүлтүксүз иштетүү"</string> <string name="permdesc_persistentActivity" product="tablet" msgid="8525189272329086137">"Колдонмого өзүнүн бөлүктөрүн эстутумда туруктуу кармоого уруксат берет.Бул эстутумдун башка колдонмолорго жетиштүүлүгүн чектеши жана телефондун иштешин жайлатышы мүмкүн."</string> <string name="permdesc_persistentActivity" product="tv" msgid="5086862529499103587">"Колдонмого эстутумдагы өз бөлүктөрүн туруктуу кылуу мүмкүнчүлүгүн берет. Ушуну менен сыналгы жай иштеп, башка колдонмолорго жеткиликтүү эстутум чектелиши мүмкүн."</string> @@ -353,51 +343,37 @@ <string name="permdesc_writeContacts" product="tv" msgid="5438230957000018959">"Колдонмого сыналгыңызда сакталган байланыштарыңыз тууралуу дайындарды, ошондой эле белгилүү байланыштарга кандай убакыт аралыгында чалып, электрондук билдирүү жөнөтүп же башка жолдор менен байланышканыңызды өзгөртүү мүмкүнчүлүгүн берет. Мындай уруксат менен колдонмолор байланыш дайындарын жок кыла алат."</string> <string name="permdesc_writeContacts" product="default" msgid="589869224625163558">"Колдонмого телефонуңузда сакталган байланыштарыңыздын берилиштерин, анын ичинде, көп терилген, көп эмейл алмашкан же башка жолдор менен көп баарлашкан байланыштар тууралуу берилиштерди өзгөртүүгө уруксат берет. Бул уруксат, колдонмолорго сиздин байланыштарыңыздын берилиштерин өчүрүү уруксатын берет."</string> <string name="permlab_readCallLog" msgid="3478133184624102739">"чалуулар тизмегин окуу"</string> - <!-- no translation found for permdesc_readCallLog (3204122446463552146) --> - <skip /> + <string name="permdesc_readCallLog" msgid="3204122446463552146">"Бул колдонмо чалууларыңыздын таржымалын окуй алат."</string> <string name="permlab_writeCallLog" msgid="8552045664743499354">"чалуулар тизмегин жаздыруу"</string> <string name="permdesc_writeCallLog" product="tablet" msgid="6661806062274119245">"Колдонмого планшетиңиздин чалуулар тизмегин, анын ичинде, чыгыш жана кириш чалууларына тиешелүү берилиштерди өзгөртүү уруксатын берет. Зыяндуу колдонмолор муну колдонуп чалуулар тизмегин өзгөртө же жок кыла алышат."</string> <string name="permdesc_writeCallLog" product="tv" msgid="4225034892248398019">"Колдонмого сыналгыңыздын чалуулар таржымалын, ошондой эле келүүчү жана чыгуучу чалуулар тууралуу дайындарды өзгөртүү мүмкүнчүлүгү берилет. Зыянкеч колдонмолор ушуну менен чалуулар таржымалыңызды жок кылып же өзгөртүп коюшу мүмкүн."</string> <string name="permdesc_writeCallLog" product="default" msgid="683941736352787842">"Колдонмого телефонуңуздун чалуулар тизмегин, анын ичинде, чыгыш жана кириш чалууларына тиешелүү берилиштерди өзгөртүү уруксатын берет. Зыяндуу колдонмолор муну колдонуп чалуулар тизмегин өзгөртө же жок кыла алышат."</string> <string name="permlab_bodySensors" msgid="4683341291818520277">"дене-бой сенсорлоруна (жүрөктүн кагышын өлчөгүчтөр сыяктуу) уруксат"</string> <string name="permdesc_bodySensors" product="default" msgid="4380015021754180431">"Колдонмого жүрөгүңүздүн согушу сыяктуу дене-бой абалыңызды көзөмөлдөгөн сенсорлордогу дайындарды көрүп туруу мүмкүнчүлүгүн берет."</string> - <!-- no translation found for permlab_readCalendar (6716116972752441641) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (4993979255403945892) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (8837931557573064315) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (4373978642145196715) --> - <skip /> + <string name="permlab_readCalendar" msgid="6716116972752441641">"Жылнаамадагы иш-чараларды жана алардын чоо-жайын окуу"</string> + <string name="permdesc_readCalendar" product="tablet" msgid="4993979255403945892">"Бул колдонмо планшетиңизде сакталган жылнаамадагы иш-чаралардын баарын окуп жана андагы дайындарды бөлүшүп же сактай алат."</string> + <string name="permdesc_readCalendar" product="tv" msgid="8837931557573064315">"Бул колдонмо сыналгыңызда сакталган жылнаамадагы иш-чаралардын баарын окуп жана андагы дайындарды бөлүшүп же сактай алат."</string> + <string name="permdesc_readCalendar" product="default" msgid="4373978642145196715">"Бул колдонмо телефонуңузда сакталган жылнаамадагы иш-чаралардын баарын окуп жана андагы дайындарды бөлүшүп же сактай алат."</string> <string name="permlab_writeCalendar" msgid="8438874755193825647">"ээсинен уруксат албай, күнбаракка иш-аракеттерди кошуу же өзгөртүү жана конокторго чакыруу жөнөтүү"</string> - <!-- no translation found for permdesc_writeCalendar (1675270619903625982) --> - <skip /> - <!-- no translation found for permdesc_writeCalendar (9017809326268135866) --> - <skip /> - <!-- no translation found for permdesc_writeCalendar (7592791790516943173) --> - <skip /> + <string name="permdesc_writeCalendar" product="tablet" msgid="1675270619903625982">"Бул колдонмо планшетиңизге жылнаама иш-чараларын кошуп, алып салып же өзгөртүшү мүмкүн. Бул колдонмо жылнаама ээсинин атынан билдирүүлөрдү жөнөтүп же ээсине эскертпестен иш-чараларды өзгөртүшү мүмкүн."</string> + <string name="permdesc_writeCalendar" product="tv" msgid="9017809326268135866">"Бул колдонмо сыналгыңызга жылнаама иш-чараларын кошуп, алып салып же өзгөртүшү мүмкүн. Бул колдонмо жылнаама ээсинин атынан билдирүүлөрдү жөнөтүп же ээсине эскертпестен иш-чараларды өзгөртүшү мүмкүн."</string> + <string name="permdesc_writeCalendar" product="default" msgid="7592791790516943173">"Бул колдонмо телефонуңузга жылнаама иш-чараларын кошуп, алып салып же өзгөртүшү мүмкүн. Бул колдонмо жылнаама ээсинин атынан билдирүүлөрдү жөнөтүп же ээсине эскертпестен иш-чараларды өзгөртүшү мүмкүн."</string> <string name="permlab_accessLocationExtraCommands" msgid="2836308076720553837">"жайгашкан жерди аныктагычтын кошумча буйруктарын пайдалануу"</string> <string name="permdesc_accessLocationExtraCommands" msgid="6078307221056649927">"Колдонмого жайгашкан жерди табуучу кошумча жабдуучулардын буйруктарын колдонуу мүмкүнчүлүгүн берет. Ушуну менен колдонмо GPS\'тин ишине жана башка жайгашкан жерлерди аныктоо кызматтарына кийлигише алат."</string> <string name="permlab_accessFineLocation" msgid="251034415460950944">"так аныкталган жайгашкан жерге (GPS жана тармактын негизинде) уруксат"</string> - <!-- no translation found for permdesc_accessFineLocation (5821994817969957884) --> - <skip /> + <string name="permdesc_accessFineLocation" msgid="5821994817969957884">"Бул колдонмо GPS же байланыш мунаралары жана Wi-Fi сыяктуу тармактык булактар аркылуу жайгашкан жериңизди аныктай алат. Колдонмо бул кызматтарды пайдаланышы үчүн, аларды күйгүзүп, телефонуңузга туташтырып коюшуңуз керек. Ушуну менен батареянын кубаты көбүрөөк сарпталышы мүмкүн."</string> <string name="permlab_accessCoarseLocation" msgid="7715277613928539434">"болжолдуу жайгашкан жерге (тармактын негизинде) уруксат"</string> - <!-- no translation found for permdesc_accessCoarseLocation (3373266766487862426) --> - <skip /> - <!-- no translation found for permdesc_accessCoarseLocation (1884022719818788511) --> - <skip /> - <!-- no translation found for permdesc_accessCoarseLocation (7788009094906196995) --> - <skip /> + <string name="permdesc_accessCoarseLocation" product="tablet" msgid="3373266766487862426">"Бул колдонмо байланыш мунаралары жана Wi-Fi сыяктуу тармактык булактар аркылуу жайгашкан жериңизди аныктай алат. Колдонмо бул кызматтарды пайдаланышы үчүн, аларды күйгүзүп, планшетиңизге туташтырып коюшуңуз керек."</string> + <string name="permdesc_accessCoarseLocation" product="tv" msgid="1884022719818788511">"Бул колдонмо байланыш мунаралары жана Wi-Fi сыяктуу тармактык булактар аркылуу жайгашкан жериңизди аныктай алат. Колдонмо бул кызматтарды пайдаланышы үчүн, аларды күйгүзүп, сыналгыңызга туташтырып коюшуңуз керек."</string> + <string name="permdesc_accessCoarseLocation" product="default" msgid="7788009094906196995">"Бул колдонмо байланыш мунаралары жана Wi-Fi сыяктуу тармактык булактар аркылуу жайгашкан жериңизди аныктай алат. Колдонмо бул кызматтарды пайдаланышы үчүн, аларды күйгүзүп, телефонуңузга туташтырып коюшуңуз керек."</string> <string name="permlab_modifyAudioSettings" msgid="6095859937069146086">"аудио жөндөөлөрүңүздү өзгөртүңүз"</string> <string name="permdesc_modifyAudioSettings" msgid="3522565366806248517">"Колдонмого үн деңгээли жана кайсы динамик аркылуу үн чыгарылышы керек сыяктуу түзмөктүн аудио тууралоолорун өзгөртүүгө уруксат берет."</string> <string name="permlab_recordAudio" msgid="3876049771427466323">"аудио жаздыруу"</string> - <!-- no translation found for permdesc_recordAudio (4245930455135321433) --> - <skip /> + <string name="permdesc_recordAudio" msgid="4245930455135321433">"Бул колдонмо каалаган убакта микрофон менен аудио файлдарды жаздыра алат."</string> <string name="permlab_sim_communication" msgid="2935852302216852065">"SIM-картага буйруктарды жөнөтүү"</string> <string name="permdesc_sim_communication" msgid="5725159654279639498">"Колдонмого SIM-картага буйруктарды жөнөтүү мүмкүнчүлүгүн берет. Бул абдан кооптуу."</string> <string name="permlab_camera" msgid="3616391919559751192">"сүрөт жана видео тартуу"</string> - <!-- no translation found for permdesc_camera (5392231870049240670) --> - <skip /> + <string name="permdesc_camera" msgid="5392231870049240670">"Бул колдонмо каалаган убакта камера менен сүрөт же видеолорду тарта алат."</string> <string name="permlab_vibrate" msgid="7696427026057705834">"титирөөнү башкаруу"</string> <string name="permdesc_vibrate" msgid="6284989245902300945">"Колдонмого дирилдегичти көзөмөлдөө мүмкүнчүлүгүн берет."</string> <string name="permlab_callPhone" msgid="3925836347681847954">"телефон номерлерине түз чалуу"</string> diff --git a/core/res/res/values-lo-rLA/strings.xml b/core/res/res/values-lo-rLA/strings.xml index 6058a2e3d66e..534ffe2a13f1 100644 --- a/core/res/res/values-lo-rLA/strings.xml +++ b/core/res/res/values-lo-rLA/strings.xml @@ -46,8 +46,7 @@ <string name="defaultMsisdnAlphaTag" msgid="2850889754919584674">"MSISDN1"</string> <string name="mmiError" msgid="5154499457739052907">"ມີບັນຫາໃນການເຊື່ອມຕໍ່ ຫຼືລະຫັດ MMI ບໍ່ຖືກຕ້ອງ."</string> <string name="mmiFdnError" msgid="5224398216385316471">"ການດຳເນີນການຖືກຈຳກັດເປັນ ຈຳກັດໝາຍເລກໂທອອກເທົ່ານັ້ນ."</string> - <!-- no translation found for mmiErrorWhileRoaming (762488890299284230) --> - <skip /> + <string name="mmiErrorWhileRoaming" msgid="762488890299284230">"Can not change call forwarding settings from your phone while you are roaming."</string> <string name="serviceEnabled" msgid="8147278346414714315">"ບໍລິການຖືກເປີດໄວ້ແລ້ວ."</string> <string name="serviceEnabledFor" msgid="6856228140453471041">"ບໍລິການຖືກເປີດໃຊ້ສຳລັບ:"</string> <string name="serviceDisabled" msgid="1937553226592516411">"ບໍລິການໄດ້ຖືກປິດແລ້ວ."</string> @@ -98,10 +97,8 @@ <string name="RestrictedOnVoiceData" msgid="996636487106171320">"ບໍລິການ ຂໍ້ມູນ/ສຽງ ຖືກບລັອກ."</string> <string name="RestrictedOnVoiceSms" msgid="1888588152792023873">"ບໍລິການ ສຽງ/SMS ຖືກບລັອກ."</string> <string name="RestrictedOnAll" msgid="5643028264466092821">"ບໍລິການ ການໂທ/ອິນເຕີເນັດ/SMS ຖືກປິດກັ້ນໄວ້."</string> - <!-- no translation found for NetworkPreferenceSwitchTitle (4008877505368566980) --> - <skip /> - <!-- no translation found for NetworkPreferenceSwitchSummary (7335915397439759249) --> - <skip /> + <string name="NetworkPreferenceSwitchTitle" msgid="4008877505368566980">"Can’t reach network"</string> + <string name="NetworkPreferenceSwitchSummary" msgid="7335915397439759249">"To improve reception, try changing the type selected at Settings > Cellular networks > Preferred network type."</string> <string name="peerTtyModeFull" msgid="6165351790010341421">"ໂໝດ TTY ທີ່ເພື່ອນຂໍນັ້ນເຕັມແລ້ວ"</string> <string name="peerTtyModeHco" msgid="5728602160669216784">"ໂໝດ TTY ທີ່ເພື່ອນຂໍ HCO"</string> <string name="peerTtyModeVco" msgid="1742404978686538049">"ໂໝດ TTY ທີ່ເພື່ອນຂໍ VCO"</string> @@ -185,10 +182,8 @@ <string name="work_profile_deleted_description" msgid="6305147513054341102">"ລຶບໂປຣໄຟລ໌ບ່ອນເຮັດວຽກແລ້ວ ເນື່ອງຈາກຂາດແອັບບໍລິຫານໄປ."</string> <string name="work_profile_deleted_details" msgid="226615743462361248">"ແອັບບໍລິຫານໂປຣໄຟລ໌ວຽກຂາດໄປ ຫຼືຖືກເສຍຫາຍ. ດ້ວຍເຫດຜົນນັ້ນ, ໂປຣໄຟລ໌ບ່ອນເຮັດວຽກຂອງທ່ານ ແລະຂໍ້ມູນທີ່ກ່ຽວຂ້ອງຈິ່ງຖືກລຶບໄປ. ຕິດຕໍ່ຜູ້ຄວບຄຸມຂອງທ່ານ ເພື່ອຂໍຄວາມຊ່ວຍເຫຼືອ."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="6019770344820507579">"ໂປຣໄຟລ໌ບ່ອນເຮັດວຽກບໍ່ມີໃຫ້ໃຊ້ງານເທິງອຸປະກອນນີ້ອີກຕໍ່ໄປ."</string> - <!-- no translation found for network_logging_notification_title (1805392571290161924) --> - <skip /> - <!-- no translation found for network_logging_notification_text (4448072433371155729) --> - <skip /> + <string name="network_logging_notification_title" msgid="1805392571290161924">"ກຳລັງຕິດຕາມທຣາບຟິກເຄືອຂ່າຍ"</string> + <string name="network_logging_notification_text" msgid="4448072433371155729">"ແຕະເພື່ອເບິ່ງລາຍລະອຽດເພີ່ມເຕີມ"</string> <string name="factory_reset_warning" msgid="5423253125642394387">"ອຸປະກອນຂອງທ່ານຈະຖືກລຶບ"</string> <string name="factory_reset_message" msgid="4905025204141900666">"ແອັບບໍລິຫານຂາດອົງປະກອບ ຫຼືຖືກຂັດຈັງຫວະ, ແລະບໍ່ສາມາດໃຊໄດ້. ດຽວນີ້ອຸປະກອນຂອງທ່ານຈະຖືກລຶບ. ຕິດຕໍ່ຜູ້ຄວບຄຸມຂອງທ່ານ ເພື່ອຂໍຄວາມຊ່ວຍເຫຼືອ."</string> <string name="me" msgid="6545696007631404292">"ຂ້າພະເຈົ້າ"</string> @@ -306,12 +301,9 @@ <string name="permlab_sendSms" msgid="7544599214260982981">"ສົ່ງ ແລະເບິ່ງຂໍ້ຄວາມ SMS"</string> <string name="permdesc_sendSms" msgid="7094729298204937667">"ອະນຸຍາດໃຫ້ແອັບຯສົ່ງຂໍ້ຄວາມ SMS ໄດ້. ນີ້ອາດເຮັດໃຫ້ທ່ານເກີດການຄິດຄ່າບໍລິການທີ່ບໍ່ຄາດຄິດໄດ້. ແອັບຯທີ່ເປັນອັນຕະລາຍ ອາດເຮັດໃຫ້ທ່ານເສຍເງິນຍ້ອນການສົ່ງຂໍ້ຄວາມໂດຍທີ່ທ່ານບໍ່ຮູ້ໂຕໄດ້."</string> <string name="permlab_readSms" msgid="8745086572213270480">"ອ່ານຂໍ້ຄວາມຂອງທ່ານ (SMS ຫຼື MMS)"</string> - <!-- no translation found for permdesc_readSms (4741697454888074891) --> - <skip /> - <!-- no translation found for permdesc_readSms (5796670395641116592) --> - <skip /> - <!-- no translation found for permdesc_readSms (6826832415656437652) --> - <skip /> + <string name="permdesc_readSms" product="tablet" msgid="4741697454888074891">"This app can read all SMS (text) messages stored on your tablet."</string> + <string name="permdesc_readSms" product="tv" msgid="5796670395641116592">"This app can read all SMS (text) messages stored on your TV."</string> + <string name="permdesc_readSms" product="default" msgid="6826832415656437652">"This app can read all SMS (text) messages stored on your phone."</string> <string name="permlab_receiveWapPush" msgid="5991398711936590410">"ຮັບຂໍ້ຄວາມສັ້ນ (WAP)"</string> <string name="permdesc_receiveWapPush" msgid="748232190220583385">"ອະນຸຍາດໃຫ້ແອັບຯຮັບ ແລະປະມວນຜົນຂໍ້ຄວາມ WAP. ການອະນຸຍາດນີ້ຮວມເຖິງຄວາມສາມາດໃນການກວດເບິ່ງ ແລະລຶບຂໍ້ຄວາມທີ່ສົ່ງແລ້ວ ໂດຍບໍ່ຕ້ອງສະແດງໃຫ້ທ່ານເຫັນ."</string> <string name="permlab_getTasks" msgid="6466095396623933906">"ດຶງແອັບຯທີ່ເຮັດວຽກຢູ່ມາ"</string> @@ -324,10 +316,8 @@ <string name="permdesc_enableCarMode" msgid="4853187425751419467">"ອະນຸຍາດໃຫ້ແອັບຯເປີດໃຊ້ໂໝດໃນລົດ."</string> <string name="permlab_killBackgroundProcesses" msgid="3914026687420177202">"ປິດແອັບຯອື່ນໆ"</string> <string name="permdesc_killBackgroundProcesses" msgid="4593353235959733119">"ອະນຸຍາດໃຫ້ແອັບຯປິດໂປຣເຊສພື້ນຫຼັງຂອງແອັບຯອື່ນໄດ້. ນີ້ອາດເຮັດໃຫ້ແອັບຯອື່ນນັ້ນຢຸດການເຮັດວຽກໄປນຳ."</string> - <!-- no translation found for permlab_systemAlertWindow (7238805243128138690) --> - <skip /> - <!-- no translation found for permdesc_systemAlertWindow (2393776099672266188) --> - <skip /> + <string name="permlab_systemAlertWindow" msgid="7238805243128138690">"This app can appear on top of other apps"</string> + <string name="permdesc_systemAlertWindow" msgid="2393776099672266188">"This app can appear on top of other apps or other parts of the screen. This may interfere with normal app usage and change the way that other apps appear."</string> <string name="permlab_persistentActivity" msgid="8841113627955563938">"ເຮັດໃຫ້ແອັບຯເຮັດວຽກຕະຫຼອດເວລາ"</string> <string name="permdesc_persistentActivity" product="tablet" msgid="8525189272329086137">"ອະນຸຍາດໃຫ້ແອັບຯ ສາມາດເຮັດໃຫ້ບາງພາກສ່ວນຂອງມັນເອັງ ຄົງໂຕໃນໜ່ວຍຄວາມຈຳ. ສິ່ງນີ້ສາມາດຈຳກັດໜ່ວຍຄວາມຈຳທີ່ສາມາດໃຊ້ໄດ້ໂດຍແອັບຯອື່ນ ເຮັດໃຫ້ແທັບເລັດຊ້າລົງ."</string> <string name="permdesc_persistentActivity" product="tv" msgid="5086862529499103587">"ອະນຸຍາດໃຫ້ແອັບເຮັດສ່ວນຕ່າງໆຂອງມັນເອງໃຫ້ຕໍ່ເນື່ອງຢູ່ໃນຄວາມຈຳ. ອັນນີ້ສາມາດຈຳກັດຄວາມຈຳທີ່ມີຢູ່ໃຫ້ກັບແອັບອື່ນທີເຮັດໃຫ້ໂທລະພາບຊ້າລົງ."</string> @@ -353,51 +343,37 @@ <string name="permdesc_writeContacts" product="tv" msgid="5438230957000018959">"ອະນຸຍາດໃຫ້ແອັບແກ້ໄຂຂໍ້ມູນກ່ຽວກັບລາຍຊື່ຕິດຕໍ່ ທີ່ບັນທຶກຢູ່ໃນໂທລະພາບຂອງທ່ານ ລວມທັງຄວາມຖີ່ ທີ່ທ່ານໂທ, ອີເມວ ຫຼືສື່ສານກັບລາຍຊື່ຕິດຕໍ່ສະເພາະໃນຮູບແບບອື່ນນຳອີກ. ການອະນຸຍາດນີ້ຈະເຮັດໃຫ້ແອັບ ສາມາດລຶບຂໍ້ມູນລາຍຊື່ຕິດຕໍ່ໄດ້."</string> <string name="permdesc_writeContacts" product="default" msgid="589869224625163558">"ອະນຸຍາດໃຫ້ແອັບຯແກ້ໄຂຂໍ້ມູນກ່ຽວກັບລາຍຊື່ຜູ່ຕິດຕໍ່ ທີ່ບັນທຶກໃນໂທລະສັບຂອງທ່ານ ຮວມທັງຄວາມຖີ່ຂອງການໂທ, ການອີເມວ ຫຼືການຕິດຕໍ່ໃນຮູບແບບອື່ນກັບລາຍຊື່ຜູ່ຕິດຕໍ່ໃດນຶ່ງນຳ. ການອະນຸຍາດນີ້ຈະເຮັດໃຫ້ແອັບຯ ສາມາດລຶບຂໍ້ມູນລາຍຊື່ຜູ່ຕິດຕໍ່ໄດ້."</string> <string name="permlab_readCallLog" msgid="3478133184624102739">"ອ່ານບັນທຶກການໂທ"</string> - <!-- no translation found for permdesc_readCallLog (3204122446463552146) --> - <skip /> + <string name="permdesc_readCallLog" msgid="3204122446463552146">"This app can read your call history."</string> <string name="permlab_writeCallLog" msgid="8552045664743499354">"ຂຽນຂໍ້ມູນການໂທ"</string> <string name="permdesc_writeCallLog" product="tablet" msgid="6661806062274119245">"ອະນຸຍາດໃຫ້ແອັບຯແກ້ໄຂບັນທຶກການໂທຂອງແທັບເລັດ ຮວມທັງຂໍ້ມູນກ່ຽວກັບການໂທອອກ ແລະໂທເຂົ້ານຳ. ແອັບຯທີ່ເປັນອັນຕະລາຍອາດໃຊ້ຄຸນສົມບັດນີ້ເພື່ອລຶບ ຫຼືແກ້ໄຂບັນທຶກການໂທຂອງທ່ານໄດ້."</string> <string name="permdesc_writeCallLog" product="tv" msgid="4225034892248398019">"ອະນຸຍາດໃຫ້ແອັບແກ້ໄຂບັນທຶກການໂທຂອງໂທລະພາບຂອງທ່ານ ລວມທັງຂໍ້ມູນກ່ຽວກັບການໂທອອກ ແລະໂທເຂົ້ານຳ. ແອັບທີ່ເປັນອັນຕະລາຍອາດໃຊ້ຄຸນສົມບັດນີ້ເພື່ອລຶບ ຫຼືແກ້ໄຂບັນທຶກການໂທຂອງທ່ານໄດ້."</string> <string name="permdesc_writeCallLog" product="default" msgid="683941736352787842">"ອະນຸຍາດໃຫ້ແອັບຯ ແກ້ໄຂລາຍການການໂທໃນໂທລະສັບຂອງທ່ານ, ຮວມທັງຂໍ້ມູນກ່ຽວກັບສາຍໂທເຂົ້າ ແລະການໂທອອກ. ແອັບຯທີ່ເປັນອັນຕະລາຍ ອາດໃຊ້ຄວາມສາມາດນີ້ ເພື່ອລຶບ ຫຼືແກ້ໄຂລາຍການການໂທຂອງທ່ານໄດ້."</string> <string name="permlab_bodySensors" msgid="4683341291818520277">"ເຂົ້າຫາເຊັນເຊີກວດຮ່າງກາຍ (ເຊັ່ນ: ຈໍຕິດຕາມອັດຕາການເຕັ້ນຂອງຫົວໃຈ)"</string> <string name="permdesc_bodySensors" product="default" msgid="4380015021754180431">"ອະນຸຍາດໃຫ້ແອັບຯເຂົ້າເຖິງຂໍ້ມູນຈາກເຊັນເຊີທີ່ຕິດຕາມສະພາບຮ່າງການຂອງທ່ານ, ເຊັ່ນ: ອັດຕາການເຕັ້ນຂອງຫົວໃຈຂອງທ່ານ."</string> - <!-- no translation found for permlab_readCalendar (6716116972752441641) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (4993979255403945892) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (8837931557573064315) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (4373978642145196715) --> - <skip /> + <string name="permlab_readCalendar" msgid="6716116972752441641">"Read calendar events and details"</string> + <string name="permdesc_readCalendar" product="tablet" msgid="4993979255403945892">"This app can read all calendar events stored on your tablet and share or save your calendar data."</string> + <string name="permdesc_readCalendar" product="tv" msgid="8837931557573064315">"This app can read all calendar events stored on your TV and share or save your calendar data."</string> + <string name="permdesc_readCalendar" product="default" msgid="4373978642145196715">"This app can read all calendar events stored on your phone and share or save your calendar data."</string> <string name="permlab_writeCalendar" msgid="8438874755193825647">"ເພີ່ມ ຫຼືແກ້ໄຂນັດໝາຍໃນປະຕິທິນ ແລະສົ່ງອີເມວຫາຜູ່ເຂົ້າຮ່ວມໂດຍບໍ່ຕ້ອງໃຫ້ເຈົ້າຂອງຮັບຮູ້"</string> - <!-- no translation found for permdesc_writeCalendar (1675270619903625982) --> - <skip /> - <!-- no translation found for permdesc_writeCalendar (9017809326268135866) --> - <skip /> - <!-- no translation found for permdesc_writeCalendar (7592791790516943173) --> - <skip /> + <string name="permdesc_writeCalendar" product="tablet" msgid="1675270619903625982">"This app can add, remove, or change calendar events on your tablet. This app can send messages that may appear to come from calendar owners, or change events without notifying their owners."</string> + <string name="permdesc_writeCalendar" product="tv" msgid="9017809326268135866">"This app can add, remove, or change calendar events on your TV. This app can send messages that may appear to come from calendar owners, or change events without notifying their owners."</string> + <string name="permdesc_writeCalendar" product="default" msgid="7592791790516943173">"This app can add, remove, or change calendar events on your phone. This app can send messages that may appear to come from calendar owners, or change events without notifying their owners."</string> <string name="permlab_accessLocationExtraCommands" msgid="2836308076720553837">"ເຂົ້າເຖິງຄຳສັ່ງຜູ່ໃຫ້ບໍລິການພິກັດສະຖານທີ່"</string> <string name="permdesc_accessLocationExtraCommands" msgid="6078307221056649927">"ອະນຸຍາດໃຫ້ແອັບຯເຂົ້າເຖິງຄຳສັ່ງເພີ່ມເຕີມຂອງຜູ່ໃຫ້ບໍລິການສະຖານທີ່. ນີ້ອາດຈະເປັນການເຮັດໃຫ້ແອັບຯ ລົບກວນການເຮັດວຽກຂອງ GPS ຫຼືແຫລ່ງຂໍ້ມູນສະຖານທີ່ອື່ນໆໄດ້."</string> <string name="permlab_accessFineLocation" msgid="251034415460950944">"ເຂົ້າຫາທີ່ຕັ້ງທີ່ແນ່ນອນ (ອີງໃສ່ GPS ແລະ ເຄືອຂ່າຍ)"</string> - <!-- no translation found for permdesc_accessFineLocation (5821994817969957884) --> - <skip /> + <string name="permdesc_accessFineLocation" msgid="5821994817969957884">"This app can get your location based on GPS or network location sources such as cell towers and Wi-Fi networks. These location services must be turned on and available on your phone for the app to be able to use them. This may increase battery consumption."</string> <string name="permlab_accessCoarseLocation" msgid="7715277613928539434">"ເຂົ້າຫາທີ່ຕັ້ງໂດຍປະມານ (ອີງໃສ່ເຄືອຂ່າຍ)"</string> - <!-- no translation found for permdesc_accessCoarseLocation (3373266766487862426) --> - <skip /> - <!-- no translation found for permdesc_accessCoarseLocation (1884022719818788511) --> - <skip /> - <!-- no translation found for permdesc_accessCoarseLocation (7788009094906196995) --> - <skip /> + <string name="permdesc_accessCoarseLocation" product="tablet" msgid="3373266766487862426">"This app can get your location based on network sources such as cell towers and Wi-Fi networks. These location services must be turned on and available on your tablet for the app to be able to use them."</string> + <string name="permdesc_accessCoarseLocation" product="tv" msgid="1884022719818788511">"This app can get your location based on network sources such as cell towers and Wi-Fi networks. These location services must be turned on and available on your TV for the app to be able to use them."</string> + <string name="permdesc_accessCoarseLocation" product="default" msgid="7788009094906196995">"This app can get your location based on network sources such as cell towers and Wi-Fi networks. These location services must be turned on and available on your phone for the app to be able to use them."</string> <string name="permlab_modifyAudioSettings" msgid="6095859937069146086">"ປ່ຽນການຕັ້ງຄ່າສຽງຂອງທ່ານ"</string> <string name="permdesc_modifyAudioSettings" msgid="3522565366806248517">"ອະນຸຍາດໃຫ້ແອັບຯແກ້ໄຂການຕັ້ງຄ່າສຽງສ່ວນກາງ ເຊັ່ນ: ລະດັບສຽງ ແລະລຳໂພງໃດທີ່ຖືກໃຊ້ສົ່ງສຽງອອກ."</string> <string name="permlab_recordAudio" msgid="3876049771427466323">"ບັນທຶກສຽງ"</string> - <!-- no translation found for permdesc_recordAudio (4245930455135321433) --> - <skip /> + <string name="permdesc_recordAudio" msgid="4245930455135321433">"This app can record audio using the microphone at any time."</string> <string name="permlab_sim_communication" msgid="2935852302216852065">"ສົ່ງຄຳສັ່ງຫາ SIM"</string> <string name="permdesc_sim_communication" msgid="5725159654279639498">"ອະນຸຍາດໃຫ້ແອັບຯສົ່ງຄຳສັ່ງຫາ SIM. ສິ່ງນີ້ອັນຕະລາຍຫຼາຍ."</string> <string name="permlab_camera" msgid="3616391919559751192">"ຖ່າຍຮູບ ແລະວິດີໂອ"</string> - <!-- no translation found for permdesc_camera (5392231870049240670) --> - <skip /> + <string name="permdesc_camera" msgid="5392231870049240670">"This app can take pictures and record videos using the camera at any time."</string> <string name="permlab_vibrate" msgid="7696427026057705834">"ຄວບຄຸມການສັ່ນ"</string> <string name="permdesc_vibrate" msgid="6284989245902300945">"ອະນຸຍາດໃຫ້ແອັບຯຄວບຄຸມໂຕສັ່ນ."</string> <string name="permlab_callPhone" msgid="3925836347681847954">"ໂທຫາເບີໂທລະສັບໂດຍກົງ"</string> diff --git a/core/res/res/values-lt/strings.xml b/core/res/res/values-lt/strings.xml index 7ca44e1a9ff8..c9f781f9d2e9 100644 --- a/core/res/res/values-lt/strings.xml +++ b/core/res/res/values-lt/strings.xml @@ -46,8 +46,7 @@ <string name="defaultMsisdnAlphaTag" msgid="2850889754919584674">"MSISDN1"</string> <string name="mmiError" msgid="5154499457739052907">"Ryšio problema arba neteisingas MMI kodas."</string> <string name="mmiFdnError" msgid="5224398216385316471">"Operacija ribojama tik naudojant fiksuoto rinkimo numerius."</string> - <!-- no translation found for mmiErrorWhileRoaming (762488890299284230) --> - <skip /> + <string name="mmiErrorWhileRoaming" msgid="762488890299284230">"Negalima pakeisti telefono skambučio peradresavimo nustatymų, kai naudojate tarptinklinį ryšį."</string> <string name="serviceEnabled" msgid="8147278346414714315">"Paslauga įgalinta."</string> <string name="serviceEnabledFor" msgid="6856228140453471041">"Paslauga buvo įgalinta:"</string> <string name="serviceDisabled" msgid="1937553226592516411">"Paslauga išjungta."</string> @@ -100,10 +99,8 @@ <string name="RestrictedOnVoiceData" msgid="996636487106171320">"Balso / duomenų paslaugos užblokuotos."</string> <string name="RestrictedOnVoiceSms" msgid="1888588152792023873">"Balso / SMS paslaugos blokuojamos."</string> <string name="RestrictedOnAll" msgid="5643028264466092821">"Blokuojamos visos balso / duomenų / SMS paslaugos."</string> - <!-- no translation found for NetworkPreferenceSwitchTitle (4008877505368566980) --> - <skip /> - <!-- no translation found for NetworkPreferenceSwitchSummary (7335915397439759249) --> - <skip /> + <string name="NetworkPreferenceSwitchTitle" msgid="4008877505368566980">"Nepavyko pasiekti tinklo"</string> + <string name="NetworkPreferenceSwitchSummary" msgid="7335915397439759249">"Kad pagerintumėte ryšį, pabandykite pakeisti tipą, pasirinktą skiltyje „Nustatymai“ > „Mobiliojo ryšio tinklai“ > „Pageidaujamas tinklo tipas“."</string> <string name="peerTtyModeFull" msgid="6165351790010341421">"Lygiavertis naudotojas pateikė užklausą dėl TTY režimo FULL"</string> <string name="peerTtyModeHco" msgid="5728602160669216784">"Lygiavertis naudotojas pateikė užklausą dėl TTY režimo HCO"</string> <string name="peerTtyModeVco" msgid="1742404978686538049">"Lygiavertis naudotojas pateikė užklausą dėl TTY režimo VCO"</string> @@ -189,10 +186,8 @@ <string name="work_profile_deleted_description" msgid="6305147513054341102">"Darbo profilis ištrintas dėl trūkstamos administratoriaus programos."</string> <string name="work_profile_deleted_details" msgid="226615743462361248">"Trūksta darbo profilio administratoriaus programos arba ji sugadinta. Todėl darbo profilis ir susiję duomenys buvo ištrinti. Dėl pagalbos susisiekite su administratoriumi."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="6019770344820507579">"Darbo profilis nebepasiekiamas šiame įrenginyje."</string> - <!-- no translation found for network_logging_notification_title (1805392571290161924) --> - <skip /> - <!-- no translation found for network_logging_notification_text (4448072433371155729) --> - <skip /> + <string name="network_logging_notification_title" msgid="1805392571290161924">"Tinklo srautas stebimas"</string> + <string name="network_logging_notification_text" msgid="4448072433371155729">"Palieskite, kad gautumėte daugiau informacijos"</string> <string name="factory_reset_warning" msgid="5423253125642394387">"Įrenginys bus ištrintas"</string> <string name="factory_reset_message" msgid="4905025204141900666">"Trūksta administratoriaus programos komponentų arba programa sugadinta ir jos negalima naudoti. Dabar įrenginys bus ištrintas. Dėl pagalbos susisiekite su administratoriumi."</string> <string name="me" msgid="6545696007631404292">"Aš"</string> @@ -312,12 +307,9 @@ <string name="permlab_sendSms" msgid="7544599214260982981">"siųsti ir peržiūrėti SMS pranešimus"</string> <string name="permdesc_sendSms" msgid="7094729298204937667">"Leidžiama programai siųsti SMS pranešimus. Dėl to gali atsirasti nenumatytų apmokestinimų. Kenkėjiškos programos gali siųsti mokamus pranešimus be jūsų patvirtinimo."</string> <string name="permlab_readSms" msgid="8745086572213270480">"skaityti teksto pranešimus (SMS arba MMS)"</string> - <!-- no translation found for permdesc_readSms (4741697454888074891) --> - <skip /> - <!-- no translation found for permdesc_readSms (5796670395641116592) --> - <skip /> - <!-- no translation found for permdesc_readSms (6826832415656437652) --> - <skip /> + <string name="permdesc_readSms" product="tablet" msgid="4741697454888074891">"Ši programa gali nuskaityti visus planšetiniame kompiuteryje saugomus SMS (teksto) pranešimus."</string> + <string name="permdesc_readSms" product="tv" msgid="5796670395641116592">"Ši programa gali nuskaityti visus TV saugomus SMS (teksto) pranešimus."</string> + <string name="permdesc_readSms" product="default" msgid="6826832415656437652">"Ši programa gali nuskaityti visus telefone saugomus SMS (teksto) pranešimus."</string> <string name="permlab_receiveWapPush" msgid="5991398711936590410">"gauti teksto pranešimus (WAP)"</string> <string name="permdesc_receiveWapPush" msgid="748232190220583385">"Leidžiama programai gauti ir apdoroti WAP pranešimus. Šis leidimas apima galimybę stebėti ar ištrinti jums siunčiamus pranešimus jums jų neparodžius."</string> <string name="permlab_getTasks" msgid="6466095396623933906">"nuskaityti vykdomas programas"</string> @@ -330,10 +322,8 @@ <string name="permdesc_enableCarMode" msgid="4853187425751419467">"Leidžiama programai įgalinti automobilio režimą."</string> <string name="permlab_killBackgroundProcesses" msgid="3914026687420177202">"uždaryti kitas programas"</string> <string name="permdesc_killBackgroundProcesses" msgid="4593353235959733119">"Leidžiama programai baigti kitų programų fone vykdomus procesus. Dėl to gali būti sustabdytos kitos programos."</string> - <!-- no translation found for permlab_systemAlertWindow (7238805243128138690) --> - <skip /> - <!-- no translation found for permdesc_systemAlertWindow (2393776099672266188) --> - <skip /> + <string name="permlab_systemAlertWindow" msgid="7238805243128138690">"Ši programa gali būti rodoma virš kitų programų"</string> + <string name="permdesc_systemAlertWindow" msgid="2393776099672266188">"Ši programa gali būti rodoma virš kitų programų arba kitų ekrano sričių. Tai gali trukdyti įprastai naudoti programas ir pakeisti kitų programų rodymo būdą."</string> <string name="permlab_persistentActivity" msgid="8841113627955563938">"nustatyti, kad programa būtų visada vykdoma"</string> <string name="permdesc_persistentActivity" product="tablet" msgid="8525189272329086137">"Leidžiama programai savo dalis įrašyti į atmintį. Dėl to gali būti apribota kitomis programomis pasiekiama atmintis ir sulėtėti planšetinio kompiuterio veikimas."</string> <string name="permdesc_persistentActivity" product="tv" msgid="5086862529499103587">"Programai leidžiama nustatyti, kad tam tikros jos dalys nuolat išliktų atmintyje. Dėl to gali sumažėti kitoms programoms pasiekiamos atminties ir sulėtėti TV."</string> @@ -359,51 +349,37 @@ <string name="permdesc_writeContacts" product="tv" msgid="5438230957000018959">"Programai leidžiama keisti duomenis apie TV saugomus kontaktus, įskaitant tai, kaip dažnai skambinote, siuntėte el. laiškus arba kitais būdais bendravote su tam tikrais kontaktais. Šis leidimas programoms suteikia teisę ištrinti kontaktinius duomenis."</string> <string name="permdesc_writeContacts" product="default" msgid="589869224625163558">"Leidžiama programai keisti duomenis apie telefone saugomus kontaktus, įskaitant dažnį, kuriuo konkretiems asmenims skambinote, siuntėte el. laiškus ar bendravote kitais būdais. Šis leidimas suteikia teisę programoms ištrinti kontaktinius duomenis."</string> <string name="permlab_readCallLog" msgid="3478133184624102739">"skaityti skambučių žurnalą"</string> - <!-- no translation found for permdesc_readCallLog (3204122446463552146) --> - <skip /> + <string name="permdesc_readCallLog" msgid="3204122446463552146">"Ši programa gali nuskaityti skambučių istoriją."</string> <string name="permlab_writeCallLog" msgid="8552045664743499354">"rašyti skambučių žurnalą"</string> <string name="permdesc_writeCallLog" product="tablet" msgid="6661806062274119245">"Programai leidžiama skaityti planšetinio kompiuterio skambučių žurnalą, įskaitant duomenis apie gaunamuosius ir siunčiamuosius skambučius. Kenkėjiškos programos tai gali naudoti, kad ištrintų ar keistų jūsų skambučių žurnalą."</string> <string name="permdesc_writeCallLog" product="tv" msgid="4225034892248398019">"Programai leidžiama keisti TV skambučių žurnalą, įskaitant duomenis apie gaunamuosius ir siunčiamuosius skambučius. Taip kenkėjiškos programos gali ištrinti arba pakeisti skambučių žurnalą."</string> <string name="permdesc_writeCallLog" product="default" msgid="683941736352787842">"Programai leidžiama skaityti telefono skambučių žurnalą, įskaitant duomenis apie gaunamuosius ir siunčiamuosius skambučius. Kenkėjiškos programos tai gali naudoti, kad ištrintų ar keistų jūsų skambučių žurnalą."</string> <string name="permlab_bodySensors" msgid="4683341291818520277">"pas. k. jut. (pvz., pul. dažn. st. įr.)"</string> <string name="permdesc_bodySensors" product="default" msgid="4380015021754180431">"Programai leidžiama pasiekti duomenis, gautus iš jutiklių, stebinčių fizinę būseną, pvz., širdies ritmą."</string> - <!-- no translation found for permlab_readCalendar (6716116972752441641) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (4993979255403945892) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (8837931557573064315) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (4373978642145196715) --> - <skip /> + <string name="permlab_readCalendar" msgid="6716116972752441641">"Skaityti kalendoriaus įvykius arba išsamią informaciją"</string> + <string name="permdesc_readCalendar" product="tablet" msgid="4993979255403945892">"Ši programa gali nuskaityti visus planšetiniame kompiuteryje saugomus kalendoriaus įvykius ir bendrinti arba išsaugoti kalendoriaus duomenis."</string> + <string name="permdesc_readCalendar" product="tv" msgid="8837931557573064315">"Ši programa gali nuskaityti visus TV saugomus kalendoriaus įvykius ir bendrinti arba išsaugoti kalendoriaus duomenis."</string> + <string name="permdesc_readCalendar" product="default" msgid="4373978642145196715">"Ši programa gali nuskaityti visus telefone saugomus kalendoriaus įvykius ir bendrinti arba išsaugoti kalendoriaus duomenis."</string> <string name="permlab_writeCalendar" msgid="8438874755193825647">"prideda arba keičia kalendoriaus įvykius ir siunčia el. laiškus svečiams be savininko žinios"</string> - <!-- no translation found for permdesc_writeCalendar (1675270619903625982) --> - <skip /> - <!-- no translation found for permdesc_writeCalendar (9017809326268135866) --> - <skip /> - <!-- no translation found for permdesc_writeCalendar (7592791790516943173) --> - <skip /> + <string name="permdesc_writeCalendar" product="tablet" msgid="1675270619903625982">"Ši programa gali pridėti, pašalinti arba pakeisti planšetiniame kompiuteryje esančius kalendoriaus įvykius. Ši programa gali siųsti pranešimus, kurie gali atrodyti atsiųsti kalendoriaus savininkų, arba pakeisti įvykius nepranešusi jų savininkams."</string> + <string name="permdesc_writeCalendar" product="tv" msgid="9017809326268135866">"Ši programa gali pridėti, pašalinti arba pakeisti TV esančius kalendoriaus įvykius. Ši programa gali siųsti pranešimus, kurie atrodys atsiųsti kalendoriaus savininkų, arba pakeisti įvykius nepranešusi jų savininkams."</string> + <string name="permdesc_writeCalendar" product="default" msgid="7592791790516943173">"Ši programa gali pridėti, pašalinti arba pakeisti telefone esančius kalendoriaus įvykius. Ši programa gali siųsti pranešimus, kurie atrodys atsiųsti kalendoriaus savininkų, arba pakeisti įvykius nepranešusi jų savininkams."</string> <string name="permlab_accessLocationExtraCommands" msgid="2836308076720553837">"pasiekti papildomas vietos teikimo įrankio komandas"</string> <string name="permdesc_accessLocationExtraCommands" msgid="6078307221056649927">"Programai leidžiama pasiekti papildomas vietovės nustatymo paslaugų teikėjų komandas. Dėl to programa gali trukdyti veikti GPS ar kitiems vietovės nustatymo šaltiniams."</string> <string name="permlab_accessFineLocation" msgid="251034415460950944">"pasiekti tikslią vietą (nustatytą atsižvelgiant į GPS ir tinklą)"</string> - <!-- no translation found for permdesc_accessFineLocation (5821994817969957884) --> - <skip /> + <string name="permdesc_accessFineLocation" msgid="5821994817969957884">"Ši programa gali gauti jūsų vietos informaciją naudodamasi tinklo šaltinių, pvz., mobiliojo ryšio bokštų ir „Wi-Fi“ tinklų, duomenimis. Šios vietovės paslaugos turi būti įjungtos ir pasiekiamos telefone, kad programa galėtų jas naudoti. Tai gali padidinti akumuliatoriaus energijos naudojimą."</string> <string name="permlab_accessCoarseLocation" msgid="7715277613928539434">"pasiekti apytikslę vietą (nustatytą atsižvelgiant į tinklą)"</string> - <!-- no translation found for permdesc_accessCoarseLocation (3373266766487862426) --> - <skip /> - <!-- no translation found for permdesc_accessCoarseLocation (1884022719818788511) --> - <skip /> - <!-- no translation found for permdesc_accessCoarseLocation (7788009094906196995) --> - <skip /> + <string name="permdesc_accessCoarseLocation" product="tablet" msgid="3373266766487862426">"Ši programa gali gauti jūsų vietos informaciją naudodamasi tinklo šaltinių, pvz., mobiliojo ryšio bokštų ir „Wi-Fi“ tinklų, duomenimis. Šios vietovės paslaugos turi būti įjungtos ir pasiekiamos planšetiniame kompiuteryje, kad programa galėtų jas naudoti."</string> + <string name="permdesc_accessCoarseLocation" product="tv" msgid="1884022719818788511">"Ši programa gali gauti jūsų vietos informaciją naudodamasi tinklo šaltinių, pvz., mobiliojo ryšio bokštų ir „Wi-Fi“ tinklų, duomenimis. Šios vietovės paslaugos turi būti įjungtos ir pasiekiamos TV, kad programa galėtų jas naudoti."</string> + <string name="permdesc_accessCoarseLocation" product="default" msgid="7788009094906196995">"Ši programa gali gauti jūsų vietos informaciją naudodamasi tinklo šaltinių, pvz., mobiliojo ryšio bokštų ir „Wi-Fi“ tinklų, duomenimis. Šios vietovės paslaugos turi būti įjungtos ir pasiekiamos telefone, kad programa galėtų jas naudoti."</string> <string name="permlab_modifyAudioSettings" msgid="6095859937069146086">"keisti garso nustatymus"</string> <string name="permdesc_modifyAudioSettings" msgid="3522565366806248517">"Leidžiama programai keisti visuotinius garso nustatymus, pvz., garsumą ir tai, kuris garsiakalbis naudojamas išvesčiai."</string> <string name="permlab_recordAudio" msgid="3876049771427466323">"įrašyti garsą"</string> - <!-- no translation found for permdesc_recordAudio (4245930455135321433) --> - <skip /> + <string name="permdesc_recordAudio" msgid="4245930455135321433">"Ši programa gali bet kada įrašyti garsą naudodama mikrofoną."</string> <string name="permlab_sim_communication" msgid="2935852302216852065">"siųsti komandas į SIM kortelę"</string> <string name="permdesc_sim_communication" msgid="5725159654279639498">"Programai leidžiama siųsti komandas į SIM kortelę. Tai labai pavojinga."</string> <string name="permlab_camera" msgid="3616391919559751192">"fotografuoti ir filmuoti"</string> - <!-- no translation found for permdesc_camera (5392231870049240670) --> - <skip /> + <string name="permdesc_camera" msgid="5392231870049240670">"Ši programa gali bet kada fotografuoti ir įrašyti vaizdo įrašų naudodama fotoaparatą."</string> <string name="permlab_vibrate" msgid="7696427026057705834">"valdyti vibraciją"</string> <string name="permdesc_vibrate" msgid="6284989245902300945">"Leidžiama programai valdyti vibravimą."</string> <string name="permlab_callPhone" msgid="3925836347681847954">"skambinti tiesiogiai telefono numeriais"</string> diff --git a/core/res/res/values-lv/strings.xml b/core/res/res/values-lv/strings.xml index 0ecc8c0d6a2c..df2c194d0b38 100644 --- a/core/res/res/values-lv/strings.xml +++ b/core/res/res/values-lv/strings.xml @@ -46,8 +46,7 @@ <string name="defaultMsisdnAlphaTag" msgid="2850889754919584674">"MSISDN1"</string> <string name="mmiError" msgid="5154499457739052907">"Savienojuma problēma vai nederīgs MMI kods."</string> <string name="mmiFdnError" msgid="5224398216385316471">"Darbība ir atļauta tikai fiksēto numuru sastādīšanai."</string> - <!-- no translation found for mmiErrorWhileRoaming (762488890299284230) --> - <skip /> + <string name="mmiErrorWhileRoaming" msgid="762488890299284230">"Nevar mainīt zvanu pāradresēšanas iestatījumus tālrunī, kamēr izmantojat viesabonēšanu."</string> <string name="serviceEnabled" msgid="8147278346414714315">"Pakalpojums tika iespējots."</string> <string name="serviceEnabledFor" msgid="6856228140453471041">"Pakalpojums tika iespējots šādai pakalpojumu klasei:"</string> <string name="serviceDisabled" msgid="1937553226592516411">"Pakalpojums ir atspējots."</string> @@ -99,10 +98,8 @@ <string name="RestrictedOnVoiceData" msgid="996636487106171320">"Balss/datu pakalpojumi ir bloķēti."</string> <string name="RestrictedOnVoiceSms" msgid="1888588152792023873">"Balss/īsziņu pakalpojumi ir bloķēti."</string> <string name="RestrictedOnAll" msgid="5643028264466092821">"Visi balss/datu/īsziņu pakalpojumi ir bloķēti."</string> - <!-- no translation found for NetworkPreferenceSwitchTitle (4008877505368566980) --> - <skip /> - <!-- no translation found for NetworkPreferenceSwitchSummary (7335915397439759249) --> - <skip /> + <string name="NetworkPreferenceSwitchTitle" msgid="4008877505368566980">"Nevar sasniegt tīklu"</string> + <string name="NetworkPreferenceSwitchSummary" msgid="7335915397439759249">"Lai uzlabotu uztveršanu, mainiet atlasīto veidu sadaļā Iestatījumi > Mobilie tīkli gt; Ieteicamais tīkla veids."</string> <string name="peerTtyModeFull" msgid="6165351790010341421">"Vienādranga ierīce pieprasīja teksta tālruņa režīmu FULL"</string> <string name="peerTtyModeHco" msgid="5728602160669216784">"Vienādranga ierīce pieprasīja teksta tālruņa režīmu HCO"</string> <string name="peerTtyModeVco" msgid="1742404978686538049">"Vienādranga ierīce pieprasīja teksta tālruņa režīmu VCO"</string> @@ -187,10 +184,8 @@ <string name="work_profile_deleted_description" msgid="6305147513054341102">"Darba profils tika dzēsts, jo trūkst administratora lietotnes."</string> <string name="work_profile_deleted_details" msgid="226615743462361248">"Trūkst darba profila administratora lietotnes, vai šī lietotne ir bojāta. Šī iemesla dēļ jūsu darba profils un saistītie dati tika dzēsti. Lai saņemtu palīdzību, sazinieties ar administratoru."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="6019770344820507579">"Jūsu darba profils šai ierīcē vairs nav pieejams."</string> - <!-- no translation found for network_logging_notification_title (1805392571290161924) --> - <skip /> - <!-- no translation found for network_logging_notification_text (4448072433371155729) --> - <skip /> + <string name="network_logging_notification_title" msgid="1805392571290161924">"Tīkla datplūsma tiek pārraudzīta"</string> + <string name="network_logging_notification_text" msgid="4448072433371155729">"Pieskarieties, lai iegūtu detalizētu informāciju"</string> <string name="factory_reset_warning" msgid="5423253125642394387">"Jūsu ierīces dati tiks dzēsti"</string> <string name="factory_reset_message" msgid="4905025204141900666">"Administratora lietotnē trūkst komponentu, vai šī lietotne ir bojāta. Lietotni nevar izmantot. Ierīces dati tūlīt tiks dzēsti. Lai saņemtu palīdzību, sazinieties ar administratoru."</string> <string name="me" msgid="6545696007631404292">"Man"</string> @@ -309,12 +304,9 @@ <string name="permlab_sendSms" msgid="7544599214260982981">"sūtīt un skatīt īsziņas"</string> <string name="permdesc_sendSms" msgid="7094729298204937667">"Ļauj lietotnei sūtīt īsziņas. Tas var radīt neparedzētas izmaksas. Ļaunprātīgas lietotnes var radīt jums izmaksas, sūtot ziņojumus bez jūsu apstiprinājuma."</string> <string name="permlab_readSms" msgid="8745086572213270480">"lasīt ziņojumus (SMS vai MMS)"</string> - <!-- no translation found for permdesc_readSms (4741697454888074891) --> - <skip /> - <!-- no translation found for permdesc_readSms (5796670395641116592) --> - <skip /> - <!-- no translation found for permdesc_readSms (6826832415656437652) --> - <skip /> + <string name="permdesc_readSms" product="tablet" msgid="4741697454888074891">"Šī lietotne var lasīt visas īsziņas, kas saglabātas planšetdatorā."</string> + <string name="permdesc_readSms" product="tv" msgid="5796670395641116592">"Šī lietotne var lasīt visas īsziņas, kas saglabātas televizorā."</string> + <string name="permdesc_readSms" product="default" msgid="6826832415656437652">"Šī lietotne var lasīt visas īsziņas, kas saglabātas tālrunī."</string> <string name="permlab_receiveWapPush" msgid="5991398711936590410">"saņemt īsziņas (WAP)"</string> <string name="permdesc_receiveWapPush" msgid="748232190220583385">"Ļauj lietotnei saņemt un apstrādāt WAP ziņojumus. Šī atļauja ietver iespēju pārraudzīt vai dzēst jums nosūtītos ziņojumus, neparādot tos jums."</string> <string name="permlab_getTasks" msgid="6466095396623933906">"izgūt izmantotās lietotnes"</string> @@ -327,10 +319,8 @@ <string name="permdesc_enableCarMode" msgid="4853187425751419467">"Ļauj lietotnei iespējot automašīnas režīmu."</string> <string name="permlab_killBackgroundProcesses" msgid="3914026687420177202">"aizvērt citas lietotnes"</string> <string name="permdesc_killBackgroundProcesses" msgid="4593353235959733119">"Ļauj lietotnei pabeigt citu lietotņu fonā darbinātos procesus. Rezultātā var tikt apturēta citu lietotņu darbība."</string> - <!-- no translation found for permlab_systemAlertWindow (7238805243128138690) --> - <skip /> - <!-- no translation found for permdesc_systemAlertWindow (2393776099672266188) --> - <skip /> + <string name="permlab_systemAlertWindow" msgid="7238805243128138690">"Šo lietotni var rādīt virs citām lietotnēm"</string> + <string name="permdesc_systemAlertWindow" msgid="2393776099672266188">"Šo lietotni var rādīt virs citām lietotnēm vai ekrāna daļām. Tādējādi var būt traucēta citu lietotņu izmantošana un var mainīties citu lietotņu izskats."</string> <string name="permlab_persistentActivity" msgid="8841113627955563938">"likt lietotnei vienmēr darboties"</string> <string name="permdesc_persistentActivity" product="tablet" msgid="8525189272329086137">"Ļauj lietotnei nodrošināt atsevišķu tās daļu nepārtrauktu atrašanos atmiņā. Tas var ierobežot pieejamo atmiņas daudzumu citām lietotnēm, tādējādi palēninot planšetdatora darbību."</string> <string name="permdesc_persistentActivity" product="tv" msgid="5086862529499103587">"Ļauj lietotnei nodrošināt atsevišķu tās daļu nepārtrauktu atrašanos atmiņā. Tas var ierobežot pieejamo atmiņas daudzumu citām lietotnēm, tādējādi palēninot televizora darbību."</string> @@ -356,51 +346,37 @@ <string name="permdesc_writeContacts" product="tv" msgid="5438230957000018959">"Ļauj lietotnei mainīt datus par televizorā saglabātajām kontaktpersonām, tostarp par zvanu un e-pasta ziņojumu apjomu vai saziņu citos veidos, kas veikta ar konkrētām kontaktpersonām. Ar šo atļauju lietotne var dzēst kontaktpersonu datus."</string> <string name="permdesc_writeContacts" product="default" msgid="589869224625163558">"Ļauj lietotnei mainīt datus par tālrunī saglabātajām kontaktpersonām, tostarp par zvanu un e-pasta ziņojumu apjomu vai saziņu citos veidos, kas veikta ar konkrētām kontaktpersonām. Ar šo atļauju lietotne var dzēst kontaktpersonu datus."</string> <string name="permlab_readCallLog" msgid="3478133184624102739">"nolasīt zvanu žurnālu"</string> - <!-- no translation found for permdesc_readCallLog (3204122446463552146) --> - <skip /> + <string name="permdesc_readCallLog" msgid="3204122446463552146">"Šī lietotne var lasīt jūsu zvanu vēsturi."</string> <string name="permlab_writeCallLog" msgid="8552045664743499354">"rakstīt zvanu žurnālā"</string> <string name="permdesc_writeCallLog" product="tablet" msgid="6661806062274119245">"Ļauj lietotnei pārveidot planšetdatora zvanu žurnālu, tostarp ienākošo un izejošo zvanu datus. Ļaunprātīgas lietotnes var to izmantot, lai dzēstu vai pārveidotu savu zvanu žurnālu."</string> <string name="permdesc_writeCallLog" product="tv" msgid="4225034892248398019">"Ļauj lietotnei pārveidot televizora zvanu žurnālu, tostarp ienākošo un izejošo zvanu datus. Ļaunprātīgas lietotnes var to izmantot, lai dzēstu vai pārveidotu zvanu žurnālu."</string> <string name="permdesc_writeCallLog" product="default" msgid="683941736352787842">"Ļauj lietotnei pārveidot tālruņa zvanu žurnālu, tostarp ienākošo un izejošo zvanu datus. Ļaunprātīgas lietotnes var to izmantot, lai dzēstu vai pārveidotu savu zvanu žurnālu."</string> <string name="permlab_bodySensors" msgid="4683341291818520277">"Piekļūt ķermeņa sensoriem (piemēram, sirdsdarbības monitoriem)"</string> <string name="permdesc_bodySensors" product="default" msgid="4380015021754180431">"Ļauj lietotnei piekļūt to sensoru datiem, kuri pārrauga jūsu fizisko stāvokli (piemēram, sirdsdarbības ātrumu)."</string> - <!-- no translation found for permlab_readCalendar (6716116972752441641) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (4993979255403945892) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (8837931557573064315) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (4373978642145196715) --> - <skip /> + <string name="permlab_readCalendar" msgid="6716116972752441641">"Lasīt kalendāra pasākumus un informāciju"</string> + <string name="permdesc_readCalendar" product="tablet" msgid="4993979255403945892">"Šī lietotne var lasīt visus kalendāra pasākumus, kas saglabāti planšetdatorā, un kopīgot vai saglabāt jūsu kalendāra datus."</string> + <string name="permdesc_readCalendar" product="tv" msgid="8837931557573064315">"Šī lietotne var lasīt visus kalendāra pasākumus, kas saglabāti televizorā, un kopīgot vai saglabāt jūsu kalendāra datus."</string> + <string name="permdesc_readCalendar" product="default" msgid="4373978642145196715">"Šī lietotne var lasīt visus kalendāra pasākumus, kas saglabāti tālrunī, un kopīgot vai saglabāt jūsu kalendāra datus."</string> <string name="permlab_writeCalendar" msgid="8438874755193825647">"pievienot vai pārveidot kalendāra pasākumus un sūtīt e-pasta ziņojumus viesiem bez īpašnieku ziņas"</string> - <!-- no translation found for permdesc_writeCalendar (1675270619903625982) --> - <skip /> - <!-- no translation found for permdesc_writeCalendar (9017809326268135866) --> - <skip /> - <!-- no translation found for permdesc_writeCalendar (7592791790516943173) --> - <skip /> + <string name="permdesc_writeCalendar" product="tablet" msgid="1675270619903625982">"Šī lietotne var pievienot, noņemt vai mainīt kalendāra pasākumus jūsu planšetdatorā. Šī lietotne var sūtīt ziņojumus, ko šķietami sūtījuši kalendāru īpašnieki, vai mainīt pasākumus, neinformējot to īpašniekus."</string> + <string name="permdesc_writeCalendar" product="tv" msgid="9017809326268135866">"Šī lietotne var pievienot, noņemt vai mainīt kalendāra pasākumus jūsu televizorā. Šī lietotne var sūtīt ziņojumus, ko šķietami sūtījuši kalendāru īpašnieki, vai mainīt pasākumus, neinformējot to īpašniekus."</string> + <string name="permdesc_writeCalendar" product="default" msgid="7592791790516943173">"Šī lietotne var pievienot, noņemt vai mainīt kalendāra pasākumus jūsu tālrunī. Šī lietotne var sūtīt ziņojumus, ko šķietami sūtījuši kalendāru īpašnieki, vai mainīt pasākumus, neinformējot to īpašniekus."</string> <string name="permlab_accessLocationExtraCommands" msgid="2836308076720553837">"piekļūt atrašanās vietas nodrošinātāja papildu komandām"</string> <string name="permdesc_accessLocationExtraCommands" msgid="6078307221056649927">"Ļauj lietotnei piekļūt papildu atrašanās vietas noteikšanas nodrošinātāju komandām. Tas var ļaut lietotnei traucēt GPS vai citu atrašanās vietas noteikšanas avotu darbību."</string> <string name="permlab_accessFineLocation" msgid="251034415460950944">"Piekļūt precīzai atrašanās vietai (izmantojot GPS un tīklu)"</string> - <!-- no translation found for permdesc_accessFineLocation (5821994817969957884) --> - <skip /> + <string name="permdesc_accessFineLocation" msgid="5821994817969957884">"Šī lietotne var iegūt jūsu atrašanās vietu, pamatojoties uz GPS vai tīkla atrašanās vietas avotiem, piemēram, mobilo sakaru torņiem un Wi-Fi tīkliem. Šiem atrašanās vietu pakalpojumiem ir jābūt ieslēgtiem un pieejamiem jūsu tālrunī, lai lietotne tos varētu izmantot. Tādējādi var palielināties akumulatora patēriņš."</string> <string name="permlab_accessCoarseLocation" msgid="7715277613928539434">"Piekļūt aptuvenai atrašanās vietai (izmantojot tīklu)"</string> - <!-- no translation found for permdesc_accessCoarseLocation (3373266766487862426) --> - <skip /> - <!-- no translation found for permdesc_accessCoarseLocation (1884022719818788511) --> - <skip /> - <!-- no translation found for permdesc_accessCoarseLocation (7788009094906196995) --> - <skip /> + <string name="permdesc_accessCoarseLocation" product="tablet" msgid="3373266766487862426">"Šī lietotne var iegūt jūsu atrašanās vietu, pamatojoties uz tīkla avotiem, piemēram, mobilo sakaru torņiem un Wi-Fi tīkliem. Šiem atrašanās vietu pakalpojumiem ir jābūt ieslēgtiem un pieejamiem jūsu planšetdatorā, lai lietotne tos varētu izmantot."</string> + <string name="permdesc_accessCoarseLocation" product="tv" msgid="1884022719818788511">"Šī lietotne var iegūt jūsu atrašanās vietu, pamatojoties uz tīkla avotiem, piemēram, mobilo sakaru torņiem un Wi-Fi tīkliem. Šiem atrašanās vietu pakalpojumiem ir jābūt ieslēgtiem un pieejamiem jūsu televizorā, lai lietotne tos varētu izmantot."</string> + <string name="permdesc_accessCoarseLocation" product="default" msgid="7788009094906196995">"Šī lietotne var iegūt jūsu atrašanās vietu, pamatojoties uz tīkla avotiem, piemēram, mobilo sakaru torņiem un Wi-Fi tīkliem. Šiem atrašanās vietu pakalpojumiem ir jābūt ieslēgtiem un pieejamiem jūsu tālrunī, lai lietotne tos varētu izmantot."</string> <string name="permlab_modifyAudioSettings" msgid="6095859937069146086">"mainīt audio iestatījumus"</string> <string name="permdesc_modifyAudioSettings" msgid="3522565366806248517">"Ļauj lietotnei mainīt globālos audio iestatījumus, piemēram, skaļumu un izejai izmantoto skaļruni."</string> <string name="permlab_recordAudio" msgid="3876049771427466323">"ierakstīt audio"</string> - <!-- no translation found for permdesc_recordAudio (4245930455135321433) --> - <skip /> + <string name="permdesc_recordAudio" msgid="4245930455135321433">"Šī lietotne jebkurā brīdī var ierakstīt audio, izmantojot mikrofonu."</string> <string name="permlab_sim_communication" msgid="2935852302216852065">"Sūtīt komandas SIM kartei"</string> <string name="permdesc_sim_communication" msgid="5725159654279639498">"Ļauj lietotnei sūtīt komandas uz SIM karti. Tas ir ļoti bīstami!"</string> <string name="permlab_camera" msgid="3616391919559751192">"uzņemt attēlus un videoklipus"</string> - <!-- no translation found for permdesc_camera (5392231870049240670) --> - <skip /> + <string name="permdesc_camera" msgid="5392231870049240670">"Šī lietotne jebkurā brīdī var uzņemt attēlus un ierakstīt videoklipus, izmantojot kameru."</string> <string name="permlab_vibrate" msgid="7696427026057705834">"kontrolēt vibrosignālu"</string> <string name="permdesc_vibrate" msgid="6284989245902300945">"Ļauj lietotnei kontrolēt vibrosignālu."</string> <string name="permlab_callPhone" msgid="3925836347681847954">"tieši zvanīt uz tālruņa numuriem"</string> diff --git a/core/res/res/values-mk-rMK/strings.xml b/core/res/res/values-mk-rMK/strings.xml index 6a3d4cbcb84c..53b7ab72481b 100644 --- a/core/res/res/values-mk-rMK/strings.xml +++ b/core/res/res/values-mk-rMK/strings.xml @@ -182,10 +182,8 @@ <string name="work_profile_deleted_description" msgid="6305147513054341102">"Работниот профил е избришан заради отсуството на апликација на администратор."</string> <string name="work_profile_deleted_details" msgid="226615743462361248">"Апликацијата на администраторот за работниот профил недостасува или е оштетена. Како резултат на тоа, работниот профил и поврзаните податоци ќе се избришат. Контактирајте со администраторот за помош."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="6019770344820507579">"Работниот профил веќе не е достапен на уредов."</string> - <!-- no translation found for network_logging_notification_title (1805392571290161924) --> - <skip /> - <!-- no translation found for network_logging_notification_text (4448072433371155729) --> - <skip /> + <string name="network_logging_notification_title" msgid="1805392571290161924">"Се следи сообраќајот на мрежата"</string> + <string name="network_logging_notification_text" msgid="4448072433371155729">"Допрете за повеќе детали"</string> <string name="factory_reset_warning" msgid="5423253125642394387">"Уредот ќе се избрише"</string> <string name="factory_reset_message" msgid="4905025204141900666">"На апликацијата на администраторот ѝ недостасуваат компоненти или е оштетена, па не може да се користи. Уредот ќе се избрише сега. Контактирајте со администраторот за помош."</string> <string name="me" msgid="6545696007631404292">"Јас"</string> diff --git a/core/res/res/values-ml-rIN/strings.xml b/core/res/res/values-ml-rIN/strings.xml index 74d14f17752e..e29c01bae360 100644 --- a/core/res/res/values-ml-rIN/strings.xml +++ b/core/res/res/values-ml-rIN/strings.xml @@ -46,8 +46,7 @@ <string name="defaultMsisdnAlphaTag" msgid="2850889754919584674">"MSISDN1"</string> <string name="mmiError" msgid="5154499457739052907">"കണക്ഷൻ പ്രശ്നം അല്ലെങ്കിൽ MMI കോഡ് അസാധുവാണ്."</string> <string name="mmiFdnError" msgid="5224398216385316471">"നിശ്ചയിച്ചുറപ്പിച്ച ഡയൽ ചെയ്യൽ നമ്പറുകൾക്ക് മാത്രമായി പ്രവർത്തനം പരിമിതപ്പെടുത്തിയിരിക്കുന്നു."</string> - <!-- no translation found for mmiErrorWhileRoaming (762488890299284230) --> - <skip /> + <string name="mmiErrorWhileRoaming" msgid="762488890299284230">"റോമിംഗിൽ ആയിരിക്കുമ്പോൾ നിങ്ങളുടെ ഫോണിൽ നിന്ന് കോൾ കൈമാറൽ ക്രമീകരണം മാറ്റാൻ കഴിയില്ല."</string> <string name="serviceEnabled" msgid="8147278346414714315">"സേവനം പ്രവർത്തനക്ഷമമാക്കി."</string> <string name="serviceEnabledFor" msgid="6856228140453471041">"സേവനം ഇവയ്ക്കായി പ്രവർത്തനക്ഷമമാക്കി:"</string> <string name="serviceDisabled" msgid="1937553226592516411">"സേവനം പ്രവർത്തനരഹിതമാക്കി."</string> @@ -98,10 +97,8 @@ <string name="RestrictedOnVoiceData" msgid="996636487106171320">"വോയ്സ്/ഡാറ്റ സേവനങ്ങൾ തടഞ്ഞു."</string> <string name="RestrictedOnVoiceSms" msgid="1888588152792023873">"വോയ്സ്/SMS സേവനങ്ങൾ തടഞ്ഞു."</string> <string name="RestrictedOnAll" msgid="5643028264466092821">"എല്ലാ വോയ്സ്/ഡാറ്റ/SMS സേവനങ്ങളും തടഞ്ഞു."</string> - <!-- no translation found for NetworkPreferenceSwitchTitle (4008877505368566980) --> - <skip /> - <!-- no translation found for NetworkPreferenceSwitchSummary (7335915397439759249) --> - <skip /> + <string name="NetworkPreferenceSwitchTitle" msgid="4008877505368566980">"നെറ്റ്വർക്കിലേക്ക് കണക്റ്റുചെയ്യാനാവുന്നില്ല"</string> + <string name="NetworkPreferenceSwitchSummary" msgid="7335915397439759249">"സ്വീകരണം മെച്ചപ്പെടുത്തുന്നതിന് ക്രമീകരണം > സെല്ലുലാർ നെറ്റ്വർക്കുകൾ > തിരഞ്ഞെടുത്ത നെറ്റ്വർക്ക് തരം എന്നതിൽ തിരഞ്ഞെടുത്തിരിക്കുന്ന തരം മാറ്റിക്കൊണ്ട് ശ്രമിച്ചുനോക്കുക."</string> <string name="peerTtyModeFull" msgid="6165351790010341421">"പിയർ അഭ്യർത്ഥിച്ച TTY മോഡ് \'ഫുൾ\'"</string> <string name="peerTtyModeHco" msgid="5728602160669216784">"പിയർ അഭ്യർത്ഥിച്ച TTY മോഡ് HCO"</string> <string name="peerTtyModeVco" msgid="1742404978686538049">"പിയർ അഭ്യർത്ഥിച്ച TTY മോഡ് VCO"</string> @@ -185,10 +182,8 @@ <string name="work_profile_deleted_description" msgid="6305147513054341102">"അഡ്മിൻ അപ്ലിക്കേഷൻ നഷ്ടപ്പെട്ടതിനാൽ ഔദ്യോഗിക പ്രൊഫൈൽ ഇല്ലാതാക്കി."</string> <string name="work_profile_deleted_details" msgid="226615743462361248">"ഔദ്യോഗിക പ്രൊഫൈൽ അഡ്മിൻ അപ്ലിക്കേഷൻ നഷ്ടപ്പെട്ടതോ കേടായതോ ആണ്. അക്കാരണത്താൽ നിങ്ങളുടെ ഔദ്യോഗിക പ്രൊഫൈലും ബന്ധപ്പെട്ട വിവരവും ഇല്ലാതാക്കിയിരിക്കുന്നു. സഹായത്തിന് അഡ്മിനിസ്ട്രേറ്ററുമായി ബന്ധപ്പെടുക."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="6019770344820507579">"ഈ ഉപകരണത്തിൽ തുടർന്നങ്ങോട്ട് നിങ്ങളുടെ ഔദ്യോഗിക പ്രൊഫൈൽ ലഭ്യമല്ല."</string> - <!-- no translation found for network_logging_notification_title (1805392571290161924) --> - <skip /> - <!-- no translation found for network_logging_notification_text (4448072433371155729) --> - <skip /> + <string name="network_logging_notification_title" msgid="1805392571290161924">"നെറ്റ്വർക്ക് ട്രാഫിക്ക് നിരീക്ഷിക്കപ്പെടുന്നു"</string> + <string name="network_logging_notification_text" msgid="4448072433371155729">"കൂടുതൽ വിശദാംശങ്ങൾക്ക് ടാപ്പുചെയ്യുക"</string> <string name="factory_reset_warning" msgid="5423253125642394387">"നിങ്ങളുടെ ഉപകരണം മായ്ക്കും"</string> <string name="factory_reset_message" msgid="4905025204141900666">"അഡ്മിൻ അപ്ലിക്കേഷൻ, ഘടകഭാഗങ്ങൾ നഷ്ടപ്പെട്ടതോ കേടായതോ ആണെങ്കിൽ ഉപയോഗിക്കാനാവില്ല. നിങ്ങളുടെ ഉപകരണം ഇപ്പോൾ ഇല്ലാതാക്കും. സഹായത്തിന് നിങ്ങളുടെ അഡ്മിനിസ്ട്രേറ്ററെ ബന്ധപ്പെടുക."</string> <string name="me" msgid="6545696007631404292">"ഞാന്"</string> @@ -306,12 +301,9 @@ <string name="permlab_sendSms" msgid="7544599214260982981">"SMS സന്ദേശങ്ങൾ അയയ്ക്കുകയും കാണുകയും ചെയ്യുക"</string> <string name="permdesc_sendSms" msgid="7094729298204937667">"SMS സന്ദേശങ്ങൾ അയയ്ക്കാൻ അപ്ലിക്കേഷനെ അനുവദിക്കുന്നു. ഇത് അപ്രതീക്ഷിത നിരക്കുകൾക്കിടയാക്കാം. ക്ഷുദ്രകരമായ അപ്ലിക്കേഷനുകൾ നിങ്ങളുടെ സ്ഥിരീകരണമില്ലാതെ സന്ദേശങ്ങൾ അയയ്ക്കുന്നത് പണച്ചെലവിനിടയാക്കാം."</string> <string name="permlab_readSms" msgid="8745086572213270480">"നിങ്ങളുടെ വാചക സന്ദേശങ്ങൾ വായിക്കുക (SMS അല്ലെങ്കിൽ MMS)"</string> - <!-- no translation found for permdesc_readSms (4741697454888074891) --> - <skip /> - <!-- no translation found for permdesc_readSms (5796670395641116592) --> - <skip /> - <!-- no translation found for permdesc_readSms (6826832415656437652) --> - <skip /> + <string name="permdesc_readSms" product="tablet" msgid="4741697454888074891">"ഈ ആപ്പിന് നിങ്ങളുടെ ടാബ്ലെറ്റിൽ സംഭരിച്ചിരിക്കുന്ന എല്ലാ SMS (വാചക) സന്ദേശങ്ങളും വായിക്കാൻ കഴിയും."</string> + <string name="permdesc_readSms" product="tv" msgid="5796670395641116592">"ഈ ആപ്പിന് നിങ്ങളുടെ ടിവിയിൽ സംഭരിച്ചിരിക്കുന്ന എല്ലാ SMS (വാചക) സന്ദേശങ്ങളും വായിക്കാൻ കഴിയും."</string> + <string name="permdesc_readSms" product="default" msgid="6826832415656437652">"ഈ ആപ്പിന് നിങ്ങളുടെ ഫോണിൽ സംഭരിച്ചിരിക്കുന്ന എല്ലാ SMS (വാചക) സന്ദേശങ്ങളും വായിക്കാൻ കഴിയും."</string> <string name="permlab_receiveWapPush" msgid="5991398711936590410">"വാചക സന്ദേശം നേടുക (WAP)"</string> <string name="permdesc_receiveWapPush" msgid="748232190220583385">"WAP സന്ദേശങ്ങൾ നേടാനും പ്രോസസ്സുചെയ്യാനും അപ്ലിക്കേഷനെ അനുവദിക്കുന്നു. നിങ്ങൾക്ക് അയയ്ക്കുന്ന സന്ദേശങ്ങൾ നിങ്ങൾക്ക് ദൃശ്യമാക്കാതെ തന്നെ നിരീക്ഷിക്കാനോ ഇല്ലാതാക്കാനോ ഉള്ള കഴിവ് ഈ അനുമതികളിൽ ഉൾപ്പെടുന്നു."</string> <string name="permlab_getTasks" msgid="6466095396623933906">"പ്രവർത്തിക്കുന്ന അപ്ലിക്കേഷനുകൾ വീണ്ടെടുക്കുക"</string> @@ -324,10 +316,8 @@ <string name="permdesc_enableCarMode" msgid="4853187425751419467">"കാർ മോഡ് പ്രവർത്തനക്ഷമമാക്കുന്നതിന് അപ്ലിക്കേഷനെ അനുവദിക്കുന്നു."</string> <string name="permlab_killBackgroundProcesses" msgid="3914026687420177202">"മറ്റ് അപ്ലിക്കേഷനുകൾ അടയ്ക്കുക"</string> <string name="permdesc_killBackgroundProcesses" msgid="4593353235959733119">"മറ്റ് അപ്ലിക്കേഷനുകളുടെ പശ്ചാത്തല പ്രോസസ്സുകൾ അവസാനിപ്പിക്കാൻ അപ്ലിക്കേഷനെ അനുവദിക്കുന്നു. ഇത് മറ്റ് അപ്ലിക്കേഷനുകൾ പ്രവർത്തനം നിർത്താനിടയാക്കാം."</string> - <!-- no translation found for permlab_systemAlertWindow (7238805243128138690) --> - <skip /> - <!-- no translation found for permdesc_systemAlertWindow (2393776099672266188) --> - <skip /> + <string name="permlab_systemAlertWindow" msgid="7238805243128138690">"ഈ ആപ്പിന്, മറ്റ് ആപ്സിന്റെ മുകളിൽ ദൃശ്യമാകാൻ കഴിയും"</string> + <string name="permdesc_systemAlertWindow" msgid="2393776099672266188">"മറ്റ് ആപ്സിന് മുകളിലോ സ്ക്രീനിന്റെ മറ്റ് ഭാഗങ്ങളിലോ ദൃശ്യമാകാൻ ഈ ആപ്പിന് കഴിയും. സാധാരണ ആപ്പ് ഉപയോഗത്തെ ഇത് തടസ്സപ്പെടുത്താം, മറ്റ് ആപ്സ് ദൃശ്യമാകുന്ന രീതിയെയും ഇത് മാറ്റാം."</string> <string name="permlab_persistentActivity" msgid="8841113627955563938">"അപ്ലിക്കേഷൻ എപ്പോഴും പ്രവർത്തിക്കുന്നതാക്കുക"</string> <string name="permdesc_persistentActivity" product="tablet" msgid="8525189272329086137">"മെമ്മറിയിൽ അപ്ലിക്കേഷനുകളുടെ ഭാഗങ്ങൾ നിലനിർത്താൻ സ്വയം അനുവദിക്കുന്നു. ഇത് ടാബ്ലെറ്റിനെ മന്ദഗതിയിലാക്കുന്ന വിധത്തിൽ മറ്റ് അപ്ലിക്കേഷനുകൾക്ക് ലഭ്യമായ മെമ്മറി പരിമിതപ്പെടുത്താനിടയുണ്ട്."</string> <string name="permdesc_persistentActivity" product="tv" msgid="5086862529499103587">"മെമ്മറിയിൽ സ്ഥിരതയുള്ളതാക്കുന്നതിന് അപ്ലിക്കേഷൻ അനുവദിക്കുന്നു. ടിവിയെ സാവധാനത്തിലാക്കുന്ന മറ്റ് അപ്ലിക്കേഷനുകളിലേക്കുള്ള മെമ്മറി ലഭ്യതയെ ഇതിന് പരിമിതമാക്കാനാവും."</string> @@ -353,51 +343,37 @@ <string name="permdesc_writeContacts" product="tv" msgid="5438230957000018959">"നിശ്ചിത കോൺടാക്റ്റുകളെ മറ്റ് മാർഗങ്ങളിൽ നിങ്ങൾ എത്ര തവണ വിളിച്ചിട്ടുണ്ടെന്നതോ അവർക്ക് ഇമെയിൽ ചെയ്തിട്ടുണ്ടെന്നതോ ആശയവിനിമയം നടത്തിയിട്ടുണ്ടെന്നതോ ഉൾപ്പെടെ, നിങ്ങളുടെ ടിവിയിൽ സംഭരിച്ചിരിക്കുന്ന കോൺടാക്റ്റുകളെക്കുറിച്ചുള്ള വിവരം പരിഷ്ക്കരിക്കാൻ അപ്ലിക്കേഷനെ അനുവദിക്കുന്നു. ഈ അനുമതി കോൺടാക്റ്റ് വിവരം ഇല്ലാതാക്കാൻ അപ്ലിക്കേഷനുകളെ അനുവദിക്കുന്നു."</string> <string name="permdesc_writeContacts" product="default" msgid="589869224625163558">"നിശ്ചിത കോൺടാക്റ്റുകളെ മറ്റ് മാർഗങ്ങളിൽ നിങ്ങൾ എത്ര തവണ വിളിച്ചിട്ടുണ്ടെന്നതോ അവർക്ക് ഇമെയിൽ ചെയ്തിട്ടുണ്ടെന്നതോ ആശയവിനിമയം നടത്തിയിട്ടുണ്ടെന്നതോ ഉൾപ്പെടെ, നിങ്ങളുടെ ഫോണിൽ സംഭരിച്ചിരിക്കുന്ന നിങ്ങളുടെ കോൺടാക്റ്റുകളെക്കുറിച്ചുള്ള ഡാറ്റ പരിഷ്ക്കരിക്കാൻ അപ്ലിക്കേഷനെ അനുവദിക്കുന്നു. ഈ അനുമതി കോൺടാക്റ്റ് ഡാറ്റ ഇല്ലാതാക്കാൻ അപ്ലിക്കേഷനുകളെ അനുവദിക്കുന്നു."</string> <string name="permlab_readCallLog" msgid="3478133184624102739">"കോൾ ലോഗ് റീഡുചെയ്യുക"</string> - <!-- no translation found for permdesc_readCallLog (3204122446463552146) --> - <skip /> + <string name="permdesc_readCallLog" msgid="3204122446463552146">"ഈ ആപ്പിന് നിങ്ങളുടെ കോൾ ചരിത്രം വായിക്കാൻ കഴിയും."</string> <string name="permlab_writeCallLog" msgid="8552045664743499354">"കോൾ ലോഗ് റൈറ്റുചെയ്യുക"</string> <string name="permdesc_writeCallLog" product="tablet" msgid="6661806062274119245">"ഇൻകമിംഗ്, ഔട്ട്ഗോയിംഗ് കോളുകളെക്കുറിച്ചുള്ള ഡാറ്റയുൾപ്പെടുന്ന, നിങ്ങളുടെ ടാബ്ലെറ്റിന്റെ കോൾ ലോഗ് പരിഷ്ക്കരിക്കാൻ അപ്ലിക്കേഷനെ അനുവദിക്കുന്നു. ക്ഷുദ്രകരമായ അപ്ലിക്കേഷനുകൾ നിങ്ങളുടെ കോൾ ലോഗ് മായ്ക്കാനോ പരിഷ്ക്കരിക്കാനോ ഇത് ഉപയോഗിച്ചേക്കാം."</string> <string name="permdesc_writeCallLog" product="tv" msgid="4225034892248398019">"ഇൻകമിംഗ്, ഔട്ട്ഗോയിംഗ് കോളുകളെക്കുറിച്ചുള്ള വിവരമുൾപ്പെടുന്ന, നിങ്ങളുടെ ടിവിയുടെ കോൾ ലോഗ് പരിഷ്ക്കരിക്കാൻ അപ്ലിക്കേഷനെ അനുവദിക്കുന്നു. ദോഷകരമായ അപ്ലിക്കേഷനുകൾ നിങ്ങളുടെ കോൾ ലോഗ് മായ്ക്കാനോ പരിഷ്ക്കരിക്കാനോ ഇത് ഉപയോഗിച്ചേക്കാം."</string> <string name="permdesc_writeCallLog" product="default" msgid="683941736352787842">"ഇൻകമിംഗ്, ഔട്ട്ഗോയിംഗ് കോളുകളെക്കുറിച്ചുള്ള ഡാറ്റയുൾപ്പെടുന്ന, നിങ്ങളുടെ ഫോണിന്റെ കോൾ ലോഗ് പരിഷ്ക്കരിക്കാൻ അപ്ലിക്കേഷനെ അനുവദിക്കുന്നു. ക്ഷുദ്രകരമായ അപ്ലിക്കേഷനുകൾ നിങ്ങളുടെ കോൾ ലോഗ് മായ്ക്കാനോ പരിഷ്ക്കരിക്കാനോ ഇത് ഉപയോഗിച്ചേക്കാം."</string> <string name="permlab_bodySensors" msgid="4683341291818520277">"ശരീര സെൻസറുകൾ (ഹൃദയമിടിപ്പ് നിരക്ക് മോണിറ്ററുകൾ പോലെ) ആക്സസ് ചെയ്യുക"</string> <string name="permdesc_bodySensors" product="default" msgid="4380015021754180431">"നിങ്ങളുടെ ഹൃദയമിടിപ്പ് പോലുള്ള ശാരീരികാവസ്ഥ നിരീക്ഷിക്കാൻ സെൻസറുകളിൽ നിന്ന് വിവരം ആക്സസ്സുചെയ്യാൻ അപ്ലിക്കേഷനെ അനുവദിക്കുന്നു."</string> - <!-- no translation found for permlab_readCalendar (6716116972752441641) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (4993979255403945892) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (8837931557573064315) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (4373978642145196715) --> - <skip /> + <string name="permlab_readCalendar" msgid="6716116972752441641">"കലണ്ടർ ഇവന്റുകളും വിശദാംശങ്ങളും വായിക്കുക"</string> + <string name="permdesc_readCalendar" product="tablet" msgid="4993979255403945892">"ഈ ആപ്പിന് നിങ്ങളുടെ ടാബ്ലെറ്റിൽ സംഭരിച്ചിരിക്കുന്ന എല്ലാ കലണ്ടർ ഇവന്റുകളും വായിക്കാനും നിങ്ങളുടെ കലണ്ടർ വിവരങ്ങൾ പങ്കിടാനും അല്ലെങ്കിൽ സംരക്ഷിക്കാനും കഴിയും."</string> + <string name="permdesc_readCalendar" product="tv" msgid="8837931557573064315">"ഈ ആപ്പിന് നിങ്ങളുടെ ടിവിയിൽ സംഭരിച്ചിരിക്കുന്ന എല്ലാ കലണ്ടർ ഇവന്റുകളും വായിക്കാനും നിങ്ങളുടെ കലണ്ടർ വിവരങ്ങൾ പങ്കിടാനും അല്ലെങ്കിൽ സംരക്ഷിക്കാനും കഴിയും."</string> + <string name="permdesc_readCalendar" product="default" msgid="4373978642145196715">"ഈ ആപ്പിന് നിങ്ങളുടെ ഫോണിൽ സംഭരിച്ചിരിക്കുന്ന എല്ലാ കലണ്ടർ ഇവന്റുകളും വായിക്കാനും നിങ്ങളുടെ കലണ്ടർ വിവരങ്ങൾ പങ്കിടാനും അല്ലെങ്കിൽ സംരക്ഷിക്കാനും കഴിയും."</string> <string name="permlab_writeCalendar" msgid="8438874755193825647">"ഉടമകളുടെ അറിവില്ലാതെ കലണ്ടർ ഇവന്റുകൾ ചേർക്കുകയോ പരിഷ്ക്കരിക്കുകയോ ചെയ്ത് അതിഥികൾക്ക് ഇമെയിൽ അയയ്ക്കുക"</string> - <!-- no translation found for permdesc_writeCalendar (1675270619903625982) --> - <skip /> - <!-- no translation found for permdesc_writeCalendar (9017809326268135866) --> - <skip /> - <!-- no translation found for permdesc_writeCalendar (7592791790516943173) --> - <skip /> + <string name="permdesc_writeCalendar" product="tablet" msgid="1675270619903625982">"ഈ ആപ്പിന്, നിങ്ങളുടെ ടാബ്ലെറ്റിൽ കലണ്ടർ ഇവന്റുകൾ ചേർക്കാനോ നീക്കംചെയ്യാനോ മാറ്റാനോ കഴിയും. കലണ്ടർ ഉടമകളിൽ നിന്നാണ് വരുന്നതെന്ന് തോന്നിപ്പിക്കാവുന്ന സന്ദേശങ്ങൾ അയയ്ക്കാനോ ഉടമകളെ അറിയിക്കാതെ അവരുടെ ഇവന്റുകളെ മാറ്റാനോ ഈ ആപ്പിന് കഴിയും."</string> + <string name="permdesc_writeCalendar" product="tv" msgid="9017809326268135866">"ഈ ആപ്പിന്, നിങ്ങളുടെ ടിവിയിൽ കലണ്ടർ ഇവന്റുകൾ ചേർക്കാനോ നീക്കംചെയ്യാനോ മാറ്റാനോ കഴിയും. കലണ്ടർ ഉടമകളിൽ നിന്നാണ് വരുന്നതെന്ന് തോന്നിപ്പിക്കാവുന്ന സന്ദേശങ്ങൾ അയയ്ക്കാനോ ഉടമകളെ അറിയിക്കാതെ അവരുടെ ഇവന്റുകളെ മാറ്റാനോ ഈ ആപ്പിന് കഴിയും."</string> + <string name="permdesc_writeCalendar" product="default" msgid="7592791790516943173">"ഈ ആപ്പിന്, നിങ്ങളുടെ ഫോണിൽ കലണ്ടർ ഇവന്റുകൾ ചേർക്കാനോ നീക്കംചെയ്യാനോ മാറ്റാനോ കഴിയും. കലണ്ടർ ഉടമകളിൽ നിന്നാണ് വരുന്നതെന്ന് തോന്നിപ്പിക്കാവുന്ന സന്ദേശങ്ങൾ അയയ്ക്കാനോ ഉടമകളെ അറിയിക്കാതെ അവരുടെ ഇവന്റുകളെ മാറ്റാനോ ഈ ആപ്പിന് കഴിയും."</string> <string name="permlab_accessLocationExtraCommands" msgid="2836308076720553837">"ലൊക്കേഷൻ ദാതാവിന്റെ അധിക കമാൻഡുകൾ ആക്സസ്സുചെയ്യുക"</string> <string name="permdesc_accessLocationExtraCommands" msgid="6078307221056649927">"ലൊക്കേഷൻ ദാതാവിന്റെ അധിക കമാൻഡുകൾ ആക്സസ്സുചെയ്യാൻ അപ്ലിക്കേഷനെ അനുവദിക്കുന്നു. ഇത് GPS-ന്റെയോ മറ്റ് ലൊക്കേഷൻ ഉറവിടങ്ങളുടെയോ പ്രവർത്തനത്തിൽ ഇടപെടാൻ അപ്ലിക്കേഷനെ അനുവദിക്കാനിടയുണ്ട്."</string> <string name="permlab_accessFineLocation" msgid="251034415460950944">"കൃത്യമായ ലൊക്കേഷൻ (GPS - നെറ്റ്വർക്ക് അധിഷ്ഠിതം) ആക്സസ് ചെയ്യുക"</string> - <!-- no translation found for permdesc_accessFineLocation (5821994817969957884) --> - <skip /> + <string name="permdesc_accessFineLocation" msgid="5821994817969957884">"GPS-നെയോ സെൽ ടവറുകളും വൈഫൈ നെറ്റ്വർക്കുകളും പോലുള്ള നെറ്റ്വർക്ക് ലൊക്കേഷൻ ഉറവിടങ്ങളെയോ അടിസ്ഥാനമാക്കിക്കൊണ്ട് ഈ ആപ്പിന് നിങ്ങളുടെ ലൊക്കേഷൻ അനുമാനിക്കാൻ കഴിയും. നിങ്ങളുടെ ഫോണിൽ ഈ ലൊക്കേഷൻ സേവനങ്ങൾ ഓൺ ചെയ്തിട്ടുണ്ടെങ്കിൽ മാത്രമാണ് ആപ്പിന് അവ ഉപയോഗിക്കാൻ കഴിയുക. ഇത് ബാറ്ററി ഉപയോഗം വർദ്ധിപ്പിച്ചേക്കാം."</string> <string name="permlab_accessCoarseLocation" msgid="7715277613928539434">"ഏകദേശ ലൊക്കേഷൻ (നെറ്റ്വർക്ക് അധിഷ്ഠിതം) ആക്സസ് ചെയ്യുക"</string> - <!-- no translation found for permdesc_accessCoarseLocation (3373266766487862426) --> - <skip /> - <!-- no translation found for permdesc_accessCoarseLocation (1884022719818788511) --> - <skip /> - <!-- no translation found for permdesc_accessCoarseLocation (7788009094906196995) --> - <skip /> + <string name="permdesc_accessCoarseLocation" product="tablet" msgid="3373266766487862426">"സെൽ ടവറുകളും വൈഫൈ നെറ്റ്വർക്കുകളും പോലുള്ള നെറ്റ്വർക്ക് ഉറവിടങ്ങളെ അടിസ്ഥാനമാക്കിക്കൊണ്ട് ഈ ആപ്പിന് നിങ്ങളുടെ ലൊക്കേഷൻ അനുമാനിക്കാൻ കഴിയും. നിങ്ങളുടെ ടാബ്ലെറ്റിൽ ഈ ലൊക്കേഷൻ സേവനങ്ങൾ ഓൺ ചെയ്തിട്ടുണ്ടെങ്കിൽ മാത്രമാണ് ആപ്പിന് അവ ഉപയോഗിക്കാൻ കഴിയുക."</string> + <string name="permdesc_accessCoarseLocation" product="tv" msgid="1884022719818788511">"സെൽ ടവറുകളും വൈഫൈ നെറ്റ്വർക്കുകളും പോലുള്ള നെറ്റ്വർക്ക് ഉറവിടങ്ങളെ അടിസ്ഥാനമാക്കിക്കൊണ്ട് ഈ ആപ്പിന് നിങ്ങളുടെ ലൊക്കേഷൻ അനുമാനിക്കാൻ കഴിയും. നിങ്ങളുടെ ടിവിയിൽ ഈ ലൊക്കേഷൻ സേവനങ്ങൾ ഓൺ ചെയ്തിട്ടുണ്ടെങ്കിൽ മാത്രമാണ് ആപ്പിന് അവ ഉപയോഗിക്കാൻ കഴിയുക."</string> + <string name="permdesc_accessCoarseLocation" product="default" msgid="7788009094906196995">"സെൽ ടവറുകളും വൈഫൈ നെറ്റ്വർക്കുകളും പോലുള്ള നെറ്റ്വർക്ക് ഉറവിടങ്ങളെ അടിസ്ഥാനമാക്കിക്കൊണ്ട് ഈ ആപ്പിന് നിങ്ങളുടെ ലൊക്കേഷൻ അനുമാനിക്കാൻ കഴിയും. നിങ്ങളുടെ ഫോണിൽ ഈ ലൊക്കേഷൻ സേവനങ്ങൾ ഓൺ ചെയ്തിട്ടുണ്ടെങ്കിൽ മാത്രമാണ് ആപ്പിന് അവ ഉപയോഗിക്കാൻ കഴിയുക."</string> <string name="permlab_modifyAudioSettings" msgid="6095859937069146086">"നിങ്ങളുടെ ഓഡിയോ ക്രമീകരണങ്ങൾ മാറ്റുക"</string> <string name="permdesc_modifyAudioSettings" msgid="3522565366806248517">"വോളിയവും ഔട്ട്പുട്ടിനായി ഉപയോഗിച്ച സ്പീക്കറും പോലുള്ള ആഗോള ഓഡിയോ ക്രമീകരണങ്ങൾ പരിഷ്ക്കരിക്കാൻ അപ്ലിക്കേഷനെ അനുവദിക്കുന്നു."</string> <string name="permlab_recordAudio" msgid="3876049771427466323">"ഓഡിയോ റെക്കോർഡ് ചെയ്യുക"</string> - <!-- no translation found for permdesc_recordAudio (4245930455135321433) --> - <skip /> + <string name="permdesc_recordAudio" msgid="4245930455135321433">"ഈ ആപ്പിന് ഏത് സമയത്തും മൈക്രോഫോൺ ഉപയോഗിച്ചുകൊണ്ട് ഓഡിയോ റെക്കോർഡുചെയ്യാൻ കഴിയും."</string> <string name="permlab_sim_communication" msgid="2935852302216852065">"SIM-ലേക്ക് കമാൻഡുകൾ അയയ്ക്കുക"</string> <string name="permdesc_sim_communication" msgid="5725159654279639498">"സിമ്മിലേക്ക് കമാൻഡുകൾ അയയ്ക്കാൻ അപ്ലിക്കേഷനെ അനുവദിക്കുന്നു. ഇത് വളരെ അപകടകരമാണ്."</string> <string name="permlab_camera" msgid="3616391919559751192">"ചിത്രങ്ങളും വീഡിയോകളും എടുക്കുക"</string> - <!-- no translation found for permdesc_camera (5392231870049240670) --> - <skip /> + <string name="permdesc_camera" msgid="5392231870049240670">"ഏതുസമയത്തും ക്യാമറ ഉപയോഗിച്ചുകൊണ്ട് ചിത്രങ്ങൾ എടുക്കാനും വീഡിയോകൾ റെക്കോർഡുചെയ്യാനും ഈ ആപ്പിന് കഴിയും."</string> <string name="permlab_vibrate" msgid="7696427026057705834">"വൈബ്രേറ്റുചെയ്യൽ നിയന്ത്രിക്കുക"</string> <string name="permdesc_vibrate" msgid="6284989245902300945">"വൈബ്രേറ്റർ നിയന്ത്രിക്കുന്നതിന് അപ്ലിക്കേഷനെ അനുവദിക്കുന്നു."</string> <string name="permlab_callPhone" msgid="3925836347681847954">"ഫോൺ നമ്പറുകളിലേക്ക് നേരിട്ട് വിളിക്കുക"</string> diff --git a/core/res/res/values-mn-rMN/strings.xml b/core/res/res/values-mn-rMN/strings.xml index 8d4469d9757e..2f1cc6978f8c 100644 --- a/core/res/res/values-mn-rMN/strings.xml +++ b/core/res/res/values-mn-rMN/strings.xml @@ -182,10 +182,8 @@ <string name="work_profile_deleted_description" msgid="6305147513054341102">"Зохицуулагч аппликейшн алга болсон учраас ажлын профайл устсан байна."</string> <string name="work_profile_deleted_details" msgid="226615743462361248">"Ажлын профайлын зохицуулагч аппликейшн алга болсон эсвэл эвдэрсэн байна. Үүний улмаас таны ажлын профайл болон холбогдох мэдээллүүд устсан байна. Тусламж хэрэгтэй байгаа бол админтай холбоо барина уу."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="6019770344820507579">"Таны ажлын профайл энэ төхөөрөмж дээр ажиллахгүй болсон байна."</string> - <!-- no translation found for network_logging_notification_title (1805392571290161924) --> - <skip /> - <!-- no translation found for network_logging_notification_text (4448072433371155729) --> - <skip /> + <string name="network_logging_notification_title" msgid="1805392571290161924">"Сүлжээний ачааллыг хянаж байна"</string> + <string name="network_logging_notification_text" msgid="4448072433371155729">"Дэлгэрэнгүй мэдээлэл авахын тулд товшино уу"</string> <string name="factory_reset_warning" msgid="5423253125642394387">"Таны төхөөрөмж устах болно."</string> <string name="factory_reset_message" msgid="4905025204141900666">"Зохицуулагч аппликейшны зарим нэг хэсэг дутуу эсвэл эвдэрсэн байгаа тул ашиглах боломжгүй байна. Таны төхөөрөмжийг одоо устгах болно. Танд тусламж хэрэгтэй байгаа бол админтайгаа холбоо барина уу."</string> <string name="me" msgid="6545696007631404292">"Би"</string> diff --git a/core/res/res/values-mr-rIN/strings.xml b/core/res/res/values-mr-rIN/strings.xml index 8bf4d2b78ba8..50b41c0f9c55 100644 --- a/core/res/res/values-mr-rIN/strings.xml +++ b/core/res/res/values-mr-rIN/strings.xml @@ -46,8 +46,7 @@ <string name="defaultMsisdnAlphaTag" msgid="2850889754919584674">"MSISDN1"</string> <string name="mmiError" msgid="5154499457739052907">"कनेक्शन समस्या किंवा अवैध MMI कोड."</string> <string name="mmiFdnError" msgid="5224398216385316471">"कार्य फक्त निश्चित डायलिंग नंबरसाठी प्रतिबंधित आहे."</string> - <!-- no translation found for mmiErrorWhileRoaming (762488890299284230) --> - <skip /> + <string name="mmiErrorWhileRoaming" msgid="762488890299284230">"आपण रोमिंगमध्ये असताना आपल्या फोनवरील कॉल अग्रेषण सेटिंंग्ज बदलू शकत नाही."</string> <string name="serviceEnabled" msgid="8147278346414714315">"सेवा सक्षम केली."</string> <string name="serviceEnabledFor" msgid="6856228140453471041">"सेवा यासाठी सक्षम केली:"</string> <string name="serviceDisabled" msgid="1937553226592516411">"सेवा अक्षम केली गेली आहे."</string> @@ -98,10 +97,8 @@ <string name="RestrictedOnVoiceData" msgid="996636487106171320">"व्हॉइस/डेटा सेवा अवरोधित केल्या आहेत."</string> <string name="RestrictedOnVoiceSms" msgid="1888588152792023873">"व्हॉइस/SMS सेवा अवरोधित केल्या आहेत."</string> <string name="RestrictedOnAll" msgid="5643028264466092821">"सर्व व्हॉइस/डेटा/SMS सेवा अवरोधित केल्या आहेत."</string> - <!-- no translation found for NetworkPreferenceSwitchTitle (4008877505368566980) --> - <skip /> - <!-- no translation found for NetworkPreferenceSwitchSummary (7335915397439759249) --> - <skip /> + <string name="NetworkPreferenceSwitchTitle" msgid="4008877505368566980">"नेटवर्कवर पोहोचूू शकत नाही"</string> + <string name="NetworkPreferenceSwitchSummary" msgid="7335915397439759249">"रिसेप्शन सुधारण्यासाठी, प्रकार सेटिंग्ज > सेल्युलर नेटवर्क > प्राधान्यीकृत नेटवर्क प्रकार येथे निवडलेला प्रकार बदलून पहा."</string> <string name="peerTtyModeFull" msgid="6165351790010341421">"समवयस्क व्यक्तीने TTY मोड पूर्ण ची विनंती केली"</string> <string name="peerTtyModeHco" msgid="5728602160669216784">"समवयस्क व्यक्तीने TTY मोड HCO ची विनंती केली"</string> <string name="peerTtyModeVco" msgid="1742404978686538049">"समवयस्क व्यक्तीने TTY मोड VCO ची विनंती केली"</string> @@ -185,10 +182,8 @@ <string name="work_profile_deleted_description" msgid="6305147513054341102">"गहाळ प्रशासन अॅपमुळे कार्य प्रोफाईल हटविले."</string> <string name="work_profile_deleted_details" msgid="226615743462361248">"कार्य प्रोफाईल प्रशासन अॅप गहाळ आहे किंवा दुषित आहे. यामुळे, आपले कार्य प्रोफाईल आणि संबंधित डेटा हटविला गेला आहे. सहाय्यासाठी आपल्या प्रशासकाशी संपर्क साधा."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="6019770344820507579">"आपले कार्य प्रोफाईल या डिव्डाइसवर यापुढे उपलब्ध नाही."</string> - <!-- no translation found for network_logging_notification_title (1805392571290161924) --> - <skip /> - <!-- no translation found for network_logging_notification_text (4448072433371155729) --> - <skip /> + <string name="network_logging_notification_title" msgid="1805392571290161924">"नेटवर्क रहदारीचे परीक्षण केले जात आहे"</string> + <string name="network_logging_notification_text" msgid="4448072433371155729">"अधिक तपशीलांसाठी टॅप करा"</string> <string name="factory_reset_warning" msgid="5423253125642394387">"आपले डिव्हाइस मिटविले जाईल"</string> <string name="factory_reset_message" msgid="4905025204141900666">"प्रशासन अॅपमध्ये घटक गहाळ किंवा दूषित आहेत आणि वापरला जाऊ शकत नाही. आपले डिव्हाइस आता मिटविले जाईल. सहाय्यासाठी आपल्या प्रशासकाशी संपर्क साधा."</string> <string name="me" msgid="6545696007631404292">"मी"</string> @@ -306,12 +301,9 @@ <string name="permlab_sendSms" msgid="7544599214260982981">"SMS संदेश पाठवणे आणि पाहणे"</string> <string name="permdesc_sendSms" msgid="7094729298204937667">"SMS संदेश पाठविण्यासाठी अॅप ला अनुमती देते. हे अनपेक्षित शुल्कामुळे होऊ शकते. दुर्भावनापूर्ण अॅप्स नी आपल्या पुष्टिकरणाशिवाय संदेश पाठवल्यामुळे आपले पैसे खर्च होऊ शकतात."</string> <string name="permlab_readSms" msgid="8745086572213270480">"आपले मजकूर संदेश वाचा (SMS किंवा MMS)"</string> - <!-- no translation found for permdesc_readSms (4741697454888074891) --> - <skip /> - <!-- no translation found for permdesc_readSms (5796670395641116592) --> - <skip /> - <!-- no translation found for permdesc_readSms (6826832415656437652) --> - <skip /> + <string name="permdesc_readSms" product="tablet" msgid="4741697454888074891">"हा अॅप आपल्या टॅब्लेटवर संचयित केलेले सर्व SMS (मजकूर) संदेश वाचू शकतो."</string> + <string name="permdesc_readSms" product="tv" msgid="5796670395641116592">"हा अॅप आपल्या टीव्हीवर संचयित केलेले सर्व SMS (मजकूर) संदेश वाचू शकतो."</string> + <string name="permdesc_readSms" product="default" msgid="6826832415656437652">"हा अॅप आपल्या फोनवर संचयित केलेले सर्व SMS (मजकूर) संदेश वाचू शकतो."</string> <string name="permlab_receiveWapPush" msgid="5991398711936590410">"मजकूर संदेश प्राप्त करा (WAP)"</string> <string name="permdesc_receiveWapPush" msgid="748232190220583385">"WAP संदेश प्राप्त करण्यास आणि त्यावर प्रक्रिया करण्यासाठी अॅप ला अनुमती देते. ही परवानगी आपल्याला पाठविलेले संदेश आपल्याला न दर्शविता त्यांचे परीक्षण करण्याची आणि ते हटविण्याची क्षमता समाविष्ट करते."</string> <string name="permlab_getTasks" msgid="6466095396623933906">"चालणारे अॅप्स पुनर्प्राप्त करा"</string> @@ -324,10 +316,8 @@ <string name="permdesc_enableCarMode" msgid="4853187425751419467">"कार मोड सक्षम करण्यासाठी अॅप ला अनुमती देते."</string> <string name="permlab_killBackgroundProcesses" msgid="3914026687420177202">"अन्य अॅप्स बंद करा"</string> <string name="permdesc_killBackgroundProcesses" msgid="4593353235959733119">"अन्य अॅप्सच्या पार्श्वभूमी प्रक्रिया समाप्त करण्यासाठी अॅप ला अनुमती देते. यामुळे अन्य अॅप्स चालणे थांबू शकते."</string> - <!-- no translation found for permlab_systemAlertWindow (7238805243128138690) --> - <skip /> - <!-- no translation found for permdesc_systemAlertWindow (2393776099672266188) --> - <skip /> + <string name="permlab_systemAlertWindow" msgid="7238805243128138690">"हा अॅप इतर अॅप्सच्या शीर्षस्थानी दिसू शकतो."</string> + <string name="permdesc_systemAlertWindow" msgid="2393776099672266188">"हा अॅप इतर अॅप्सच्या शीर्षस्थानी किंवा स्क्रीनच्या इतर भागांवर दिसू शकतो. हे सामान्य अॅप वापरात व्यत्यय आणू शकते किंवा इतर अॅप्सची प्रदर्शन पद्धत बदलू शकते."</string> <string name="permlab_persistentActivity" msgid="8841113627955563938">"अॅप नेहमी चालवा"</string> <string name="permdesc_persistentActivity" product="tablet" msgid="8525189272329086137">"अॅप ला मेमरीमध्ये कायम असलेले त्याचे स्वतःचे भाग बनविण्यास अनुमती देते. हे टॅबलेट धीमा करून अन्य अॅप्सवर उपलब्ध असलेल्या मेमरीवर मर्यादा घालू शकते."</string> <string name="permdesc_persistentActivity" product="tv" msgid="5086862529499103587">"अॅपला मेमरीमध्ये कायम असलेले त्याचे स्वतःचे भाग बनविण्यासाठी अनुमती देते. हे टीव्ही धीमा करून इतर अॅप्सवर उपलब्ध असलेली मेमरी मर्यादित करू शकते."</string> @@ -353,51 +343,37 @@ <string name="permdesc_writeContacts" product="tv" msgid="5438230957000018959">"आपण विशिष्ट संपर्कांशी अन्य मार्गांनी कॉल केलेल्या, ईमेल केलेल्या किंवा संप्रेषण केलेल्या फ्रिक्वेन्सीसह, आपल्या टीव्हीवर संचयित केलेल्या आपल्या संपर्कांविषयीचा डेटा सुधारित करण्यासाठी अॅपला अनुमती देते. ही परवानगी संपर्क डेटा हटविण्यासाठी अॅपला अनुमती देते."</string> <string name="permdesc_writeContacts" product="default" msgid="589869224625163558">"आपण विशिष्ट संपर्कांशी अन्य मार्गांनी कॉल केलेल्या, ईमेल केलेल्या किंवा संप्रेषण केलेल्या फ्रिक्वेन्सीसह, आपल्या फोनवर संचयित केलेल्या आपल्या संपर्कांविषयीचा डेटा सुधारित करण्यासाठी अॅप ला अनुमती देते. ही परवानगी संपर्क डेटा हटविण्यासाठी अॅप ला अनुमती देते."</string> <string name="permlab_readCallLog" msgid="3478133184624102739">"कॉल लॉग वाचा"</string> - <!-- no translation found for permdesc_readCallLog (3204122446463552146) --> - <skip /> + <string name="permdesc_readCallLog" msgid="3204122446463552146">"हा अॅप आपला कॉल इतिहास वाचू शकता."</string> <string name="permlab_writeCallLog" msgid="8552045664743499354">"कॉल लॉग लिहा"</string> <string name="permdesc_writeCallLog" product="tablet" msgid="6661806062274119245">"येणार्या आणि केल्या जाणार्या कॉलविषयीच्या डेटासह, आपल्या टॅब्लेटचा कॉल लॉग सुधारित करण्यासाठी अॅप ला अनुमती देते. दुर्भावनापूर्ण अॅप्स आपला कॉल लॉग मिटवण्यासाठी किंवा सुधारित करण्यासाठी याचा वापर करू शकतात."</string> <string name="permdesc_writeCallLog" product="tv" msgid="4225034892248398019">"येणार्या आणि केल्या जाणार्या कॉलविषयीच्या डेटासह, आपल्या टीव्हीचा कॉल लॉग सुधारित करण्यासाठी अॅपला अनुमती देते. दुर्भावनापूर्ण अॅप्स आपला कॉल लॉग मिटवण्यासाठी किंवा सुधारित करण्यासाठी याचा वापर करू शकतात."</string> <string name="permdesc_writeCallLog" product="default" msgid="683941736352787842">"येणार्या आणि केल्या जाणार्या कॉलविषयीच्या डेटासह, आपल्या फोनचा कॉल लॉग सुधारित करण्यासाठी अॅप ला अनुमती देते. दुर्भावनापूर्ण अॅप्स आपला कॉल लॉग मिटवण्यासाठी किंवा सुधारित करण्यासाठी याचा वापर करू शकतात."</string> <string name="permlab_bodySensors" msgid="4683341291818520277">"शरीर सेन्सरमध्ये (हृदय गती मॉनिटरसारखे) प्रवेश करा"</string> <string name="permdesc_bodySensors" product="default" msgid="4380015021754180431">"हृदय गती सारख्या, आपल्या शारीरिक स्थितीचे नियंत्रण करणार्या सेन्सरवरून डेटामध्ये प्रवेश करण्यासाठी अॅपला अनुमती देते."</string> - <!-- no translation found for permlab_readCalendar (6716116972752441641) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (4993979255403945892) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (8837931557573064315) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (4373978642145196715) --> - <skip /> + <string name="permlab_readCalendar" msgid="6716116972752441641">"कॅलेंडर इव्हेंट आणि तपशील वाचा"</string> + <string name="permdesc_readCalendar" product="tablet" msgid="4993979255403945892">"हा अॅप आपल्या टॅब्लेटवर संचयित केलेले सर्व कॅलेंडर इव्हेंट वाचू आणि सामायिक करू शकतो किंवा आपला कॅलेंडर डेटा जतन करू शकतो."</string> + <string name="permdesc_readCalendar" product="tv" msgid="8837931557573064315">"हा अॅप आपल्या टीव्हीवर संचयित केलेले सर्व कॅलेंडर इव्हेंट वाचू आणि सामायिक करू शकतो किंवा आपला कॅलेंडर डेटा जतन करू शकतो."</string> + <string name="permdesc_readCalendar" product="default" msgid="4373978642145196715">"हा अॅप आपल्या फोनवर संचयित केलेले सर्व कॅलेंडर इव्हेंट वाचू आणि सामायिक करू शकतो किंवा आपला कॅलेंडर डेटा जतन करू शकतो."</string> <string name="permlab_writeCalendar" msgid="8438874755193825647">"कॅलेंडर इव्हेंट जोडा किंवा सुधारित करा आणि मालकांच्या माहितीशिवाय अतिथींना ईमेल पाठवा"</string> - <!-- no translation found for permdesc_writeCalendar (1675270619903625982) --> - <skip /> - <!-- no translation found for permdesc_writeCalendar (9017809326268135866) --> - <skip /> - <!-- no translation found for permdesc_writeCalendar (7592791790516943173) --> - <skip /> + <string name="permdesc_writeCalendar" product="tablet" msgid="1675270619903625982">"हा अॅप आपल्या टॅब्लेटवर कॅलेंडर इव्हेंट जोडू, काढू किंवा बदलू शकतो. हा अॅप कॅलेंडर मालकांकडून येत आहेत असे वाटणारे संदेश पाठवू किंवा त्यांच्या मालकांना सूचित केल्याशिवाय इव्हेंट बदलू शकतो."</string> + <string name="permdesc_writeCalendar" product="tv" msgid="9017809326268135866">"हा अॅप आपल्या टीव्हीवर कॅलेंडर इव्हेंट जोडू, काढू किंवा बदलू शकतो. हा अॅप कॅलेंडर मालकांकडून येत आहेत असे वाटणारे संदेश पाठवू किंवा त्यांच्या मालकांना सूचित केल्याशिवाय इव्हेंट बदलू शकतो."</string> + <string name="permdesc_writeCalendar" product="default" msgid="7592791790516943173">"हा अॅप आपल्या फोनवर कॅलेंडर इव्हेंट जोडू, काढू किंवा बदलू शकतो. हा अॅप कॅलेंडर मालकांकडून येत आहेत असे वाटणारे संदेश पाठवू किंवा त्यांच्या मालकांना सूचित केल्याशिवाय इव्हेंट बदलू शकतो."</string> <string name="permlab_accessLocationExtraCommands" msgid="2836308076720553837">"अतिरिक्त स्थान प्रदाता आदेशांवर प्रवेश करा"</string> <string name="permdesc_accessLocationExtraCommands" msgid="6078307221056649927">"अॅपला अतिरिक्त स्थान प्रदाता आदेशावर प्रवेश करण्याची अनुमती देते. हे कदाचित अॅपला GPS किंवा इतर स्थान स्त्रोत च्या ऑपरेशनमध्ये हस्तक्षेप करण्याची अनुमती देऊ शकते."</string> <string name="permlab_accessFineLocation" msgid="251034415460950944">"अचूक स्थानामध्ये (GPS आणि नेटवर्क-आधारित) प्रवेश करा"</string> - <!-- no translation found for permdesc_accessFineLocation (5821994817969957884) --> - <skip /> + <string name="permdesc_accessFineLocation" msgid="5821994817969957884">"हा अॅप सेल टॉवर आणि वाय-फाय नेटवर्क सारख्या GPS किंवा नेटवर्क स्रोतांच्या आधारावर आपले स्थान मिळवू शकतो. या स्थान सेवा वापरण्यास सक्षम असण्यासाठी त्या आपल्या फोनवर चालू केलेल्या आणि उपलब्ध असणे आवश्यक आहे. हे बॅटरी वापर वाढवू शकते."</string> <string name="permlab_accessCoarseLocation" msgid="7715277613928539434">"अंदाजे स्थानामध्ये (नेटवर्क-आधारित) प्रवेश करा"</string> - <!-- no translation found for permdesc_accessCoarseLocation (3373266766487862426) --> - <skip /> - <!-- no translation found for permdesc_accessCoarseLocation (1884022719818788511) --> - <skip /> - <!-- no translation found for permdesc_accessCoarseLocation (7788009094906196995) --> - <skip /> + <string name="permdesc_accessCoarseLocation" product="tablet" msgid="3373266766487862426">"हा अॅप सेल टॉवर आणि वाय-फाय नेटवर्क सारख्या नेटवर्क स्रोतांच्या आधारावर आपले स्थान मिळवू शकतो. अॅपला या स्थान सेवा वापरण्यास सक्षम असण्यासाठी आपल्या टॅॅब्लेटवर त्या चालू केलेल्या आणि उपलब्ध असणे आवश्यक आहे."</string> + <string name="permdesc_accessCoarseLocation" product="tv" msgid="1884022719818788511">"हा अॅप सेल टॉवर आणि वाय-फाय नेटवर्क सारख्या नेटवर्क स्रोतांच्या आधारावर आपले स्थान मिळवू शकतो. अॅपला या स्थान सेवा वापरण्यास सक्षम असण्यासाठी आपल्या टीव्हीवर त्या चालू केलेल्या आणि उपलब्ध असणे आवश्यक आहे."</string> + <string name="permdesc_accessCoarseLocation" product="default" msgid="7788009094906196995">"हा अॅप सेल टॉवर आणि वाय-फाय नेटवर्क सारख्या नेटवर्क स्रोतांच्या आधारावर आपले स्थान मिळवू शकतो. अॅपला या स्थान सेवा वापरण्यास सक्षम असण्यासाठी आपल्या फोनवर त्या चालू केलेल्या आणि उपलब्ध असणे आवश्यक आहे."</string> <string name="permlab_modifyAudioSettings" msgid="6095859937069146086">"आपल्या ऑडिओ सेटिंग्ज बदला"</string> <string name="permdesc_modifyAudioSettings" msgid="3522565366806248517">"व्हॉल्यूम आणि आउटपुटसाठी कोणता स्पीकर वापरला आहे यासारख्या समग्र ऑडिओ सेटिंग्ज सुधारित करण्यासाठी अॅप ला अनुमती देते."</string> <string name="permlab_recordAudio" msgid="3876049771427466323">"ऑडिओ रेकॉर्ड"</string> - <!-- no translation found for permdesc_recordAudio (4245930455135321433) --> - <skip /> + <string name="permdesc_recordAudio" msgid="4245930455135321433">"हा अॅप कोणत्याही वेळी मायक्रोफोन वापरून ऑडिओ रेकॉर्ड करू शकता."</string> <string name="permlab_sim_communication" msgid="2935852302216852065">"सिम वर आदेश पाठवा"</string> <string name="permdesc_sim_communication" msgid="5725159654279639498">"अॅप ला सिम वर आदेश पाठविण्याची अनुमती देते. हे खूप धोकादायक असते."</string> <string name="permlab_camera" msgid="3616391919559751192">"चित्रे आणि व्हिडिओ घ्या"</string> - <!-- no translation found for permdesc_camera (5392231870049240670) --> - <skip /> + <string name="permdesc_camera" msgid="5392231870049240670">"हा अॅप कोणत्याही वेळी कॅमेरा वापरून चित्रेे घेऊ आणि व्हिडिअो रेकॉर्ड करू शकतो."</string> <string name="permlab_vibrate" msgid="7696427026057705834">"कंपन नियंत्रित करा"</string> <string name="permdesc_vibrate" msgid="6284989245902300945">"अॅप ला व्हायब्रेटर नियंत्रित करण्यासाठी अनुमती देते."</string> <string name="permlab_callPhone" msgid="3925836347681847954">"फोन नंबरवर प्रत्यक्ष कॉल करा"</string> diff --git a/core/res/res/values-ms-rMY/strings.xml b/core/res/res/values-ms-rMY/strings.xml index 3c795fd89301..72daecb73a91 100644 --- a/core/res/res/values-ms-rMY/strings.xml +++ b/core/res/res/values-ms-rMY/strings.xml @@ -46,8 +46,7 @@ <string name="defaultMsisdnAlphaTag" msgid="2850889754919584674">"MSISDN1"</string> <string name="mmiError" msgid="5154499457739052907">"Masalah sambungan atau kod MMI tidak sah"</string> <string name="mmiFdnError" msgid="5224398216385316471">"Pengendalian dihadkan kepada nombor dailan tetap sahaja."</string> - <!-- no translation found for mmiErrorWhileRoaming (762488890299284230) --> - <skip /> + <string name="mmiErrorWhileRoaming" msgid="762488890299284230">"Tidak dapat mengubah tetapan pemajuan panggilan daripad telefon anda semasa dalam perayauan."</string> <string name="serviceEnabled" msgid="8147278346414714315">"Perkhidmatan telah didayakan."</string> <string name="serviceEnabledFor" msgid="6856228140453471041">"Perkhidmatan didayakan untuk:"</string> <string name="serviceDisabled" msgid="1937553226592516411">"Perkhidmatan telah dilumpuhkan."</string> @@ -98,10 +97,8 @@ <string name="RestrictedOnVoiceData" msgid="996636487106171320">"Perkhidmatan suara/data disekat."</string> <string name="RestrictedOnVoiceSms" msgid="1888588152792023873">"Perkhidmatan suara/SMS disekat."</string> <string name="RestrictedOnAll" msgid="5643028264466092821">"Semua perkhidmatan suara/data/SMS disekat."</string> - <!-- no translation found for NetworkPreferenceSwitchTitle (4008877505368566980) --> - <skip /> - <!-- no translation found for NetworkPreferenceSwitchSummary (7335915397439759249) --> - <skip /> + <string name="NetworkPreferenceSwitchTitle" msgid="4008877505368566980">"Tidak dapat mencapai rangkaian"</string> + <string name="NetworkPreferenceSwitchSummary" msgid="7335915397439759249">"Untuk mempertingkat penerimaan, cuba tukar jenis yang dipilih di Tetapan > Rangkaian selular > Jenis rangkaian yang dipilih."</string> <string name="peerTtyModeFull" msgid="6165351790010341421">"Rakan meminta Mod TTY PENUH"</string> <string name="peerTtyModeHco" msgid="5728602160669216784">"Rakan meminta Mod TTY HCO"</string> <string name="peerTtyModeVco" msgid="1742404978686538049">"Rakan meminta Mod TTY VCO"</string> @@ -185,10 +182,8 @@ <string name="work_profile_deleted_description" msgid="6305147513054341102">"Profil kerja dipadam kerana apl pentadbir hilang."</string> <string name="work_profile_deleted_details" msgid="226615743462361248">"Apl admin profil kerja hilang atau pun rosak. Akibatnya, profil kerja anda dan data yang berkaitan telah dipadam. Hubungi pentadbir anda untuk mendapatkan bantuan."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="6019770344820507579">"Profil kerja anda tidak tersedia pada peranti ini lagi."</string> - <!-- no translation found for network_logging_notification_title (1805392571290161924) --> - <skip /> - <!-- no translation found for network_logging_notification_text (4448072433371155729) --> - <skip /> + <string name="network_logging_notification_title" msgid="1805392571290161924">"Trafik rangkaian sedang dipantau"</string> + <string name="network_logging_notification_text" msgid="4448072433371155729">"Ketik untuk mendapatkan butiran lanjut"</string> <string name="factory_reset_warning" msgid="5423253125642394387">"Peranti anda akan dipadam"</string> <string name="factory_reset_message" msgid="4905025204141900666">"Apl pentadbir kehilangan komponen atau rosak dan tidak boleh digunakan. Sekarang peranti anda akan dipadam. Hubungi pentadbir anda untuk mendapatkan bantuan."</string> <string name="me" msgid="6545696007631404292">"Saya"</string> @@ -306,12 +301,9 @@ <string name="permlab_sendSms" msgid="7544599214260982981">"hantar dan lihat mesej SMS"</string> <string name="permdesc_sendSms" msgid="7094729298204937667">"Membenarkan apl menghantar mesej SMS. Ini boleh menyebabkan caj di luar jangkaan. Apl hasad boleh membuat anda kerugian wang dengan menghantar mesej tanpa pengesahan anda."</string> <string name="permlab_readSms" msgid="8745086572213270480">"baca mesej teks anda (SMS atau MMS)"</string> - <!-- no translation found for permdesc_readSms (4741697454888074891) --> - <skip /> - <!-- no translation found for permdesc_readSms (5796670395641116592) --> - <skip /> - <!-- no translation found for permdesc_readSms (6826832415656437652) --> - <skip /> + <string name="permdesc_readSms" product="tablet" msgid="4741697454888074891">"Apl ini boleh membaca semua mesej SMS (teks) yang disimpan pada tablet anda."</string> + <string name="permdesc_readSms" product="tv" msgid="5796670395641116592">"Apl ini boleh membaca semua mesej SMS (teks) yang disimpan pada TV anda."</string> + <string name="permdesc_readSms" product="default" msgid="6826832415656437652">"Apl ini boleh membaca semua mesej SMS (teks) yang disimpan pada telefon anda."</string> <string name="permlab_receiveWapPush" msgid="5991398711936590410">"terima mesej teks (WAP)"</string> <string name="permdesc_receiveWapPush" msgid="748232190220583385">"Membenarkan apl menerima dan memproses mesej WAP. Kebenaran ini termasuk keupayaan untuk memantau atau memadam mesej yang dihantar kepada anda tanpa menunjukkannya kepada anda."</string> <string name="permlab_getTasks" msgid="6466095396623933906">"dapatkan semula apl yang sedang dijalankan"</string> @@ -324,10 +316,8 @@ <string name="permdesc_enableCarMode" msgid="4853187425751419467">"Membenarkan apl mendayakan mod kereta."</string> <string name="permlab_killBackgroundProcesses" msgid="3914026687420177202">"tutup apl lain"</string> <string name="permdesc_killBackgroundProcesses" msgid="4593353235959733119">"Membenarkan apl untuk menamatkan proses latar belakang apl lain. Ini boleh menyebabkan apl lain berhenti berjalan."</string> - <!-- no translation found for permlab_systemAlertWindow (7238805243128138690) --> - <skip /> - <!-- no translation found for permdesc_systemAlertWindow (2393776099672266188) --> - <skip /> + <string name="permlab_systemAlertWindow" msgid="7238805243128138690">"Apl ini boleh muncul di sebelah atas apl lain"</string> + <string name="permdesc_systemAlertWindow" msgid="2393776099672266188">"Apl ini boleh muncul di sebelah atas apl lain atau pada bahagian lain skrin. Hal ini mungkin mengganggu penggunaan biasa apl dan mengubah cara apl lain itu muncul."</string> <string name="permlab_persistentActivity" msgid="8841113627955563938">"buatkan apl sentiasa berjalan"</string> <string name="permdesc_persistentActivity" product="tablet" msgid="8525189272329086137">"Membenarkan apl untuk membuat sebahagian dirinya berterusan dalam memori. Ini boleh mengehadkan memori yang tersedia kepada apl lain dan menjadikan tablet perlahan."</string> <string name="permdesc_persistentActivity" product="tv" msgid="5086862529499103587">"Membenarkan apl menjadikan sebahagian daripada apl kekal dalam memori. Ini boleh mengehadkan memori yang tersedia kepada apl lain dan menjadikan TV perlahan."</string> @@ -353,51 +343,37 @@ <string name="permdesc_writeContacts" product="tv" msgid="5438230957000018959">"Membenarkan apl mengubah suai data mengenai kenalan anda yang disimpan pada TV anda, termasuk kekerapan anda membuat panggilan, menghantar e-mel atau berkomunikasi dalam cara lain dengan kenalan tertentu. Kebenaran ini membenarkan apl untuk memadam data kenalan."</string> <string name="permdesc_writeContacts" product="default" msgid="589869224625163558">"Membenarkan apl mengubah suai data tentang kenalan anda yang tersimpan pada telefon anda, termasuk kekerapan siapa anda panggil, hantar e-mel atau berkomunikasi dalam cara lain dengan kenalan tertentu. Kebenaran ini membenarkan apl untuk memadam data kenalan."</string> <string name="permlab_readCallLog" msgid="3478133184624102739">"baca log panggilan"</string> - <!-- no translation found for permdesc_readCallLog (3204122446463552146) --> - <skip /> + <string name="permdesc_readCallLog" msgid="3204122446463552146">"Apl ini boleh membaca sejarah panggilan anda."</string> <string name="permlab_writeCallLog" msgid="8552045664743499354">"tulis log panggilan"</string> <string name="permdesc_writeCallLog" product="tablet" msgid="6661806062274119245">"Membenarkan apl untuk mengubah suai panggilan tablet anda, termasuk data tentang panggilan masuk dan keluar. Apl hasad boleh menggunakannya untuk memadam atau mengubah suai log panggilan anda."</string> <string name="permdesc_writeCallLog" product="tv" msgid="4225034892248398019">"Membenarkan apl untuk mengubah suai log panggilan TV anda, termasuk data mengenai panggilan masuk atau keluar. Apl hasad mungkin menggunakan ini untuk memadam atau mengubah suai log panggilan anda."</string> <string name="permdesc_writeCallLog" product="default" msgid="683941736352787842">"Membenarkan apl untuk mengubah suai panggilan telefon anda, termasuk data tentang panggilan masuk dan keluar. Apl hasad boleh menggunakannya untuk memadam atau mengubah suai log panggilan anda."</string> <string name="permlab_bodySensors" msgid="4683341291818520277">"akss pndia bdn (spt pmntau kdr dnyt jntg)"</string> <string name="permdesc_bodySensors" product="default" msgid="4380015021754180431">"Membenarkan apl mengakses data dari penderia yang memantau keadaan fizikal anda, seperti kadar denyutan jantung anda."</string> - <!-- no translation found for permlab_readCalendar (6716116972752441641) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (4993979255403945892) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (8837931557573064315) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (4373978642145196715) --> - <skip /> + <string name="permlab_readCalendar" msgid="6716116972752441641">"Baca acara dan butiran kalendar"</string> + <string name="permdesc_readCalendar" product="tablet" msgid="4993979255403945892">"Apl ini boleh membaca semua acara kalendar yang disimpan pada tablet anda dan berkongsi atau menyimpan data kalendar anda."</string> + <string name="permdesc_readCalendar" product="tv" msgid="8837931557573064315">"Apl ini boleh membaca semua acara kaledar yang disimpan pada TV anda dan berkongsi atau menyimpan data kalendar anda."</string> + <string name="permdesc_readCalendar" product="default" msgid="4373978642145196715">"Apl ini boleh membaca semua acara kalendar yang disimpan pada telefon anda dan berkongsi atau menyimpan data kalendar anda."</string> <string name="permlab_writeCalendar" msgid="8438874755193825647">"tambah atau ubah suai acara kalendar dan hantar e-mel kepada tetamu tanpa pengetahuan pemilik"</string> - <!-- no translation found for permdesc_writeCalendar (1675270619903625982) --> - <skip /> - <!-- no translation found for permdesc_writeCalendar (9017809326268135866) --> - <skip /> - <!-- no translation found for permdesc_writeCalendar (7592791790516943173) --> - <skip /> + <string name="permdesc_writeCalendar" product="tablet" msgid="1675270619903625982">"Apl ini boleh menambah, mengalih keluar atau mengubah acara kalendar pada tablet anda. Apl ini boleh menghantar mesej yang mungkin kelihatan seperti dihantar oleh pemilik kalendar atau mengubah acara tanpa memaklumi pemilik acara itu."</string> + <string name="permdesc_writeCalendar" product="tv" msgid="9017809326268135866">"Apl ini boleh menambah, mengalih keluar atau mengubah acara kalendar pada TV anda. Apl ini boleh menghantar mesej yang mungkin kelihatan seperti dihantar oleh pemilik kalendar atau mengubah acara tanpa memaklumi pemilik acara itu."</string> + <string name="permdesc_writeCalendar" product="default" msgid="7592791790516943173">"Apl ini boleh menambah, mengalih keluar atau mengubah acara kalendar pada telefon anda. Apl ini boleh menghantar mesej yang mungkin kelihatan seperti dihantar oleh pemilik kalendar atau mengubah acara tanpa memaklumi pemilik acara itu."</string> <string name="permlab_accessLocationExtraCommands" msgid="2836308076720553837">"akses perintah tambahan pembekal lokasi"</string> <string name="permdesc_accessLocationExtraCommands" msgid="6078307221056649927">"Membenarkan apl mengakses arahan pembekal lokasi tambahan. Ini boleh membenarkan apl untuk campur tangan dengan operasi GPS atau sumber lokasi lain."</string> <string name="permlab_accessFineLocation" msgid="251034415460950944">"akses lokasi tepat (GPS dan berasaskan rangkaian)"</string> - <!-- no translation found for permdesc_accessFineLocation (5821994817969957884) --> - <skip /> + <string name="permdesc_accessFineLocation" msgid="5821994817969957884">"Apl ini boleh mendapatkan lokasi anda berdasarkan sumber rangkaian seperti menara selular dan rangkaian Wi-Fi. Perkhidmatan lokasi ini mesti dihidupkan dan tersedia pada telefon anda untuk membolehkan apl menggunakan perkhidmatan tersebut. Hal ini mungkin meningkatkan penggunaan bateri."</string> <string name="permlab_accessCoarseLocation" msgid="7715277613928539434">"akses lokasi anggaran (berasaskan rangkaian)"</string> - <!-- no translation found for permdesc_accessCoarseLocation (3373266766487862426) --> - <skip /> - <!-- no translation found for permdesc_accessCoarseLocation (1884022719818788511) --> - <skip /> - <!-- no translation found for permdesc_accessCoarseLocation (7788009094906196995) --> - <skip /> + <string name="permdesc_accessCoarseLocation" product="tablet" msgid="3373266766487862426">"Apl ini boleh mendapatkan lokasi anda berdasarkan sumber rangkaian seperti menara selular dan rangkaian Wi-Fi. Perkhidmatan lokasi ini mesti dihidupkan dan tersedia pada tablet anda untuk membolehkan apl menggunakan perkhidmatan tersebut."</string> + <string name="permdesc_accessCoarseLocation" product="tv" msgid="1884022719818788511">"Apl ini boleh mendapatkan lokasi anda berdasarkan sumber rangkaian seperti menara selular dan rangkaian Wi-Fi. Perkhidmatan lokasi ini mesti dihidupkan dan tersedia pada TV anda untuk membolehkan apl menggunakan perkhidmatan tersebut."</string> + <string name="permdesc_accessCoarseLocation" product="default" msgid="7788009094906196995">"Apl ini boleh mendapatkan lokasi anda berdasarkan sumber rangkaian seperti menara selular dan rangkaian Wi-Fi. Perkhidmatan lokasi ini mesti dihidupkan dan tersedia pada telefon anda untuk membolehkan apl menggunakan perkhidmatan tersebut."</string> <string name="permlab_modifyAudioSettings" msgid="6095859937069146086">"tukar tetapan audio anda"</string> <string name="permdesc_modifyAudioSettings" msgid="3522565366806248517">"Membenarkan apl untuk mengubah suai tetapan audio global seperti kelantangan dan pembesar suara mana digunakan untuk output."</string> <string name="permlab_recordAudio" msgid="3876049771427466323">"rakam audio"</string> - <!-- no translation found for permdesc_recordAudio (4245930455135321433) --> - <skip /> + <string name="permdesc_recordAudio" msgid="4245930455135321433">"Apl ini boleh merakam audio menggunakan mikrofon pada bila-bila masa."</string> <string name="permlab_sim_communication" msgid="2935852302216852065">"hantar perintah ke SIM"</string> <string name="permdesc_sim_communication" msgid="5725159654279639498">"Membenarkan apl menghantar arahan kepada SIM. Ini amat berbahaya."</string> <string name="permlab_camera" msgid="3616391919559751192">"ambil gambar dan video"</string> - <!-- no translation found for permdesc_camera (5392231870049240670) --> - <skip /> + <string name="permdesc_camera" msgid="5392231870049240670">"Apl ini boleh mengambil gambar dan merakam video menggunakan kamera pada bila-bila masa."</string> <string name="permlab_vibrate" msgid="7696427026057705834">"kawal getaran"</string> <string name="permdesc_vibrate" msgid="6284989245902300945">"Membenarkan apl mengawal penggetar."</string> <string name="permlab_callPhone" msgid="3925836347681847954">"panggil terus nombor telefon"</string> diff --git a/core/res/res/values-my-rMM/strings.xml b/core/res/res/values-my-rMM/strings.xml index 343523291bdd..c3ebf7473ab8 100644 --- a/core/res/res/values-my-rMM/strings.xml +++ b/core/res/res/values-my-rMM/strings.xml @@ -182,10 +182,8 @@ <string name="work_profile_deleted_description" msgid="6305147513054341102">"အက်ဒမင် အက်ပ်ပျောက်နေသောကြောင့် အလုပ်ပရိုဖိုင် ပျက်သွားသည်။"</string> <string name="work_profile_deleted_details" msgid="226615743462361248">"အလုပ်ပရိုဖိုင် အက်ဒမင် အပလီကေးရှင်းပျောက်နေသည် သို့မဟုတ် ပျက်စီးနေသည်။ ထို့ကြောင့် သင့်အလုပ်ပရိုဖိုင်နှင့် ဆက်စပ်နေသော ဒေတာများအား ပယ်ဖျက်ခြင်းခံရမည်။ အကူအညီတောင်းခံရန် သင့်အက်ဒမင်အား ဆက်သွယ်ပါ။"</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="6019770344820507579">"ဤစက်ကိရိယာတွင် သင့်အလုပ်ပရိုဖိုင် မရှိတော့ပါ။"</string> - <!-- no translation found for network_logging_notification_title (1805392571290161924) --> - <skip /> - <!-- no translation found for network_logging_notification_text (4448072433371155729) --> - <skip /> + <string name="network_logging_notification_title" msgid="1805392571290161924">"ကွန်ရက်အသွားအလာကို စောင့်ကြည့်နေပါသည်"</string> + <string name="network_logging_notification_text" msgid="4448072433371155729">"နောက်ထပ်အသေးစိတ် အချက်အလက်များအတွက် တို့ပါ"</string> <string name="factory_reset_warning" msgid="5423253125642394387">"သင့်ကိရိယာအား ပယ်ဖျက်လိမ့်မည်"</string> <string name="factory_reset_message" msgid="4905025204141900666">"အက်ဒမင် အက်ပ်၏ အစိတ်အပိုင်းများ ပျောက်နေသည် သို့မဟုတ် ပျက်စီးနေသည်။ သင့်ကိရိယာအား ပယ်ဖျက်လိမ့်မည်။ အကူအညီတောင်းခံရန် သင့်အက်ဒမင်အား ဆက်သွယ်ပါ။"</string> <string name="me" msgid="6545696007631404292">"ကျွန်ုပ်"</string> diff --git a/core/res/res/values-nb/strings.xml b/core/res/res/values-nb/strings.xml index d59a025eaeb9..4e7c4ce936b3 100644 --- a/core/res/res/values-nb/strings.xml +++ b/core/res/res/values-nb/strings.xml @@ -46,8 +46,7 @@ <string name="defaultMsisdnAlphaTag" msgid="2850889754919584674">"MSISDN1"</string> <string name="mmiError" msgid="5154499457739052907">"Tilkoblingsproblem eller ugyldig MMI-kode."</string> <string name="mmiFdnError" msgid="5224398216385316471">"Handlingen kan kun utføres på numre med anropsbegrensning."</string> - <!-- no translation found for mmiErrorWhileRoaming (762488890299284230) --> - <skip /> + <string name="mmiErrorWhileRoaming" msgid="762488890299284230">"Får ikke endret innstillinger for viderekobling fra telefonen din når du bruker roaming."</string> <string name="serviceEnabled" msgid="8147278346414714315">"Tjenesten ble aktivert."</string> <string name="serviceEnabledFor" msgid="6856228140453471041">"Tjenesten ble aktivert for:"</string> <string name="serviceDisabled" msgid="1937553226592516411">"Tjenesten ble deaktivert."</string> @@ -98,10 +97,8 @@ <string name="RestrictedOnVoiceData" msgid="996636487106171320">"Alle tjenester for tale og data er blokkert."</string> <string name="RestrictedOnVoiceSms" msgid="1888588152792023873">"Tjenester for tale og tekstmeldinger er blokkert."</string> <string name="RestrictedOnAll" msgid="5643028264466092821">"Alle tjenester for tale, data og tekstmeldinger er blokkert."</string> - <!-- no translation found for NetworkPreferenceSwitchTitle (4008877505368566980) --> - <skip /> - <!-- no translation found for NetworkPreferenceSwitchSummary (7335915397439759249) --> - <skip /> + <string name="NetworkPreferenceSwitchTitle" msgid="4008877505368566980">"Får ikke kontakt med nettverket"</string> + <string name="NetworkPreferenceSwitchSummary" msgid="7335915397439759249">"For å forbedre signalet, prøv å endre valgt nettverkstype i Innstillinger > Mobilnettverk > Foretrukket nettverkstype."</string> <string name="peerTtyModeFull" msgid="6165351790010341421">"Motpart ba om TTY-modus FULL"</string> <string name="peerTtyModeHco" msgid="5728602160669216784">"Motpart ba om TTY-modus HCO"</string> <string name="peerTtyModeVco" msgid="1742404978686538049">"Motpart ba om TTY-modus VCO"</string> @@ -185,10 +182,8 @@ <string name="work_profile_deleted_description" msgid="6305147513054341102">"Arbeidsprofilen er slettet på grunn av manglende admin-app."</string> <string name="work_profile_deleted_details" msgid="226615743462361248">"Arbeidsprofilens admin-app mangler eller er ødelagt. Dette har ført til at arbeidsprofilen og alle data knyttet til den er blitt slettet. Kontakt administratoren for å få hjelp."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="6019770344820507579">"Arbeidsprofilen din er ikke lenger tilgjengelig på denne enheten."</string> - <!-- no translation found for network_logging_notification_title (1805392571290161924) --> - <skip /> - <!-- no translation found for network_logging_notification_text (4448072433371155729) --> - <skip /> + <string name="network_logging_notification_title" msgid="1805392571290161924">"Nettverkstrafikken blir overvåket"</string> + <string name="network_logging_notification_text" msgid="4448072433371155729">"Trykk for å få flere detaljer"</string> <string name="factory_reset_warning" msgid="5423253125642394387">"Enheten blir slettet"</string> <string name="factory_reset_message" msgid="4905025204141900666">"Admin-appen mangler komponenter eller er ødelagt, og kan ikke brukes. Enheten din blir nå slettet. Kontakt administratoren for å få hjelp."</string> <string name="me" msgid="6545696007631404292">"Meg"</string> @@ -306,12 +301,9 @@ <string name="permlab_sendSms" msgid="7544599214260982981">"sende og lese SMS-meldinger"</string> <string name="permdesc_sendSms" msgid="7094729298204937667">"Lar appen sende tekstmeldinger. Dette kan resultere i uventede kostnader. Merk at skadelige apper kan påføre deg kostnader ved å sende meldinger uten bekreftelse fra deg."</string> <string name="permlab_readSms" msgid="8745086572213270480">"lese tekstmeldinger (SMS eller MMS)"</string> - <!-- no translation found for permdesc_readSms (4741697454888074891) --> - <skip /> - <!-- no translation found for permdesc_readSms (5796670395641116592) --> - <skip /> - <!-- no translation found for permdesc_readSms (6826832415656437652) --> - <skip /> + <string name="permdesc_readSms" product="tablet" msgid="4741697454888074891">"Denne appen kan lese alle tekstmeldingene (SMS) som er lagret på nettbrettet ditt."</string> + <string name="permdesc_readSms" product="tv" msgid="5796670395641116592">"Denne appen kan lese alle tekstmeldingene (SMS) som er lagret på TV-en din."</string> + <string name="permdesc_readSms" product="default" msgid="6826832415656437652">"Denne appen kan lese alle tekstmeldingene (SMS) som er lagret på telefonen din."</string> <string name="permlab_receiveWapPush" msgid="5991398711936590410">"motta tekstmeldinger (WAP)"</string> <string name="permdesc_receiveWapPush" msgid="748232190220583385">"Lar appen motta og behandle WAP-meldinger. Dette betyr at appen kan overvåke eller slette meldinger som er sendt til deg uten at du har sett dem."</string> <string name="permlab_getTasks" msgid="6466095396623933906">"hente apper som kjører"</string> @@ -324,10 +316,8 @@ <string name="permdesc_enableCarMode" msgid="4853187425751419467">"Lar appen aktivere bilmodus."</string> <string name="permlab_killBackgroundProcesses" msgid="3914026687420177202">"lukke andre apper"</string> <string name="permdesc_killBackgroundProcesses" msgid="4593353235959733119">"Lar appen avslutte andre appers bakgrunnsprosesser. Dette kan føre til at andre apper slutter å kjøre."</string> - <!-- no translation found for permlab_systemAlertWindow (7238805243128138690) --> - <skip /> - <!-- no translation found for permdesc_systemAlertWindow (2393776099672266188) --> - <skip /> + <string name="permlab_systemAlertWindow" msgid="7238805243128138690">"Denne appen kan ligge over andre apper"</string> + <string name="permdesc_systemAlertWindow" msgid="2393776099672266188">"Denne appen kan vises over andre apper eller andre deler av skjermen. Dette kan påvirke normal bruk av apper og endre måten andre apper vises på."</string> <string name="permlab_persistentActivity" msgid="8841113627955563938">"angi at appen alltid skal kjøre"</string> <string name="permdesc_persistentActivity" product="tablet" msgid="8525189272329086137">"Lar appen gjøre deler av seg selv vedvarende i minnet. Dette kan begrense minnet for andre apper og gjøre nettbrettet tregt."</string> <string name="permdesc_persistentActivity" product="tv" msgid="5086862529499103587">"Gjør at deler av appen kan legge seg vedvarende i minnet. Dette kan begrense minnets tilgjengelighet for andre apper, noe som gjør at TV-en går langsommere."</string> @@ -353,51 +343,37 @@ <string name="permdesc_writeContacts" product="tv" msgid="5438230957000018959">"Gjør at appen kan endre data om kontaktene du har lagret på TV-en, inkludert hvor ofte du har ringt, sendt e-post til eller på andre måter kommunisert med bestemte kontakter. Denne tillatelsen gjør at apper kan slette kontaktdata."</string> <string name="permdesc_writeContacts" product="default" msgid="589869224625163558">"Lar appen endre informasjon om kontaktene lagret på telefonen din, inkludert hvor ofte du har ringt, sendt e-post til eller på andre måter kommunisert med bestemte kontakter. Denne tillatelsen lar apper slette kontaktdata."</string> <string name="permlab_readCallLog" msgid="3478133184624102739">"lese anropsloggen"</string> - <!-- no translation found for permdesc_readCallLog (3204122446463552146) --> - <skip /> + <string name="permdesc_readCallLog" msgid="3204122446463552146">"Denne appen kan lese anropsloggen din."</string> <string name="permlab_writeCallLog" msgid="8552045664743499354">"endre anropsloggen"</string> <string name="permdesc_writeCallLog" product="tablet" msgid="6661806062274119245">"Lar appen endre nettbrettets samtalelogg, inkludert data om innkommende og utgående anrop. Skadelige apper kan utnytte denne tillatelsen til å slette eller endre samtaleloggen din."</string> <string name="permdesc_writeCallLog" product="tv" msgid="4225034892248398019">"Gjør at appen kan endre TV-ens samtalelogg, herunder data om innkommende eller utgående samtaler. Skadelige apper kan bruke dette til å slette eller endre samtaleloggen."</string> <string name="permdesc_writeCallLog" product="default" msgid="683941736352787842">"Lar appen endre telefonens samtalelogg, inkludert data om innkommende og utgående anrop. Skadelige apper kan utnytte denne tillatelsen til å slette eller endre samtaleloggen din."</string> <string name="permlab_bodySensors" msgid="4683341291818520277">"få tilgang til kroppssensorer (f.eks. pulsmålere)"</string> <string name="permdesc_bodySensors" product="default" msgid="4380015021754180431">"Gir appen tilgang til data fra sensorer som overvåker den fysiske tilstanden din, for eksempel hjertefrekvensen din."</string> - <!-- no translation found for permlab_readCalendar (6716116972752441641) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (4993979255403945892) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (8837931557573064315) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (4373978642145196715) --> - <skip /> + <string name="permlab_readCalendar" msgid="6716116972752441641">"Les kalenderaktivitet og detaljer"</string> + <string name="permdesc_readCalendar" product="tablet" msgid="4993979255403945892">"Denne appen kan lese all kalenderaktivitet som er lagret på nettbrettet ditt, og dele eller lagre kalenderdataene."</string> + <string name="permdesc_readCalendar" product="tv" msgid="8837931557573064315">"Denne appen kan lese all kalenderaktivitet som er lagret på TV-en din, og dele eller lagre kalenderdataene."</string> + <string name="permdesc_readCalendar" product="default" msgid="4373978642145196715">"Denne appen kan lese all kalenderaktivitet som er lagret på telefonen din, og dele eller lagre kalenderdataene."</string> <string name="permlab_writeCalendar" msgid="8438874755193825647">"legge til eller endre kalenderhendelser og sende e-post til gjester uten eiernes viten"</string> - <!-- no translation found for permdesc_writeCalendar (1675270619903625982) --> - <skip /> - <!-- no translation found for permdesc_writeCalendar (9017809326268135866) --> - <skip /> - <!-- no translation found for permdesc_writeCalendar (7592791790516943173) --> - <skip /> + <string name="permdesc_writeCalendar" product="tablet" msgid="1675270619903625982">"Denne appen kan legge til, fjerne eller endre kalenderaktiviteter på nettbrettet ditt. Denne appen kan sende meldinger som kan virke som om kommer fra kalendereiere, eller endre aktiviteter uten at eierne blir varslet."</string> + <string name="permdesc_writeCalendar" product="tv" msgid="9017809326268135866">"Denne appen kan legge til, fjerne eller endre kalenderaktiviteter på TV-en din. Denne appen kan sende meldinger som kan virke som om kommer fra kalendereiere, eller endre aktiviteter uten at eierne blir varslet."</string> + <string name="permdesc_writeCalendar" product="default" msgid="7592791790516943173">"Denne appen kan legge til, fjerne eller endre kalenderaktiviteter på telefonen din. Denne appen kan sende meldinger som kan virke som om kommer fra kalendereiere, eller endre aktiviteter uten at eierne blir varslet."</string> <string name="permlab_accessLocationExtraCommands" msgid="2836308076720553837">"bruke ekstra posisjonskommandoer"</string> <string name="permdesc_accessLocationExtraCommands" msgid="6078307221056649927">"Appen gis tillatelse til å bruke ekstra kommandoer fra posisjonsleverandører. Dette kan gi appen tillatelse til å påvirke bruken av GPS eller andre posisjonskilder."</string> <string name="permlab_accessFineLocation" msgid="251034415460950944">"få tilgang til nøyaktig posisjon (GPS- og nettverksbasert)"</string> - <!-- no translation found for permdesc_accessFineLocation (5821994817969957884) --> - <skip /> + <string name="permdesc_accessFineLocation" msgid="5821994817969957884">"Denne appen kan få posisjonen din fra GPS eller nettverksplasseringskilder som mobilmaster og Wi-Fi-nettverk. Disse posisjonstjenestene må være slått på og tilgjengelige på telefonen din for at appen skal kunne bruke dem. Dette kan øke batteriforbruket."</string> <string name="permlab_accessCoarseLocation" msgid="7715277613928539434">"få tilgang til omtrentlig posisjon (nettverksbasert)"</string> - <!-- no translation found for permdesc_accessCoarseLocation (3373266766487862426) --> - <skip /> - <!-- no translation found for permdesc_accessCoarseLocation (1884022719818788511) --> - <skip /> - <!-- no translation found for permdesc_accessCoarseLocation (7788009094906196995) --> - <skip /> + <string name="permdesc_accessCoarseLocation" product="tablet" msgid="3373266766487862426">"Denne appen kan få posisjonen din fra nettverkskilder som mobilmaster og Wi-Fi-nettverk. Disse posisjonstjenestene må være slått på og tilgjengelige på nettbrettet ditt for at appen skal kunne bruke dem."</string> + <string name="permdesc_accessCoarseLocation" product="tv" msgid="1884022719818788511">"Denne appen kan få posisjonen din fra nettverkskilder som mobilmaster og Wi-Fi-nettverk. Disse posisjonstjenestene må være slått på og tilgjengelige på TV-en din for at appen skal kunne bruke dem."</string> + <string name="permdesc_accessCoarseLocation" product="default" msgid="7788009094906196995">"Denne appen kan få posisjonen din fra nettverkskilder som mobilmaster og Wi-Fi-nettverk. Disse posisjonstjenestene må være slått på og tilgjengelige på telefonen din for at appen skal kunne bruke dem."</string> <string name="permlab_modifyAudioSettings" msgid="6095859937069146086">"endre lydinnstillinger"</string> <string name="permdesc_modifyAudioSettings" msgid="3522565366806248517">"Lar appen endre globale lydinnstillinger slik som volum og hvilken høyttaler som brukes for lydavspilling."</string> <string name="permlab_recordAudio" msgid="3876049771427466323">"ta opp lyd"</string> - <!-- no translation found for permdesc_recordAudio (4245930455135321433) --> - <skip /> + <string name="permdesc_recordAudio" msgid="4245930455135321433">"Denne appen kan når som helst ta opp lyd med mikrofonen."</string> <string name="permlab_sim_communication" msgid="2935852302216852065">"sende kommandoer til SIM-kortet"</string> <string name="permdesc_sim_communication" msgid="5725159654279639498">"Lar appen sende kommandoer til SIM-kortet. Dette er veldig farlig."</string> <string name="permlab_camera" msgid="3616391919559751192">"ta bilder og videoer"</string> - <!-- no translation found for permdesc_camera (5392231870049240670) --> - <skip /> + <string name="permdesc_camera" msgid="5392231870049240670">"Denne appen kan når som helst ta bilder og spille inn videoer ved hjelp av kameraet."</string> <string name="permlab_vibrate" msgid="7696427026057705834">"kontrollere vibreringen"</string> <string name="permdesc_vibrate" msgid="6284989245902300945">"Lar appen kontrollere vibreringsfunksjonen."</string> <string name="permlab_callPhone" msgid="3925836347681847954">"ringe telefonnummer direkte"</string> diff --git a/core/res/res/values-ne-rNP/strings.xml b/core/res/res/values-ne-rNP/strings.xml index 823206374686..3af81303dd2b 100644 --- a/core/res/res/values-ne-rNP/strings.xml +++ b/core/res/res/values-ne-rNP/strings.xml @@ -182,10 +182,8 @@ <string name="work_profile_deleted_description" msgid="6305147513054341102">"प्रशासन अनुप्रयोग हराएको कारण कार्य प्रोफाइल मेटियो।"</string> <string name="work_profile_deleted_details" msgid="226615743462361248">"कार्य प्रोफाइल व्यवस्थापक अनुप्रयोग या त हराएको या त बिग्रेको छ। फलस्वरूप, तपाईँको कार्य प्रोफाइल र सम्बन्धित डेटा मेटिएको छ। सहयोगको लागि तपाईँको व्यवस्थापकसँग सम्पर्क गर्नुहोस्।"</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="6019770344820507579">"यस यन्त्रमा तपाईँको कार्य प्रोफाइल अब उपलब्ध छैन।"</string> - <!-- no translation found for network_logging_notification_title (1805392571290161924) --> - <skip /> - <!-- no translation found for network_logging_notification_text (4448072433371155729) --> - <skip /> + <string name="network_logging_notification_title" msgid="1805392571290161924">"नेटवर्कको ट्राफिकको अनुगमन गरिँदै छ"</string> + <string name="network_logging_notification_text" msgid="4448072433371155729">"थप विवरणहरूको लागि ट्याप गर्नुहोस्"</string> <string name="factory_reset_warning" msgid="5423253125642394387">"तपाईंको यन्त्र मेटिनेछ"</string> <string name="factory_reset_message" msgid="4905025204141900666">"व्यवस्थापक अनुप्रयोगमा कम्पोनेन्टहरू या त हराएको वा भ्रष्ट छन्, र यसैले प्रयोग गर्न सकिँदैन। तपाईंको यन्त्र अब मेटिनेछ। सहयोगको लागि आफ्नो व्यवस्थापकलाई सम्पर्क गर्नुहोस्।"</string> <string name="me" msgid="6545696007631404292">"मलाई"</string> diff --git a/core/res/res/values-nl/strings.xml b/core/res/res/values-nl/strings.xml index f795d9ae187f..39a5a02b3c18 100644 --- a/core/res/res/values-nl/strings.xml +++ b/core/res/res/values-nl/strings.xml @@ -21,7 +21,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="byteShort" msgid="8340973892742019101">"B"</string> - <string name="kilobyteShort" msgid="7542884022844556968">"kB"</string> + <string name="kilobyteShort" msgid="7542884022844556968">" KB"</string> <string name="megabyteShort" msgid="6355851576770428922">"MB"</string> <string name="gigabyteShort" msgid="3259882455212193214">"GB"</string> <string name="terabyteShort" msgid="231613018159186962">"TB"</string> @@ -55,11 +55,11 @@ <string name="passwordIncorrect" msgid="7612208839450128715">"Onjuist wachtwoord."</string> <string name="mmiComplete" msgid="8232527495411698359">"MMI voltooid."</string> <string name="badPin" msgid="9015277645546710014">"De oude pincode die je hebt ingevoerd, is onjuist."</string> - <string name="badPuk" msgid="5487257647081132201">"De PUK-code die je hebt ingevoerd, is onjuist."</string> + <string name="badPuk" msgid="5487257647081132201">"De pukcode die je hebt ingevoerd, is onjuist."</string> <string name="mismatchPin" msgid="609379054496863419">"De pincodes die je hebt ingevoerd, komen niet overeen."</string> <string name="invalidPin" msgid="3850018445187475377">"Voer een pincode van 4 tot 8 cijfers in."</string> - <string name="invalidPuk" msgid="8761456210898036513">"Typ een PUK-code die 8 cijfers of langer is."</string> - <string name="needPuk" msgid="919668385956251611">"Je SIM-kaart is vergrendeld met de PUK-code. Typ de PUK-code om te ontgrendelen."</string> + <string name="invalidPuk" msgid="8761456210898036513">"Typ een pukcode die 8 cijfers of langer is."</string> + <string name="needPuk" msgid="919668385956251611">"Je SIM-kaart is vergrendeld met de pukcode. Typ de pukcode om te ontgrendelen."</string> <string name="needPuk2" msgid="4526033371987193070">"Voer de PUK2-code in om de SIM-kaart te ontgrendelen."</string> <string name="enablePin" msgid="209412020907207950">"Mislukt. Schakel SIM/RUIM-vergrendeling in."</string> <plurals name="pinpuk_attempts" formatted="false" msgid="1251012001539225582"> @@ -182,10 +182,8 @@ <string name="work_profile_deleted_description" msgid="6305147513054341102">"Werkprofiel verwijderd wegens ontbrekende beheerapp."</string> <string name="work_profile_deleted_details" msgid="226615743462361248">"De beheerapp van het werkprofiel ontbreekt of is beschadigd. Als gevolg hiervan zijn je werkprofiel en alle gerelateerde gegevens verwijderd. Neem voor hulp contact op met je beheerder."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="6019770344820507579">"Je werkprofiel is niet meer beschikbaar op dit apparaat."</string> - <!-- no translation found for network_logging_notification_title (1805392571290161924) --> - <skip /> - <!-- no translation found for network_logging_notification_text (4448072433371155729) --> - <skip /> + <string name="network_logging_notification_title" msgid="1805392571290161924">"Netwerkverkeer wordt bijgehouden"</string> + <string name="network_logging_notification_text" msgid="4448072433371155729">"Tik voor meer informatie"</string> <string name="factory_reset_warning" msgid="5423253125642394387">"Je apparaat wordt gewist"</string> <string name="factory_reset_message" msgid="4905025204141900666">"Er ontbreken onderdelen van de beheerapp of de app is beschadigd, waardoor de app niet kan worden gebruikt. Je apparaat wordt nu gewist. Neem voor hulp contact op met je beheerder."</string> <string name="me" msgid="6545696007631404292">"Ik"</string> @@ -664,13 +662,13 @@ <string name="relationTypeSister" msgid="1735983554479076481">"Zus"</string> <string name="relationTypeSpouse" msgid="394136939428698117">"Huwelijkspartner"</string> <string name="sipAddressTypeCustom" msgid="2473580593111590945">"Aangepast"</string> - <string name="sipAddressTypeHome" msgid="6093598181069359295">"Startpagina"</string> + <string name="sipAddressTypeHome" msgid="6093598181069359295">"Homepage"</string> <string name="sipAddressTypeWork" msgid="6920725730797099047">"Werk"</string> <string name="sipAddressTypeOther" msgid="4408436162950119849">"Overig"</string> <string name="quick_contacts_not_available" msgid="746098007828579688">"Er is geen app gevonden om dit contact te bekijken."</string> <string name="keyguard_password_enter_pin_code" msgid="3037685796058495017">"Pincode typen"</string> - <string name="keyguard_password_enter_puk_code" msgid="4800725266925845333">"Geef de PUK-code en de nieuwe pincode op"</string> - <string name="keyguard_password_enter_puk_prompt" msgid="1341112146710087048">"PUK-code"</string> + <string name="keyguard_password_enter_puk_code" msgid="4800725266925845333">"Geef de pukcode en de nieuwe pincode op"</string> + <string name="keyguard_password_enter_puk_prompt" msgid="1341112146710087048">"pukcode"</string> <string name="keyguard_password_enter_pin_prompt" msgid="8027680321614196258">"Nieuwe pincode"</string> <string name="keyguard_password_entry_touch_hint" msgid="2644215452200037944"><font size="17">"Tik om het wachtwoord te typen"</font></string> <string name="keyguard_password_enter_password_code" msgid="1054721668279049780">"Typ het wachtwoord om te ontgrendelen"</string> @@ -707,7 +705,7 @@ <string name="lockscreen_transport_ffw_description" msgid="42987149870928985">"Vooruitspoelen"</string> <string name="emergency_calls_only" msgid="6733978304386365407">"Alleen noodoproepen"</string> <string name="lockscreen_network_locked_message" msgid="143389224986028501">"Netwerk vergrendeld"</string> - <string name="lockscreen_sim_puk_locked_message" msgid="7441797339976230">"SIM-kaart is vergrendeld met PUK-code."</string> + <string name="lockscreen_sim_puk_locked_message" msgid="7441797339976230">"SIM-kaart is vergrendeld met pukcode."</string> <string name="lockscreen_sim_puk_locked_instructions" msgid="8127916255245181063">"Raadpleeg de gebruikershandleiding of neem contact op met de klantenservice."</string> <string name="lockscreen_sim_locked_message" msgid="8066660129206001039">"SIM-kaart is vergrendeld."</string> <string name="lockscreen_sim_unlock_progress_dialog_message" msgid="595323214052881264">"SIM-kaart ontgrendelen..."</string> @@ -1401,14 +1399,14 @@ <string name="kg_sim_pin_instructions" msgid="2319508550934557331">"Geef de pincode van de simkaart op"</string> <string name="kg_pin_instructions" msgid="2377242233495111557">"Pincode opgeven"</string> <string name="kg_password_instructions" msgid="5753646556186936819">"Wachtwoord invoeren"</string> - <string name="kg_puk_enter_puk_hint" msgid="453227143861735537">"De simkaart is nu uitgeschakeld. Geef de PUK-code op om door te gaan. Neem contact op met de provider voor informatie."</string> + <string name="kg_puk_enter_puk_hint" msgid="453227143861735537">"De simkaart is nu uitgeschakeld. Geef de pukcode op om door te gaan. Neem contact op met de provider voor informatie."</string> <string name="kg_puk_enter_pin_hint" msgid="7871604527429602024">"Gewenste pincode opgeven"</string> <string name="kg_enter_confirm_pin_hint" msgid="325676184762529976">"Gewenste pincode bevestigen"</string> <string name="kg_sim_unlock_progress_dialog_message" msgid="8950398016976865762">"Simkaart ontgrendelen..."</string> <string name="kg_password_wrong_pin_code" msgid="1139324887413846912">"Onjuiste pincode."</string> <string name="kg_invalid_sim_pin_hint" msgid="8795159358110620001">"Voer een pincode van 4 tot 8 cijfers in."</string> - <string name="kg_invalid_sim_puk_hint" msgid="6025069204539532000">"De PUK-code is acht cijfers lang."</string> - <string name="kg_invalid_puk" msgid="3638289409676051243">"Geef de juiste PUK-code opnieuw op. Bij herhaalde pogingen wordt de simkaart permanent uitgeschakeld."</string> + <string name="kg_invalid_sim_puk_hint" msgid="6025069204539532000">"De pukcode is acht cijfers lang."</string> + <string name="kg_invalid_puk" msgid="3638289409676051243">"Geef de juiste pukcode opnieuw op. Bij herhaalde pogingen wordt de simkaart permanent uitgeschakeld."</string> <string name="kg_invalid_confirm_pin_hint" product="default" msgid="7003469261464593516">"Pincodes komen niet overeen"</string> <string name="kg_login_too_many_attempts" msgid="6486842094005698475">"Te veel patroonpogingen"</string> <string name="kg_login_instructions" msgid="1100551261265506448">"Als u wilt ontgrendelen, moet u inloggen op je Google-account."</string> diff --git a/core/res/res/values-pa-rIN/strings.xml b/core/res/res/values-pa-rIN/strings.xml index 9aaa9156031b..315e7d513d6c 100644 --- a/core/res/res/values-pa-rIN/strings.xml +++ b/core/res/res/values-pa-rIN/strings.xml @@ -46,8 +46,7 @@ <string name="defaultMsisdnAlphaTag" msgid="2850889754919584674">"MSISDN1"</string> <string name="mmiError" msgid="5154499457739052907">"ਕਨੈਕਸ਼ਨ ਸਮੱਸਿਆ ਜਾਂ ਅਪ੍ਰਮਾਣਿਕ MMI ਕੋਡ।"</string> <string name="mmiFdnError" msgid="5224398216385316471">"ਓਪਰੇਸ਼ਨ ਕੇਵਲ ਫਿਕਸਡ ਡਾਇਲਿੰਗ ਨੰਬਰਾਂ ਤੱਕ ਸੀਮਿਤ ਹੈ।"</string> - <!-- no translation found for mmiErrorWhileRoaming (762488890299284230) --> - <skip /> + <string name="mmiErrorWhileRoaming" msgid="762488890299284230">"ਤੁਹਾਡੇ ਰੋਮਿੰਗ ਵਿੱਚ ਹੋਣ ਦੌਰਾਨ ਤੁਹਾਡੇ ਫ਼ੋਨ ਤੋਂ ਕਾਲ ਫਾਰਵਰਡਿੰਗ ਸੈਟਿੰਗਾਂ ਨੂੰ ਬਦਲਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ।"</string> <string name="serviceEnabled" msgid="8147278346414714315">"ਸੇਵਾ ਅਸਮਰੱਥ ਬਣਾਈ ਗਈ ਸੀ।"</string> <string name="serviceEnabledFor" msgid="6856228140453471041">"ਸੇਵਾ ਇਸ ਲਈ ਸਮਰੱਥ ਬਣਾਈ ਗਈ ਸੀ:"</string> <string name="serviceDisabled" msgid="1937553226592516411">"ਸੇਵਾ ਅਸਮਰੱਥ ਬਣਾਈ ਗਈ ਹੈ।"</string> @@ -98,10 +97,8 @@ <string name="RestrictedOnVoiceData" msgid="996636487106171320">"ਵੌਇਸ/ਡੈਟਾ ਸੇਵਾਵਾਂ ਬਲੌਕ ਕੀਤੀਆਂ ਹੋਈਆਂ ਹਨ।"</string> <string name="RestrictedOnVoiceSms" msgid="1888588152792023873">"ਵੌਇਸ/SMS ਸੇਵਾਵਾਂ ਬਲੌਕ ਕੀਤੀਆਂ ਗਈਆਂ ਹਨ।"</string> <string name="RestrictedOnAll" msgid="5643028264466092821">"ਸਾਰੀਆਂ ਵੌਇਸ/ਡੈਟਾ/SMS ਸੇਵਾਵਾਂ ਬਲੌਕ ਕੀਤੀਆਂ ਗਈਆਂ ਹਨ।"</string> - <!-- no translation found for NetworkPreferenceSwitchTitle (4008877505368566980) --> - <skip /> - <!-- no translation found for NetworkPreferenceSwitchSummary (7335915397439759249) --> - <skip /> + <string name="NetworkPreferenceSwitchTitle" msgid="4008877505368566980">"ਨੈੱਟਵਰਕ ਤੱਕ ਪਹੁੰਚ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕਦੀ"</string> + <string name="NetworkPreferenceSwitchSummary" msgid="7335915397439759249">"ਪ੍ਰਾਪਤੀ ਨੂੰ ਬਿਹਤਰ ਬਣਾਉਣ ਲਈ, ਸੈਟਿੰਗਾਂ > ਸੈਲਿਊਲਰ ਨੈੱਟਵਰਕ > ਤਰਜੀਹੀ ਨੈੱਟਵਰਕ ਕਿਸਮ \'ਤੇ ਚੁਣੀ ਗਈ ਕਿਸਮ ਨੂੰ ਬਦਲਣ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰੋ।"</string> <string name="peerTtyModeFull" msgid="6165351790010341421">"ਪੀਅਰ ਨੇ TTY Mode FULL ਦੀ ਬੇਨਤੀ ਕੀਤੀ"</string> <string name="peerTtyModeHco" msgid="5728602160669216784">"ਪੀਅਰ ਨੇ TTY Mode HCO ਦੀ ਬੇਨਤੀ ਕੀਤੀ"</string> <string name="peerTtyModeVco" msgid="1742404978686538049">"ਪੀਅਰ ਨੇ TTY Mode VCO ਦੀ ਬੇਨਤੀ ਕੀਤੀ"</string> @@ -185,10 +182,8 @@ <string name="work_profile_deleted_description" msgid="6305147513054341102">"ਕੰਮ ਪ੍ਰੋਫਾਈਲ ਐਡਮਿਨ ਐਪ ਦੇ ਕਾਰਨ ਮਿਟਾਈ ਗਈ।"</string> <string name="work_profile_deleted_details" msgid="226615743462361248">"ਕੰਮ ਪ੍ਰੋਫਾਈਲ ਐਡਮਿਨ ਐਪ ਜਾਂ ਤਾਂ ਲੁਪਤ ਹੈ ਜਾਂ ਕਰਪਟ ਹੈ। ਇੱਕ ਸਿੱਟੇ ਦੇ ਤੌਰ ਤੇ, ਤੁਹਾਡੀ ਕੰਮ ਪ੍ਰੋਫਾਈਲ ਅਤੇ ਸੰਬੰਧਿਤ ਡੈਟਾ ਮਿਟਾਇਆ ਗਿਆ ਹੈ। ਸਹਾਇਤਾ ਲਈ ਆਪਣੇ ਪ੍ਰਬੰਧਕ ਨੂੰ ਸੰਪਰਕ ਕਰੋ।"</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="6019770344820507579">"ਤੁਹਾਡੀ ਕੰਮ ਪ੍ਰੋਫਾਈਲ ਹੁਣ ਇਸ ਡੀਵਾਈਸ ਤੇ ਉਪਲਬਧ ਨਹੀਂ ਹੈ।"</string> - <!-- no translation found for network_logging_notification_title (1805392571290161924) --> - <skip /> - <!-- no translation found for network_logging_notification_text (4448072433371155729) --> - <skip /> + <string name="network_logging_notification_title" msgid="1805392571290161924">"ਨੈੱਟਵਰਕ ਟਰੈਫਿਕ ਦੀ ਨਿਗਰਾਨੀ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"</string> + <string name="network_logging_notification_text" msgid="4448072433371155729">"ਹੋਰ ਵੇਰਵਿਆਂ ਲਈ ਟੈਪ ਕਰੋ"</string> <string name="factory_reset_warning" msgid="5423253125642394387">"ਤੁਹਾਡੀ ਡੀਵਾਈਸ ਮਿਟਾਈ ਜਾਏਗੀ"</string> <string name="factory_reset_message" msgid="4905025204141900666">"ਐਡਮਿਨ ਐਪ ਲੁਪਤ ਕੰਪੋਨੈਂਟ ਜਾਂ ਕਰਪਟ ਹੈ ਅਤੇ ਇਸਦੀ ਵਰਤੋਂ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕਦੀ। ਹੁਣ ਤੁਹਾਡੀ ਡੀਵਾਈਸ ਮਿਟਾ ਦਿੱਤੀ ਜਾਏਗੀ। ਸਹਾਇਤਾ ਲਈ ਆਪਣੇ ਪ੍ਰਬੰਧਕ ਨੂੰ ਸੰਪਰਕ ਕਰੋ।"</string> <string name="me" msgid="6545696007631404292">"ਮੈਂ"</string> @@ -306,12 +301,9 @@ <string name="permlab_sendSms" msgid="7544599214260982981">"SMS ਸੁਨੇਹੇ ਭੇਜਣ ਅਤੇ ਦੇਖਣ"</string> <string name="permdesc_sendSms" msgid="7094729298204937667">"ਐਪ ਨੂੰ SMS ਸੁਨੇਹੇ ਭੇਜਣ ਦੀ ਆਗਿਆ ਦਿੰਦਾ ਹੈ। ਇਸਦੇ ਸਿੱਟੇ ਵਜੋਂ ਅਕਲਪਿਤ ਖ਼ਰਚੇ ਪੈ ਸਕਦੇ ਹਨ। ਖ਼ਰਾਬ ਐਪਸ ਤੁਹਾਡੀ ਪੁਸ਼ਟੀ ਤੋਂ ਬਿਨਾਂ ਸੁਨੇਹੇ ਭੇਜ ਕੇ ਤੁਹਾਨੂੰ ਖ਼ਰਚੇ ਪਾ ਸਕਦੇ ਹਨ।"</string> <string name="permlab_readSms" msgid="8745086572213270480">"ਤੁਹਾਡੇ ਟੈਕਸਟ ਸੁਨੇਹੇ (SMS ਜਾਂ MMS) ਪੜ੍ਹੋ"</string> - <!-- no translation found for permdesc_readSms (4741697454888074891) --> - <skip /> - <!-- no translation found for permdesc_readSms (5796670395641116592) --> - <skip /> - <!-- no translation found for permdesc_readSms (6826832415656437652) --> - <skip /> + <string name="permdesc_readSms" product="tablet" msgid="4741697454888074891">"ਇਹ ਐਪ ਤੁਹਾਡੇ ਟੈਬਲੈੱਟ \'ਤੇ ਸਟੋਰ ਕੀਤੇ ਸਾਰੇ SMS (ਲਿਖਤ) ਸੁਨੇਹਿਆਂ ਨੂੰ ਪੜ੍ਹ ਸਕਦੀ ਹੈ।"</string> + <string name="permdesc_readSms" product="tv" msgid="5796670395641116592">"ਇਹ ਐਪ ਤੁਹਾਡੇ ਟੀਵੀ \'ਤੇ ਸਟੋਰ ਕੀਤੇ ਸਾਰੇ SMS (ਲਿਖਤ) ਸੁਨੇਹਿਆਂ ਨੂੰ ਪੜ੍ਹ ਸਕਦੀ ਹੈ।"</string> + <string name="permdesc_readSms" product="default" msgid="6826832415656437652">"ਇਹ ਐਪ ਤੁਹਾਡੇ ਫ਼ੋਨ \'ਤੇ ਸਟੋਰ ਕੀਤੇ ਸਾਰੇ SMS (ਲਿਖਤ) ਸੁਨੇਹਿਆਂ ਨੂੰ ਪੜ੍ਹ ਸਕਦੀ ਹੈ।"</string> <string name="permlab_receiveWapPush" msgid="5991398711936590410">"ਟੈਕਸਟ ਸੁਨੇਹੇ (WAP) ਪ੍ਰਾਪਤ ਕਰੋ"</string> <string name="permdesc_receiveWapPush" msgid="748232190220583385">"ਐਪ ਨੂੰ WAP ਸੁਨੇਹੇ ਪ੍ਰਾਪਤ ਕਰਨ ਅਤੇ ਉਹਨਾਂ ਦੀ ਪ੍ਰਕਿਰਿਆ ਕਰਨ ਦੀ ਆਗਿਆ ਦਿੰਦਾ ਹੈ। ਇਸ ਅਨੁਮਤੀ ਵਿੱਚ ਸ਼ਾਮਲ ਹੈ ਐਪ ਦੀ ਤੁਹਾਡੀ ਡੀਵਾਈਸ ਤੇ ਭੇਜੇ ਗਏ ਸੁਨੇਹਿਆਂ ਨੂੰ ਤੁਹਾਨੂੰ ਦਿਖਾਏ ਬਿਨਾਂ ਨਿਰੀਖਣ ਕਰਨ ਅਤੇ ਮਿਟਾਉਣ ਦੀ ਸਮਰੱਥਾ।"</string> <string name="permlab_getTasks" msgid="6466095396623933906">"ਚੱਲ ਰਹੇ ਐਪਸ ਮੁੜ ਪ੍ਰਾਪਤ ਕਰੋ"</string> @@ -324,10 +316,8 @@ <string name="permdesc_enableCarMode" msgid="4853187425751419467">"ਐਪ ਨੂੰ ਕਾਰ ਮੋਡ ਸਮਰੱਥ ਬਣਾਉਣ ਦੀ ਆਗਿਆ ਦਿੰਦਾ ਹੈ।"</string> <string name="permlab_killBackgroundProcesses" msgid="3914026687420177202">"ਹੋਰ ਐਪਸ ਬੰਦ ਕਰੋ"</string> <string name="permdesc_killBackgroundProcesses" msgid="4593353235959733119">"ਐਪ ਨੂੰ ਹੋਰਾਂ ਐਪਸ ਦੀਆਂ ਪਿਛੋਕੜ ਪ੍ਰਕਿਰਿਆਵਾਂ ਖ਼ਤਮ ਕਰਨ ਦੀ ਆਗਿਆ ਦਿੰਦਾ ਹੈ। ਇਸ ਨਾਲ ਹੋਰ ਚੱਲ ਰਹੇ ਐਪਸ ਰੁਕ ਸਕਦੇ ਹਨ।"</string> - <!-- no translation found for permlab_systemAlertWindow (7238805243128138690) --> - <skip /> - <!-- no translation found for permdesc_systemAlertWindow (2393776099672266188) --> - <skip /> + <string name="permlab_systemAlertWindow" msgid="7238805243128138690">"ਇਹ ਐਪ ਹੋਰ ਐਪਾਂ ਦੇ ਸਿਖਰ \'ਤੇ ਵਿਖਾਈ ਦੇ ਸਕਦੀ ਹੈ"</string> + <string name="permdesc_systemAlertWindow" msgid="2393776099672266188">"ਇਹ ਐਪ ਹੋਰ ਐਪਾਂ ਦੇ ਸਿਖਰ \'ਤੇ ਜਾਂ ਸਕ੍ਰੀਨ ਦੇ ਹੋਰ ਭਾਗਾਂ \'ਤੇ ਵਿਖਾਈ ਦੇ ਸਕਦੀ ਹੈ। ਇਹ ਸਧਾਰਨ ਐਪ ਵਰਤੋਂ ਵਿੱਚ ਵਿਘਨ ਪਾ ਸਕਦੀ ਹੈ ਅਤੇ ਹੋਰ ਐਪਾਂ ਦੇ ਵਿਖਾਈ ਦੇਣ ਦੇ ਤਰੀਕੇ ਨੂੰ ਬਦਲ ਸਕਦੀ ਹੈ।"</string> <string name="permlab_persistentActivity" msgid="8841113627955563938">"ਐਪ ਨੂੰ ਹਮੇਸ਼ਾਂ ਰਨ ਕਰੋ"</string> <string name="permdesc_persistentActivity" product="tablet" msgid="8525189272329086137">"ਐਪ ਨੂੰ ਮੈਮਰੀ ਵਿੱਚ ਖੁਦ ਦੇ ਭਾਗਾਂ ਨੂੰ ਸਥਾਈ ਬਣਾਉਣ ਦੀ ਆਗਿਆ ਦਿੰਦਾ ਹੈ। ਇਹ ਟੈਬਲੇਟ ਨੂੰ ਹੌਲੀ ਕਰਦੇ ਹੋਏ ਹੋਰਾਂ ਐਪਸ ਤੇ ਉਪਲਬਧ ਮੈਮਰੀ ਨੂੰ ਸੀਮਿਤ ਕਰ ਸਕਦਾ ਹੈ।"</string> <string name="permdesc_persistentActivity" product="tv" msgid="5086862529499103587">"ਐਪ ਨੂੰ ਮੈਮਰੀ ਵਿੱਚ ਖੁਦ ਦੇ ਭਾਗਾਂ ਨੂੰ ਸਥਾਈ ਬਣਾਉਣ ਦੀ ਆਗਿਆ ਦਿੰਦਾ ਹੈ। ਇਹ TV ਨੂੰ ਹੌਲੀ ਕਰਦੇ ਹੋਏ ਹੋਰਾਂ ਐਪਸ ਤੇ ਉਪਲਬਧ ਮੈਮਰੀ ਨੂੰ ਸੀਮਿਤ ਕਰ ਸਕਦਾ ਹੈ।"</string> @@ -353,51 +343,37 @@ <string name="permdesc_writeContacts" product="tv" msgid="5438230957000018959">"ਐਪ ਨੂੰ ਤੁਹਾਡੇ TV ਤੇ ਸਟੋਰ ਕੀਤੇ ਤੁਹਾਡੇ ਸੰਪਰਕਾਂ ਬਾਰੇ ਡੈਟਾ ਪੜ੍ਹਨ ਦੀ ਆਗਿਆ ਦਿੰਦਾ ਹੈ, ਉਸ ਬਾਰੰਬਾਰਤਾ ਸਮੇਤ ਜਿਸ ਨਾਲ ਤੁਸੀਂ ਕਾਲ ਕੀਤੀ ਹੈ, ਈਮੇਲ ਕੀਤੀ ਹੈ ਜਾਂ ਖ਼ਾਸ ਵਿਅਕਤੀਆਂ ਨਾਲ ਹੋਰ ਤਰੀਕਿਆਂ ਨਾਲ ਸੰਚਾਰ ਕੀਤਾ। ਇਹ ਅਨੁਮਤੀ ਐਪਸ ਨੂੰ ਸੰਪਰਕ ਡੈਟਾ ਮਿਟਾਉਣ ਦੀ ਆਗਿਆ ਦਿੰਦੀ ਹੈ।"</string> <string name="permdesc_writeContacts" product="default" msgid="589869224625163558">"ਐਪ ਨੂੰ ਤੁਹਾਡੇ ਫੋਨ ਤੇ ਸਟੋਰ ਕੀਤੇ ਤੁਹਾਡੇ ਸੰਪਰਕਾਂ ਬਾਰੇ ਡੈਟਾ ਪੜ੍ਹਨ ਦੀ ਆਗਿਆ ਦਿੰਦਾ ਹੈ, ਉਸ ਬਾਰੰਬਾਰਤਾ ਸਮੇਤ ਜਿਸ ਨਾਲ ਤੁਸੀਂ ਕਾਲ ਕੀਤੀ ਹੈ, ਈਮੇਲ ਕੀਤੀ ਹੈ ਜਾਂ ਖ਼ਾਸ ਵਿਅਕਤੀਆਂ ਨਾਲ ਹੋਰ ਤਰੀਕਿਆਂ ਨਾਲ ਸੰਚਾਰ ਕੀਤਾ। ਇਹ ਅਨੁਮਤੀ ਐਪਸ ਨੂੰ ਤੁਹਾਡਾ ਸੰਪਰਕ ਡੈਟਾ ਮਿਟਾਉਣ ਦੀ ਆਗਿਆ ਦਿੰਦੀ ਹੈ।"</string> <string name="permlab_readCallLog" msgid="3478133184624102739">"ਕਾਲ ਲੌਗ ਪੜ੍ਹੋ"</string> - <!-- no translation found for permdesc_readCallLog (3204122446463552146) --> - <skip /> + <string name="permdesc_readCallLog" msgid="3204122446463552146">"ਇਹ ਐਪ ਤੁਹਾਡਾ ਕਾਲ ਇਤਿਹਾਸ ਪੜ੍ਹ ਸਕਦੀ ਹੈ।"</string> <string name="permlab_writeCallLog" msgid="8552045664743499354">"ਕਾਲ ਲੌਗ ਲਿਖੋ"</string> <string name="permdesc_writeCallLog" product="tablet" msgid="6661806062274119245">"ਐਪ ਨੂੰ ਤੁਹਾਡੀ ਟੈਬਲੇਟ ਦਾ ਕਾਲ ਲੌਗ ਸੰਸ਼ੋਧਿਤ ਕਰਨ ਦੀ ਆਗਿਆ ਦਿੰਦਾ ਹੈ, ਇਨਕਮਿੰਗ ਅਤੇ ਆਊਟਗੋਇੰਗ ਕਾਲਾਂ ਬਾਰੇ ਡੈਟਾ ਸਮੇਤ। ਖ਼ਰਾਬ ਐਪਸ ਇਸਦੀ ਵਰਤੋਂ ਤੁਹਾਡੇ ਕਾਲ ਲੌਗ ਨੂੰ ਮਿਟਾਉਣ ਜਾਂ ਸੰਸ਼ੋਧਿਤ ਕਰਨ ਲਈ ਕਰ ਸਕਦੇ ਹਨ।"</string> <string name="permdesc_writeCallLog" product="tv" msgid="4225034892248398019">"ਐਪ ਨੂੰ ਤੁਹਾਡੇ TV ਦਾ ਕਾਲ ਲੌਗ ਸੰਸ਼ੋਧਿਤ ਕਰਨ ਦੀ ਆਗਿਆ ਦਿੰਦਾ ਹੈ, ਇਨਕਮਿੰਗ ਅਤੇ ਆਊਟਗੋਇੰਗ ਕਾਲਾਂ ਬਾਰੇ ਡੈਟਾ ਸਮੇਤ। ਖ਼ਰਾਬ ਐਪਸ ਇਸਦੀ ਵਰਤੋਂ ਤੁਹਾਡੇ ਕਾਲ ਲੌਗ ਨੂੰ ਮਿਟਾਉਣ ਜਾਂ ਸੰਸ਼ੋਧਿਤ ਕਰਨ ਲਈ ਕਰ ਸਕਦੇ ਹਨ।"</string> <string name="permdesc_writeCallLog" product="default" msgid="683941736352787842">"ਐਪ ਨੂੰ ਤੁਹਾਡੇ ਫੋਨ ਦਾ ਕਾਲ ਲੌਗ ਸੰਸ਼ੋਧਿਤ ਕਰਨ ਦੀ ਆਗਿਆ ਦਿੰਦਾ ਹੈ, ਇਨਕਮਿੰਗ ਅਤੇ ਆਊਟਗੋਇੰਗ ਕਾਲਾਂ ਬਾਰੇ ਡੈਟਾ ਸਮੇਤ। ਖ਼ਰਾਬ ਐਪਸ ਇਸਦੀ ਵਰਤੋਂ ਤੁਹਾਡੇ ਕਾਲ ਲੌਗ ਨੂੰ ਮਿਟਾਉਣ ਜਾਂ ਸੰਸ਼ੋਧਿਤ ਕਰਨ ਲਈ ਕਰ ਸਕਦੇ ਹਨ।"</string> <string name="permlab_bodySensors" msgid="4683341291818520277">"ਸਰੀਰ ਸੰਵੇਦਕਾਂ \'ਤੇ ਪਹੁੰਚ ਕਰੋ (ਜਿਵੇਂ ਦਿਲ ਦੀ ਧੜਕਣ ਦੇ ਨਿਰੀਖਕ)"</string> <string name="permdesc_bodySensors" product="default" msgid="4380015021754180431">"ਐਪ ਨੂੰ ਉਹਨਾਂ ਸੰਵੇਦਕਾਂ ਦੇ ਡੈਟਾ ਤੱਕ ਪਹੁੰਚ ਦੀ ਆਗਿਆ ਦਿੰਦਾ ਹੈ ਜੋ ਤੁਹਾਡੀ ਸਰੀਰਕ ਸਥਿਤੀ ਦਾ ਨਿਰੀਖਣ ਕਰ ਸਕਦੇ ਹਨ, ਜਿਵੇਂ ਤੁਹਾਡੇ ਦਿਲ ਦੀ ਧੜਕਣ।"</string> - <!-- no translation found for permlab_readCalendar (6716116972752441641) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (4993979255403945892) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (8837931557573064315) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (4373978642145196715) --> - <skip /> + <string name="permlab_readCalendar" msgid="6716116972752441641">"ਕੈਲੰਡਰ ਵਰਤਾਰਿਆਂ ਅਤੇ ਵੇਰਵਿਆਂ ਨੂੰ ਪੜ੍ਹੋ"</string> + <string name="permdesc_readCalendar" product="tablet" msgid="4993979255403945892">"ਇਹ ਐਪ ਤੁਹਾਡੇ ਟੈਬਲੈੱਟ ਉੱਤੇ ਸਟੋਰ ਕੀਤੇ ਸਾਰੇ ਕੈਲੰਡਰ ਵਰਤਾਰਿਆਂ ਨੂੰ ਪੜ੍ਹ ਸਕਦੀ ਹੈ ਅਤੇ ਤੁਹਾਡੇ ਕੈਲੰਡਰ ਡੈਟੇ ਨੂੰ ਸਾਂਝਾ ਜਾਂ ਰੱਖਿਅਤ ਕਰ ਸਕਦੀ ਹੈ।"</string> + <string name="permdesc_readCalendar" product="tv" msgid="8837931557573064315">"ਇਹ ਐਪ ਤੁਹਾਡੇ ਟੀਵੀ ਉੱਤੇ ਸਟੋਰ ਕੀਤੇ ਸਾਰੇ ਕੈਲੰਡਰ ਵਰਤਾਰਿਆਂ ਨੂੰ ਪੜ੍ਹ ਸਕਦੀ ਹੈ ਅਤੇ ਤੁਹਾਡੇ ਕੈਲੰਡਰ ਡੈਟੇ ਨੂੰ ਸਾਂਝਾ ਜਾਂ ਰੱਖਿਅਤ ਕਰ ਸਕਦੀ ਹੈ।"</string> + <string name="permdesc_readCalendar" product="default" msgid="4373978642145196715">"ਇਹ ਐਪ ਤੁਹਾਡੇ ਫ਼ੋਨ ਉੱਤੇ ਸਟੋਰ ਕੀਤੇ ਸਾਰੇ ਕੈਲੰਡਰ ਵਰਤਾਰਿਆਂ ਨੂੰ ਪੜ੍ਹ ਸਕਦੀ ਹੈ ਅਤੇ ਤੁਹਾਡੇ ਕੈਲੰਡਰ ਡੈਟੇ ਨੂੰ ਸਾਂਝਾ ਜਾਂ ਰੱਖਿਅਤ ਕਰ ਸਕਦੀ ਹੈ।"</string> <string name="permlab_writeCalendar" msgid="8438874755193825647">"ਕੈਲੰਡਰ ਇਵੈਂਟਾਂ ਜੋੜੋ ਜਾਂ ਸੰਸ਼ੋਧਿਤ ਕਰੋ ਅਤੇ ਮਾਲਕ ਦੀ ਜਾਣਕਾਰੀ ਤੋਂ ਬਿਨਾਂ ਮਹਿਮਾਨਾਂ ਨੂੰ ਈਮੇਲ ਭੇਜੋ"</string> - <!-- no translation found for permdesc_writeCalendar (1675270619903625982) --> - <skip /> - <!-- no translation found for permdesc_writeCalendar (9017809326268135866) --> - <skip /> - <!-- no translation found for permdesc_writeCalendar (7592791790516943173) --> - <skip /> + <string name="permdesc_writeCalendar" product="tablet" msgid="1675270619903625982">"ਇਹ ਐਪ ਤੁਹਾਡੇ ਟੈਬਲੈੱਟ \'ਤੇ ਕੈਲੰਡਰ ਵਰਤਾਰਿਆਂ ਨੂੰ ਸ਼ਾਮਲ ਕਰ ਸਕਦੀ ਹੈ, ਹਟਾ ਸਕਦੀ ਹੈ, ਜਾਂ ਬਦਲ ਸਕਦੀ ਹੈ। ਇਹ ਐਪ ਉਹਨਾਂ ਸੁਨੇਹਿਆਂ ਨੂੰ ਭੇਜ ਸਕਦੀ ਹੈ ਜੋ ਕਿ ਕੈਲੰਡਰ ਮਾਲਕਾਂ ਤੋਂ ਆਉਂਦੇ ਜਾਪ ਸਕਦੇ ਹਨ, ਜਾਂ ਉਹਨਾਂ ਦੇ ਮਾਲਕਾਂ ਨੂੰ ਸੂਚਿਤ ਕੀਤੇ ਬਿਨਾਂ ਵਰਤਾਰਿਆਂ ਨੂੰ ਬਦਲ ਸਕਦੀ ਹੈ।"</string> + <string name="permdesc_writeCalendar" product="tv" msgid="9017809326268135866">"ਇਹ ਐਪ ਤੁਹਾਡੇ ਟੀਵੀ \'ਤੇ ਕੈਲੰਡਰ ਵਰਤਾਰਿਆਂ ਨੂੰ ਸ਼ਾਮਲ ਕਰ ਸਕਦੀ ਹੈ, ਹਟਾ ਸਕਦੀ ਹੈ, ਜਾਂ ਬਦਲ ਸਕਦੀ ਹੈ। ਇਹ ਐਪ ਉਹਨਾਂ ਸੁਨੇਹਿਆਂ ਨੂੰ ਭੇਜ ਸਕਦੀ ਹੈ ਜੋ ਕੈਲੰਡਰ ਮਾਲਕਾਂ ਤੋਂ ਆਉਂਦੇ ਜਾਪ ਸਕਦੇ ਹਨ, ਜਾਂ ਉਹਨਾਂ ਦੇ ਮਾਲਕਾਂ ਨੂੰ ਸੂਚਿਤ ਕੀਤੇ ਬਿਨਾਂ ਵਰਤਾਰਿਆਂ ਨੂੰ ਬਦਲ ਸਕਦੀ ਹੈ।"</string> + <string name="permdesc_writeCalendar" product="default" msgid="7592791790516943173">"ਇਹ ਐਪ ਤੁਹਾਡੇ ਫ਼ੋਨ \'ਤੇ ਕੈਲੰਡਰ ਵਰਤਾਰਿਆਂ ਨੂੰ ਸ਼ਾਮਲ ਕਰ ਸਕਦੀ ਹੈ, ਹਟਾ ਸਕਦੀ ਹੈ, ਜਾਂ ਬਦਲ ਸਕਦੀ ਹੈ। ਇਹ ਐਪ ਉਹਨਾਂ ਸੁਨੇਹਿਆਂ ਨੂੰ ਭੇਜ ਸਕਦੀ ਹੈ ਜੋ ਕੈਲੰਡਰ ਮਾਲਕਾਂ ਤੋਂ ਆਉਂਦੇ ਜਾਪ ਸਕਦੇ ਹਨ, ਜਾਂ ਉਹਨਾਂ ਦੇ ਮਾਲਕਾਂ ਨੂੰ ਸੂਚਿਤ ਕੀਤੇ ਬਿਨਾਂ ਵਰਤਾਰਿਆਂ ਨੂੰ ਬਦਲ ਸਕਦੀ ਹੈ।"</string> <string name="permlab_accessLocationExtraCommands" msgid="2836308076720553837">"ਵਾਧੂ ਨਿਰਧਾਰਿਤ ਸਥਾਨ ਪ੍ਰਦਾਤਾ ਕਮਾਂਡਾਂ ਤੱਕ ਪਹੁੰਚ"</string> <string name="permdesc_accessLocationExtraCommands" msgid="6078307221056649927">"ਐਪ ਨੂੰ ਵਾਧੂ ਨਿਰਧਾਰਿਤ ਸਥਾਨ ਪ੍ਰਦਾਤਾ ਕਮਾਂਡਾਂ ਤੱਕ ਪਹੁੰਚ ਦੀ ਆਗਿਆ ਦਿੰਦਾ ਹੈ। ਇਹ ਐਪ ਨੂੰ GPS ਜਾਂ ਹੋਰ ਨਿਰਧਾਰਿਤ ਸਥਾਨ ਸਰੋਤਾਂ ਦੇ ਓਪਰੇਸ਼ਨ ਵਿੱਚ ਵਿਘਨ ਪਾਉਣ ਦੀ ਆਗਿਆ ਦੇ ਸਕਦਾ ਹੈ।"</string> <string name="permlab_accessFineLocation" msgid="251034415460950944">"ਸਟੀਕ ਟਿਕਾਣੇ \'ਤੇ ਪਹੁੰਚ ਕਰੋ (GPS ਅਤੇ ਨੈੱਟਵਰਕ-ਆਧਾਰਿਤ)"</string> - <!-- no translation found for permdesc_accessFineLocation (5821994817969957884) --> - <skip /> + <string name="permdesc_accessFineLocation" msgid="5821994817969957884">"ਇਹ ਐਪ GPS ਜਾਂ ਨੈੱਟਵਰਕ ਸਰੋਤਾਂ ਜਿਵੇਂ ਕਿ ਸੈੱਲ ਟਾਵਰਾਂ ਅਤੇ Wi-Fi ਨੈੱਟਵਰਕਾਂ \'ਤੇ ਆਧਾਰਿਤ ਤੁਹਾਡਾ ਟਿਕਾਣਾ ਪਤਾ ਕਰ ਸਕਦੀ ਹੈ। ਐਪ ਦੁਆਰਾ ਟਿਕਾਣਾ ਸੇਵਾਵਾਂ ਦੀ ਵਰਤੋਂ ਕੀਤੇ ਜਾਣ ਦੇ ਯੋਗ ਹੋਣ ਲਈ ਇਹ ਸੇਵਾਵਾਂ ਤੁਹਾਡੇ ਫ਼ੋਨ \'ਤੇ ਉਪਲਬਧ ਹੋਣੀਆਂ ਅਤੇ ਚਾਲੂ ਕੀਤੀਆਂ ਹੋਣੀਆਂ ਲਾਜ਼ਮੀ ਹਨ। ਇਸ ਨਾਲ ਬੈਟਰੀ ਦੀ ਖਪਤ ਵਧ ਸਕਦੀ ਹੈ।"</string> <string name="permlab_accessCoarseLocation" msgid="7715277613928539434">"ਅੰਦਾਜ਼ਨ ਟਿਕਾਣੇ \'ਤੇ ਪਹੁੰਚ ਕਰੋ (ਨੈੱਟਵਰਕ-ਆਧਾਰਿਤ)"</string> - <!-- no translation found for permdesc_accessCoarseLocation (3373266766487862426) --> - <skip /> - <!-- no translation found for permdesc_accessCoarseLocation (1884022719818788511) --> - <skip /> - <!-- no translation found for permdesc_accessCoarseLocation (7788009094906196995) --> - <skip /> + <string name="permdesc_accessCoarseLocation" product="tablet" msgid="3373266766487862426">"ਇਹ ਐਪ ਨੈੱਟਵਰਕ ਸਰੋਤਾਂ ਜਿਵੇਂ ਕਿ ਸੈੱਲ ਟਾਵਰਾਂ ਅਤੇ Wi-Fi ਨੈੱਟਵਰਕਾਂ \'ਤੇ ਆਧਾਰਿਤ ਤੁਹਾਡਾ ਟਿਕਾਣਾ ਪਤਾ ਕਰ ਸਕਦੀ ਹੈ। ਐਪ ਦੁਆਰਾ ਟਿਕਾਣਾ ਸੇਵਾਵਾਂ ਦੀ ਵਰਤੋਂ ਕੀਤੇ ਜਾਣ ਦੇ ਯੋਗ ਹੋਣ ਲਈ ਇਹ ਸੇਵਾਵਾਂ ਤੁਹਾਡੇ ਟੈਬਲੈੱਟ \'ਤੇ ਉਪਲਬਧ ਹੋਣੀਆਂ ਅਤੇ ਚਾਲੂ ਕੀਤੀਆਂ ਹੋਣੀਆਂ ਲਾਜ਼ਮੀ ਹਨ।"</string> + <string name="permdesc_accessCoarseLocation" product="tv" msgid="1884022719818788511">"ਇਹ ਐਪ ਨੈੱਟਵਰਕ ਸਰੋਤਾਂ ਜਿਵੇਂ ਕਿ ਸੈੱਲ ਟਾਵਰਾਂ ਅਤੇ Wi-Fi ਨੈੱਟਵਰਕਾਂ \'ਤੇ ਆਧਾਰਿਤ ਤੁਹਾਡਾ ਟਿਕਾਣਾ ਪਤਾ ਕਰ ਸਕਦੀ ਹੈ। ਐਪ ਦੁਆਰਾ ਟਿਕਾਣਾ ਸੇਵਾਵਾਂ ਦੀ ਵਰਤੋਂ ਕੀਤੇ ਜਾਣ ਦੇ ਯੋਗ ਹੋਣ ਲਈ ਇਹ ਸੇਵਾਵਾਂ ਤੁਹਾਡੇ ਟੀਵੀ \'ਤੇ ਉਪਲਬਧ ਹੋਣੀਆਂ ਅਤੇ ਚਾਲੂ ਕੀਤੀਆਂ ਹੋਣੀਆਂ ਲਾਜ਼ਮੀ ਹਨ।"</string> + <string name="permdesc_accessCoarseLocation" product="default" msgid="7788009094906196995">"ਇਹ ਐਪ ਨੈੱਟਵਰਕ ਸਰੋਤਾਂ ਜਿਵੇਂ ਕਿ ਸੈੱਲ ਟਾਵਰਾਂ ਅਤੇ Wi-Fi ਨੈੱਟਵਰਕਾਂ \'ਤੇ ਆਧਾਰਿਤ ਤੁਹਾਡਾ ਟਿਕਾਣਾ ਪਤਾ ਕਰ ਸਕਦੀ ਹੈ। ਐਪ ਦੁਆਰਾ ਟਿਕਾਣਾ ਸੇਵਾਵਾਂ ਦੀ ਵਰਤੋਂ ਕੀਤੇ ਜਾਣ ਦੇ ਯੋਗ ਹੋਣ ਲਈ ਇਹ ਸੇਵਾਵਾਂ ਤੁਹਾਡੇ ਫ਼ੋਨ \'ਤੇ ਉਪਲਬਧ ਹੋਣੀਆਂ ਅਤੇ ਚਾਲੂ ਕੀਤੀਆਂ ਹੋਣੀਆਂ ਲਾਜ਼ਮੀ ਹਨ।"</string> <string name="permlab_modifyAudioSettings" msgid="6095859937069146086">"ਆਪਣੀਆਂ ਔਡੀਓ ਸੈਟਿੰਗਾਂ ਬਦਲੋ"</string> <string name="permdesc_modifyAudioSettings" msgid="3522565366806248517">"ਔਪ ਨੂੰ ਗਲੋਬਲ ਔਡੀਓ ਸੈਟਿੰਗਾਂ ਸੰਸ਼ੋਧਿਤ ਕਰਨ ਦੀ ਆਗਿਆ ਦਿੰਦਾ ਹੈ ਜਿਵੇਂ ਵੌਲਿਊਮ ਅਤੇ ਆਊਟਪੁਟ ਲਈ ਕਿਹੜਾ ਸਪੀਕਰ ਵਰਤਿਆ ਜਾਂਦਾ ਹੈ।"</string> <string name="permlab_recordAudio" msgid="3876049771427466323">"ਔਡੀਓ ਰਿਕਾਰਡ ਕਰਨ"</string> - <!-- no translation found for permdesc_recordAudio (4245930455135321433) --> - <skip /> + <string name="permdesc_recordAudio" msgid="4245930455135321433">"ਇਹ ਐਪ ਕਿਸੇ ਵੀ ਸਮੇਂ ਮਾਈਕ੍ਰੋਫ਼ੋਨ ਦੀ ਵਰਤੋਂ ਕਰਕੇ ਔਡੀਓ ਫ਼ਾਈਲ ਰਿਕਾਰਡ ਕਰ ਸਕਦੀ ਹੈ।"</string> <string name="permlab_sim_communication" msgid="2935852302216852065">"SIM ਨੂੰ ਕਮਾਂਡਾਂ ਭੇਜੋ"</string> <string name="permdesc_sim_communication" msgid="5725159654279639498">"ਐਪ ਨੂੰ SIM ਨੂੰ ਕਮਾਂਡਾਂ ਭੇਜਣ ਦੀ ਆਗਿਆ ਦਿੰਦਾ ਹੈ। ਇਹ ਬਹੁਤ ਘਾਤਕ ਹੈ।"</string> <string name="permlab_camera" msgid="3616391919559751192">"ਤਸਵੀਰਾਂ ਅਤੇ ਵੀਡੀਓ ਬਣਾਓ"</string> - <!-- no translation found for permdesc_camera (5392231870049240670) --> - <skip /> + <string name="permdesc_camera" msgid="5392231870049240670">"ਇਹ ਐਪ ਕਿਸੇ ਵੀ ਸਮੇਂ ਕੈਮਰੇ ਨੂੰ ਵਰਤ ਕੇ ਤਸਵੀਰਾਂ ਖਿੱਚ ਸਕਦੀ ਹੈ ਅਤੇ ਵੀਡੀਓ ਫ਼ਾਈਲਾਂ ਰਿਕਾਰਡ ਕਰ ਸਕਦੀ ਹੈ।"</string> <string name="permlab_vibrate" msgid="7696427026057705834">"ਵਾਈਬ੍ਰੇਸ਼ਨ ਤੇ ਨਿਯੰਤਰਣ ਪਾਓ"</string> <string name="permdesc_vibrate" msgid="6284989245902300945">"ਐਪ ਨੂੰ ਵਾਈਬ੍ਰੇਟਰ ਤੇ ਨਿਯੰਤਰਣ ਪਾਉਣ ਦੀ ਆਗਿਆ ਦਿੰਦਾ ਹੈ।"</string> <string name="permlab_callPhone" msgid="3925836347681847954">"ਫੋਨ ਨੰਬਰਾਂ ਤੇ ਸਿੱਧੇ ਕਾਲ ਕਰੋ"</string> diff --git a/core/res/res/values-pl/strings.xml b/core/res/res/values-pl/strings.xml index 49dbb7651f59..77b2bf3dc84a 100644 --- a/core/res/res/values-pl/strings.xml +++ b/core/res/res/values-pl/strings.xml @@ -46,8 +46,7 @@ <string name="defaultMsisdnAlphaTag" msgid="2850889754919584674">"MSISDN1"</string> <string name="mmiError" msgid="5154499457739052907">"Problem z połączeniem lub błędny kod MMI."</string> <string name="mmiFdnError" msgid="5224398216385316471">"Operacja jest ograniczona wyłącznie do numerów ustalonych."</string> - <!-- no translation found for mmiErrorWhileRoaming (762488890299284230) --> - <skip /> + <string name="mmiErrorWhileRoaming" msgid="762488890299284230">"Podczas roamingu nie można zmienić ustawień przekazywania połączeń z telefonu."</string> <string name="serviceEnabled" msgid="8147278346414714315">"Usługa została włączona."</string> <string name="serviceEnabledFor" msgid="6856228140453471041">"Usługa została włączona dla:"</string> <string name="serviceDisabled" msgid="1937553226592516411">"Usługa została wyłączona."</string> @@ -100,10 +99,8 @@ <string name="RestrictedOnVoiceData" msgid="996636487106171320">"Usługi głosowe/danych są zablokowane."</string> <string name="RestrictedOnVoiceSms" msgid="1888588152792023873">"Usługi głosowe/SMS są zablokowane."</string> <string name="RestrictedOnAll" msgid="5643028264466092821">"Wszystkie usługi głosowe/danych/SMS są zablokowane."</string> - <!-- no translation found for NetworkPreferenceSwitchTitle (4008877505368566980) --> - <skip /> - <!-- no translation found for NetworkPreferenceSwitchSummary (7335915397439759249) --> - <skip /> + <string name="NetworkPreferenceSwitchTitle" msgid="4008877505368566980">"Brak zasięgu sieci"</string> + <string name="NetworkPreferenceSwitchSummary" msgid="7335915397439759249">"Aby poprawić odbiór, zmień typ sieci – wybierz Ustawienia > Sieci komórkowe > Preferowany typ sieci."</string> <string name="peerTtyModeFull" msgid="6165351790010341421">"Drugie urządzenie zażądało trybu „TTY pełny”"</string> <string name="peerTtyModeHco" msgid="5728602160669216784">"Drugie urządzenie zażądało trybu „TTY HCO”"</string> <string name="peerTtyModeVco" msgid="1742404978686538049">"Drugie urządzenie zażądało trybu „TTY VCO”"</string> @@ -189,10 +186,8 @@ <string name="work_profile_deleted_description" msgid="6305147513054341102">"Profil do pracy został usunięty z powodu braku aplikacji administracyjnej."</string> <string name="work_profile_deleted_details" msgid="226615743462361248">"Brakuje aplikacji administracyjnej profilu do pracy lub jest ona uszkodzona. Z tego powodu Twój profil do pracy i związane z nim dane zostały usunięte. Skontaktuj się ze swoim administratorem, by uzyskać pomoc."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="6019770344820507579">"Twój profil do pracy nie jest już dostępny na tym urządzeniu."</string> - <!-- no translation found for network_logging_notification_title (1805392571290161924) --> - <skip /> - <!-- no translation found for network_logging_notification_text (4448072433371155729) --> - <skip /> + <string name="network_logging_notification_title" msgid="1805392571290161924">"Ruch w sieci jest monitorowany"</string> + <string name="network_logging_notification_text" msgid="4448072433371155729">"Kliknij, aby wyświetlić szczegóły"</string> <string name="factory_reset_warning" msgid="5423253125642394387">"Twoje urządzenie zostanie wyczyszczone"</string> <string name="factory_reset_message" msgid="4905025204141900666">"Aplikacja administracyjna nie ma wszystkich składników lub jest uszkodzona i nie można jej użyć. Twoje urządzenie zostanie teraz wyczyszczone. Skontaktuj się ze swoim administratorem, aby uzyskać pomoc."</string> <string name="me" msgid="6545696007631404292">"Ja"</string> @@ -312,12 +307,9 @@ <string name="permlab_sendSms" msgid="7544599214260982981">"wysyłać i wyświetlać SMS-y"</string> <string name="permdesc_sendSms" msgid="7094729298204937667">"Pozwala aplikacji na wysyłanie SMS-ów. Może to skutkować nieoczekiwanymi opłatami. Złośliwe aplikacje mogą generować koszty, wysyłając wiadomości bez Twojego potwierdzenia."</string> <string name="permlab_readSms" msgid="8745086572213270480">"odczytywanie wiadomości tekstowych (SMS i MMS)"</string> - <!-- no translation found for permdesc_readSms (4741697454888074891) --> - <skip /> - <!-- no translation found for permdesc_readSms (5796670395641116592) --> - <skip /> - <!-- no translation found for permdesc_readSms (6826832415656437652) --> - <skip /> + <string name="permdesc_readSms" product="tablet" msgid="4741697454888074891">"Ta aplikacja może odczytywać wszystkie SMS-y zapisane na tablecie."</string> + <string name="permdesc_readSms" product="tv" msgid="5796670395641116592">"Ta aplikacja może odczytywać wszystkie SMS-y zapisane na telewizorze."</string> + <string name="permdesc_readSms" product="default" msgid="6826832415656437652">"Ta aplikacja może odczytywać wszystkie SMS-y zapisane na telefonie."</string> <string name="permlab_receiveWapPush" msgid="5991398711936590410">"odbieranie wiadomości tekstowych (WAP)"</string> <string name="permdesc_receiveWapPush" msgid="748232190220583385">"Pozwala aplikacji na odbieranie i przetwarzanie wiadomości WAP. To oznacza, że aplikacja będzie mogła bez Twojej wiedzy monitorować i usuwać wiadomości wysyłane do Twojego urządzenia."</string> <string name="permlab_getTasks" msgid="6466095396623933906">"pobieranie uruchomionych aplikacji"</string> @@ -330,10 +322,8 @@ <string name="permdesc_enableCarMode" msgid="4853187425751419467">"Pozwala aplikacji na włączanie trybu samochodowego."</string> <string name="permlab_killBackgroundProcesses" msgid="3914026687420177202">"zamykanie innych aplikacji"</string> <string name="permdesc_killBackgroundProcesses" msgid="4593353235959733119">"Pozwala aplikacji na kończenie procesów innych aplikacji działających w tle. Może to spowodować przerwanie działania innych aplikacji."</string> - <!-- no translation found for permlab_systemAlertWindow (7238805243128138690) --> - <skip /> - <!-- no translation found for permdesc_systemAlertWindow (2393776099672266188) --> - <skip /> + <string name="permlab_systemAlertWindow" msgid="7238805243128138690">"Ta aplikacja może wyświetlać się nad innymi aplikacjami"</string> + <string name="permdesc_systemAlertWindow" msgid="2393776099672266188">"Ta aplikacja może pojawić się nad innymi aplikacjami lub częściami ekranu. Może to przeszkadzać w jej zwykłym używaniu i zmieniać sposób wyświetlania innych aplikacji."</string> <string name="permlab_persistentActivity" msgid="8841113627955563938">"sprawianie, że aplikacja jest cały czas uruchomiona"</string> <string name="permdesc_persistentActivity" product="tablet" msgid="8525189272329086137">"Pozwala aplikacji na trwałe zapisywanie swoich fragmentów w pamięci. Może to zmniejszyć ilość pamięci dostępnej dla innych aplikacji i spowolnić działanie tabletu."</string> <string name="permdesc_persistentActivity" product="tv" msgid="5086862529499103587">"Pozwala aplikacji zapewnić nieusuwalność swoich fragmentów z pamięci. Może to ograniczyć ilość pamięci dostępną dla innych aplikacji i spowalniać działanie telewizora."</string> @@ -359,51 +349,37 @@ <string name="permdesc_writeContacts" product="tv" msgid="5438230957000018959">"Pozwala aplikacji modyfikować dane o Twoich kontaktach zapisane na telewizorze, w tym jak często dzwonisz lub piszesz e-maile do określonych osób albo komunikujesz się z nimi na inne sposoby. To uprawnienie umożliwia aplikacjom usuwanie danych kontaktów."</string> <string name="permdesc_writeContacts" product="default" msgid="589869224625163558">"Pozwala aplikacji na modyfikowanie danych o kontaktach zapisanych na telefonie, w tym informacji o częstotliwości rozmawiania, przesyłania e-maili i komunikowania się w inny sposób z poszczególnymi kontaktami. Aplikacje z tym uprawnieniem mogą usuwać dane kontaktów."</string> <string name="permlab_readCallLog" msgid="3478133184624102739">"czytanie rejestru połączeń"</string> - <!-- no translation found for permdesc_readCallLog (3204122446463552146) --> - <skip /> + <string name="permdesc_readCallLog" msgid="3204122446463552146">"Ta aplikacja może odczytywać historię połączeń."</string> <string name="permlab_writeCallLog" msgid="8552045664743499354">"zapisywanie rejestru połączeń"</string> <string name="permdesc_writeCallLog" product="tablet" msgid="6661806062274119245">"Zezwala aplikacji na modyfikowanie rejestru połączeń tabletu, w tym danych o połączeniach przychodzących i wychodzących. Złośliwe aplikacje mogą wykorzystać tę możliwość, by wyczyścić lub zmodyfikować rejestr połączeń."</string> <string name="permdesc_writeCallLog" product="tv" msgid="4225034892248398019">"Pozwala aplikacji modyfikować rejestr połączeń telewizora, w tym dane o połączeniach przychodzących i wychodzących. Szkodliwe aplikacje mogą to wykorzystać do skasowania lub zmodyfikowania rejestru połączeń."</string> <string name="permdesc_writeCallLog" product="default" msgid="683941736352787842">"Zezwala aplikacji na modyfikowanie rejestru połączeń telefonu, w tym danych o połączeniach przychodzących i wychodzących. Złośliwe aplikacje mogą wykorzystać tę możliwość, by wyczyścić lub zmodyfikować rejestr połączeń."</string> <string name="permlab_bodySensors" msgid="4683341291818520277">"dostęp do czujników ciała (np. monitorujących tętno)"</string> <string name="permdesc_bodySensors" product="default" msgid="4380015021754180431">"Pozwala aplikacji na dostęp do danych z czujników, które monitorują Twój stan fizyczny (np. tętno)."</string> - <!-- no translation found for permlab_readCalendar (6716116972752441641) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (4993979255403945892) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (8837931557573064315) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (4373978642145196715) --> - <skip /> + <string name="permlab_readCalendar" msgid="6716116972752441641">"Odczytywanie wydarzeń i informacji z kalendarza"</string> + <string name="permdesc_readCalendar" product="tablet" msgid="4993979255403945892">"Ta aplikacja może odczytywać wszystkie zapisane na tablecie wydarzenia z kalendarza i udostępniać oraz zapisywać dane kalendarza."</string> + <string name="permdesc_readCalendar" product="tv" msgid="8837931557573064315">"Ta aplikacja może odczytywać wszystkie zapisane w telewizorze wydarzenia z kalendarza i udostępniać oraz zapisywać dane kalendarza."</string> + <string name="permdesc_readCalendar" product="default" msgid="4373978642145196715">"Ta aplikacja może odczytywać wszystkie zapisane na telefonie wydarzenia z kalendarza i udostępniać oraz zapisywać dane kalendarza."</string> <string name="permlab_writeCalendar" msgid="8438874755193825647">"dodawanie i modyfikowanie wydarzeń w kalendarzu oraz wysyłanie e-maili do gości bez wiedzy właściciela"</string> - <!-- no translation found for permdesc_writeCalendar (1675270619903625982) --> - <skip /> - <!-- no translation found for permdesc_writeCalendar (9017809326268135866) --> - <skip /> - <!-- no translation found for permdesc_writeCalendar (7592791790516943173) --> - <skip /> + <string name="permdesc_writeCalendar" product="tablet" msgid="1675270619903625982">"Ta aplikacja może dodawać, usuwać i zmieniać wydarzenia z kalendarza na tablecie. Ta aplikacja może wysyłać wiadomości wyglądające jak utworzone przez właścicieli kalendarza lub zmieniać wydarzenia bez wiedzy ich właścicieli."</string> + <string name="permdesc_writeCalendar" product="tv" msgid="9017809326268135866">"Ta aplikacja może dodawać, usuwać i zmieniać wydarzenia z kalendarza na telewizorze. Ta aplikacja może wysyłać wiadomości wyglądające jak utworzone przez właścicieli kalendarza lub zmieniać wydarzenia bez wiedzy ich właścicieli."</string> + <string name="permdesc_writeCalendar" product="default" msgid="7592791790516943173">"Ta aplikacja może dodawać, usuwać i zmieniać wydarzenia z kalendarza na telefonie. Ta aplikacja może wysyłać wiadomości wyglądające jak utworzone przez właścicieli kalendarza lub zmieniać wydarzenia bez wiedzy ich właścicieli."</string> <string name="permlab_accessLocationExtraCommands" msgid="2836308076720553837">"dostęp do dodatkowych poleceń dostawcy informacji o lokalizacji"</string> <string name="permdesc_accessLocationExtraCommands" msgid="6078307221056649927">"Pozwala aplikacji na dostęp do dodatkowych poleceń dostawcy informacji o lokalizacji. Aplikacje z tym uprawnieniem mogą wpływać na działanie GPS-u lub innych źródeł lokalizacji."</string> <string name="permlab_accessFineLocation" msgid="251034415460950944">"dostęp do dokładnej lokalizacji (na podstawie GPS-u i sieci)"</string> - <!-- no translation found for permdesc_accessFineLocation (5821994817969957884) --> - <skip /> + <string name="permdesc_accessFineLocation" msgid="5821994817969957884">"Ta aplikacja może określać Twoją lokalizację na podstawie GPS-u lub sieciowych źródeł lokalizacji, takich jak stacje bazowe i sieci Wi-Fi. Te usługi lokalizacyjne muszą być włączone i dostępne na telefonie, by aplikacja mogła z nich korzystać. Może to zwiększyć zużycie baterii."</string> <string name="permlab_accessCoarseLocation" msgid="7715277613928539434">"dostęp do przybliżonej lokalizacji (na podstawie sieci)"</string> - <!-- no translation found for permdesc_accessCoarseLocation (3373266766487862426) --> - <skip /> - <!-- no translation found for permdesc_accessCoarseLocation (1884022719818788511) --> - <skip /> - <!-- no translation found for permdesc_accessCoarseLocation (7788009094906196995) --> - <skip /> + <string name="permdesc_accessCoarseLocation" product="tablet" msgid="3373266766487862426">"Ta aplikacja może określać Twoją lokalizację na podstawie źródeł sieciowych, takich jak stacje bazowe i sieci Wi-Fi. Te usługi lokalizacyjne muszą być włączone i dostępne na tablecie, by aplikacja mogła z nich korzystać."</string> + <string name="permdesc_accessCoarseLocation" product="tv" msgid="1884022719818788511">"Ta aplikacja może określać Twoją lokalizację na podstawie źródeł sieciowych, takich jak stacje bazowe i sieci Wi-Fi. Te usługi lokalizacyjne muszą być włączone i dostępne na telewizorze, by aplikacja mogła z nich korzystać."</string> + <string name="permdesc_accessCoarseLocation" product="default" msgid="7788009094906196995">"Ta aplikacja może określać Twoją lokalizację na podstawie źródeł sieciowych, takich jak stacje bazowe i sieci Wi-Fi. Te usługi lokalizacyjne muszą być włączone i dostępne na telefonie, by aplikacja mogła z nich korzystać."</string> <string name="permlab_modifyAudioSettings" msgid="6095859937069146086">"zmienianie ustawień audio"</string> <string name="permdesc_modifyAudioSettings" msgid="3522565366806248517">"Pozwala aplikacji na modyfikowanie globalnych ustawień dźwięku, takich jak głośność oraz urządzenie wyjściowe."</string> <string name="permlab_recordAudio" msgid="3876049771427466323">"nagrywanie dźwięku"</string> - <!-- no translation found for permdesc_recordAudio (4245930455135321433) --> - <skip /> + <string name="permdesc_recordAudio" msgid="4245930455135321433">"Ta aplikacja może w dowolnym momencie nagrać dźwięk przez mikrofon."</string> <string name="permlab_sim_communication" msgid="2935852302216852065">"wysyłanie poleceń do karty SIM"</string> <string name="permdesc_sim_communication" msgid="5725159654279639498">"Pozwala aplikacji na wysyłanie poleceń do karty SIM. To bardzo niebezpieczne."</string> <string name="permlab_camera" msgid="3616391919559751192">"wykonywanie zdjęć i filmów wideo"</string> - <!-- no translation found for permdesc_camera (5392231870049240670) --> - <skip /> + <string name="permdesc_camera" msgid="5392231870049240670">"Ta aplikacja może w dowolnym momencie robić zdjęcia i nagrywać filmy przy użyciu aparatu."</string> <string name="permlab_vibrate" msgid="7696427026057705834">"sterowanie wibracjami"</string> <string name="permdesc_vibrate" msgid="6284989245902300945">"Pozwala aplikacji na sterowanie wibracjami."</string> <string name="permlab_callPhone" msgid="3925836347681847954">"bezpośrednie wybieranie numerów telefonów"</string> diff --git a/core/res/res/values-pt-rBR/strings.xml b/core/res/res/values-pt-rBR/strings.xml index 0127208e8956..71b974725e80 100644 --- a/core/res/res/values-pt-rBR/strings.xml +++ b/core/res/res/values-pt-rBR/strings.xml @@ -46,8 +46,7 @@ <string name="defaultMsisdnAlphaTag" msgid="2850889754919584674">"MSISDN1"</string> <string name="mmiError" msgid="5154499457739052907">"Problema de conexão ou código MMI inválido."</string> <string name="mmiFdnError" msgid="5224398216385316471">"A operação é limitada somente a números de chamadas fixas."</string> - <!-- no translation found for mmiErrorWhileRoaming (762488890299284230) --> - <skip /> + <string name="mmiErrorWhileRoaming" msgid="762488890299284230">"Não é possível alterar as configurações de encaminhamento de chamada do seu smartphone em roaming."</string> <string name="serviceEnabled" msgid="8147278346414714315">"O serviço foi ativado."</string> <string name="serviceEnabledFor" msgid="6856228140453471041">"O serviço foi ativado para:"</string> <string name="serviceDisabled" msgid="1937553226592516411">"O serviço foi desativado."</string> @@ -98,10 +97,8 @@ <string name="RestrictedOnVoiceData" msgid="996636487106171320">"Os serviços de voz/dados estão bloqueados."</string> <string name="RestrictedOnVoiceSms" msgid="1888588152792023873">"Os serviços de voz/SMS estão bloqueados."</string> <string name="RestrictedOnAll" msgid="5643028264466092821">"Todos os serviços de voz/dados/SMS estão bloqueados."</string> - <!-- no translation found for NetworkPreferenceSwitchTitle (4008877505368566980) --> - <skip /> - <!-- no translation found for NetworkPreferenceSwitchSummary (7335915397439759249) --> - <skip /> + <string name="NetworkPreferenceSwitchTitle" msgid="4008877505368566980">"Não foi possível acessar a rede"</string> + <string name="NetworkPreferenceSwitchSummary" msgid="7335915397439759249">"Para melhorar a recepção, tente alterar o tipo selecionado em Configurações > Redes celulares > Tipo de rede preferencial."</string> <string name="peerTtyModeFull" msgid="6165351790010341421">"TTD modo COMPLETO solicitado"</string> <string name="peerTtyModeHco" msgid="5728602160669216784">"TTD modo HCO solicitado"</string> <string name="peerTtyModeVco" msgid="1742404978686538049">"TTD modo VCO solicitado"</string> @@ -185,10 +182,8 @@ <string name="work_profile_deleted_description" msgid="6305147513054341102">"Perfil de trabalho excluído devido à ausência de um app para administrador."</string> <string name="work_profile_deleted_details" msgid="226615743462361248">"O app para administrador do perfil de trabalho não foi encontrado ou está corrompido. Consequentemente, seu perfil de trabalho e os dados relacionados foram excluídos. Entre em contato com seu administrador para receber assistência."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="6019770344820507579">"Seu perfil de trabalho não está mais disponível neste dispositivo."</string> - <!-- no translation found for network_logging_notification_title (1805392571290161924) --> - <skip /> - <!-- no translation found for network_logging_notification_text (4448072433371155729) --> - <skip /> + <string name="network_logging_notification_title" msgid="1805392571290161924">"O tráfego de rede está sendo monitorado"</string> + <string name="network_logging_notification_text" msgid="4448072433371155729">"Toque para ver mais detalhes"</string> <string name="factory_reset_warning" msgid="5423253125642394387">"Seu dispositivo será limpo"</string> <string name="factory_reset_message" msgid="4905025204141900666">"O app para administrador está sem alguns componentes ou foi corrompido e não pode ser usado. Seu dispositivo será limpo agora. Entre em contato com seu administrador para receber assistência."</string> <string name="me" msgid="6545696007631404292">"Eu"</string> @@ -306,12 +301,9 @@ <string name="permlab_sendSms" msgid="7544599214260982981">"envie e veja mensagens SMS"</string> <string name="permdesc_sendSms" msgid="7094729298204937667">"Permite que o app envie mensagens SMS. Isso pode resultar em cobranças inesperadas. Apps maliciosos podem gerar custos através do envio de mensagens sem sua confirmação."</string> <string name="permlab_readSms" msgid="8745086572213270480">"ler suas mensagens de texto (SMS ou MMS)"</string> - <!-- no translation found for permdesc_readSms (4741697454888074891) --> - <skip /> - <!-- no translation found for permdesc_readSms (5796670395641116592) --> - <skip /> - <!-- no translation found for permdesc_readSms (6826832415656437652) --> - <skip /> + <string name="permdesc_readSms" product="tablet" msgid="4741697454888074891">"Este app pode ler todas as mensagens SMS (de texto) armazenadas no seu tablet."</string> + <string name="permdesc_readSms" product="tv" msgid="5796670395641116592">"Este app pode ler todas as mensagens SMS (de texto) armazenadas na sua TV."</string> + <string name="permdesc_readSms" product="default" msgid="6826832415656437652">"Este app pode ler todas as mensagens SMS (de texto) armazenadas no seu smartphone."</string> <string name="permlab_receiveWapPush" msgid="5991398711936590410">"receber mensagens de texto (WAP)"</string> <string name="permdesc_receiveWapPush" msgid="748232190220583385">"Permite que o app receba e processe mensagens WAP. Esta permissão inclui a capacidade de monitorar ou excluir mensagens enviadas para você sem mostrá-las para você."</string> <string name="permlab_getTasks" msgid="6466095396623933906">"recuperar apps em execução"</string> @@ -324,10 +316,8 @@ <string name="permdesc_enableCarMode" msgid="4853187425751419467">"Permite que o app ative o modo Carro."</string> <string name="permlab_killBackgroundProcesses" msgid="3914026687420177202">"fechar outros apps"</string> <string name="permdesc_killBackgroundProcesses" msgid="4593353235959733119">"Permite que o app encerre processos em segundo plano de outros apps. Pode ser que outros apps parem de funcionar."</string> - <!-- no translation found for permlab_systemAlertWindow (7238805243128138690) --> - <skip /> - <!-- no translation found for permdesc_systemAlertWindow (2393776099672266188) --> - <skip /> + <string name="permlab_systemAlertWindow" msgid="7238805243128138690">"Este app pode se sobrepor visualmente a outros apps"</string> + <string name="permdesc_systemAlertWindow" msgid="2393776099672266188">"Este app pode se sobrepor visualmente a outros apps ou a outras partes da tela. Isso pode interferir no uso normal do app e alterar a forma como os outros apps são exibidos."</string> <string name="permlab_persistentActivity" msgid="8841113627955563938">"sempre executar o app"</string> <string name="permdesc_persistentActivity" product="tablet" msgid="8525189272329086137">"Permite que o app torne partes de si mesmo persistentes na memória. Pode limitar a memória disponível para outros apps, deixando o tablet mais lento."</string> <string name="permdesc_persistentActivity" product="tv" msgid="5086862529499103587">"Permite que o app torne partes de si mesmo persistentes na memória. Isso pode limitar a memória disponível para outros apps, deixando a TV mais lenta."</string> @@ -353,51 +343,37 @@ <string name="permdesc_writeContacts" product="tv" msgid="5438230957000018959">"Permite que o app modifique os dados de contatos armazenados na sua TV, incluindo a frequência com que você fez chamadas, enviou e-mails ou se comunicou de outras formas com contatos específicos. Essa permissão autoriza o app a excluir dados de contatos."</string> <string name="permdesc_writeContacts" product="default" msgid="589869224625163558">"Permite que o app modifique os dados dos contatos armazenados no telefone, incluindo a frequência com que você fez chamadas, enviou e-mails ou se comunicou de outras formas com contatos específicos. Esta permissão autoriza o app a excluir dados de contatos."</string> <string name="permlab_readCallLog" msgid="3478133184624102739">"ler registro de chamadas"</string> - <!-- no translation found for permdesc_readCallLog (3204122446463552146) --> - <skip /> + <string name="permdesc_readCallLog" msgid="3204122446463552146">"Este app pode ler seu histórico de chamadas."</string> <string name="permlab_writeCallLog" msgid="8552045664743499354">"salvar no registo de chamadas"</string> <string name="permdesc_writeCallLog" product="tablet" msgid="6661806062274119245">"Permite que o app modifique o registro de chamadas de seu tablet, incluindo dados sobre chamadas recebidas e efetuadas. Apps maliciosos podem usar esta permissão para apagar ou modificar seu registro de chamadas."</string> <string name="permdesc_writeCallLog" product="tv" msgid="4225034892248398019">"Permite que o app modifique o registro de chamadas da sua TV, incluindo dados sobre chamadas recebidas e efetuadas. Apps maliciosos podem usá-lo para apagar ou modificar seu registro de chamadas."</string> <string name="permdesc_writeCallLog" product="default" msgid="683941736352787842">"Permite que o app modifique o registro de chamadas de seu telefone, incluindo dados sobre chamadas recebidas e efetuadas. Apps maliciosos podem usar esta permissão para apagar ou modificar seu registro de chamadas."</string> <string name="permlab_bodySensors" msgid="4683341291818520277">"acessar sensores corporais (como monitores de frequência cardíaca)"</string> <string name="permdesc_bodySensors" product="default" msgid="4380015021754180431">"Permite que o app acesse dados de sensores que monitoram sua condição física, como a frequência cardíaca."</string> - <!-- no translation found for permlab_readCalendar (6716116972752441641) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (4993979255403945892) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (8837931557573064315) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (4373978642145196715) --> - <skip /> + <string name="permlab_readCalendar" msgid="6716116972752441641">"Ler detalhes e eventos da agenda"</string> + <string name="permdesc_readCalendar" product="tablet" msgid="4993979255403945892">"Este app pode ler todos os eventos da agenda armazenados no seu tablet e compartilhar ou salvar os dados da sua agenda."</string> + <string name="permdesc_readCalendar" product="tv" msgid="8837931557573064315">"Este app pode ler todos os eventos da agenda armazenados na sua TV e compartilhar ou salvar os dados da sua agenda."</string> + <string name="permdesc_readCalendar" product="default" msgid="4373978642145196715">"Este app pode ler todos os eventos da agenda armazenados no seu smartphone e compartilhar ou salvar os dados da sua agenda."</string> <string name="permlab_writeCalendar" msgid="8438874755193825647">"adicionar ou modificar compromissos e enviar e-mail para os convidados sem o conhecimento dos donos"</string> - <!-- no translation found for permdesc_writeCalendar (1675270619903625982) --> - <skip /> - <!-- no translation found for permdesc_writeCalendar (9017809326268135866) --> - <skip /> - <!-- no translation found for permdesc_writeCalendar (7592791790516943173) --> - <skip /> + <string name="permdesc_writeCalendar" product="tablet" msgid="1675270619903625982">"Este app pode adicionar, remover ou alterar eventos da agenda no seu tablet. Ele também pode enviar mensagens que aparentem ser de autoria do proprietário da agenda ou alterar eventos sem notificar o proprietário."</string> + <string name="permdesc_writeCalendar" product="tv" msgid="9017809326268135866">"Este app pode adicionar, remover ou alterar eventos da agenda na sua TV. Ele também pode enviar mensagens que aparentem ser de autoria do proprietário da agenda ou alterar eventos sem notificar o proprietário."</string> + <string name="permdesc_writeCalendar" product="default" msgid="7592791790516943173">"Este app pode adicionar, remover ou alterar eventos da agenda no seu smartphone. Ele também pode enviar mensagens que aparentem ser de autoria do proprietário da agenda ou alterar eventos sem notificar o proprietário."</string> <string name="permlab_accessLocationExtraCommands" msgid="2836308076720553837">"acessar comandos extras do provedor de localização"</string> <string name="permdesc_accessLocationExtraCommands" msgid="6078307221056649927">"Permite que o app acesse comandos do provedor não relacionados à localização. Isso pode permitir que o app interfira no funcionamento do GPS ou de outras fontes de localização."</string> <string name="permlab_accessFineLocation" msgid="251034415460950944">"acessar localização precisa (GPS e com base na rede)"</string> - <!-- no translation found for permdesc_accessFineLocation (5821994817969957884) --> - <skip /> + <string name="permdesc_accessFineLocation" msgid="5821994817969957884">"Este app pode ver seu local com base no GPS ou nas fontes de localização da rede, como torres de celular e redes Wi-Fi. Esses serviços de localização precisam estar ativados e disponíveis no seu smartphone para que o app possa usá-los. Isso pode aumentar o consumo de bateria."</string> <string name="permlab_accessCoarseLocation" msgid="7715277613928539434">"acessar localização aproximada (com base na rede)"</string> - <!-- no translation found for permdesc_accessCoarseLocation (3373266766487862426) --> - <skip /> - <!-- no translation found for permdesc_accessCoarseLocation (1884022719818788511) --> - <skip /> - <!-- no translation found for permdesc_accessCoarseLocation (7788009094906196995) --> - <skip /> + <string name="permdesc_accessCoarseLocation" product="tablet" msgid="3373266766487862426">"Este app pode ver seu local com base nas fontes de rede, como torres de celular e redes Wi-Fi. Esses serviços de localização precisam estar ativados e disponíveis no seu tablet para que o app possa usá-los."</string> + <string name="permdesc_accessCoarseLocation" product="tv" msgid="1884022719818788511">"Este app pode ver seu local com base nas fontes de rede, como torres de celular e redes Wi-Fi. Esses serviços de localização precisam estar ativados e disponíveis na sua TV para que o app possa usá-los."</string> + <string name="permdesc_accessCoarseLocation" product="default" msgid="7788009094906196995">"Este app pode ver seu local com base nas fontes de rede, como torres de celular e redes Wi-Fi. Esses serviços de localização precisam estar ativados e disponíveis no seu smartphone para que o app possa usá-los."</string> <string name="permlab_modifyAudioSettings" msgid="6095859937069146086">"alterar as suas configurações de áudio"</string> <string name="permdesc_modifyAudioSettings" msgid="3522565366806248517">"Permite que o app modifique configurações de áudio globais como volume e alto-falantes de saída."</string> <string name="permlab_recordAudio" msgid="3876049771427466323">"gravar áudio"</string> - <!-- no translation found for permdesc_recordAudio (4245930455135321433) --> - <skip /> + <string name="permdesc_recordAudio" msgid="4245930455135321433">"Este app pode gravar áudio usando o microfone a qualquer momento."</string> <string name="permlab_sim_communication" msgid="2935852302216852065">"enviar comandos para o SIM"</string> <string name="permdesc_sim_communication" msgid="5725159654279639498">"Permite que o app envie comandos ao SIM. Muito perigoso."</string> <string name="permlab_camera" msgid="3616391919559751192">"tirar fotos e gravar vídeos"</string> - <!-- no translation found for permdesc_camera (5392231870049240670) --> - <skip /> + <string name="permdesc_camera" msgid="5392231870049240670">"Este app pode tirar fotos e gravar vídeos usando a câmera a qualquer momento."</string> <string name="permlab_vibrate" msgid="7696427026057705834">"controlar vibração"</string> <string name="permdesc_vibrate" msgid="6284989245902300945">"Permite que o app controle a vibração."</string> <string name="permlab_callPhone" msgid="3925836347681847954">"ligar diretamente para números de telefone"</string> diff --git a/core/res/res/values-pt-rPT/strings.xml b/core/res/res/values-pt-rPT/strings.xml index 4ddd5a373e06..5ae5c40b7dd8 100644 --- a/core/res/res/values-pt-rPT/strings.xml +++ b/core/res/res/values-pt-rPT/strings.xml @@ -46,8 +46,7 @@ <string name="defaultMsisdnAlphaTag" msgid="2850889754919584674">"MSISDN1"</string> <string name="mmiError" msgid="5154499457739052907">"Problema de ligação ou código MMI inválido."</string> <string name="mmiFdnError" msgid="5224398216385316471">"A operação está restringida a números fixos autorizados."</string> - <!-- no translation found for mmiErrorWhileRoaming (762488890299284230) --> - <skip /> + <string name="mmiErrorWhileRoaming" msgid="762488890299284230">"Não é possível alterar as definições do encaminhamento de chamadas no telemóvel quando está em roaming."</string> <string name="serviceEnabled" msgid="8147278346414714315">"O serviço foi ativado."</string> <string name="serviceEnabledFor" msgid="6856228140453471041">"O serviço foi ativado para:"</string> <string name="serviceDisabled" msgid="1937553226592516411">"O serviço foi desativado."</string> @@ -98,10 +97,8 @@ <string name="RestrictedOnVoiceData" msgid="996636487106171320">"Os serviços de voz/dados estão bloqueados."</string> <string name="RestrictedOnVoiceSms" msgid="1888588152792023873">"Os serviços de Voz/SMS estão bloqueados."</string> <string name="RestrictedOnAll" msgid="5643028264466092821">"Todos os serviços de voz/dados/SMS estão bloqueados."</string> - <!-- no translation found for NetworkPreferenceSwitchTitle (4008877505368566980) --> - <skip /> - <!-- no translation found for NetworkPreferenceSwitchSummary (7335915397439759249) --> - <skip /> + <string name="NetworkPreferenceSwitchTitle" msgid="4008877505368566980">"Não é possível ligar à rede"</string> + <string name="NetworkPreferenceSwitchSummary" msgid="7335915397439759249">"Para melhorar a receção, experimente alterar o tipo selecionado em Definições > Redes móveis > Tipo de rede preferido."</string> <string name="peerTtyModeFull" msgid="6165351790010341421">"O par solicitou o modo COMPLETO de teletipo"</string> <string name="peerTtyModeHco" msgid="5728602160669216784">"O par solicitou o modo HCO de teletipo"</string> <string name="peerTtyModeVco" msgid="1742404978686538049">"O par solicitou o modo VCO de teletipo"</string> @@ -185,10 +182,8 @@ <string name="work_profile_deleted_description" msgid="6305147513054341102">"Perfil de trabalho eliminado devido a aplicação de administração em falta."</string> <string name="work_profile_deleted_details" msgid="226615743462361248">"A aplicação de administração do perfil de trabalho está em falta ou corrompida. Consequentemente, o seu perfil de trabalho e os dados relacionados foram eliminados. Contacte o seu administrador para obter assistência."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="6019770344820507579">"O seu perfil de trabalho já não está disponível neste dispositivo."</string> - <!-- no translation found for network_logging_notification_title (1805392571290161924) --> - <skip /> - <!-- no translation found for network_logging_notification_text (4448072433371155729) --> - <skip /> + <string name="network_logging_notification_title" msgid="1805392571290161924">"O tráfego de rede está a ser monitorizado"</string> + <string name="network_logging_notification_text" msgid="4448072433371155729">"Toque para obter mais detalhes"</string> <string name="factory_reset_warning" msgid="5423253125642394387">"O seu dispositivo será apagado"</string> <string name="factory_reset_message" msgid="4905025204141900666">"A aplicação de administração tem componentes em falta ou corrompidos e não podem ser utilizados. O seu dispositivo será agora apagado. Contacte o seu administrador para obter assistência."</string> <string name="me" msgid="6545696007631404292">"Eu"</string> @@ -306,12 +301,9 @@ <string name="permlab_sendSms" msgid="7544599214260982981">"enviar e ver mensagens SMS"</string> <string name="permdesc_sendSms" msgid="7094729298204937667">"Permite que a aplicação envie mensagens SMS. Isto pode resultar em custos inesperados. As aplicações maliciosas podem fazer com que incorra em custos, enviando mensagens sem a sua confirmação."</string> <string name="permlab_readSms" msgid="8745086572213270480">"ler as mensagens de texto (SMS ou MMS)"</string> - <!-- no translation found for permdesc_readSms (4741697454888074891) --> - <skip /> - <!-- no translation found for permdesc_readSms (5796670395641116592) --> - <skip /> - <!-- no translation found for permdesc_readSms (6826832415656437652) --> - <skip /> + <string name="permdesc_readSms" product="tablet" msgid="4741697454888074891">"Esta aplicação pode ler todas as mensagens SMS (de texto) armazenadas no seu tablet."</string> + <string name="permdesc_readSms" product="tv" msgid="5796670395641116592">"Esta aplicação pode ler todas as mensagens SMS (de texto) armazenadas na sua TV."</string> + <string name="permdesc_readSms" product="default" msgid="6826832415656437652">"Esta aplicação pode ler todas as mensagens SMS (de texto) armazenadas no seu telemóvel."</string> <string name="permlab_receiveWapPush" msgid="5991398711936590410">"receber mensagens de texto (WAP)"</string> <string name="permdesc_receiveWapPush" msgid="748232190220583385">"Permite que a aplicação receba e processe mensagens WAP. Esta autorização inclui a capacidade de monitorizar ou eliminar mensagens enviadas para si sem as apresentar."</string> <string name="permlab_getTasks" msgid="6466095396623933906">"obter aplicações em execução"</string> @@ -324,10 +316,8 @@ <string name="permdesc_enableCarMode" msgid="4853187425751419467">"Permite que a aplicação ative o modo automóvel."</string> <string name="permlab_killBackgroundProcesses" msgid="3914026687420177202">"fechar outras aplicações"</string> <string name="permdesc_killBackgroundProcesses" msgid="4593353235959733119">"Permite que a aplicação termine processos em segundo plano de outras aplicações. Isto pode fazer com que outras aplicações deixem de funcionar."</string> - <!-- no translation found for permlab_systemAlertWindow (7238805243128138690) --> - <skip /> - <!-- no translation found for permdesc_systemAlertWindow (2393776099672266188) --> - <skip /> + <string name="permlab_systemAlertWindow" msgid="7238805243128138690">"Esta aplicação pode aparecer por cima de outras aplicações"</string> + <string name="permdesc_systemAlertWindow" msgid="2393776099672266188">"Esta aplicação pode aparecer por cima de outras aplicações ou de outras partes do ecrã. Tal pode interferir com a utilização normal das aplicações e alterar a forma como as outras aplicações aparecem."</string> <string name="permlab_persistentActivity" msgid="8841113627955563938">"fazer com que a aplicação seja sempre executada"</string> <string name="permdesc_persistentActivity" product="tablet" msgid="8525189272329086137">"Permite que a aplicação torne partes de si mesma persistentes na memória. Isto pode limitar a disponibilidade da memória para outras aplicações, tornando o tablet mais lento."</string> <string name="permdesc_persistentActivity" product="tv" msgid="5086862529499103587">"Permite à aplicação tornar partes de si própria persistentes na memória. Isto pode limitar a memória disponível para outras aplicações, o que torna a TV mais lenta."</string> @@ -353,51 +343,37 @@ <string name="permdesc_writeContacts" product="tv" msgid="5438230957000018959">"Permite à aplicação modificar dados acerca dos contactos guardados na sua TV, incluindo a frequência com que telefonou, enviou emails ou comunicou através de outras formas com determinadas pessoas. Esta autorização permite às aplicações eliminarem dados de contactos."</string> <string name="permdesc_writeContacts" product="default" msgid="589869224625163558">"Permite que a aplicação modifique dados acerca dos contactos guardados no telemóvel, incluindo a frequência com que telefonou, enviou emails ou comunicou através de outras formas com determinadas pessoas. Esta autorização permite que as aplicações eliminem dados de contactos."</string> <string name="permlab_readCallLog" msgid="3478133184624102739">"ler registo de chamadas"</string> - <!-- no translation found for permdesc_readCallLog (3204122446463552146) --> - <skip /> + <string name="permdesc_readCallLog" msgid="3204122446463552146">"Esta aplicação pode ler o seu histórico de chamadas."</string> <string name="permlab_writeCallLog" msgid="8552045664743499354">"escrever registo de chamadas"</string> <string name="permdesc_writeCallLog" product="tablet" msgid="6661806062274119245">"Permite à aplicação modificar o registo de chamadas do tablet, incluindo os dados sobre as chamadas recebidas e efetuadas. As aplicações maliciosas podem utilizar esta funcionalidade para apagar ou modificar o registo de chamadas."</string> <string name="permdesc_writeCallLog" product="tv" msgid="4225034892248398019">"Permite à aplicação modificar o registo de chamadas da sua TV, incluindo os dados sobre as chamadas recebidas e efetuadas. As aplicações maliciosas podem utilizar esta funcionalidade para apagar ou modificar o registo de chamadas."</string> <string name="permdesc_writeCallLog" product="default" msgid="683941736352787842">"Permite à aplicação modificar o registo de chamadas do telemóvel, incluindo os dados sobre as chamadas recebidas e efetuadas. As aplicações maliciosas podem utilizar esta funcionalidade para apagar ou modificar o seu registo de chamadas."</string> <string name="permlab_bodySensors" msgid="4683341291818520277">"aceder a sensores corporais (como monitores do ritmo cardíaco)"</string> <string name="permdesc_bodySensors" product="default" msgid="4380015021754180431">"Permite que a aplicação aceda a dados de sensores que monitorizam a sua condição física, como o ritmo cardíaco."</string> - <!-- no translation found for permlab_readCalendar (6716116972752441641) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (4993979255403945892) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (8837931557573064315) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (4373978642145196715) --> - <skip /> + <string name="permlab_readCalendar" msgid="6716116972752441641">"Ler detalhes e eventos do calendário"</string> + <string name="permdesc_readCalendar" product="tablet" msgid="4993979255403945892">"Esta aplicação pode ler todos os eventos do calendário armazenados no seu tablet e partilhar ou guardar os dados do calendário."</string> + <string name="permdesc_readCalendar" product="tv" msgid="8837931557573064315">"Esta aplicação pode ler todos os eventos do calendário armazenados na sua TV e partilhar ou guardar os dados do calendário."</string> + <string name="permdesc_readCalendar" product="default" msgid="4373978642145196715">"Esta aplicação pode ler todos os eventos do calendário armazenados no seu telemóvel e partilhar ou guardar os dados do calendário."</string> <string name="permlab_writeCalendar" msgid="8438874755193825647">"adicionar ou modificar eventos do calendário e enviar e-mail a convidados sem o conhecimento dos proprietários"</string> - <!-- no translation found for permdesc_writeCalendar (1675270619903625982) --> - <skip /> - <!-- no translation found for permdesc_writeCalendar (9017809326268135866) --> - <skip /> - <!-- no translation found for permdesc_writeCalendar (7592791790516943173) --> - <skip /> + <string name="permdesc_writeCalendar" product="tablet" msgid="1675270619903625982">"Esta aplicação pode adicionar, remover ou alterar eventos do calendário no seu tablet. Esta aplicação pode enviar mensagens que parecem vir de proprietários do calendário ou alterar eventos sem notificar os respetivos proprietários."</string> + <string name="permdesc_writeCalendar" product="tv" msgid="9017809326268135866">"Esta aplicação pode adicionar, remover ou alterar eventos do calendário na sua TV. Esta aplicação pode enviar mensagens que parecem vir de proprietários do calendário ou alterar eventos sem notificar os respetivos proprietários."</string> + <string name="permdesc_writeCalendar" product="default" msgid="7592791790516943173">"Esta aplicação pode adicionar, remover ou alterar eventos do calendário no seu telemóvel. Esta aplicação pode enviar mensagens que parecem vir de proprietários do calendário ou alterar eventos sem notificar os respetivos proprietários."</string> <string name="permlab_accessLocationExtraCommands" msgid="2836308076720553837">"aceder a comandos adicionais do fornecedor de localização"</string> <string name="permdesc_accessLocationExtraCommands" msgid="6078307221056649927">"Permite que a aplicação aceda a comandos adicionais do fornecedor de localização. Esta opção pode permitir que a aplicação interfira com o funcionamento do GPS ou de outras fontes de localização."</string> <string name="permlab_accessFineLocation" msgid="251034415460950944">"aceder à localização exata (baseada no GPS e na rede)"</string> - <!-- no translation found for permdesc_accessFineLocation (5821994817969957884) --> - <skip /> + <string name="permdesc_accessFineLocation" msgid="5821994817969957884">"Esta aplicação pode obter a sua localização com base em fontes de localização da rede e de GPS, tais como torres de redes móveis e redes Wi-Fi. É necessário que estes serviços de localização estejam ativados e disponíveis no seu telemóvel para que a aplicação os possa utilizar. Esta ação pode aumentar o consumo da bateria."</string> <string name="permlab_accessCoarseLocation" msgid="7715277613928539434">"aceder à localização aproximada (baseada na rede)"</string> - <!-- no translation found for permdesc_accessCoarseLocation (3373266766487862426) --> - <skip /> - <!-- no translation found for permdesc_accessCoarseLocation (1884022719818788511) --> - <skip /> - <!-- no translation found for permdesc_accessCoarseLocation (7788009094906196995) --> - <skip /> + <string name="permdesc_accessCoarseLocation" product="tablet" msgid="3373266766487862426">"Esta aplicação pode obter a sua localização com base em fontes de rede, tais como torres de redes móveis e redes Wi-Fi. É necessário que estes serviços de localização estejam ativados e disponíveis no seu tablet para que a aplicação os possa utilizar."</string> + <string name="permdesc_accessCoarseLocation" product="tv" msgid="1884022719818788511">"Esta aplicação pode obter a sua localização com base em fontes de rede, tais como torres de redes móveis e redes Wi-Fi. É necessário que estes serviços de localização estejam ativados e disponíveis na sua TV para que a aplicação os possa utilizar."</string> + <string name="permdesc_accessCoarseLocation" product="default" msgid="7788009094906196995">"Esta aplicação pode obter a sua localização com base em fontes de rede, tais como torres de redes móveis e redes Wi-Fi. É necessário que estes serviços de localização estejam ativados e disponíveis no seu telemóvel para que a aplicação os possa utilizar."</string> <string name="permlab_modifyAudioSettings" msgid="6095859937069146086">"alterar as suas definições de áudio"</string> <string name="permdesc_modifyAudioSettings" msgid="3522565366806248517">"Permite que a aplicação modifique definições de áudio globais, tais como o volume e qual o altifalante utilizado para a saída de som."</string> <string name="permlab_recordAudio" msgid="3876049771427466323">"gravar áudio"</string> - <!-- no translation found for permdesc_recordAudio (4245930455135321433) --> - <skip /> + <string name="permdesc_recordAudio" msgid="4245930455135321433">"Esta aplicação pode gravar áudio através do microfone a qualquer momento."</string> <string name="permlab_sim_communication" msgid="2935852302216852065">"enviar comandos para o SIM"</string> <string name="permdesc_sim_communication" msgid="5725159654279639498">"Permite que a aplicação envie comandos para o SIM. Esta ação é muito perigosa."</string> <string name="permlab_camera" msgid="3616391919559751192">"tirar fotografias e vídeos"</string> - <!-- no translation found for permdesc_camera (5392231870049240670) --> - <skip /> + <string name="permdesc_camera" msgid="5392231870049240670">"Esta aplicação pode tirar fotos e gravar vídeos através da câmara a qualquer momento."</string> <string name="permlab_vibrate" msgid="7696427026057705834">"controlar vibração"</string> <string name="permdesc_vibrate" msgid="6284989245902300945">"Permite à aplicação controlar o vibrador."</string> <string name="permlab_callPhone" msgid="3925836347681847954">"marcar números de telefone diretamente"</string> diff --git a/core/res/res/values-pt/strings.xml b/core/res/res/values-pt/strings.xml index 0127208e8956..71b974725e80 100644 --- a/core/res/res/values-pt/strings.xml +++ b/core/res/res/values-pt/strings.xml @@ -46,8 +46,7 @@ <string name="defaultMsisdnAlphaTag" msgid="2850889754919584674">"MSISDN1"</string> <string name="mmiError" msgid="5154499457739052907">"Problema de conexão ou código MMI inválido."</string> <string name="mmiFdnError" msgid="5224398216385316471">"A operação é limitada somente a números de chamadas fixas."</string> - <!-- no translation found for mmiErrorWhileRoaming (762488890299284230) --> - <skip /> + <string name="mmiErrorWhileRoaming" msgid="762488890299284230">"Não é possível alterar as configurações de encaminhamento de chamada do seu smartphone em roaming."</string> <string name="serviceEnabled" msgid="8147278346414714315">"O serviço foi ativado."</string> <string name="serviceEnabledFor" msgid="6856228140453471041">"O serviço foi ativado para:"</string> <string name="serviceDisabled" msgid="1937553226592516411">"O serviço foi desativado."</string> @@ -98,10 +97,8 @@ <string name="RestrictedOnVoiceData" msgid="996636487106171320">"Os serviços de voz/dados estão bloqueados."</string> <string name="RestrictedOnVoiceSms" msgid="1888588152792023873">"Os serviços de voz/SMS estão bloqueados."</string> <string name="RestrictedOnAll" msgid="5643028264466092821">"Todos os serviços de voz/dados/SMS estão bloqueados."</string> - <!-- no translation found for NetworkPreferenceSwitchTitle (4008877505368566980) --> - <skip /> - <!-- no translation found for NetworkPreferenceSwitchSummary (7335915397439759249) --> - <skip /> + <string name="NetworkPreferenceSwitchTitle" msgid="4008877505368566980">"Não foi possível acessar a rede"</string> + <string name="NetworkPreferenceSwitchSummary" msgid="7335915397439759249">"Para melhorar a recepção, tente alterar o tipo selecionado em Configurações > Redes celulares > Tipo de rede preferencial."</string> <string name="peerTtyModeFull" msgid="6165351790010341421">"TTD modo COMPLETO solicitado"</string> <string name="peerTtyModeHco" msgid="5728602160669216784">"TTD modo HCO solicitado"</string> <string name="peerTtyModeVco" msgid="1742404978686538049">"TTD modo VCO solicitado"</string> @@ -185,10 +182,8 @@ <string name="work_profile_deleted_description" msgid="6305147513054341102">"Perfil de trabalho excluído devido à ausência de um app para administrador."</string> <string name="work_profile_deleted_details" msgid="226615743462361248">"O app para administrador do perfil de trabalho não foi encontrado ou está corrompido. Consequentemente, seu perfil de trabalho e os dados relacionados foram excluídos. Entre em contato com seu administrador para receber assistência."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="6019770344820507579">"Seu perfil de trabalho não está mais disponível neste dispositivo."</string> - <!-- no translation found for network_logging_notification_title (1805392571290161924) --> - <skip /> - <!-- no translation found for network_logging_notification_text (4448072433371155729) --> - <skip /> + <string name="network_logging_notification_title" msgid="1805392571290161924">"O tráfego de rede está sendo monitorado"</string> + <string name="network_logging_notification_text" msgid="4448072433371155729">"Toque para ver mais detalhes"</string> <string name="factory_reset_warning" msgid="5423253125642394387">"Seu dispositivo será limpo"</string> <string name="factory_reset_message" msgid="4905025204141900666">"O app para administrador está sem alguns componentes ou foi corrompido e não pode ser usado. Seu dispositivo será limpo agora. Entre em contato com seu administrador para receber assistência."</string> <string name="me" msgid="6545696007631404292">"Eu"</string> @@ -306,12 +301,9 @@ <string name="permlab_sendSms" msgid="7544599214260982981">"envie e veja mensagens SMS"</string> <string name="permdesc_sendSms" msgid="7094729298204937667">"Permite que o app envie mensagens SMS. Isso pode resultar em cobranças inesperadas. Apps maliciosos podem gerar custos através do envio de mensagens sem sua confirmação."</string> <string name="permlab_readSms" msgid="8745086572213270480">"ler suas mensagens de texto (SMS ou MMS)"</string> - <!-- no translation found for permdesc_readSms (4741697454888074891) --> - <skip /> - <!-- no translation found for permdesc_readSms (5796670395641116592) --> - <skip /> - <!-- no translation found for permdesc_readSms (6826832415656437652) --> - <skip /> + <string name="permdesc_readSms" product="tablet" msgid="4741697454888074891">"Este app pode ler todas as mensagens SMS (de texto) armazenadas no seu tablet."</string> + <string name="permdesc_readSms" product="tv" msgid="5796670395641116592">"Este app pode ler todas as mensagens SMS (de texto) armazenadas na sua TV."</string> + <string name="permdesc_readSms" product="default" msgid="6826832415656437652">"Este app pode ler todas as mensagens SMS (de texto) armazenadas no seu smartphone."</string> <string name="permlab_receiveWapPush" msgid="5991398711936590410">"receber mensagens de texto (WAP)"</string> <string name="permdesc_receiveWapPush" msgid="748232190220583385">"Permite que o app receba e processe mensagens WAP. Esta permissão inclui a capacidade de monitorar ou excluir mensagens enviadas para você sem mostrá-las para você."</string> <string name="permlab_getTasks" msgid="6466095396623933906">"recuperar apps em execução"</string> @@ -324,10 +316,8 @@ <string name="permdesc_enableCarMode" msgid="4853187425751419467">"Permite que o app ative o modo Carro."</string> <string name="permlab_killBackgroundProcesses" msgid="3914026687420177202">"fechar outros apps"</string> <string name="permdesc_killBackgroundProcesses" msgid="4593353235959733119">"Permite que o app encerre processos em segundo plano de outros apps. Pode ser que outros apps parem de funcionar."</string> - <!-- no translation found for permlab_systemAlertWindow (7238805243128138690) --> - <skip /> - <!-- no translation found for permdesc_systemAlertWindow (2393776099672266188) --> - <skip /> + <string name="permlab_systemAlertWindow" msgid="7238805243128138690">"Este app pode se sobrepor visualmente a outros apps"</string> + <string name="permdesc_systemAlertWindow" msgid="2393776099672266188">"Este app pode se sobrepor visualmente a outros apps ou a outras partes da tela. Isso pode interferir no uso normal do app e alterar a forma como os outros apps são exibidos."</string> <string name="permlab_persistentActivity" msgid="8841113627955563938">"sempre executar o app"</string> <string name="permdesc_persistentActivity" product="tablet" msgid="8525189272329086137">"Permite que o app torne partes de si mesmo persistentes na memória. Pode limitar a memória disponível para outros apps, deixando o tablet mais lento."</string> <string name="permdesc_persistentActivity" product="tv" msgid="5086862529499103587">"Permite que o app torne partes de si mesmo persistentes na memória. Isso pode limitar a memória disponível para outros apps, deixando a TV mais lenta."</string> @@ -353,51 +343,37 @@ <string name="permdesc_writeContacts" product="tv" msgid="5438230957000018959">"Permite que o app modifique os dados de contatos armazenados na sua TV, incluindo a frequência com que você fez chamadas, enviou e-mails ou se comunicou de outras formas com contatos específicos. Essa permissão autoriza o app a excluir dados de contatos."</string> <string name="permdesc_writeContacts" product="default" msgid="589869224625163558">"Permite que o app modifique os dados dos contatos armazenados no telefone, incluindo a frequência com que você fez chamadas, enviou e-mails ou se comunicou de outras formas com contatos específicos. Esta permissão autoriza o app a excluir dados de contatos."</string> <string name="permlab_readCallLog" msgid="3478133184624102739">"ler registro de chamadas"</string> - <!-- no translation found for permdesc_readCallLog (3204122446463552146) --> - <skip /> + <string name="permdesc_readCallLog" msgid="3204122446463552146">"Este app pode ler seu histórico de chamadas."</string> <string name="permlab_writeCallLog" msgid="8552045664743499354">"salvar no registo de chamadas"</string> <string name="permdesc_writeCallLog" product="tablet" msgid="6661806062274119245">"Permite que o app modifique o registro de chamadas de seu tablet, incluindo dados sobre chamadas recebidas e efetuadas. Apps maliciosos podem usar esta permissão para apagar ou modificar seu registro de chamadas."</string> <string name="permdesc_writeCallLog" product="tv" msgid="4225034892248398019">"Permite que o app modifique o registro de chamadas da sua TV, incluindo dados sobre chamadas recebidas e efetuadas. Apps maliciosos podem usá-lo para apagar ou modificar seu registro de chamadas."</string> <string name="permdesc_writeCallLog" product="default" msgid="683941736352787842">"Permite que o app modifique o registro de chamadas de seu telefone, incluindo dados sobre chamadas recebidas e efetuadas. Apps maliciosos podem usar esta permissão para apagar ou modificar seu registro de chamadas."</string> <string name="permlab_bodySensors" msgid="4683341291818520277">"acessar sensores corporais (como monitores de frequência cardíaca)"</string> <string name="permdesc_bodySensors" product="default" msgid="4380015021754180431">"Permite que o app acesse dados de sensores que monitoram sua condição física, como a frequência cardíaca."</string> - <!-- no translation found for permlab_readCalendar (6716116972752441641) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (4993979255403945892) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (8837931557573064315) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (4373978642145196715) --> - <skip /> + <string name="permlab_readCalendar" msgid="6716116972752441641">"Ler detalhes e eventos da agenda"</string> + <string name="permdesc_readCalendar" product="tablet" msgid="4993979255403945892">"Este app pode ler todos os eventos da agenda armazenados no seu tablet e compartilhar ou salvar os dados da sua agenda."</string> + <string name="permdesc_readCalendar" product="tv" msgid="8837931557573064315">"Este app pode ler todos os eventos da agenda armazenados na sua TV e compartilhar ou salvar os dados da sua agenda."</string> + <string name="permdesc_readCalendar" product="default" msgid="4373978642145196715">"Este app pode ler todos os eventos da agenda armazenados no seu smartphone e compartilhar ou salvar os dados da sua agenda."</string> <string name="permlab_writeCalendar" msgid="8438874755193825647">"adicionar ou modificar compromissos e enviar e-mail para os convidados sem o conhecimento dos donos"</string> - <!-- no translation found for permdesc_writeCalendar (1675270619903625982) --> - <skip /> - <!-- no translation found for permdesc_writeCalendar (9017809326268135866) --> - <skip /> - <!-- no translation found for permdesc_writeCalendar (7592791790516943173) --> - <skip /> + <string name="permdesc_writeCalendar" product="tablet" msgid="1675270619903625982">"Este app pode adicionar, remover ou alterar eventos da agenda no seu tablet. Ele também pode enviar mensagens que aparentem ser de autoria do proprietário da agenda ou alterar eventos sem notificar o proprietário."</string> + <string name="permdesc_writeCalendar" product="tv" msgid="9017809326268135866">"Este app pode adicionar, remover ou alterar eventos da agenda na sua TV. Ele também pode enviar mensagens que aparentem ser de autoria do proprietário da agenda ou alterar eventos sem notificar o proprietário."</string> + <string name="permdesc_writeCalendar" product="default" msgid="7592791790516943173">"Este app pode adicionar, remover ou alterar eventos da agenda no seu smartphone. Ele também pode enviar mensagens que aparentem ser de autoria do proprietário da agenda ou alterar eventos sem notificar o proprietário."</string> <string name="permlab_accessLocationExtraCommands" msgid="2836308076720553837">"acessar comandos extras do provedor de localização"</string> <string name="permdesc_accessLocationExtraCommands" msgid="6078307221056649927">"Permite que o app acesse comandos do provedor não relacionados à localização. Isso pode permitir que o app interfira no funcionamento do GPS ou de outras fontes de localização."</string> <string name="permlab_accessFineLocation" msgid="251034415460950944">"acessar localização precisa (GPS e com base na rede)"</string> - <!-- no translation found for permdesc_accessFineLocation (5821994817969957884) --> - <skip /> + <string name="permdesc_accessFineLocation" msgid="5821994817969957884">"Este app pode ver seu local com base no GPS ou nas fontes de localização da rede, como torres de celular e redes Wi-Fi. Esses serviços de localização precisam estar ativados e disponíveis no seu smartphone para que o app possa usá-los. Isso pode aumentar o consumo de bateria."</string> <string name="permlab_accessCoarseLocation" msgid="7715277613928539434">"acessar localização aproximada (com base na rede)"</string> - <!-- no translation found for permdesc_accessCoarseLocation (3373266766487862426) --> - <skip /> - <!-- no translation found for permdesc_accessCoarseLocation (1884022719818788511) --> - <skip /> - <!-- no translation found for permdesc_accessCoarseLocation (7788009094906196995) --> - <skip /> + <string name="permdesc_accessCoarseLocation" product="tablet" msgid="3373266766487862426">"Este app pode ver seu local com base nas fontes de rede, como torres de celular e redes Wi-Fi. Esses serviços de localização precisam estar ativados e disponíveis no seu tablet para que o app possa usá-los."</string> + <string name="permdesc_accessCoarseLocation" product="tv" msgid="1884022719818788511">"Este app pode ver seu local com base nas fontes de rede, como torres de celular e redes Wi-Fi. Esses serviços de localização precisam estar ativados e disponíveis na sua TV para que o app possa usá-los."</string> + <string name="permdesc_accessCoarseLocation" product="default" msgid="7788009094906196995">"Este app pode ver seu local com base nas fontes de rede, como torres de celular e redes Wi-Fi. Esses serviços de localização precisam estar ativados e disponíveis no seu smartphone para que o app possa usá-los."</string> <string name="permlab_modifyAudioSettings" msgid="6095859937069146086">"alterar as suas configurações de áudio"</string> <string name="permdesc_modifyAudioSettings" msgid="3522565366806248517">"Permite que o app modifique configurações de áudio globais como volume e alto-falantes de saída."</string> <string name="permlab_recordAudio" msgid="3876049771427466323">"gravar áudio"</string> - <!-- no translation found for permdesc_recordAudio (4245930455135321433) --> - <skip /> + <string name="permdesc_recordAudio" msgid="4245930455135321433">"Este app pode gravar áudio usando o microfone a qualquer momento."</string> <string name="permlab_sim_communication" msgid="2935852302216852065">"enviar comandos para o SIM"</string> <string name="permdesc_sim_communication" msgid="5725159654279639498">"Permite que o app envie comandos ao SIM. Muito perigoso."</string> <string name="permlab_camera" msgid="3616391919559751192">"tirar fotos e gravar vídeos"</string> - <!-- no translation found for permdesc_camera (5392231870049240670) --> - <skip /> + <string name="permdesc_camera" msgid="5392231870049240670">"Este app pode tirar fotos e gravar vídeos usando a câmera a qualquer momento."</string> <string name="permlab_vibrate" msgid="7696427026057705834">"controlar vibração"</string> <string name="permdesc_vibrate" msgid="6284989245902300945">"Permite que o app controle a vibração."</string> <string name="permlab_callPhone" msgid="3925836347681847954">"ligar diretamente para números de telefone"</string> diff --git a/core/res/res/values-ro/strings.xml b/core/res/res/values-ro/strings.xml index 3e1b957cc0b7..7af49e8b0c03 100644 --- a/core/res/res/values-ro/strings.xml +++ b/core/res/res/values-ro/strings.xml @@ -184,10 +184,8 @@ <string name="work_profile_deleted_description" msgid="6305147513054341102">"Profilul de serviciu a fost șters, deoarece aplicația de administrare lipsește."</string> <string name="work_profile_deleted_details" msgid="226615743462361248">"Aplicația de administrare a profilului de serviciu lipsește sau este deteriorată. Prin urmare, profilul de serviciu și datele asociate au fost șterse. Pentru asistență, contactați administratorul."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="6019770344820507579">"Profilul de serviciu nu mai este disponibil pe acest dispozitiv."</string> - <!-- no translation found for network_logging_notification_title (1805392571290161924) --> - <skip /> - <!-- no translation found for network_logging_notification_text (4448072433371155729) --> - <skip /> + <string name="network_logging_notification_title" msgid="1805392571290161924">"Traficul de rețea este monitorizat"</string> + <string name="network_logging_notification_text" msgid="4448072433371155729">"Atingeți pentru mai multe detalii"</string> <string name="factory_reset_warning" msgid="5423253125642394387">"Datele de pe dispozitiv vor fi șterse"</string> <string name="factory_reset_message" msgid="4905025204141900666">"Aplicația de administrare nu poate fi utilizată, deoarece este deteriorată sau îi lipsesc componente. Datele de pe dispozitiv vor fi șterse. Pentru asistență, contactați administratorul."</string> <string name="me" msgid="6545696007631404292">"Eu"</string> diff --git a/core/res/res/values-ru/strings.xml b/core/res/res/values-ru/strings.xml index 1707147b2c9e..073033eb541a 100644 --- a/core/res/res/values-ru/strings.xml +++ b/core/res/res/values-ru/strings.xml @@ -46,8 +46,7 @@ <string name="defaultMsisdnAlphaTag" msgid="2850889754919584674">"MSISDN1"</string> <string name="mmiError" msgid="5154499457739052907">"Неполадки подключения или неверный код MMI."</string> <string name="mmiFdnError" msgid="5224398216385316471">"Операция возможна только для разрешенных номеров."</string> - <!-- no translation found for mmiErrorWhileRoaming (762488890299284230) --> - <skip /> + <string name="mmiErrorWhileRoaming" msgid="762488890299284230">"Вы не можете изменить настройки переадресации вызовов, поскольку находитесь в роуминге."</string> <string name="serviceEnabled" msgid="8147278346414714315">"Служба включена."</string> <string name="serviceEnabledFor" msgid="6856228140453471041">"Служба подключена для:"</string> <string name="serviceDisabled" msgid="1937553226592516411">"Служба отключена."</string> @@ -100,10 +99,8 @@ <string name="RestrictedOnVoiceData" msgid="996636487106171320">"Службы передачи данных/голосовых сообщений заблокированы."</string> <string name="RestrictedOnVoiceSms" msgid="1888588152792023873">"Службы передачи голосовых сообщений/SMS заблокированы."</string> <string name="RestrictedOnAll" msgid="5643028264466092821">"Все службы передачи данных/голосовых сообщений/SMS заблокированы."</string> - <!-- no translation found for NetworkPreferenceSwitchTitle (4008877505368566980) --> - <skip /> - <!-- no translation found for NetworkPreferenceSwitchSummary (7335915397439759249) --> - <skip /> + <string name="NetworkPreferenceSwitchTitle" msgid="4008877505368566980">"Сеть недоступна"</string> + <string name="NetworkPreferenceSwitchSummary" msgid="7335915397439759249">"Чтобы улучшить сигнал, попробуйте выбрать другой тип сети в настройках (раздел \"Мобильные сети\")."</string> <string name="peerTtyModeFull" msgid="6165351790010341421">"На устройстве абонента выбран режим телетайпа \"ВСЕ\""</string> <string name="peerTtyModeHco" msgid="5728602160669216784">"На устройстве абонента выбран режим телетайпа HCO"</string> <string name="peerTtyModeVco" msgid="1742404978686538049">"На устройстве абонента выбран режим телетайпа VCO"</string> @@ -189,10 +186,8 @@ <string name="work_profile_deleted_description" msgid="6305147513054341102">"Рабочий профиль удален из-за отсутствия приложения Admin."</string> <string name="work_profile_deleted_details" msgid="226615743462361248">"Приложение Admin в рабочем профиле отсутствует или повреждено. Из-за этого рабочий профиль и связанные с ним данные были удалены. Если у вас возникли вопросы, обратитесь к администратору."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="6019770344820507579">"Ваш рабочий профиль больше не доступен на этом устройстве."</string> - <!-- no translation found for network_logging_notification_title (1805392571290161924) --> - <skip /> - <!-- no translation found for network_logging_notification_text (4448072433371155729) --> - <skip /> + <string name="network_logging_notification_title" msgid="1805392571290161924">"Включен мониторинг сетевого трафика"</string> + <string name="network_logging_notification_text" msgid="4448072433371155729">"Нажмите, чтобы показать подробную информацию"</string> <string name="factory_reset_warning" msgid="5423253125642394387">"Все данные с устройства будут удалены"</string> <string name="factory_reset_message" msgid="4905025204141900666">"Приложение Admin нельзя использовать, так как оно отсутствует или повреждено. С устройства будут удалены все данные. Если у вас возникли вопросы, обратитесь к администратору."</string> <string name="me" msgid="6545696007631404292">"Я"</string> @@ -312,12 +307,9 @@ <string name="permlab_sendSms" msgid="7544599214260982981">"отправка и просмотр SMS-сообщений"</string> <string name="permdesc_sendSms" msgid="7094729298204937667">"Приложение сможет отправлять SMS. Учтите, что вредоносные программы смогут отправлять сообщения без уведомления, что может привести к непредвиденным расходам."</string> <string name="permlab_readSms" msgid="8745086572213270480">"Просмотр SMS и MMS"</string> - <!-- no translation found for permdesc_readSms (4741697454888074891) --> - <skip /> - <!-- no translation found for permdesc_readSms (5796670395641116592) --> - <skip /> - <!-- no translation found for permdesc_readSms (6826832415656437652) --> - <skip /> + <string name="permdesc_readSms" product="tablet" msgid="4741697454888074891">"Приложение может считывать SMS-сообщения на планшете."</string> + <string name="permdesc_readSms" product="tv" msgid="5796670395641116592">"Приложение может считывать SMS-сообщения на телевизоре."</string> + <string name="permdesc_readSms" product="default" msgid="6826832415656437652">"Приложение может считывать SMS-сообщения на телефоне."</string> <string name="permlab_receiveWapPush" msgid="5991398711936590410">"Прием WAP-сообщений"</string> <string name="permdesc_receiveWapPush" msgid="748232190220583385">"Приложение сможет получать и обрабатывать WAP-сообщения. Это значит, что оно сможет отслеживать и удалять отправленные на ваше устройство сообщения, не показывая их."</string> <string name="permlab_getTasks" msgid="6466095396623933906">"Получение данных о запущенных приложениях"</string> @@ -330,10 +322,8 @@ <string name="permdesc_enableCarMode" msgid="4853187425751419467">"Приложение сможет включать режим \"Штурман\"."</string> <string name="permlab_killBackgroundProcesses" msgid="3914026687420177202">"Закрытие других приложений"</string> <string name="permdesc_killBackgroundProcesses" msgid="4593353235959733119">"Приложение сможет завершать фоновые процессы других приложений. Из-за этого другие приложения могут прекратить работу."</string> - <!-- no translation found for permlab_systemAlertWindow (7238805243128138690) --> - <skip /> - <!-- no translation found for permdesc_systemAlertWindow (2393776099672266188) --> - <skip /> + <string name="permlab_systemAlertWindow" msgid="7238805243128138690">"Показ поверх всех окон"</string> + <string name="permdesc_systemAlertWindow" msgid="2393776099672266188">"Приложение может открываться поверх других окон. Это может влиять на работу с другими приложениями."</string> <string name="permlab_persistentActivity" msgid="8841113627955563938">"Поддержание приложения в рабочем режиме"</string> <string name="permdesc_persistentActivity" product="tablet" msgid="8525189272329086137">"Приложение сможет постоянно хранить свои компоненты в памяти. Это может уменьшить объем памяти, доступный другим приложениям, и замедлить работу устройства."</string> <string name="permdesc_persistentActivity" product="tv" msgid="5086862529499103587">"Сохранение элементов приложения в памяти. Это может ограничить объем памяти, доступный другим приложениям, и замедлить работу телевизора."</string> @@ -359,51 +349,37 @@ <string name="permdesc_writeContacts" product="tv" msgid="5438230957000018959">"Изменение сведений о контактах на вашем телефоне, в том числе информации о том, как часто вы звоните, отправляете сообщения электронной почты и другими способами связываетесь с определенными людьми. С этим разрешением приложения смогут удалять данные о контактах."</string> <string name="permdesc_writeContacts" product="default" msgid="589869224625163558">"Приложение сможет изменять сведения о контактах на вашем телефоне, включая то, как часто вы звоните, отправляете письма и другими способами связываетесь с определенными людьми. С этим разрешением приложения смогут удалять данные о контактах."</string> <string name="permlab_readCallLog" msgid="3478133184624102739">"Просмотр журнала вызовов"</string> - <!-- no translation found for permdesc_readCallLog (3204122446463552146) --> - <skip /> + <string name="permdesc_readCallLog" msgid="3204122446463552146">"Приложение может считывать данные журнала звонков."</string> <string name="permlab_writeCallLog" msgid="8552045664743499354">"Изменение журнала вызовов"</string> <string name="permdesc_writeCallLog" product="tablet" msgid="6661806062274119245">"Приложение сможет вносить изменения в список вызовов планшетного ПК и данные о входящих и исходящих звонках. Вредоносные приложения смогут воспользоваться этим для удаления или изменения информации о звонках."</string> <string name="permdesc_writeCallLog" product="tv" msgid="4225034892248398019">"Изменение списка вызовов телевизора и данных о входящих и исходящих звонках. Вредоносные приложения смогут воспользоваться этим для удаления или изменения информации о звонках."</string> <string name="permdesc_writeCallLog" product="default" msgid="683941736352787842">"Приложение сможет вносить изменения в список вызовов телефона и данные о входящих и исходящих звонках. Вредоносные приложения смогут воспользоваться этим для удаления или изменения информации о звонках."</string> <string name="permlab_bodySensors" msgid="4683341291818520277">"Датчики (например, пульсометр)"</string> <string name="permdesc_bodySensors" product="default" msgid="4380015021754180431">"Приложение сможет получить доступ к данным датчиков, размещенных на теле, например измеряющих частоту сердцебиения."</string> - <!-- no translation found for permlab_readCalendar (6716116972752441641) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (4993979255403945892) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (8837931557573064315) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (4373978642145196715) --> - <skip /> + <string name="permlab_readCalendar" msgid="6716116972752441641">"Просмотр мероприятий и других данных календаря"</string> + <string name="permdesc_readCalendar" product="tablet" msgid="4993979255403945892">"Приложение может считывать, отправлять и сохранять информацию о мероприятиях в календаре планшета."</string> + <string name="permdesc_readCalendar" product="tv" msgid="8837931557573064315">"Приложение может считывать, отправлять и сохранять информацию о мероприятиях в календаре телевизора."</string> + <string name="permdesc_readCalendar" product="default" msgid="4373978642145196715">"Приложение может считывать, отправлять и сохранять информацию о мероприятиях в календаре телефона."</string> <string name="permlab_writeCalendar" msgid="8438874755193825647">"Добавление/изменение мероприятий и отправление гостям эл. сообщений без предупреждения владельца календаря"</string> - <!-- no translation found for permdesc_writeCalendar (1675270619903625982) --> - <skip /> - <!-- no translation found for permdesc_writeCalendar (9017809326268135866) --> - <skip /> - <!-- no translation found for permdesc_writeCalendar (7592791790516943173) --> - <skip /> + <string name="permdesc_writeCalendar" product="tablet" msgid="1675270619903625982">"Приложение может добавлять, удалять или изменять мероприятия в календаре на планшете. Оно также может отправлять сообщения от имени владельцев календаря, а также изменять мероприятия без ведома владельца."</string> + <string name="permdesc_writeCalendar" product="tv" msgid="9017809326268135866">"Приложение может добавлять, удалять или изменять мероприятия в календаре на телевизоре. Оно также может отправлять сообщения от имени владельцев календаря, а также изменять мероприятия без ведома владельца."</string> + <string name="permdesc_writeCalendar" product="default" msgid="7592791790516943173">"Приложение может добавлять, удалять или изменять мероприятия в календаре на телефоне. Оно также может отправлять сообщения от имени владельцев календаря, а также изменять мероприятия без ведома владельца."</string> <string name="permlab_accessLocationExtraCommands" msgid="2836308076720553837">"Доступ к дополнительным командам управления источниками геоданных"</string> <string name="permdesc_accessLocationExtraCommands" msgid="6078307221056649927">"Доступ к дополнительным командам управления источниками геоданных и вмешательство в работу системы GPS или других источников геоданных."</string> <string name="permlab_accessFineLocation" msgid="251034415460950944">"Доступ к точному местоположению (по координатам сети и спутникам GPS)"</string> - <!-- no translation found for permdesc_accessFineLocation (5821994817969957884) --> - <skip /> + <string name="permdesc_accessFineLocation" msgid="5821994817969957884">"Приложение может получать сведения о вашем местоположении от GPS-датчика или сетевых источников, таких как вышки сотовой связи и точки доступа Wi-Fi. Необходимо включить соответствующие параметры на телефоне и разрешить приложению использовать геоданные. Может увеличиться расход заряда батареи."</string> <string name="permlab_accessCoarseLocation" msgid="7715277613928539434">"Доступ к примерному местоположению (по координатам сети)"</string> - <!-- no translation found for permdesc_accessCoarseLocation (3373266766487862426) --> - <skip /> - <!-- no translation found for permdesc_accessCoarseLocation (1884022719818788511) --> - <skip /> - <!-- no translation found for permdesc_accessCoarseLocation (7788009094906196995) --> - <skip /> + <string name="permdesc_accessCoarseLocation" product="tablet" msgid="3373266766487862426">"Приложение может получать сведения о вашем местоположении от сетевых источников, таких как вышки сотовой связи и точки доступа Wi-Fi. Необходимо включить соответствующие параметры на планшете и разрешить приложению использовать геоданные."</string> + <string name="permdesc_accessCoarseLocation" product="tv" msgid="1884022719818788511">"Приложение может получать сведения о вашем местоположении от сетевых источников, таких как вышки сотовой связи и точки доступа Wi-Fi. Необходимо включить соответствующие параметры на телевизоре и разрешить приложению использовать геоданные."</string> + <string name="permdesc_accessCoarseLocation" product="default" msgid="7788009094906196995">"Приложение может получать сведения о вашем местоположении от сетевых источников, таких как вышки сотовой связи и точки доступа Wi-Fi. Необходимо включить соответствующие параметры на телефоне и разрешить приложению использовать геоданные."</string> <string name="permlab_modifyAudioSettings" msgid="6095859937069146086">"Изменение настроек аудио"</string> <string name="permdesc_modifyAudioSettings" msgid="3522565366806248517">"Приложение сможет изменять системные настройки звука, например уровень громкости и активный динамик."</string> <string name="permlab_recordAudio" msgid="3876049771427466323">"Запись аудио"</string> - <!-- no translation found for permdesc_recordAudio (4245930455135321433) --> - <skip /> + <string name="permdesc_recordAudio" msgid="4245930455135321433">"Приложение может в любое время записывать аудио с помощью микрофона."</string> <string name="permlab_sim_communication" msgid="2935852302216852065">"Отправка команд SIM-карте"</string> <string name="permdesc_sim_communication" msgid="5725159654279639498">"Приложение сможет отправлять команды SIM-карте (данное разрешение представляет большую угрозу)."</string> <string name="permlab_camera" msgid="3616391919559751192">"Фото- и видеосъемка"</string> - <!-- no translation found for permdesc_camera (5392231870049240670) --> - <skip /> + <string name="permdesc_camera" msgid="5392231870049240670">"Приложение может в любое время делать фотографии и снимать видео с помощью камеры."</string> <string name="permlab_vibrate" msgid="7696427026057705834">"Управление функцией вибросигнала"</string> <string name="permdesc_vibrate" msgid="6284989245902300945">"Приложение сможет контролировать вибросигналы."</string> <string name="permlab_callPhone" msgid="3925836347681847954">"Осуществление телефонных вызовов"</string> diff --git a/core/res/res/values-si-rLK/strings.xml b/core/res/res/values-si-rLK/strings.xml index a85fb7161a91..c9b231a6bbbe 100644 --- a/core/res/res/values-si-rLK/strings.xml +++ b/core/res/res/values-si-rLK/strings.xml @@ -182,10 +182,8 @@ <string name="work_profile_deleted_description" msgid="6305147513054341102">"පරිපාලක යෙදුමක් නොමැති වීමෙන් කාර්යාල පැතිකඩ මකා දමන ලදි."</string> <string name="work_profile_deleted_details" msgid="226615743462361248">"කාර්යාල පැතිකඩ පාලක යෙදුම නොමැති හෝ දූෂණය වී ඇත. ප්රතිඵලයක් ලෙස ඔබගේ කාර්යාල පැතිකඩ සහ අදාළ දත්ත මකා දමා ඇත. සහය සඳහා ඔබගේ පරිපාලකයා සම්බන්ධ කර ගන්න."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="6019770344820507579">"ඔබේ කාර්යාල පැතිකඩ මෙම උපාංගය මත තවදුරටත් ලබා ගැනීමට නොහැකිය."</string> - <!-- no translation found for network_logging_notification_title (1805392571290161924) --> - <skip /> - <!-- no translation found for network_logging_notification_text (4448072433371155729) --> - <skip /> + <string name="network_logging_notification_title" msgid="1805392571290161924">"ජාල තදබදය නිරීක්ෂණය කරමින් පවතී"</string> + <string name="network_logging_notification_text" msgid="4448072433371155729">"වැඩි විස්තර සඳහා තට්ටු කරන්න"</string> <string name="factory_reset_warning" msgid="5423253125642394387">"ඔබගේ උපාංගය මකා දැමෙනු ඇත"</string> <string name="factory_reset_message" msgid="4905025204141900666">"යෙදුමේ කොටස් නොමැති හෝ දූෂණය වී ඇති නිසා, භාවිතා කළ නොහැක. ඔබගේ උපාංගය දැන් මකා දැමෙනු ඇත. සහය සඳහා ඔබගේ පරිපාලකයා සම්බන්ධ කරගන්න."</string> <string name="me" msgid="6545696007631404292">"මම"</string> diff --git a/core/res/res/values-sk/strings.xml b/core/res/res/values-sk/strings.xml index 372c6c225e41..298b70f00774 100644 --- a/core/res/res/values-sk/strings.xml +++ b/core/res/res/values-sk/strings.xml @@ -186,10 +186,8 @@ <string name="work_profile_deleted_description" msgid="6305147513054341102">"Pracovný profil bol odstránený z dôvodu chýbajúcej správcovskej aplikácie."</string> <string name="work_profile_deleted_details" msgid="226615743462361248">"Správcovská aplikácia pracovného profilu buď chýba, alebo je poškodená. Z toho dôvodu boli váš pracovný profil a s ním súvisiace údaje odstránené. Ak potrebujete pomoc, kontaktujte svojho správcu."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="6019770344820507579">"Váš pracovný profil už nie je na tomto zariadení dostupný."</string> - <!-- no translation found for network_logging_notification_title (1805392571290161924) --> - <skip /> - <!-- no translation found for network_logging_notification_text (4448072433371155729) --> - <skip /> + <string name="network_logging_notification_title" msgid="1805392571290161924">"Sleduje sa sieťová premávka."</string> + <string name="network_logging_notification_text" msgid="4448072433371155729">"Ďalšie podrobnosti získate klepnutím"</string> <string name="factory_reset_warning" msgid="5423253125642394387">"Vaše zariadenie bude vymazané"</string> <string name="factory_reset_message" msgid="4905025204141900666">"V správcovskej aplikácii chýbajú komponenty alebo je poškodená, a preto sa nedá použiť. Vaše zariadenie bude vymazané. Ak potrebujete pomoc, kontaktujte svojho správcu."</string> <string name="me" msgid="6545696007631404292">"Ja"</string> diff --git a/core/res/res/values-sl/strings.xml b/core/res/res/values-sl/strings.xml index 28b8d2ae213f..c972bc0d6c2e 100644 --- a/core/res/res/values-sl/strings.xml +++ b/core/res/res/values-sl/strings.xml @@ -46,8 +46,7 @@ <string name="defaultMsisdnAlphaTag" msgid="2850889754919584674">"MSISDN1"</string> <string name="mmiError" msgid="5154499457739052907">"Težava s povezavo ali neveljavna koda MMI."</string> <string name="mmiFdnError" msgid="5224398216385316471">"Operacija je omejena na dovoljene telefonske številke, za katere ne velja zapora odhodnega klica."</string> - <!-- no translation found for mmiErrorWhileRoaming (762488890299284230) --> - <skip /> + <string name="mmiErrorWhileRoaming" msgid="762488890299284230">"Nastavitev preusmerjanja klicev ni mogoče spremeniti v telefonu med gostovanjem v tujem omrežju."</string> <string name="serviceEnabled" msgid="8147278346414714315">"Storitev je omogočena."</string> <string name="serviceEnabledFor" msgid="6856228140453471041">"Storitev je bila omogočena za:"</string> <string name="serviceDisabled" msgid="1937553226592516411">"Storitev je onemogočena."</string> @@ -100,10 +99,8 @@ <string name="RestrictedOnVoiceData" msgid="996636487106171320">"Storitvi za govor/podatke sta blokirani."</string> <string name="RestrictedOnVoiceSms" msgid="1888588152792023873">"Storitvi za govor/SMS sta blokirani."</string> <string name="RestrictedOnAll" msgid="5643028264466092821">"Vse storitve za govor/podatke/SMS so blokirane."</string> - <!-- no translation found for NetworkPreferenceSwitchTitle (4008877505368566980) --> - <skip /> - <!-- no translation found for NetworkPreferenceSwitchSummary (7335915397439759249) --> - <skip /> + <string name="NetworkPreferenceSwitchTitle" msgid="4008877505368566980">"Povezave z omrežjem ni mogoče vzpostaviti"</string> + <string name="NetworkPreferenceSwitchSummary" msgid="7335915397439759249">"Če želite izboljšati sprejem, poskusite zamenjati vrsto omrežja v »Nastavitve« > »Mobilna omrežja« > »Prednostna vrsta omrežja«."</string> <string name="peerTtyModeFull" msgid="6165351790010341421">"Enakovredna naprava je zahtevala način TTY FULL"</string> <string name="peerTtyModeHco" msgid="5728602160669216784">"Enakovredna naprava je zahtevala način TTY HCO"</string> <string name="peerTtyModeVco" msgid="1742404978686538049">"Enakovredna naprava je zahtevala način TTY VCO"</string> @@ -189,10 +186,8 @@ <string name="work_profile_deleted_description" msgid="6305147513054341102">"Delovni profil izbrisan zaradi manjkajoče skrbniške aplikacije."</string> <string name="work_profile_deleted_details" msgid="226615743462361248">"Skrbniška aplikacija delovnega profila manjka ali pa je poškodovana, zaradi česar je bil delovni profil s povezanimi podatki izbrisan. Za pomoč se obrnite na skrbnika."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="6019770344820507579">"Vaš delovni profil ni več na voljo v tej napravi."</string> - <!-- no translation found for network_logging_notification_title (1805392571290161924) --> - <skip /> - <!-- no translation found for network_logging_notification_text (4448072433371155729) --> - <skip /> + <string name="network_logging_notification_title" msgid="1805392571290161924">"Omrežni promet je nadzorovan"</string> + <string name="network_logging_notification_text" msgid="4448072433371155729">"Dotaknite se za več podrobnosti"</string> <string name="factory_reset_warning" msgid="5423253125642394387">"Podatki v napravi bodo izbrisani"</string> <string name="factory_reset_message" msgid="4905025204141900666">"Skrbniška aplikacija je nepopolna ali poškodovana, zato je ni mogoče uporabiti. Podatki v napravi bodo izbrisani. Za pomoč se obrnite na skrbnika."</string> <string name="me" msgid="6545696007631404292">"Jaz"</string> @@ -312,12 +307,9 @@ <string name="permlab_sendSms" msgid="7544599214260982981">"pošiljanje in ogled sporočil SMS"</string> <string name="permdesc_sendSms" msgid="7094729298204937667">"Aplikaciji omogoča pošiljanje SMS-ov. Zaradi tega lahko pride do nepričakovanih stroškov. Zlonamerne aplikacije lahko pošiljajo sporočila brez vaše potrditve, kar vas lahko drago stane."</string> <string name="permlab_readSms" msgid="8745086572213270480">"branje sporočil (SMS ali MMS)"</string> - <!-- no translation found for permdesc_readSms (4741697454888074891) --> - <skip /> - <!-- no translation found for permdesc_readSms (5796670395641116592) --> - <skip /> - <!-- no translation found for permdesc_readSms (6826832415656437652) --> - <skip /> + <string name="permdesc_readSms" product="tablet" msgid="4741697454888074891">"Ta aplikacija lahko prebere vsa sporočila SMS, ki so shranjena v tabličnem računalniku."</string> + <string name="permdesc_readSms" product="tv" msgid="5796670395641116592">"Ta aplikacija lahko prebere vsa sporočila SMS, ki so shranjena v televizorju."</string> + <string name="permdesc_readSms" product="default" msgid="6826832415656437652">"Ta aplikacija lahko prebere vsa sporočila SMS, ki so shranjena v telefonu."</string> <string name="permlab_receiveWapPush" msgid="5991398711936590410">"prejemanje sporočil (WAP)"</string> <string name="permdesc_receiveWapPush" msgid="748232190220583385">"Aplikaciji omogoča prejemanje in obdelavo sporočil WAP. S tem lahko aplikacija nadzoruje ali izbriše sporočila, poslana v napravo, ne da bi vam jih pokazala."</string> <string name="permlab_getTasks" msgid="6466095396623933906">"dobivanje aplikacij, ki se izvajajo"</string> @@ -330,10 +322,8 @@ <string name="permdesc_enableCarMode" msgid="4853187425751419467">"Aplikaciji dovoljuje omogočanje načina za avto."</string> <string name="permlab_killBackgroundProcesses" msgid="3914026687420177202">"zapiranje drugih aplikacij"</string> <string name="permdesc_killBackgroundProcesses" msgid="4593353235959733119">"Aplikaciji omogoča, da konča procese v ozadju drugih aplikacij. S tem lahko druge aplikacije nehajo delovati."</string> - <!-- no translation found for permlab_systemAlertWindow (7238805243128138690) --> - <skip /> - <!-- no translation found for permdesc_systemAlertWindow (2393776099672266188) --> - <skip /> + <string name="permlab_systemAlertWindow" msgid="7238805243128138690">"Prikaz aplikacije s prekrivanjem drugih aplikacij"</string> + <string name="permdesc_systemAlertWindow" msgid="2393776099672266188">"Ta aplikacija lahko prekrije druge aplikacije ali druge dele zaslona. To lahko vpliva na normalno delovanje aplikacije in na način prikaza drugih aplikacij."</string> <string name="permlab_persistentActivity" msgid="8841113627955563938">"neprekinjeno izvajanje aplikacij"</string> <string name="permdesc_persistentActivity" product="tablet" msgid="8525189272329086137">"Aplikaciji omogoča, da nekatere svoje dele naredi trajne v pomnilniku. S tem je lahko pomnilnik omejen za druge aplikacije, zaradi česar je delovanje tabličnega računalnika upočasnjeno."</string> <string name="permdesc_persistentActivity" product="tv" msgid="5086862529499103587">"Aplikaciji dovoljuje, da nekatere svoje dele naredi trajno prisotne v pomnilniku. S tem je lahko pomnilnik omejen za druge aplikacije, zaradi česar je delovanje televizorja upočasnjeno."</string> @@ -359,51 +349,37 @@ <string name="permdesc_writeContacts" product="tv" msgid="5438230957000018959">"Aplikaciji dovoljuje spreminjanje podatkov o stikih v televizorju, vključno s pogostostjo klicev, pošiljanja e-poštnih sporočil in druge komunikacije z določenimi stiki. S tem dovoljenjem lahko aplikacije brišejo podatke o stikih."</string> <string name="permdesc_writeContacts" product="default" msgid="589869224625163558">"Aplikaciji omogoča spreminjanje podatkov o stikih v telefonu, vključno s pogostostjo klicev, pošiljanja e-poštnih sporočil in druge komunikacije z določenimi stiki. S tem dovoljenjem lahko aplikacije brišejo podatke o stikih."</string> <string name="permlab_readCallLog" msgid="3478133184624102739">"branje dnevnika klicev"</string> - <!-- no translation found for permdesc_readCallLog (3204122446463552146) --> - <skip /> + <string name="permdesc_readCallLog" msgid="3204122446463552146">"Ta aplikacija lahko prebere zgodovino klicev."</string> <string name="permlab_writeCallLog" msgid="8552045664743499354">"pisanje v dnevnik klicev"</string> <string name="permdesc_writeCallLog" product="tablet" msgid="6661806062274119245">"Aplikaciji dovoli spreminjanje dnevnika klicev v tabličnem računalniku, vključno s podatki o dohodnih in odhodnih klicih. Zlonamerne aplikacije lahko tako izbrišejo ali spreminjajo vaš dnevnik klicev."</string> <string name="permdesc_writeCallLog" product="tv" msgid="4225034892248398019">"Aplikaciji dovoljuje spreminjanje dnevnika klicev v televizorju, vključno s podatki o dohodnih in odhodnih klicih. Zlonamerne aplikacije lahko tako izbrišejo ali spreminjajo vaš dnevnik klicev."</string> <string name="permdesc_writeCallLog" product="default" msgid="683941736352787842">"Aplikaciji dovoli spreminjanje dnevnika klicev v telefonu, vključno s podatki o dohodnih in odhodnih klicih. Zlonamerne aplikacije lahko tako izbrišejo ali spreminjajo vaš dnevnik klicev."</string> <string name="permlab_bodySensors" msgid="4683341291818520277">"dostop do tipal telesnih funkcij (npr. merilnikov srčnega utripa)"</string> <string name="permdesc_bodySensors" product="default" msgid="4380015021754180431">"Aplikaciji omogoča dostop do podatkov tipal, ki nadzirajo vaše fizično stanje, med drugim vaš srčni utrip."</string> - <!-- no translation found for permlab_readCalendar (6716116972752441641) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (4993979255403945892) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (8837931557573064315) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (4373978642145196715) --> - <skip /> + <string name="permlab_readCalendar" msgid="6716116972752441641">"Branje dogodkov v koledarjih in podrobnosti koledarjev"</string> + <string name="permdesc_readCalendar" product="tablet" msgid="4993979255403945892">"Ta aplikacija lahko prebere vse dogodke v koledarju, ki so shranjeni v tabličnem računalniku, ter shrani podatke koledarja ali jih deli z drugimi."</string> + <string name="permdesc_readCalendar" product="tv" msgid="8837931557573064315">"Ta aplikacija lahko prebere vse dogodke v koledarju, ki so shranjeni v televizorju, ter shrani podatke koledarja ali jih deli z drugimi."</string> + <string name="permdesc_readCalendar" product="default" msgid="4373978642145196715">"Ta aplikacija lahko prebere vse dogodke v koledarju, ki so shranjeni v telefonu, ter shrani podatke koledarja ali jih deli z drugimi."</string> <string name="permlab_writeCalendar" msgid="8438874755193825647">"dodajanje ali spreminjanje dogodkov v koledarju in pošiljanje e-pošte gostom brez vedenja lastnikov"</string> - <!-- no translation found for permdesc_writeCalendar (1675270619903625982) --> - <skip /> - <!-- no translation found for permdesc_writeCalendar (9017809326268135866) --> - <skip /> - <!-- no translation found for permdesc_writeCalendar (7592791790516943173) --> - <skip /> + <string name="permdesc_writeCalendar" product="tablet" msgid="1675270619903625982">"Ta aplikacija lahko dodaja, odstranjuje in spreminja dogodke v koledarju, ki so shranjeni v tabličnem računalniku. Ta aplikacija lahko pošilja sporočila, ki bodo morda videti, kot da prihajajo od lastnikov koledarjev, ali spreminja dogodke brez vednosti lastnikov."</string> + <string name="permdesc_writeCalendar" product="tv" msgid="9017809326268135866">"Ta aplikacija lahko dodaja, odstranjuje in spreminja dogodke v koledarju, ki so shranjeni v televizorju. Ta aplikacija lahko pošilja sporočila, ki bodo morda videti, kot da prihajajo od lastnikov koledarjev, ali spreminja dogodke brez vednosti lastnikov."</string> + <string name="permdesc_writeCalendar" product="default" msgid="7592791790516943173">"Ta aplikacija lahko dodaja, odstranjuje in spreminja dogodke v koledarju, ki so shranjeni v telefonu. Ta aplikacija lahko pošilja sporočila, ki bodo morda videti, kot da prihajajo od lastnikov koledarjev, ali spreminja dogodke brez vednosti lastnikov."</string> <string name="permlab_accessLocationExtraCommands" msgid="2836308076720553837">"dostopanje do ukazov ponudnika dodatnih lokacij"</string> <string name="permdesc_accessLocationExtraCommands" msgid="6078307221056649927">"Aplikaciji omogoča dostop do dodatnih ukazov ponudnika lokacij. S tem lahko aplikacija moti delovanje sistema GPS ali drugih virov lokacije."</string> <string name="permlab_accessFineLocation" msgid="251034415460950944">"dostop do natančne lokacije (na podlagi podatkov GPS in omrežja)"</string> - <!-- no translation found for permdesc_accessFineLocation (5821994817969957884) --> - <skip /> + <string name="permdesc_accessFineLocation" msgid="5821994817969957884">"Ta aplikacija lahko pridobi vašo lokacijo na podlagi sistema GPS ali omrežnih lokacijskih virov, kot so bazne postaje in omrežja Wi-Fi. Če želite aplikaciji omogočiti uporabo teh lokacijskih storitev, morajo biti te vklopljene in na voljo v telefonu. Poraba energije akumulatorja bo morda večja."</string> <string name="permlab_accessCoarseLocation" msgid="7715277613928539434">"dostop do približne lokacije (na podlagi podatkov omrežja)"</string> - <!-- no translation found for permdesc_accessCoarseLocation (3373266766487862426) --> - <skip /> - <!-- no translation found for permdesc_accessCoarseLocation (1884022719818788511) --> - <skip /> - <!-- no translation found for permdesc_accessCoarseLocation (7788009094906196995) --> - <skip /> + <string name="permdesc_accessCoarseLocation" product="tablet" msgid="3373266766487862426">"Ta aplikacija lahko pridobi vašo lokacijo na podlagi omrežnih virov, kot so bazne postaje in omrežja Wi-Fi. Če želite aplikaciji omogočiti uporabo teh lokacijskih storitev, morajo biti te vklopljene in na voljo v tabličnem računalniku."</string> + <string name="permdesc_accessCoarseLocation" product="tv" msgid="1884022719818788511">"Ta aplikacija lahko pridobi vašo lokacijo na podlagi omrežnih virov, kot so bazne postaje in omrežja Wi-Fi. Če želite aplikaciji omogočiti uporabo teh lokacijskih storitev, morajo biti te vklopljene in na voljo v televizorju."</string> + <string name="permdesc_accessCoarseLocation" product="default" msgid="7788009094906196995">"Ta aplikacija lahko pridobi vašo lokacijo na podlagi omrežnih virov, kot so bazne postaje in omrežja Wi-Fi. Če želite aplikaciji omogočiti uporabo teh lokacijskih storitev, morajo biti te vklopljene in na voljo v telefonu."</string> <string name="permlab_modifyAudioSettings" msgid="6095859937069146086">"spreminjanje nastavitev zvoka"</string> <string name="permdesc_modifyAudioSettings" msgid="3522565366806248517">"Aplikaciji omogoča spreminjanje splošnih zvočnih nastavitev, na primer glasnost in kateri zvočnik se uporablja."</string> <string name="permlab_recordAudio" msgid="3876049771427466323">"snemanje zvoka"</string> - <!-- no translation found for permdesc_recordAudio (4245930455135321433) --> - <skip /> + <string name="permdesc_recordAudio" msgid="4245930455135321433">"Ta aplikacija lahko poljubno uporablja mikrofon za snemanje zvoka."</string> <string name="permlab_sim_communication" msgid="2935852302216852065">"pošiljanje ukazov na kartico SIM"</string> <string name="permdesc_sim_communication" msgid="5725159654279639498">"Aplikaciji dovoli pošiljanje ukazov kartici SIM. To je lahko zelo nevarno."</string> <string name="permlab_camera" msgid="3616391919559751192">"fotografiranje in snemanje videoposnetkov"</string> - <!-- no translation found for permdesc_camera (5392231870049240670) --> - <skip /> + <string name="permdesc_camera" msgid="5392231870049240670">"Ta aplikacija lahko poljubno uporablja fotoaparat za snemanje fotografij ali videoposnetkov."</string> <string name="permlab_vibrate" msgid="7696427026057705834">"nadzor vibriranja"</string> <string name="permdesc_vibrate" msgid="6284989245902300945">"Aplikaciji omogoča nadzor vibriranja."</string> <string name="permlab_callPhone" msgid="3925836347681847954">"neposredno klicanje telefonskih številk"</string> diff --git a/core/res/res/values-sq-rAL/strings.xml b/core/res/res/values-sq-rAL/strings.xml index 4bd4fec30300..bf5110bfacc8 100644 --- a/core/res/res/values-sq-rAL/strings.xml +++ b/core/res/res/values-sq-rAL/strings.xml @@ -182,10 +182,8 @@ <string name="work_profile_deleted_description" msgid="6305147513054341102">"Profili i punës u fshi për shkak të mungesës së aplikacionit të administratorit."</string> <string name="work_profile_deleted_details" msgid="226615743462361248">"Aplikacioni i administratorit të profilit të punës mungon ose është dëmtuar. Si rezultat i kësaj, profili yt i punës dhe të dhënat përkatëse janë fshirë. Kontakto administratorin tënd për ndihmë."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="6019770344820507579">"Profili yt i punës nuk është më i disponueshëm në këtë pajisje."</string> - <!-- no translation found for network_logging_notification_title (1805392571290161924) --> - <skip /> - <!-- no translation found for network_logging_notification_text (4448072433371155729) --> - <skip /> + <string name="network_logging_notification_title" msgid="1805392571290161924">"Trafiku i rrjetit po monitorohet"</string> + <string name="network_logging_notification_text" msgid="4448072433371155729">"Trokit për më shumë detaje"</string> <string name="factory_reset_warning" msgid="5423253125642394387">"Pajisja do të spastrohet"</string> <string name="factory_reset_message" msgid="4905025204141900666">"Aplikacionit të administratorit i mungojnë përbërësit ose është dëmtuar dhe nuk mund të përdoret. Pajisja jote tani do të fshihet. Kontakto administratorin tënd për ndihmë."</string> <string name="me" msgid="6545696007631404292">"Unë"</string> diff --git a/core/res/res/values-sr/strings.xml b/core/res/res/values-sr/strings.xml index 4f04c09fc9f3..b5adb2ce284f 100644 --- a/core/res/res/values-sr/strings.xml +++ b/core/res/res/values-sr/strings.xml @@ -46,8 +46,7 @@ <string name="defaultMsisdnAlphaTag" msgid="2850889754919584674">"MSISDN1"</string> <string name="mmiError" msgid="5154499457739052907">"Проблеми са везом или неважећи MMI кôд."</string> <string name="mmiFdnError" msgid="5224398216385316471">"Рад је ограничен само на бројеве фиксног бирања."</string> - <!-- no translation found for mmiErrorWhileRoaming (762488890299284230) --> - <skip /> + <string name="mmiErrorWhileRoaming" msgid="762488890299284230">"Не можете да промените подешавања преусмеравања позива са телефона док сте у ромингу."</string> <string name="serviceEnabled" msgid="8147278346414714315">"Услуга је омогућена."</string> <string name="serviceEnabledFor" msgid="6856228140453471041">"Услуга је омогућена за:"</string> <string name="serviceDisabled" msgid="1937553226592516411">"Услуга је онемогућена."</string> @@ -99,10 +98,8 @@ <string name="RestrictedOnVoiceData" msgid="996636487106171320">"Гласовна услуга/услуга преноса података су блокиране."</string> <string name="RestrictedOnVoiceSms" msgid="1888588152792023873">"Гласовна услуга и SMS услуга су блокиране."</string> <string name="RestrictedOnAll" msgid="5643028264466092821">"Све гласовне и SMS услуге, као и услуге преноса података су блокиране."</string> - <!-- no translation found for NetworkPreferenceSwitchTitle (4008877505368566980) --> - <skip /> - <!-- no translation found for NetworkPreferenceSwitchSummary (7335915397439759249) --> - <skip /> + <string name="NetworkPreferenceSwitchTitle" msgid="4008877505368566980">"Повезивање са мрежом није успело"</string> + <string name="NetworkPreferenceSwitchSummary" msgid="7335915397439759249">"Да бисте побољшали пријем, пробајте да промените изабрани тип у одељку Подешавања > Мобилне мреже > Жељени тип мреже."</string> <string name="peerTtyModeFull" msgid="6165351790010341421">"Корисник захтева ПОТПУН режим TTY"</string> <string name="peerTtyModeHco" msgid="5728602160669216784">"Корисник захтева ПРЕНОС ЗВУКА за режим TTY"</string> <string name="peerTtyModeVco" msgid="1742404978686538049">"Корисник захтева ПРЕНОС ГЛАСА за режим TTY"</string> @@ -187,10 +184,8 @@ <string name="work_profile_deleted_description" msgid="6305147513054341102">"Пословни профил је избрисан јер недостаје администраторска апликација."</string> <string name="work_profile_deleted_details" msgid="226615743462361248">"Администраторска апликација пословног профила недостаје или је оштећена. Због тога су ваш пословни профил и повезани подаци избрисани. Обратите се администратору за помоћ."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="6019770344820507579">"Профил за Work више није доступан на овом уређају."</string> - <!-- no translation found for network_logging_notification_title (1805392571290161924) --> - <skip /> - <!-- no translation found for network_logging_notification_text (4448072433371155729) --> - <skip /> + <string name="network_logging_notification_title" msgid="1805392571290161924">"Мрежни саобраћај се прати"</string> + <string name="network_logging_notification_text" msgid="4448072433371155729">"Додирните за више детаља"</string> <string name="factory_reset_warning" msgid="5423253125642394387">"Уређај ће бити обрисан"</string> <string name="factory_reset_message" msgid="4905025204141900666">"Администраторској апликацији недостају неке компоненте или је оштећена и не може да се користи. Уређај ће сада бити обрисан. Обратите се администратору за помоћ."</string> <string name="me" msgid="6545696007631404292">"Ја"</string> @@ -309,12 +304,9 @@ <string name="permlab_sendSms" msgid="7544599214260982981">"шаље и прегледа SMS поруке"</string> <string name="permdesc_sendSms" msgid="7094729298204937667">"Дозвољава апликацији да шаље SMS поруке. Ово може да доведе до неочекиваних трошкова. Злонамерне апликације могу да шаљу поруке без ваше потврде, што може да изазове трошкове."</string> <string name="permlab_readSms" msgid="8745086572213270480">"читање текстуалних порука (SMS или MMS)"</string> - <!-- no translation found for permdesc_readSms (4741697454888074891) --> - <skip /> - <!-- no translation found for permdesc_readSms (5796670395641116592) --> - <skip /> - <!-- no translation found for permdesc_readSms (6826832415656437652) --> - <skip /> + <string name="permdesc_readSms" product="tablet" msgid="4741697454888074891">"Ова апликација може да чита све SMS (текстуалне) поруке које се чувају на таблету."</string> + <string name="permdesc_readSms" product="tv" msgid="5796670395641116592">"Ова апликација може да чита све SMS (текстуалне) поруке које се чувају на ТВ-у."</string> + <string name="permdesc_readSms" product="default" msgid="6826832415656437652">"Ова апликација може да чита све SMS (текстуалне) поруке које се чувају на телефону."</string> <string name="permlab_receiveWapPush" msgid="5991398711936590410">"пријем текстуалних порука (WAP)"</string> <string name="permdesc_receiveWapPush" msgid="748232190220583385">"Дозвољава апликацији да прима и обрађује WAP поруке. Ова дозвола укључује могућност праћења или брисања порука које вам се шаљу, а које вам се не приказују."</string> <string name="permlab_getTasks" msgid="6466095396623933906">"преузимање покренутих апликација"</string> @@ -327,10 +319,8 @@ <string name="permdesc_enableCarMode" msgid="4853187425751419467">"Дозвољава апликацији да омогући режим рада у аутомобилу."</string> <string name="permlab_killBackgroundProcesses" msgid="3914026687420177202">"затварање других апликација"</string> <string name="permdesc_killBackgroundProcesses" msgid="4593353235959733119">"Дозвољава апликацији да заустави позадинске процесе других апликација. Ово може да заустави друге апликације."</string> - <!-- no translation found for permlab_systemAlertWindow (7238805243128138690) --> - <skip /> - <!-- no translation found for permdesc_systemAlertWindow (2393776099672266188) --> - <skip /> + <string name="permlab_systemAlertWindow" msgid="7238805243128138690">"Ова апликација може да се приказује преко других апликација"</string> + <string name="permdesc_systemAlertWindow" msgid="2393776099672266188">"Ова апликација може да се приказује преко других апликација или других делова делова екрана. То може да омета стандардно коришћење апликација и начин на који се друге апликације приказују."</string> <string name="permlab_persistentActivity" msgid="8841113627955563938">"омогућавање непрекидне активности апликације"</string> <string name="permdesc_persistentActivity" product="tablet" msgid="8525189272329086137">"Дозвољава апликацији да учини сопствене компоненте трајним у меморији. Ово може да ограничи меморију доступну другим апликацијама и успори таблет."</string> <string name="permdesc_persistentActivity" product="tv" msgid="5086862529499103587">"Дозвољава апликацији да неке своје делове трајно задржи у меморији. То може да ограничи меморију доступну другим апликацијама и успори ТВ."</string> @@ -356,51 +346,37 @@ <string name="permdesc_writeContacts" product="tv" msgid="5438230957000018959">"Дозвољава апликацији да мења податке о контактима које чувате на ТВ-у, укључујући колико често сте звали, слали имејлове или на друге начине комуницирали са одређеним контактима. Ова дозвола омогућава апликацијама да бришу податке о контактима."</string> <string name="permdesc_writeContacts" product="default" msgid="589869224625163558">"Дозвољава апликацији да мења податке о контактима ускладиштене на телефону, укључујући податке о томе колико често зовете одређене контакте, шаљете им поруке е-поште или на други начин комуницирате са њима. Ова дозвола омогућава апликацијама да бришу податке о контактима."</string> <string name="permlab_readCallLog" msgid="3478133184624102739">"читање евиденције позива"</string> - <!-- no translation found for permdesc_readCallLog (3204122446463552146) --> - <skip /> + <string name="permdesc_readCallLog" msgid="3204122446463552146">"Ова апликација може да чита историју позива."</string> <string name="permlab_writeCallLog" msgid="8552045664743499354">"писање евиденције позива"</string> <string name="permdesc_writeCallLog" product="tablet" msgid="6661806062274119245">"Дозвољава апликацији да мења евиденцију позива на таблету, укључујући податке о долазним и одлазним позивима. Злонамерне апликације могу ово да користе да би брисале или мењале евиденцију позива."</string> <string name="permdesc_writeCallLog" product="tv" msgid="4225034892248398019">"Дозвољава апликацији да мења евиденцију позива на ТВ-у, укључујући податке о долазним и одлазним позивима. Злонамерне апликације могу ово да користе да би брисале или мењале евиденцију позива."</string> <string name="permdesc_writeCallLog" product="default" msgid="683941736352787842">"Дозвољава апликацији да мења евиденцију позива на телефону, укључујући податке о долазним и одлазним позивима. Злонамерне апликације могу ово да користе да би брисале или мењале евиденцију позива."</string> <string name="permlab_bodySensors" msgid="4683341291818520277">"приступ сензорима на телу (попут монитора за праћење пулса)"</string> <string name="permdesc_bodySensors" product="default" msgid="4380015021754180431">"Дозвољава апликацији да приступа подацима са сензора који надгледају физичку кондицију, као што је број откуцаја срца."</string> - <!-- no translation found for permlab_readCalendar (6716116972752441641) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (4993979255403945892) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (8837931557573064315) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (4373978642145196715) --> - <skip /> + <string name="permlab_readCalendar" msgid="6716116972752441641">"Читање догађаја и података из календара"</string> + <string name="permdesc_readCalendar" product="tablet" msgid="4993979255403945892">"Ова апликација може да чита све догађаје из календара које чувате на таблету, као и да дели или чува податке из календара."</string> + <string name="permdesc_readCalendar" product="tv" msgid="8837931557573064315">"Ова апликација може да чита све догађаје из календара које чувате на ТВ-у, као и да дели или чува податке из календара."</string> + <string name="permdesc_readCalendar" product="default" msgid="4373978642145196715">"Ова апликација може да чита све догађаје из календара које чувате на телефону, као и да дели или чува податке из календара."</string> <string name="permlab_writeCalendar" msgid="8438874755193825647">"додавање или измена календарских догађаја и слање порука е-поште гостима без знања власника"</string> - <!-- no translation found for permdesc_writeCalendar (1675270619903625982) --> - <skip /> - <!-- no translation found for permdesc_writeCalendar (9017809326268135866) --> - <skip /> - <!-- no translation found for permdesc_writeCalendar (7592791790516943173) --> - <skip /> + <string name="permdesc_writeCalendar" product="tablet" msgid="1675270619903625982">"Ова апликацији може да додаје, уклања или мења догађаје из календара на таблету. Ова апликација може да шаље поруке које изгледају као да их шаљу власници календара или да мења догађаје без знања власника."</string> + <string name="permdesc_writeCalendar" product="tv" msgid="9017809326268135866">"Ова апликацији може да додаје, уклања или мења догађаје из календара на ТВ-у. Ова апликација може да шаље поруке које изгледају као да их шаљу власници календара или да мења догађаје без знања власника."</string> + <string name="permdesc_writeCalendar" product="default" msgid="7592791790516943173">"Ова апликацији може да додаје, уклања или мења догађаје из календара на телефону. Ова апликација може да шаље поруке које изгледају као да их шаљу власници календара или да мења догађаје без знања власника."</string> <string name="permlab_accessLocationExtraCommands" msgid="2836308076720553837">"приступ додатним командама добављача локације"</string> <string name="permdesc_accessLocationExtraCommands" msgid="6078307221056649927">"Омогућава апликацији да приступа додатним командама даваоца услуга локације. То може да омогући апликацији да утиче на рад GPS-а или других извора локације."</string> <string name="permlab_accessFineLocation" msgid="251034415460950944">"приступ прецизној локацији (утврђена преко мреже и GPS-а)"</string> - <!-- no translation found for permdesc_accessFineLocation (5821994817969957884) --> - <skip /> + <string name="permdesc_accessFineLocation" msgid="5821994817969957884">"Ова апликација може да приступи вашој локацији помоћу GPS-а или мрежних извора локација, као што су мобилни предајници и Wi-Fi мреже. Ове услуге локације морају да буду укључене и доступне на телефону да би апликација могла да их користи. То може да повећа потрошњу батерије."</string> <string name="permlab_accessCoarseLocation" msgid="7715277613928539434">"приступ приближној локацији (утврђена преко мреже)"</string> - <!-- no translation found for permdesc_accessCoarseLocation (3373266766487862426) --> - <skip /> - <!-- no translation found for permdesc_accessCoarseLocation (1884022719818788511) --> - <skip /> - <!-- no translation found for permdesc_accessCoarseLocation (7788009094906196995) --> - <skip /> + <string name="permdesc_accessCoarseLocation" product="tablet" msgid="3373266766487862426">"Ова апликација може да приступи вашој локацији помоћу извора мреже, као што су мобилни предајници и Wi-Fi мреже. Ове услуге локације морају да буду укључене и доступне на таблету да би апликација могла да их користи."</string> + <string name="permdesc_accessCoarseLocation" product="tv" msgid="1884022719818788511">"Ова апликација може да приступи вашој локацији помоћу извора мреже, као што су мобилни предајници и Wi-Fi мреже. Ове услуге локације морају да буду укључене и доступне на ТВ-у да би апликација могла да их користи."</string> + <string name="permdesc_accessCoarseLocation" product="default" msgid="7788009094906196995">"Ова апликација може да приступи вашој локацији помоћу извора мреже, као што су мобилни предајници и Wi-Fi мреже. Ове услуге локације морају да буду укључене и доступне на телефону да би апликација могла да их користи."</string> <string name="permlab_modifyAudioSettings" msgid="6095859937069146086">"промена аудио подешавања"</string> <string name="permdesc_modifyAudioSettings" msgid="3522565366806248517">"Дозвољава апликацији да мења глобална аудио подешавања као што су јачина звука и избор звучника који се користи као излаз."</string> <string name="permlab_recordAudio" msgid="3876049771427466323">"снимање аудио записа"</string> - <!-- no translation found for permdesc_recordAudio (4245930455135321433) --> - <skip /> + <string name="permdesc_recordAudio" msgid="4245930455135321433">"Ова апликација може да снима звук помоћу микрофона у било ком тренутку."</string> <string name="permlab_sim_communication" msgid="2935852302216852065">"слање команди на SIM"</string> <string name="permdesc_sim_communication" msgid="5725159654279639498">"Омогућава апликацији да шаље команде SIM картици. То је веома опасно."</string> <string name="permlab_camera" msgid="3616391919559751192">"снимање фотографија и видео снимака"</string> - <!-- no translation found for permdesc_camera (5392231870049240670) --> - <skip /> + <string name="permdesc_camera" msgid="5392231870049240670">"Ова апликација може да снима фотографије и видео снимке помоћу камере у било ком тренутку."</string> <string name="permlab_vibrate" msgid="7696427026057705834">"контрола вибрације"</string> <string name="permdesc_vibrate" msgid="6284989245902300945">"Дозвољава апликацији да контролише вибрацију."</string> <string name="permlab_callPhone" msgid="3925836347681847954">"директно позивање бројева телефона"</string> diff --git a/core/res/res/values-sv/strings.xml b/core/res/res/values-sv/strings.xml index 85c87414227c..dfedf4c7c9bc 100644 --- a/core/res/res/values-sv/strings.xml +++ b/core/res/res/values-sv/strings.xml @@ -46,8 +46,7 @@ <string name="defaultMsisdnAlphaTag" msgid="2850889754919584674">"MSISDN1"</string> <string name="mmiError" msgid="5154499457739052907">"Anslutningsproblem eller ogiltig MMI-kod."</string> <string name="mmiFdnError" msgid="5224398216385316471">"Endast fasta nummer kan användas."</string> - <!-- no translation found for mmiErrorWhileRoaming (762488890299284230) --> - <skip /> + <string name="mmiErrorWhileRoaming" msgid="762488890299284230">"Det går inte att ändra inställningarna för vidarebefordran av samtal medan mobilen är i roaming-läge."</string> <string name="serviceEnabled" msgid="8147278346414714315">"Tjänsten har aktiverats."</string> <string name="serviceEnabledFor" msgid="6856228140453471041">"Tjänsten har aktiverats för:"</string> <string name="serviceDisabled" msgid="1937553226592516411">"Tjänsten har inaktiverats."</string> @@ -98,10 +97,8 @@ <string name="RestrictedOnVoiceData" msgid="996636487106171320">"Röst- och datatjänster är blockerade."</string> <string name="RestrictedOnVoiceSms" msgid="1888588152792023873">"Röst- och SMS-tjänster är blockerade."</string> <string name="RestrictedOnAll" msgid="5643028264466092821">"Alla röst-, data- och SMS-tjänster är blockerade."</string> - <!-- no translation found for NetworkPreferenceSwitchTitle (4008877505368566980) --> - <skip /> - <!-- no translation found for NetworkPreferenceSwitchSummary (7335915397439759249) --> - <skip /> + <string name="NetworkPreferenceSwitchTitle" msgid="4008877505368566980">"Det går inte att nå nätverket"</string> + <string name="NetworkPreferenceSwitchSummary" msgid="7335915397439759249">"Testa om du får bättre mottagning genom att ändra till en annan typ under Inställningar > Mobilnät > Önskad nätverkstyp."</string> <string name="peerTtyModeFull" msgid="6165351790010341421">"Peer-enheten begärde texttelefonläget FULL"</string> <string name="peerTtyModeHco" msgid="5728602160669216784">"Peer-enheten begärde texttelefonläget HCO"</string> <string name="peerTtyModeVco" msgid="1742404978686538049">"Peer-enheten begärde texttelefonläget VCO"</string> @@ -185,10 +182,8 @@ <string name="work_profile_deleted_description" msgid="6305147513054341102">"Jobbprofilen har raderats eftersom det saknas en administratörsapp."</string> <string name="work_profile_deleted_details" msgid="226615743462361248">"Administratörsappen för jobbprofilen saknas eller är skadad. Det innebär att jobbprofilen och all relaterad data har raderats. Kontakta administratören om du vill ha hjälp."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="6019770344820507579">"Din jobbprofil är inte längre tillgänglig på den här enheten."</string> - <!-- no translation found for network_logging_notification_title (1805392571290161924) --> - <skip /> - <!-- no translation found for network_logging_notification_text (4448072433371155729) --> - <skip /> + <string name="network_logging_notification_title" msgid="1805392571290161924">"Nätverkstrafiken övervakas"</string> + <string name="network_logging_notification_text" msgid="4448072433371155729">"Tryck om du vill ha mer information"</string> <string name="factory_reset_warning" msgid="5423253125642394387">"Enheten kommer att rensas"</string> <string name="factory_reset_message" msgid="4905025204141900666">"Administratörsappen saknar delar eller är skadad och kan inte användas. Enheten kommer nu att rensas. Kontakta administratören om du behöver hjälp."</string> <string name="me" msgid="6545696007631404292">"Jag"</string> @@ -306,12 +301,9 @@ <string name="permlab_sendSms" msgid="7544599214260982981">"skicka och visa sms"</string> <string name="permdesc_sendSms" msgid="7094729298204937667">"Tillåter att appen skickar SMS. Detta kan leda till oväntade avgifter. Skadliga appar kan skicka meddelanden utan ditt godkännande vilket kan kosta pengar."</string> <string name="permlab_readSms" msgid="8745086572213270480">"läsa dina textmeddelanden (SMS eller MMS)"</string> - <!-- no translation found for permdesc_readSms (4741697454888074891) --> - <skip /> - <!-- no translation found for permdesc_readSms (5796670395641116592) --> - <skip /> - <!-- no translation found for permdesc_readSms (6826832415656437652) --> - <skip /> + <string name="permdesc_readSms" product="tablet" msgid="4741697454888074891">"Appen kan läsa alla sms som sparats på surfplattan."</string> + <string name="permdesc_readSms" product="tv" msgid="5796670395641116592">"Appen kan läsa alla sms som sparats på TV:n."</string> + <string name="permdesc_readSms" product="default" msgid="6826832415656437652">"Appen kan läsa alla sms som sparats på mobilen."</string> <string name="permlab_receiveWapPush" msgid="5991398711936590410">"ta emot textmeddelanden (WAP)"</string> <string name="permdesc_receiveWapPush" msgid="748232190220583385">"Tillåter att appen tar emot och hanterar WAP-meddelanden. Med den här behörigheten kan appen övervaka eller ta bort meddelanden som skickats till dig utan att visa dem för dig."</string> <string name="permlab_getTasks" msgid="6466095396623933906">"hämta appar som körs"</string> @@ -324,10 +316,8 @@ <string name="permdesc_enableCarMode" msgid="4853187425751419467">"Tillåter att appen aktiverar billäge."</string> <string name="permlab_killBackgroundProcesses" msgid="3914026687420177202">"stänga andra appar"</string> <string name="permdesc_killBackgroundProcesses" msgid="4593353235959733119">"Tillåter att appen avslutar andra appars bakgrundsprocesser. Detta kan göra så att andra appar avslutas."</string> - <!-- no translation found for permlab_systemAlertWindow (7238805243128138690) --> - <skip /> - <!-- no translation found for permdesc_systemAlertWindow (2393776099672266188) --> - <skip /> + <string name="permlab_systemAlertWindow" msgid="7238805243128138690">"Appen kan visas ovanpå andra appar"</string> + <string name="permdesc_systemAlertWindow" msgid="2393776099672266188">"Appen kan visas ovanpå andra appar eller andra delar av skärmen. Detta kan störa den vanliga användningen av appar och påverka hur andra appar visas."</string> <string name="permlab_persistentActivity" msgid="8841113627955563938">"se till att appen alltid körs"</string> <string name="permdesc_persistentActivity" product="tablet" msgid="8525189272329086137">"Tillåter att delar av appen läggs beständigt i minnet. Detta kan innebära att det tillgängliga minnet för andra appar begränsas, vilket gör surfplattan långsam."</string> <string name="permdesc_persistentActivity" product="tv" msgid="5086862529499103587">"Tillåter att en app gör vissa delar beständiga i minnet. Det kan begränsa mängden minne som är tillgänglig för andra appar och gör TV:n långsammare."</string> @@ -353,51 +343,37 @@ <string name="permdesc_writeContacts" product="tv" msgid="5438230957000018959">"Tillåter att appen ändrar uppgifterna om dina kontakter som har sparats på TV:n, bland annat hur ofta du har ringt, skickat e-post eller kommunicerat på andra sätt med särskilda kontakter. Med den här behörigheten kan appar ta bort kontaktuppgifter."</string> <string name="permdesc_writeContacts" product="default" msgid="589869224625163558">"Tillåter att appen ändrar kontaktuppgifter som sparats på mobilen, inklusive information om hur ofta du har ringt, skickat e-post till eller på andra sätt kommunicerat med specifika personer. Med den här behörigheten tillåts appar att ta bort kontaktuppgifter."</string> <string name="permlab_readCallLog" msgid="3478133184624102739">"läs samtalslogg"</string> - <!-- no translation found for permdesc_readCallLog (3204122446463552146) --> - <skip /> + <string name="permdesc_readCallLog" msgid="3204122446463552146">"Appen kan läsa din samtalshistorik."</string> <string name="permlab_writeCallLog" msgid="8552045664743499354">"skriv samtalslogg"</string> <string name="permdesc_writeCallLog" product="tablet" msgid="6661806062274119245">"Tillåter att appen gör ändringar i pekdatorns samtalslista, inklusive i uppgifter om inkommande och utgående samtal. Skadliga program kan använda detta för att radera eller ändra din samtalslista."</string> <string name="permdesc_writeCallLog" product="tv" msgid="4225034892248398019">"Tillåter att appen gör ändringar i TV:ns samtalslista, inklusive i uppgifter om inkommande och utgående samtal. Skadliga appar kan använda detta för att rensa eller ändra din samtalslista."</string> <string name="permdesc_writeCallLog" product="default" msgid="683941736352787842">"Tillåter att appen gör ändringar i mobilens samtalslista, inklusive i uppgifter om inkommande och utgående samtal. Skadliga program kan använda detta för att radera eller ändra din samtalslista."</string> <string name="permlab_bodySensors" msgid="4683341291818520277">"få åtkomst till kroppssensorer (till exempel pulsmätare)"</string> <string name="permdesc_bodySensors" product="default" msgid="4380015021754180431">"Ger appen åtkomst till information från sensorer om ditt fysiska tillstånd, till exempel din puls."</string> - <!-- no translation found for permlab_readCalendar (6716116972752441641) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (4993979255403945892) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (8837931557573064315) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (4373978642145196715) --> - <skip /> + <string name="permlab_readCalendar" msgid="6716116972752441641">"Läsa kalenderhändelser och kalenderuppgifter"</string> + <string name="permdesc_readCalendar" product="tablet" msgid="4993979255403945892">"Appen kan läsa alla kalenderhändelser som sparats på surfplattan och dela eller spara uppgifter i din kalender."</string> + <string name="permdesc_readCalendar" product="tv" msgid="8837931557573064315">"Appen kan läsa alla kalenderhändelser som sparats på TV:n och dela eller spara uppgifter i din kalender."</string> + <string name="permdesc_readCalendar" product="default" msgid="4373978642145196715">"Appen kan läsa alla kalenderhändelser som sparats på mobilen och dela eller spara uppgifter i din kalender."</string> <string name="permlab_writeCalendar" msgid="8438874755193825647">"lägga till eller ändra kalenderuppgifter och skicka e-post till gäster utan ägarens vetskap"</string> - <!-- no translation found for permdesc_writeCalendar (1675270619903625982) --> - <skip /> - <!-- no translation found for permdesc_writeCalendar (9017809326268135866) --> - <skip /> - <!-- no translation found for permdesc_writeCalendar (7592791790516943173) --> - <skip /> + <string name="permdesc_writeCalendar" product="tablet" msgid="1675270619903625982">"Appen kan lägga till, ta bort eller ändra kalenderhändelser på surfplattan. Appen kan skicka meddelanden som ser ut att komma från kalenderns ägare eller ändra uppgifter utan ägarens vetskap."</string> + <string name="permdesc_writeCalendar" product="tv" msgid="9017809326268135866">"Appen kan lägga till, ta bort eller ändra kalenderhändelser på TV:n. Appen kan skicka meddelanden som ser ut att komma från kalenderns ägare eller ändra uppgifter utan ägarens vetskap."</string> + <string name="permdesc_writeCalendar" product="default" msgid="7592791790516943173">"Appen kan lägga till, ta bort eller ändra kalenderhändelser på mobilen. Appen kan skicka meddelanden som ser ut att komma från kalenderns ägare eller ändra uppgifter utan ägarens vetskap."</string> <string name="permlab_accessLocationExtraCommands" msgid="2836308076720553837">"få åtkomst till extra kommandon för platsleverantör"</string> <string name="permdesc_accessLocationExtraCommands" msgid="6078307221056649927">"Tillåter att appen får åtkomst till extra kommandon för platsleverantör. Detta kan innebära att appen tillåts störa funktionen för GPS eller andra platskällor."</string> <string name="permlab_accessFineLocation" msgid="251034415460950944">"få åtkomst till din exakta position (GPS- och nätverksbaserad)"</string> - <!-- no translation found for permdesc_accessFineLocation (5821994817969957884) --> - <skip /> + <string name="permdesc_accessFineLocation" msgid="5821994817969957884">"Appen kan få information om din plats från GPS eller platskällor i nätverket, som mobilmaster och Wi-Fi-nätverk. De platstjänsterna måste ha aktiverats och finnas på mobilen om appen ska kunna använda dem. Detta kan leda till ökad batteriförbrukning."</string> <string name="permlab_accessCoarseLocation" msgid="7715277613928539434">"få åtkomst till din ungefärliga position (nätverksbaserad)"</string> - <!-- no translation found for permdesc_accessCoarseLocation (3373266766487862426) --> - <skip /> - <!-- no translation found for permdesc_accessCoarseLocation (1884022719818788511) --> - <skip /> - <!-- no translation found for permdesc_accessCoarseLocation (7788009094906196995) --> - <skip /> + <string name="permdesc_accessCoarseLocation" product="tablet" msgid="3373266766487862426">"Appen kan få information om din plats från källor i nätverket, som mobilmaster och Wi-Fi-nätverk. De platstjänsterna måste ha aktiverats och finnas på surfplattan om appen ska kunna använda dem."</string> + <string name="permdesc_accessCoarseLocation" product="tv" msgid="1884022719818788511">"Appen kan få information om din plats från källor i nätverket, som mobilmaster och Wi-Fi-nätverk. De platstjänsterna måste ha aktiverats och fungera på TV:n om appen ska kunna använda dem."</string> + <string name="permdesc_accessCoarseLocation" product="default" msgid="7788009094906196995">"Appen kan få information om din plats från källor i nätverket, som mobilmaster och Wi-Fi-nätverk. De platstjänsterna måste ha aktiverats och finnas på mobilen om appen ska kunna använda dem."</string> <string name="permlab_modifyAudioSettings" msgid="6095859937069146086">"ändra dina ljudinställningar"</string> <string name="permdesc_modifyAudioSettings" msgid="3522565366806248517">"Tillåter att appen ändrar globala ljudinställningar som volym och vilken högtalarutgång som används."</string> <string name="permlab_recordAudio" msgid="3876049771427466323">"spela in ljud"</string> - <!-- no translation found for permdesc_recordAudio (4245930455135321433) --> - <skip /> + <string name="permdesc_recordAudio" msgid="4245930455135321433">"Appen kan spela in ljud med mikrofonen när som helst."</string> <string name="permlab_sim_communication" msgid="2935852302216852065">"skicka kommandon till SIM-kortet"</string> <string name="permdesc_sim_communication" msgid="5725159654279639498">"Tillåter att appen skickar kommandon till SIM-kortet. Detta är mycket farligt."</string> <string name="permlab_camera" msgid="3616391919559751192">"ta bilder och spela in videoklipp"</string> - <!-- no translation found for permdesc_camera (5392231870049240670) --> - <skip /> + <string name="permdesc_camera" msgid="5392231870049240670">"Appen kan ta kort och spela in video med kameran när som helst."</string> <string name="permlab_vibrate" msgid="7696427026057705834">"styra vibration"</string> <string name="permdesc_vibrate" msgid="6284989245902300945">"Tillåter att appen styr vibrationen."</string> <string name="permlab_callPhone" msgid="3925836347681847954">"ringa telefonnummer direkt"</string> diff --git a/core/res/res/values-sw/strings.xml b/core/res/res/values-sw/strings.xml index 55bebe023874..6cd3b8974abd 100644 --- a/core/res/res/values-sw/strings.xml +++ b/core/res/res/values-sw/strings.xml @@ -46,8 +46,7 @@ <string name="defaultMsisdnAlphaTag" msgid="2850889754919584674">"MSISDN1"</string> <string name="mmiError" msgid="5154499457739052907">"Tatizo la muunganisho au msimbo batili MMI."</string> <string name="mmiFdnError" msgid="5224398216385316471">"Uendeshaji umepunguzwa kwa namba za upigaji simu za kudumu pekee."</string> - <!-- no translation found for mmiErrorWhileRoaming (762488890299284230) --> - <skip /> + <string name="mmiErrorWhileRoaming" msgid="762488890299284230">"Haiwezi kubadilisha mipangilio ya kusambaza simu kutoka kwenye simu yako ukiwa unatumia mitandao mingine."</string> <string name="serviceEnabled" msgid="8147278346414714315">"Huduma iliwezeshwa"</string> <string name="serviceEnabledFor" msgid="6856228140453471041">"Huduma iliwezesha kwa:"</string> <string name="serviceDisabled" msgid="1937553226592516411">"Hitilafu ya huduma!"</string> @@ -98,10 +97,8 @@ <string name="RestrictedOnVoiceData" msgid="996636487106171320">"Huduma za sauti/data zimezuiwa."</string> <string name="RestrictedOnVoiceSms" msgid="1888588152792023873">"Huduma za Sauti/Ujumbe mfupi zimezuiwa."</string> <string name="RestrictedOnAll" msgid="5643028264466092821">"Huduma zote za Sauti/data/SMS zimezuiwa."</string> - <!-- no translation found for NetworkPreferenceSwitchTitle (4008877505368566980) --> - <skip /> - <!-- no translation found for NetworkPreferenceSwitchSummary (7335915397439759249) --> - <skip /> + <string name="NetworkPreferenceSwitchTitle" msgid="4008877505368566980">"Haiwezi kufikia mtandao"</string> + <string name="NetworkPreferenceSwitchSummary" msgid="7335915397439759249">"Ili uboreshe upokeaji, jaribu kubadilisha aina iliyochaguliwa katika Mipangilio > Mitandao ya simu > Aina ya mtandao unaopendelea."</string> <string name="peerTtyModeFull" msgid="6165351790010341421">"Hali ya TTY iliyoombwa na mtandao mwenza KAMILI"</string> <string name="peerTtyModeHco" msgid="5728602160669216784">"Hali ya TTY iliyoombwa na mtandao mwenza HCO"</string> <string name="peerTtyModeVco" msgid="1742404978686538049">"Hali ya TTY iliyoombwa na mtandao mwenza VCO"</string> @@ -183,10 +180,8 @@ <string name="work_profile_deleted_description" msgid="6305147513054341102">"Wasifu wa kazini umefutwa kutokana na kupotea kwa programu ya msimamizi."</string> <string name="work_profile_deleted_details" msgid="226615743462361248">"Programu ya msimamizi wa wasifu wa kazini imepotea au ina hitilafu. Kwa sbabu hiyo, wasifu wako wa kazini na data husika imefutwa. Wasiliana na msimamizi wako kwa usaidizi."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="6019770344820507579">"Wasifu wako wa kazini haupatikani tena kwenye kifaa hiki."</string> - <!-- no translation found for network_logging_notification_title (1805392571290161924) --> - <skip /> - <!-- no translation found for network_logging_notification_text (4448072433371155729) --> - <skip /> + <string name="network_logging_notification_title" msgid="1805392571290161924">"Trafiki ya mtandao inachunguzwa"</string> + <string name="network_logging_notification_text" msgid="4448072433371155729">"Gonga ili upate maelezo zaidi"</string> <string name="factory_reset_warning" msgid="5423253125642394387">"Data iliyomo kwenye kifaa chako itafutwa"</string> <string name="factory_reset_message" msgid="4905025204141900666">"Programu ya msimamizi inakosa vipengele au ina hitilafu, na haiwezi kutumika. Data iliyomo kwenye kifaa chako sasa itafutwa. Wasiliana na msimamizi wako kwa usaidizi."</string> <string name="me" msgid="6545696007631404292">"Mimi"</string> @@ -304,12 +299,9 @@ <string name="permlab_sendSms" msgid="7544599214260982981">"itume na iangalie SMS"</string> <string name="permdesc_sendSms" msgid="7094729298204937667">"Inaruhusu programu kutuma ujumbe wa SMS. Hii inaweza ikasababisha malipo yasiyotarajiwa. Programu hasidi zinaweza kukugharimu pesa kwa kutuma ujumbe bila uthibitisho wako."</string> <string name="permlab_readSms" msgid="8745086572213270480">"soma SMS au MMS zako"</string> - <!-- no translation found for permdesc_readSms (4741697454888074891) --> - <skip /> - <!-- no translation found for permdesc_readSms (5796670395641116592) --> - <skip /> - <!-- no translation found for permdesc_readSms (6826832415656437652) --> - <skip /> + <string name="permdesc_readSms" product="tablet" msgid="4741697454888074891">"Programu hii inaweza kusoma ujumbe wa SMS (maandishi) wote uliohifadhiwa kwenye kompyuta yako kibao."</string> + <string name="permdesc_readSms" product="tv" msgid="5796670395641116592">"Programu hii inaweza kusoma ujumbe wa SMS (maandishi) wote uliohifadhiwa kwenye runinga yako."</string> + <string name="permdesc_readSms" product="default" msgid="6826832415656437652">"Programu hii inaweza kusoma ujumbe wa SMS (maandishi) wote uliohifadhiwa kwenye simu yako."</string> <string name="permlab_receiveWapPush" msgid="5991398711936590410">"pokea ujumbe wa maandishi wa WAP"</string> <string name="permdesc_receiveWapPush" msgid="748232190220583385">"Inaruhusu programu kupokea na kuchakata ujumbe wa WAP. Idhini hii inajumuisha uwezo wa kuchunguza na kufuta ujumbe uliotumwa kwako bila ya kukuonyesha."</string> <string name="permlab_getTasks" msgid="6466095396623933906">"rudisha programu zinazoendeshwa"</string> @@ -322,10 +314,8 @@ <string name="permdesc_enableCarMode" msgid="4853187425751419467">"Inaruhusu programu kuwawezesha mtindo wa gari."</string> <string name="permlab_killBackgroundProcesses" msgid="3914026687420177202">"funga programu zingine"</string> <string name="permdesc_killBackgroundProcesses" msgid="4593353235959733119">"Inaruhusu programu kukamilisha michakato ya usuli ya programu nyingine. Hii inaweza kusababisha programu nyingine kukoma kufanyakazi."</string> - <!-- no translation found for permlab_systemAlertWindow (7238805243128138690) --> - <skip /> - <!-- no translation found for permdesc_systemAlertWindow (2393776099672266188) --> - <skip /> + <string name="permlab_systemAlertWindow" msgid="7238805243128138690">"Pogramu hii inaweza kuonekana juu ya programu zingine"</string> + <string name="permdesc_systemAlertWindow" msgid="2393776099672266188">"Programu hii inaweza kuonekana juu ya programu zingine au sehemu zingine za skrini. Hii huenda ikaathiri matumizi ya kawaida ya programu na kubadilisha jinsi ambavyo programu zingine zinavyoonekana."</string> <string name="permlab_persistentActivity" msgid="8841113627955563938">"Fanya programu kuendeshwa kila mara"</string> <string name="permdesc_persistentActivity" product="tablet" msgid="8525189272329086137">"Inaruhusu programu kuendeleza vijisehemu vyake kwenye kumbukumbu. Hii inaweza kupunguza kumbukumbu inayopatikana katika programu nyingine ikipunguza kasi ya kompyuta ndogo."</string> <string name="permdesc_persistentActivity" product="tv" msgid="5086862529499103587">"Huruhusu programu kufanya vijisehemu vyake vidumu kwenye kumbukumbu. Hii inaweza kupunguza kumbukumbu inayopatikana katika programu nyingine ikipunguza kasi ya runinga."</string> @@ -351,51 +341,37 @@ <string name="permdesc_writeContacts" product="tv" msgid="5438230957000018959">"Huruhusu programu kurekebisha data kuhusu anwani zako zilizohifadhiwa kwenye runinga yako, pamoja na marudio ya upigaji wako wa simu, utumaji wa barua pepe, au mawasiliano kwa njia nyingine na watu maalum unaowasiliana nao. Ruhusa hii huruhusu programu kufuta data ya anwani."</string> <string name="permdesc_writeContacts" product="default" msgid="589869224625163558">"Inaruhusu programu kurekebisha data kuhusu anwani zako zilizohifadhiwa kwenye simu yako, ikijumuisha ni mara ngapi umepiga simu, kutuma barua pepe, au kuwasiliana kwa njia nyingine na wawasiliani maalum. Idhini hii inaruhusu programu kufuta data ya anwani."</string> <string name="permlab_readCallLog" msgid="3478133184624102739">"kusoma rekodi ya simu"</string> - <!-- no translation found for permdesc_readCallLog (3204122446463552146) --> - <skip /> + <string name="permdesc_readCallLog" msgid="3204122446463552146">"Programu hii inaweza kusoma rekodi yako ya simu zilizopigwa."</string> <string name="permlab_writeCallLog" msgid="8552045664743499354">"kuandika rekodi ya simu"</string> <string name="permdesc_writeCallLog" product="tablet" msgid="6661806062274119245">"Huruhusu programu kurekebisha rajisi ya kompyuta kibao yako, ikiwa ni pamoja na simu zinazoingia na kutoka. Huenda programu hasidi zikatumia hii ili kufuta au kurekebisha rajisi ya simu yako."</string> <string name="permdesc_writeCallLog" product="tv" msgid="4225034892248398019">"Huruhusu programu kurekebisha rajisi ya runinga yako, ikiwa ni pamoja na data ya simu zinazoingia na kutoka. Huenda programu hasidi zikatumia hii ili kufuta au kurekebisha rajisi ya simu yako."</string> <string name="permdesc_writeCallLog" product="default" msgid="683941736352787842">"Huruhusu programu kurekebisha rajisi ya simu yako, ikiwa ni pamoja na simu zinazoingia na kutoka. Huenda programu hasidi zikatumia hii ili kufuta au kurekebisha rajisi ya simu yako."</string> <string name="permlab_bodySensors" msgid="4683341291818520277">"fikia vihisi vya mwili (kama vifuatiliaji vya mapigo ya moyo)"</string> <string name="permdesc_bodySensors" product="default" msgid="4380015021754180431">"Huruhusu programu kufikia data kutoka vihisi vinavyofuatilia hali yako ya kimwili, kama vile mapigo ya moyo."</string> - <!-- no translation found for permlab_readCalendar (6716116972752441641) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (4993979255403945892) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (8837931557573064315) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (4373978642145196715) --> - <skip /> + <string name="permlab_readCalendar" msgid="6716116972752441641">"Soma matukio na maelezo ya kalenda"</string> + <string name="permdesc_readCalendar" product="tablet" msgid="4993979255403945892">"Programu hii inaweza kusoma matukio yote ya kalenda yaliyohifadhiwa kwenye kompyuta yako kibao na kushiriki au kuhifadhi data yako ya kalenda."</string> + <string name="permdesc_readCalendar" product="tv" msgid="8837931557573064315">"Programu hii inaweza kusoma matukio yote ya kalenda yaliyohifadhiwa kwenye runinga yako na kushiriki au kuhifadhi data yako ya kalenda."</string> + <string name="permdesc_readCalendar" product="default" msgid="4373978642145196715">"Programu hii inaweza kusoma matukio yote ya kalenda yaliyohifadhiwa kwenye simu yako na kushiriki au kuhifadhi data yako ya kalenda."</string> <string name="permlab_writeCalendar" msgid="8438874755193825647">"ongeza au rekebisha matukio ya kalenda na utume barua pepe kwa wageni bila ufahamu wa mmiliki"</string> - <!-- no translation found for permdesc_writeCalendar (1675270619903625982) --> - <skip /> - <!-- no translation found for permdesc_writeCalendar (9017809326268135866) --> - <skip /> - <!-- no translation found for permdesc_writeCalendar (7592791790516943173) --> - <skip /> + <string name="permdesc_writeCalendar" product="tablet" msgid="1675270619903625982">"Programu hii inaweza kuongeza, kuondoa au kubadilisha matukio kwenye kompyuta yako kibao. Pogramu hii inaweza kutuma ujumbe unaoonekana kuwa umetoka kwa wamiliki wa kalenda au kurekebisha matukio bila kuwataarifu wamiliki."</string> + <string name="permdesc_writeCalendar" product="tv" msgid="9017809326268135866">"Programu hii inaweza kuongeza, kuondoa au kubadilisha matukio kwenye runinga yako. Pogramu hii inaweza kutuma ujumbe unaoonekana kuwa umetoka kwa wamiliki wa kalenda au kurekebisha matukio bila kuwataarifu wamiliki."</string> + <string name="permdesc_writeCalendar" product="default" msgid="7592791790516943173">"Programu hii inaweza kuongeza, kuondoa au kubadilisha matukio kwenye simu yako. Pogramu hii inaweza kutuma ujumbe unaoonekana kuwa umetoka kwa wamiliki wa kalenda au kurekebisha matukio bila kuwataarifu wamiliki."</string> <string name="permlab_accessLocationExtraCommands" msgid="2836308076720553837">"fikia amri za ziada za mtoa huduma ya mahali"</string> <string name="permdesc_accessLocationExtraCommands" msgid="6078307221056649927">"Ruhusu programu kufikia amri za ziada za mtoa huduma za mahali. Hii huenda ikaruhusu programu ikatize matumizi ya GPS au vyanzo vingine vya eneo."</string> <string name="permlab_accessFineLocation" msgid="251034415460950944">"fikia mahali halisi (inategemea mtandao na GPS)"</string> - <!-- no translation found for permdesc_accessFineLocation (5821994817969957884) --> - <skip /> + <string name="permdesc_accessFineLocation" msgid="5821994817969957884">"Programu hii inaweza kupata eneo lako kulingana na vyanzo vya eneo vya GPS au mtandao kama vile minara ya simu na mitandao ya Wi-Fi. Huduma hizi za mahali lazima ziwashwe na zipatikane kwenye simu yako ili programu iweze kuzitumia.Hii huenda ikaongeza matumizi ya betri."</string> <string name="permlab_accessCoarseLocation" msgid="7715277613928539434">"fikia mahali karibu na hapo (inategemea mtandao)"</string> - <!-- no translation found for permdesc_accessCoarseLocation (3373266766487862426) --> - <skip /> - <!-- no translation found for permdesc_accessCoarseLocation (1884022719818788511) --> - <skip /> - <!-- no translation found for permdesc_accessCoarseLocation (7788009094906196995) --> - <skip /> + <string name="permdesc_accessCoarseLocation" product="tablet" msgid="3373266766487862426">"Programu hii inaweza kupata eneo lako kulingana na vyanzo vya mtandao kama vile minara ya simu na mitandao ya Wi-Fi. Huduma hizi za mahali lazima ziwashwe na zipatikane kwenye kompyuta yako kibao ili programu iweze kuzitumia."</string> + <string name="permdesc_accessCoarseLocation" product="tv" msgid="1884022719818788511">"Programu hii inaweza kupata eneo lako kulingana na vyanzo vya mtandao kama vile minara ya simu na mitandao ya Wi-Fi. Huduma hizi za mahali lazima ziwashwe na zipatikane kwenye runinga yako ili programu iweze kuzitumia."</string> + <string name="permdesc_accessCoarseLocation" product="default" msgid="7788009094906196995">"Programu hii inaweza kupata eneo lako kulingana na vyanzo vya mtandao kama vile minara ya simu na mitandao ya Wi-Fi. Huduma hizi za mahali lazima ziwashwe na zipatikane kwenye simu yako ili programu iweze kuzitumia."</string> <string name="permlab_modifyAudioSettings" msgid="6095859937069146086">"badilisha mipangilio yako ya sauti"</string> <string name="permdesc_modifyAudioSettings" msgid="3522565366806248517">"Inaruhusu programu kurekebisha mipangilio ya sauti kila mahali kama vile sauti na ni kipaza sauti kipi ambacho kinatumika kwa kutoa."</string> <string name="permlab_recordAudio" msgid="3876049771427466323">"kurekodi sauti"</string> - <!-- no translation found for permdesc_recordAudio (4245930455135321433) --> - <skip /> + <string name="permdesc_recordAudio" msgid="4245930455135321433">"Programu hii inaweza kurekodi sauti kwa kutumia maikrofoni wakati wowote."</string> <string name="permlab_sim_communication" msgid="2935852302216852065">"tuma amri kwenye SIM"</string> <string name="permdesc_sim_communication" msgid="5725159654279639498">"Huruhusu programu kutuma amri kwa SIM. Hii ni hatari sana."</string> <string name="permlab_camera" msgid="3616391919559751192">"Kupiga picha na kurekodi video"</string> - <!-- no translation found for permdesc_camera (5392231870049240670) --> - <skip /> + <string name="permdesc_camera" msgid="5392231870049240670">"Programu hii inaweza kupiga picha na kurekodi video kwa kutumia kamera wakati wowote."</string> <string name="permlab_vibrate" msgid="7696427026057705834">"Kudhibiti mtetemo"</string> <string name="permdesc_vibrate" msgid="6284989245902300945">"Inaruhusu programu kudhibiti kitingishi."</string> <string name="permlab_callPhone" msgid="3925836347681847954">"piga simu moja kwa moja kwa nambari za simu"</string> diff --git a/core/res/res/values-ta-rIN/strings.xml b/core/res/res/values-ta-rIN/strings.xml index 03bc2cfab1fd..abc9f6e27455 100644 --- a/core/res/res/values-ta-rIN/strings.xml +++ b/core/res/res/values-ta-rIN/strings.xml @@ -46,8 +46,7 @@ <string name="defaultMsisdnAlphaTag" msgid="2850889754919584674">"MSISDN1"</string> <string name="mmiError" msgid="5154499457739052907">"இணைப்பு சிக்கல் அல்லது தவறான MMI குறியீடு."</string> <string name="mmiFdnError" msgid="5224398216385316471">"நிலையான அழைப்பு எண்களுக்கு மட்டுமே எனச் செயல்பாடு வரையறுக்கப்பட்டுள்ளது."</string> - <!-- no translation found for mmiErrorWhileRoaming (762488890299284230) --> - <skip /> + <string name="mmiErrorWhileRoaming" msgid="762488890299284230">"ரோமிங்கில் இருக்கும் போது, உங்கள் மொபைலிலிருந்து அழைப்புப் பகிர்வு அமைப்புகளை மாற்ற முடியாது."</string> <string name="serviceEnabled" msgid="8147278346414714315">"சேவை இயக்கப்பட்டுள்ளது."</string> <string name="serviceEnabledFor" msgid="6856228140453471041">"சேவை பின்வருவதற்கு இயக்கப்பட்டுள்ளது:"</string> <string name="serviceDisabled" msgid="1937553226592516411">"சேவை முடக்கப்பட்டுள்ளது."</string> @@ -98,10 +97,8 @@ <string name="RestrictedOnVoiceData" msgid="996636487106171320">"குரல்/தரவு சேவைகள் தடைசெய்யப்பட்டுள்ளன."</string> <string name="RestrictedOnVoiceSms" msgid="1888588152792023873">"குரல்/SMS சேவைகள் தடைசெய்யப்பட்டுள்ளன."</string> <string name="RestrictedOnAll" msgid="5643028264466092821">"எல்லா குரல்/தரவு/SMS சேவைகள் தடைசெய்யப்பட்டுள்ளன."</string> - <!-- no translation found for NetworkPreferenceSwitchTitle (4008877505368566980) --> - <skip /> - <!-- no translation found for NetworkPreferenceSwitchSummary (7335915397439759249) --> - <skip /> + <string name="NetworkPreferenceSwitchTitle" msgid="4008877505368566980">"நெட்வொர்க்குடன் இணைக்க முடியவில்லை"</string> + <string name="NetworkPreferenceSwitchSummary" msgid="7335915397439759249">"பெறுதலை மேம்படுத்த, அமைப்புகள் > செல்லுலார் நெட்வொர்க்குகள் > விரும்பும் நெட்வொர்க் வகை என்பதில் தேர்ந்தெடுத்த நெட்வொர்க் வகையை மாற்றவும்."</string> <string name="peerTtyModeFull" msgid="6165351790010341421">"TTY Mode FULLஐ இணைச் செயல்பாடு கோரியது"</string> <string name="peerTtyModeHco" msgid="5728602160669216784">"TTY Mode HCOஐ இணைச் செயல்பாடு கோரியது"</string> <string name="peerTtyModeVco" msgid="1742404978686538049">"TTY Mode VCOஐ இணைச் செயல்பாடு கோரியது"</string> @@ -185,10 +182,8 @@ <string name="work_profile_deleted_description" msgid="6305147513054341102">"நிர்வாகி பயன்பாடு இல்லாததனால், பணி சுயவிவரம் நீக்கப்பட்டது."</string> <string name="work_profile_deleted_details" msgid="226615743462361248">"பணி சுயவிவர நிர்வாகி பயன்பாடு இல்லை அல்லது சேதமடைந்துள்ளது. இதன் விளைவாக, உங்கள் பணி சுயவிவரமும், அதனுடன் தொடர்புடைய தரவும் நீக்கப்பட்டன. உதவிக்கு, உங்கள் நிர்வாகியைத் தொடர்புகொள்ளவும்."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="6019770344820507579">"சாதனத்தில் இனி பணி சுயவிவரம் கிடைக்காது."</string> - <!-- no translation found for network_logging_notification_title (1805392571290161924) --> - <skip /> - <!-- no translation found for network_logging_notification_text (4448072433371155729) --> - <skip /> + <string name="network_logging_notification_title" msgid="1805392571290161924">"நெட்வொர்க் ட்ராஃபிக் கண்காணிக்கப்படுகிறது"</string> + <string name="network_logging_notification_text" msgid="4448072433371155729">"மேலும் விவரங்களுக்கு, தட்டவும்"</string> <string name="factory_reset_warning" msgid="5423253125642394387">"சாதனத் தரவு அழிக்கப்படும்"</string> <string name="factory_reset_message" msgid="4905025204141900666">"நிர்வாகி பயன்பாடு இல்லை அல்லது சேதமடைந்துள்ளது மற்றும் பயன்படுத்த முடியாது. இப்போது சாதனத் தரவு அழிக்கப்படும். உதவிக்கு, நிர்வாகியைத் தொடர்புகொள்ளவும்."</string> <string name="me" msgid="6545696007631404292">"நான்"</string> @@ -306,12 +301,9 @@ <string name="permlab_sendSms" msgid="7544599214260982981">"SMS செய்திகளை அனுப்புதல் மற்றும் பார்த்தல்"</string> <string name="permdesc_sendSms" msgid="7094729298204937667">"SMS செய்திகளை அனுப்ப பயன்பாட்டை அனுமதிக்கிறது. இதற்கு எதிர்பாராத கட்டணங்கள் விதிக்கப்படலாம். தீங்கு விளைவிக்கும் பயன்பாடுகள் உங்களின் உறுதிப்படுத்தல் எதுவுமின்றி செய்திகளை அனுப்பி உங்களுக்குக் கட்டணம் விதிக்கலாம்."</string> <string name="permlab_readSms" msgid="8745086572213270480">"உங்கள் உரைச் செய்திகளை (SMS அல்லது MMS) படித்தல்"</string> - <!-- no translation found for permdesc_readSms (4741697454888074891) --> - <skip /> - <!-- no translation found for permdesc_readSms (5796670395641116592) --> - <skip /> - <!-- no translation found for permdesc_readSms (6826832415656437652) --> - <skip /> + <string name="permdesc_readSms" product="tablet" msgid="4741697454888074891">"இந்தப் பயன்பாடு உங்கள் டேப்லெட்டில் சேமிக்கப்பட்டுள்ள எல்லா SMS (உரை) செய்திகளையும் படிக்கலாம்."</string> + <string name="permdesc_readSms" product="tv" msgid="5796670395641116592">"இந்தப் பயன்பாடு உங்கள் டிவியில் சேமிக்கப்பட்டுள்ள எல்லா SMS (உரை) செய்திகளையும் படிக்கலாம்."</string> + <string name="permdesc_readSms" product="default" msgid="6826832415656437652">"இந்தப் பயன்பாடு உங்கள் மொபைலில் சேமிக்கப்பட்டுள்ள எல்லா SMS (உரை) செய்திகளையும் படிக்கலாம்."</string> <string name="permlab_receiveWapPush" msgid="5991398711936590410">"உரைச் செய்திகளைப் (WAP) பெறுதல்"</string> <string name="permdesc_receiveWapPush" msgid="748232190220583385">"WAP செய்திகளைப் பெற, செயற்படுத்தப் பயன்பாட்டை அனுமதிக்கிறது. உங்களுக்கு அனுப்பப்படும் செய்திகளை உங்களுக்குக் காட்டாமல் கண்காணிக்க அல்லது நீக்குவதற்கான திறன் இந்த அனுமதியில் உள்ளடங்கும்."</string> <string name="permlab_getTasks" msgid="6466095396623933906">"இயங்கும் பயன்பாடுகளை மீட்டெடுத்தல்"</string> @@ -324,10 +316,8 @@ <string name="permdesc_enableCarMode" msgid="4853187425751419467">"கார் முறையை இயக்க, பயன்பாட்டை அனுமதிக்கிறது."</string> <string name="permlab_killBackgroundProcesses" msgid="3914026687420177202">"பிற பயன்பாடுகளை மூடுதல்"</string> <string name="permdesc_killBackgroundProcesses" msgid="4593353235959733119">"பிற பயன்பாடுகளின் பின்புலச் செயல்முறைகளை நிறுத்த பயன்பாட்டை அனுமதிக்கிறது. இதனால் பிற பயன்பாடுகள் இயங்குவதை நிறுத்தலாம்."</string> - <!-- no translation found for permlab_systemAlertWindow (7238805243128138690) --> - <skip /> - <!-- no translation found for permdesc_systemAlertWindow (2393776099672266188) --> - <skip /> + <string name="permlab_systemAlertWindow" msgid="7238805243128138690">"இந்தப் பயன்பாடு பிற பயன்பாடுகளின் மேலே தோன்றலாம்"</string> + <string name="permdesc_systemAlertWindow" msgid="2393776099672266188">"இந்தப் பயன்பாடு பிற பயன்பாடுகளின் மேலே அல்லது திரையின் பிற பகுதிகளில் தோன்றலாம். இது வழக்கமான பயன்பாட்டு உபயோகத்தில் குறுக்கிட்டு, பிற பயன்பாடுகள் தோன்றும் விதத்தை மாற்றக்கூடும்."</string> <string name="permlab_persistentActivity" msgid="8841113627955563938">"பயன்பாட்டை எப்போதும் இயங்குமாறு செய்தல்"</string> <string name="permdesc_persistentActivity" product="tablet" msgid="8525189272329086137">"நினைவகத்தில் நிலையாக இருக்கும் தன்னுடைய பகுதிகளை உருவாக்கப் பயன்பாட்டை அனுமதிக்கிறது. இதனால பிற பயன்பாடுகளுக்குக் கிடைக்கும் நினைவகம் வரையறுக்கப்பட்டு, டேப்லெட்டின் வேகத்தைக் குறைக்கலாம்."</string> <string name="permdesc_persistentActivity" product="tv" msgid="5086862529499103587">"பயன்பாடு தனது உள்ளடக்கத்தை நினைவகத்தில் தொடர்ந்து வைத்திருக்க, அனுமதிக்கிறது. பிற பயன்பாடுகளுக்கென இருக்கும் நினைவகத்தை இது கட்டுப்படுத்தி, டிவியின் செயல்திறனைக் குறைக்கலாம்."</string> @@ -353,51 +343,37 @@ <string name="permdesc_writeContacts" product="tv" msgid="5438230957000018959">"உங்கள் டிவியில் சேமிக்கப்பட்ட தொடர்புகள் பற்றிய தரவை மாற்ற, பயன்பாட்டை அனுமதிக்கிறது, இதில் குறிப்பிட்ட தொடர்பை எத்தனைமுறை அழைத்தீர்கள், மின்னஞ்சல் செய்தீர்கள் அல்லது பிறவழிகளில் தொடர்புகொண்டீர்கள் என்பதும் அடங்கும். இது தொடர்புத் தரவை நீக்க, பயன்பாட்டை அனுமதிக்கிறது."</string> <string name="permdesc_writeContacts" product="default" msgid="589869224625163558">"குறிப்பிட்ட தொடர்புகளுடன் நீங்கள் அழைத்த, மின்னஞ்சல் அனுப்பிய அல்லது வேறு வழியில் தொடர்புகொண்டதின் எண்ணிக்கை உள்பட, உங்கள் மொபைலில் சேமிக்கப்பட்ட உங்கள் தொடர்புகள் குறித்த தரவைத் திருத்த பயன்பாட்டை அனுமதிக்கிறது. இந்த அனுமதியானது தொடர்புத் தரவை நீக்கப் பயன்பாடுகளை அனுமதிக்கிறது."</string> <string name="permlab_readCallLog" msgid="3478133184624102739">"அழைப்புப் பதிவைப் படித்தல்"</string> - <!-- no translation found for permdesc_readCallLog (3204122446463552146) --> - <skip /> + <string name="permdesc_readCallLog" msgid="3204122446463552146">"இந்தப் பயன்பாடு உங்கள் அழைப்பு வரலாற்றைப் படிக்கலாம்."</string> <string name="permlab_writeCallLog" msgid="8552045664743499354">"அழைப்புப் பதிவை எழுதுதல்"</string> <string name="permdesc_writeCallLog" product="tablet" msgid="6661806062274119245">"உள்வரும் மற்றும் வெளிச்செல்லும் அழைப்புகள் குறித்த தகவல் உள்பட உங்கள் டேப்லெட்டின் அழைப்புப் பதிவைத் திருத்துவதற்குப் பயன்பாட்டை அனுமதிக்கிறது. உங்கள் அழைப்பின் பதிவை அழிக்க அல்லது திருத்த தீங்கு விளைவிக்கும் பயன்பாடுகள் இதைப் பயன்படுத்தலாம்."</string> <string name="permdesc_writeCallLog" product="tv" msgid="4225034892248398019">"உள்வரும் மற்றும் வெளிச்செல்லும் அழைப்புகள் குறித்த தகவல் உள்ளிட்ட உங்கள் டிவியின் அழைப்பு பதிவைத் திருத்த, பயன்பாட்டை அனுமதிக்கிறது. உங்கள் அழைப்பு பதிவை அழிக்க அல்லது திருத்த தீங்கு விளைவிக்கும் பயன்பாடுகள் இதைப் பயன்படுத்தலாம்."</string> <string name="permdesc_writeCallLog" product="default" msgid="683941736352787842">"உள்வரும் மற்றும் வெளிச்செல்லும் அழைப்புகள் குறித்த தகவல் உள்பட உங்கள் மொபைல் அழைப்புப் பதிவைத் திருத்துவதற்குப் பயன்பாட்டை அனுமதிக்கிறது. உங்கள் அழைப்பின் பதிவை அழிக்க அல்லது திருத்த தீங்கு விளைவிக்கும் பயன்பாடுகள் இதைப் பயன்படுத்தலாம்."</string> <string name="permlab_bodySensors" msgid="4683341291818520277">"உடல் உணர்விகளை (இதயத் துடிப்பு மானிட்டர்கள் போன்றவை) அணுகுதல்"</string> <string name="permdesc_bodySensors" product="default" msgid="4380015021754180431">"உங்கள் இதயத்துடிப்பு விகிதம் போன்ற உங்கள் உடல்நிலையைக் கண்காணிக்கும் உணர்விகளில் இருந்து தரவை அணுக பயன்பாடுகளை அனுமதிக்கும்."</string> - <!-- no translation found for permlab_readCalendar (6716116972752441641) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (4993979255403945892) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (8837931557573064315) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (4373978642145196715) --> - <skip /> + <string name="permlab_readCalendar" msgid="6716116972752441641">"கேலெண்டர் நிகழ்வுகளையும் விவரங்களையும் படிக்கலாம்"</string> + <string name="permdesc_readCalendar" product="tablet" msgid="4993979255403945892">"இந்தப் பயன்பாடு உங்கள் டேப்லெட்டில் சேமிக்கப்பட்டுள்ள கேலெண்டர் நிகழ்வுகள் அனைத்தையும் படிக்கலாம், உங்கள் கேலெண்டர் தரவைப் பகிரலாம் அல்லது சேமிக்கலாம்."</string> + <string name="permdesc_readCalendar" product="tv" msgid="8837931557573064315">"இந்தப் பயன்பாடு உங்கள் டிவியில் சேமிக்கப்பட்டுள்ள எல்லா கேலெண்டர் நிகழ்வுகளையும் படிக்கலாம், உங்கள் கேலெண்டர் தரவைப் பகிரலாம் அல்லது சேமிக்கலாம்."</string> + <string name="permdesc_readCalendar" product="default" msgid="4373978642145196715">"இந்தப் பயன்பாடு உங்கள் மொபைலில் சேமிக்கப்பட்டுள்ள கேலெண்டர் நிகழ்வுகள் அனைத்தையும் படிக்கலாம், உங்கள் கேலெண்டர் தரவைப் பகிரலாம் அல்லது சேமிக்கலாம்."</string> <string name="permlab_writeCalendar" msgid="8438874755193825647">"உரிமையாளருக்குத் தெரியாமல் கேலெண்டர் நிகழ்வுகளைச் சேர்த்தல் அல்லது மாற்றுதல் மற்றும் விருந்தினர்களுக்கு மின்னஞ்சல் அனுப்புதல்"</string> - <!-- no translation found for permdesc_writeCalendar (1675270619903625982) --> - <skip /> - <!-- no translation found for permdesc_writeCalendar (9017809326268135866) --> - <skip /> - <!-- no translation found for permdesc_writeCalendar (7592791790516943173) --> - <skip /> + <string name="permdesc_writeCalendar" product="tablet" msgid="1675270619903625982">"இந்தப் பயன்பாடு உங்கள் டேப்லெட்டில் கேலெண்டர் நிகழ்வுகளைச் சேர்க்கலாம், அகற்றலாம் அல்லது மாற்றலாம். இந்தப் பயன்பாடு கேலெண்டர் உரிமையாளர்கள் அனுப்பியது போல் தோன்றும் செய்திகளை அனுப்பலாம் அல்லது உரிமையாளர்களிடம் தெரிவிக்காமலே கேலெண்டரில் நிகழ்வுகளை மாற்றலாம்."</string> + <string name="permdesc_writeCalendar" product="tv" msgid="9017809326268135866">"இந்தப் பயன்பாடு உங்கள் டிவியில் கேலெண்டர் நிகழ்வுகளைச் சேர்க்கலாம், அகற்றலாம் அல்லது மாற்றலாம். இந்தப் பயன்பாடு கேலெண்டர் உரிமையாளர்கள் அனுப்பியது போல் தோன்றும் செய்திகளை அனுப்பலாம் அல்லது உரிமையாளர்களிடம் தெரிவிக்காமலே கேலெண்டரில் நிகழ்வுகளை மாற்றலாம்."</string> + <string name="permdesc_writeCalendar" product="default" msgid="7592791790516943173">"இந்தப் பயன்பாடு உங்கள் மொபைலில் கேலெண்டர் நிகழ்வுகளைச் சேர்க்கலாம், அகற்றலாம் அல்லது மாற்றலாம். இந்தப் பயன்பாடு கேலெண்டர் உரிமையாளர்கள் அனுப்பியது போல் தோன்றும் செய்திகளை அனுப்பலாம் அல்லது உரிமையாளர்களிடம் தெரிவிக்காமலே கேலெண்டரில் நிகழ்வுகளை மாற்றலாம்."</string> <string name="permlab_accessLocationExtraCommands" msgid="2836308076720553837">"கூடுதல் இட வழங்குநரின் கட்டளைகளின் அணுகல்"</string> <string name="permdesc_accessLocationExtraCommands" msgid="6078307221056649927">"கூடுதல் இட வழங்குநர் கட்டளைகளை அணுகப் பயன்பாட்டை அனுமதிக்கிறது. இது, GPS அல்லது பிற இருப்பிட மூலங்களின் செயல்பாட்டை இடைமறிக்க பயன்பாட்டை அனுமதிக்கலாம்."</string> <string name="permlab_accessFineLocation" msgid="251034415460950944">"துல்லியமான இருப்பிடத்தை அணுகுதல் (GPS மற்றும் நெட்வொர்க் அடிப்படையில்)"</string> - <!-- no translation found for permdesc_accessFineLocation (5821994817969957884) --> - <skip /> + <string name="permdesc_accessFineLocation" msgid="5821994817969957884">"இந்தப் பயன்பாடு GPS அல்லது நெட்வொர்க் மூலங்களின் (செல் கோபுரங்கள், வைஃபை நெட்வொர்க்குகள் போன்றவை) அடிப்படையில் உங்கள் இருப்பிடத்தைப் பெறலாம். பயன்பாடு பயன்படுத்தும் வகையில், உங்கள் மொபைலில் இந்த இருப்பிடச் சேவைகள் இயக்கப்பட்டு, கிடைக்கும்படி இருக்க வேண்டும். இதனால் பேட்டரி அதிகம் பயன்படுத்தப்படலாம்."</string> <string name="permlab_accessCoarseLocation" msgid="7715277613928539434">"தோராயமான இருப்பிடத்தை அணுகுதல் (நெட்வொர்க் அடிப்படையில்)"</string> - <!-- no translation found for permdesc_accessCoarseLocation (3373266766487862426) --> - <skip /> - <!-- no translation found for permdesc_accessCoarseLocation (1884022719818788511) --> - <skip /> - <!-- no translation found for permdesc_accessCoarseLocation (7788009094906196995) --> - <skip /> + <string name="permdesc_accessCoarseLocation" product="tablet" msgid="3373266766487862426">"இந்தப் பயன்பாடு நெட்வொர்க் மூலங்களின் (செல் கோபுரங்கள், வைஃபை நெட்வொர்க்குகள் போன்றவை) அடிப்படையில் உங்கள் இருப்பிடத்தைப் பெறலாம். பயன்பாடு பயன்படுத்தும் வகையில், உங்கள் டேப்லெட்டில் இந்த இருப்பிடச் சேவைகள் இயக்கப்பட்டு, கிடைக்கும்படி இருக்க வேண்டும்."</string> + <string name="permdesc_accessCoarseLocation" product="tv" msgid="1884022719818788511">"இந்தப் பயன்பாடு நெட்வொர்க் மூலங்களின் (செல் கோபுரங்கள், வைஃபை நெட்வொர்க்குகள் போன்றவை) அடிப்படையில் உங்கள் இருப்பிடத்தைப் பெறலாம். பயன்பாடு பயன்படுத்தும் வகையில், உங்கள் டிவியில் இந்த இருப்பிடச் சேவைகள் இயக்கப்பட்டு, கிடைக்கும்படி இருக்க வேண்டும்."</string> + <string name="permdesc_accessCoarseLocation" product="default" msgid="7788009094906196995">"இந்தப் பயன்பாடு நெட்வொர்க் மூலங்களின் (செல் கோபுரங்கள், வைஃபை நெட்வொர்க்குகள் போன்றவை) அடிப்படையில் உங்கள் இருப்பிடத்தைப் பெறலாம். பயன்பாடு பயன்படுத்தும் வகையில், உங்கள் மொபைலில் இந்த இருப்பிடச் சேவைகள் இயக்கப்பட்டு, கிடைக்கும்படி இருக்க வேண்டும்."</string> <string name="permlab_modifyAudioSettings" msgid="6095859937069146086">"எனது ஆடியோ அமைப்புகளை மாற்றுதல்"</string> <string name="permdesc_modifyAudioSettings" msgid="3522565366806248517">"ஒலியளவு மற்றும் வெளியீட்டிற்கு ஸ்பீக்கர்கள் பயன்படுத்தப்படுவது போன்ற ஒட்டுமொத்த ஆடியோ அமைப்புகளைக் கட்டுப்படுத்தப் பயன்பாட்டை அனுமதிக்கிறது."</string> <string name="permlab_recordAudio" msgid="3876049771427466323">"ஆடியோவைப் பதிவுசெய்தல்"</string> - <!-- no translation found for permdesc_recordAudio (4245930455135321433) --> - <skip /> + <string name="permdesc_recordAudio" msgid="4245930455135321433">"இந்தப் பயன்பாடு எப்போது வேண்டுமானாலும் மைக்ரோஃபோனைப் பயன்படுத்தி ஆடியோவை ரெக்கார்டு செய்யலாம்."</string> <string name="permlab_sim_communication" msgid="2935852302216852065">"கட்டளைகளை சிம்மிற்கு அனுப்புதல்"</string> <string name="permdesc_sim_communication" msgid="5725159654279639498">"சிம் க்குக் கட்டளைகளை அனுப்ப பயன்பாட்டை அனுமதிக்கிறது. இது மிகவும் ஆபத்தானதாகும்."</string> <string name="permlab_camera" msgid="3616391919559751192">"படங்கள் மற்றும் வீடியோக்களை எடுத்தல்"</string> - <!-- no translation found for permdesc_camera (5392231870049240670) --> - <skip /> + <string name="permdesc_camera" msgid="5392231870049240670">"இந்தப் பயன்பாடு எப்போது வேண்டுமானாலும் கேமராவைப் பயன்படுத்தி படங்களை எடுக்கலாம், வீடியோக்களை ரெக்கார்டு செய்யலாம்."</string> <string name="permlab_vibrate" msgid="7696427026057705834">"அதிர்வைக் கட்டுப்படுத்துதல்"</string> <string name="permdesc_vibrate" msgid="6284989245902300945">"அதிர்வைக் கட்டுப்படுத்தப் பயன்பாட்டை அனுமதிக்கிறது."</string> <string name="permlab_callPhone" msgid="3925836347681847954">"தொலைபேசி எண்களை நேரடியாக அழைத்தல்"</string> diff --git a/core/res/res/values-te-rIN/strings.xml b/core/res/res/values-te-rIN/strings.xml index 77804be4a1c9..90db0497cc1f 100644 --- a/core/res/res/values-te-rIN/strings.xml +++ b/core/res/res/values-te-rIN/strings.xml @@ -46,8 +46,7 @@ <string name="defaultMsisdnAlphaTag" msgid="2850889754919584674">"MSISDN1"</string> <string name="mmiError" msgid="5154499457739052907">"కనెక్షన్ సమస్య లేదా చెల్లని MMI కోడ్."</string> <string name="mmiFdnError" msgid="5224398216385316471">"చర్య స్థిరమైన డయలింగ్ నంబర్లకు మాత్రమే పరిమితం చేయబడింది."</string> - <!-- no translation found for mmiErrorWhileRoaming (762488890299284230) --> - <skip /> + <string name="mmiErrorWhileRoaming" msgid="762488890299284230">"మీరు రోమింగ్లో ఉన్నప్పుడు మీ ఫోన్ నుండి కాల్ ఫార్వార్డింగ్ సెట్టింగ్లను మార్చలేరు."</string> <string name="serviceEnabled" msgid="8147278346414714315">"సేవ ప్రారంభించబడింది."</string> <string name="serviceEnabledFor" msgid="6856228140453471041">"వీటి కోసం సేవ ప్రారంభించబడింది:"</string> <string name="serviceDisabled" msgid="1937553226592516411">"సేవ నిలిపివేయబడింది."</string> @@ -98,10 +97,8 @@ <string name="RestrictedOnVoiceData" msgid="996636487106171320">"వాయిస్/డేటా సేవలు బ్లాక్ చేయబడ్డాయి."</string> <string name="RestrictedOnVoiceSms" msgid="1888588152792023873">"వాయిస్/SMS సేవలు బ్లాక్ చేయబడ్డాయి."</string> <string name="RestrictedOnAll" msgid="5643028264466092821">"అన్ని వాయిస్/డేటా/SMS సేవలు బ్లాక్ చేయబడ్డాయి."</string> - <!-- no translation found for NetworkPreferenceSwitchTitle (4008877505368566980) --> - <skip /> - <!-- no translation found for NetworkPreferenceSwitchSummary (7335915397439759249) --> - <skip /> + <string name="NetworkPreferenceSwitchTitle" msgid="4008877505368566980">"నెట్వర్క్ను చేరుకోలేరు"</string> + <string name="NetworkPreferenceSwitchSummary" msgid="7335915397439759249">"స్వీకరణను మెరుగుపరచడానికి, సెట్టింగ్లు > సెల్యులార్ నెట్వర్క్లు > ప్రాధాన్య నెట్వర్క్ రకం ఎంపికలో ఎంచుకున్న రకాన్ని మార్చడానికి ప్రయత్నించండి."</string> <string name="peerTtyModeFull" msgid="6165351790010341421">"అవతలి వారు FULL TTY మోడ్ని అభ్యర్థించారు"</string> <string name="peerTtyModeHco" msgid="5728602160669216784">"అవతలి వారు HCO TTY మోడ్ని అభ్యర్థించారు"</string> <string name="peerTtyModeVco" msgid="1742404978686538049">"అవతలి వారు VCO TTY మోడ్ని అభ్యర్థించారు"</string> @@ -185,10 +182,8 @@ <string name="work_profile_deleted_description" msgid="6305147513054341102">"నిర్వాహక అనువర్తనం లేనందున కార్యాలయ ప్రొఫైల్ తొలగించబడింది."</string> <string name="work_profile_deleted_details" msgid="226615743462361248">"కార్యాలయ ప్రొఫైల్ నిర్వాహక అనువర్తనం లేదు లేదా పాడైంది. తత్ఫలితంగా, మీ కార్యాలయ ప్రొఫైల్ మరియు సంబంధిత డేటా తొలగించబడ్డాయి. సహాయం కోసం మీ నిర్వాహకుడిని సంప్రదించండి."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="6019770344820507579">"ఈ పరికరంలో మీ కార్యాలయ ప్రొఫైల్ ఇప్పుడు అందుబాటులో లేదు."</string> - <!-- no translation found for network_logging_notification_title (1805392571290161924) --> - <skip /> - <!-- no translation found for network_logging_notification_text (4448072433371155729) --> - <skip /> + <string name="network_logging_notification_title" msgid="1805392571290161924">"నెట్వర్క్ ట్రాఫిక్ పర్యవేక్షించబడుతోంది"</string> + <string name="network_logging_notification_text" msgid="4448072433371155729">"మరిన్ని వివరాల కోసం నొక్కండి"</string> <string name="factory_reset_warning" msgid="5423253125642394387">"మీ పరికరంలోని డేటా తొలగించబడుతుంది"</string> <string name="factory_reset_message" msgid="4905025204141900666">"నిర్వాహక అనువర్తనంలో కొన్ని అంతర్భాగాలు లేవు లేదా అది పాడైపోయి, నిరుపయోగంగా మారింది. మీ పరికరంలోని డేటా ఇప్పుడు తొలగించబడుతుంది. సహాయం కోసం మీ నిర్వాహకుడిని సంప్రదించండి."</string> <string name="me" msgid="6545696007631404292">"నేను"</string> @@ -306,12 +301,9 @@ <string name="permlab_sendSms" msgid="7544599214260982981">"SMS సందేశాలను పంపడానికి మరియు వీక్షించడానికి"</string> <string name="permdesc_sendSms" msgid="7094729298204937667">"SMS సందేశాలు పంపడానికి అనువర్తనాన్ని అనుమతిస్తుంది. దీని వలన ఊహించని ఛార్జీలు విధించబడవచ్చు. హానికరమైన అనువర్తనాలు మీ నిర్ధారణ లేకుండానే సందేశాలను పంపడం ద్వారా మీకు డబ్బు ఖర్చయ్యేలా చేయవచ్చు."</string> <string name="permlab_readSms" msgid="8745086572213270480">"మీ వచన సందేశాలు (SMS లేదా MMS) చదవడం"</string> - <!-- no translation found for permdesc_readSms (4741697454888074891) --> - <skip /> - <!-- no translation found for permdesc_readSms (5796670395641116592) --> - <skip /> - <!-- no translation found for permdesc_readSms (6826832415656437652) --> - <skip /> + <string name="permdesc_readSms" product="tablet" msgid="4741697454888074891">"ఈ అనువర్తనం మీ టాబ్లెట్లో నిల్వ చేసిన అన్ని SMS (వచన) సందేశాలను చదవగలదు."</string> + <string name="permdesc_readSms" product="tv" msgid="5796670395641116592">"ఈ అనువర్తనం మీ టీవీలో నిల్వ చేసిన అన్ని SMS (వచన) సందేశాలను చదవగలదు."</string> + <string name="permdesc_readSms" product="default" msgid="6826832415656437652">"ఈ అనువర్తనం మీ ఫోన్లో నిల్వ చేసిన అన్ని SMS (వచన) సందేశాలను చదవగలదు."</string> <string name="permlab_receiveWapPush" msgid="5991398711936590410">"వచన సందేశాలను (WAP) స్వీకరించడం"</string> <string name="permdesc_receiveWapPush" msgid="748232190220583385">"WAP సందేశాలను స్వీకరించడానికి మరియు ప్రాసెస్ చేయడానికి అనువర్తనాన్ని అనుమతిస్తుంది. ఈ అనుమతి మీకు పంపబడిన సందేశాలను మీకు చూపకుండానే పర్యవేక్షించగల లేదా తొలగించగల సామర్థ్యాన్ని కలిగి ఉంటుంది."</string> <string name="permlab_getTasks" msgid="6466095396623933906">"అమలవుతున్న అనువర్తనాలను పునరుద్ధరించడం"</string> @@ -324,10 +316,8 @@ <string name="permdesc_enableCarMode" msgid="4853187425751419467">"కారు మోడ్ను ప్రారంభించడానికి అనువర్తనాన్ని అనుమతిస్తుంది."</string> <string name="permlab_killBackgroundProcesses" msgid="3914026687420177202">"ఇతర అనువర్తనాలను మూసివేయడం"</string> <string name="permdesc_killBackgroundProcesses" msgid="4593353235959733119">"ఇతర అనువర్తనాల నేపథ్య ప్రాసెస్లను ముగించడానికి అనువర్తనాన్ని అనుమతిస్తుంది. దీని వలన ఇతర అనువర్తనాలు అమలు కాకుండా ఆపివేయబడవచ్చు."</string> - <!-- no translation found for permlab_systemAlertWindow (7238805243128138690) --> - <skip /> - <!-- no translation found for permdesc_systemAlertWindow (2393776099672266188) --> - <skip /> + <string name="permlab_systemAlertWindow" msgid="7238805243128138690">"ఈ అనువర్తనం ఇతర అనువర్తనాల పైభాగాన కనిపించగలదు"</string> + <string name="permdesc_systemAlertWindow" msgid="2393776099672266188">"ఈ అనువర్తనం ఇతర అనువర్తనాల పైభాగాన లేదా స్క్రీన్ యొక్క ఇతర భాగాలపైన కనిపించగలదు. ఇది సాధారణ అనువర్తన వినియోగానికి అంతరాయం కలిగించవచ్చు మరియు ఆ ఇతర అనువర్తనాలు కనిపించే విధానాన్ని మార్చవచ్చు."</string> <string name="permlab_persistentActivity" msgid="8841113627955563938">"అనువర్తనాన్ని ఎల్లప్పుడూ అమలు చేయడం"</string> <string name="permdesc_persistentActivity" product="tablet" msgid="8525189272329086137">"అనువర్తనం, దాని భాగాలు మెమరీలో ఉండేలా చేయడానికి దానిని అనుమతిస్తుంది. ఇది ఇతర అనువర్తనాలకు అందుబాటులో ఉన్న మెమరీని ఆక్రమిస్తుంది, టాబ్లెట్ నెమ్మదిగా పని చేస్తుంది."</string> <string name="permdesc_persistentActivity" product="tv" msgid="5086862529499103587">"అనువర్తనం దానిలోని కొన్ని భాగాలను మెమరీలో ఉంచడానికి దాన్ని అనుమతిస్తుంది. ఇది టీవీ నెమ్మదిగా పని చేసేలా చేస్తూ ఇతర అనువర్తనాలకు అందుబాటులో ఉన్న మెమరీని పరిమితం చేయవచ్చు."</string> @@ -353,51 +343,37 @@ <string name="permdesc_writeContacts" product="tv" msgid="5438230957000018959">"మీరు నిర్దిష్ట పరిచయాలకు కాల్ చేసిన, ఇమెయిల్ చేసిన లేదా ఇతర మార్గాల్లో కమ్యూనికేట్ చేసిన తరచుదనంతో సహా మీ టీవీలో నిల్వ చేసిన మీ పరిచయాలకు సంబంధించిన డేటాను సవరించడానికి అనువర్తనాన్ని అనుమతిస్తుంది. ఈ అనుమతి పరిచయ డేటాను తొలగించడానికి అనువర్తనాలను అనుమతిస్తుంది."</string> <string name="permdesc_writeContacts" product="default" msgid="589869224625163558">"మీరు నిర్దిష్ట పరిచయాలకు కాల్ చేసిన, ఇమెయిల్ చేసిన లేదా ఇతర మార్గాల్లో కమ్యూనికేట్ చేసిన తరచుదనంతో సహా మీ ఫోన్లో నిల్వ చేయబడిన మీ పరిచయాల గురించి డేటాను సవరించడానికి అనువర్తనాన్ని అనుమతిస్తుంది. ఈ అనుమతి పరిచయ డేటాను తొలగించడానికి అనువర్తనాలను అనుమతిస్తుంది."</string> <string name="permlab_readCallLog" msgid="3478133184624102739">"కాల్ లాగ్ను చదవడం"</string> - <!-- no translation found for permdesc_readCallLog (3204122446463552146) --> - <skip /> + <string name="permdesc_readCallLog" msgid="3204122446463552146">"ఈ అనువర్తనం మీ కాల్ చరిత్రను చదవగలదు."</string> <string name="permlab_writeCallLog" msgid="8552045664743499354">"కాల్ లాగ్ను వ్రాయడం"</string> <string name="permdesc_writeCallLog" product="tablet" msgid="6661806062274119245">"ఇన్కమింగ్ మరియు అవుట్గోయింగ్ కాల్ల గురించిన డేటాతో సహా మీ టాబ్లెట్ యొక్క కాల్ లాగ్ను సవరించడానికి అనువర్తనాన్ని అనుమతిస్తుంది. హానికరమైన అనువర్తనాలు మీ కాల్ లాగ్ను ఎరేజ్ చేయడానికి లేదా సవరించడానికి దీన్ని ఉపయోగించవచ్చు."</string> <string name="permdesc_writeCallLog" product="tv" msgid="4225034892248398019">"ఇన్కమింగ్ మరియు అవుట్గోయింగ్ కాల్లకు సంబంధించిన డేటాతో సహా మీ టీవీ కాల్ లాగ్ను సవరించడానికి అనువర్తనాన్ని అనుమతిస్తుంది. హానికరమైన అనువర్తనాలు మీ కాల్ లాగ్ను తీసివేయడానికి లేదా సవరించడానికి దీన్ని ఉపయోగించవచ్చు."</string> <string name="permdesc_writeCallLog" product="default" msgid="683941736352787842">"ఇన్కమింగ్ మరియు అవుట్గోయింగ్ కాల్ల గురించిన డేటాతో సహా మీ ఫోన్ యొక్క కాల్ లాగ్ను సవరించడానికి అనువర్తనాన్ని అనుమతిస్తుంది. హానికరమైన అనువర్తనాలు మీ కాల్ లాగ్ను ఎరేజ్ చేయడానికి లేదా సవరించడానికి దీన్ని ఉపయోగించవచ్చు."</string> <string name="permlab_bodySensors" msgid="4683341291818520277">"శరీర సెన్సార్లను (గుండె స్పందన రేటు మానిటర్ల వంటివి) ప్రాప్యత చేయడం"</string> <string name="permdesc_bodySensors" product="default" msgid="4380015021754180431">"మీ శారీరక పరిస్థితిని అనగా మీ గుండె స్పందన రేటు వంటి వాటిని పర్యవేక్షించే సెన్సార్ల నుండి డేటాను ప్రాప్యత చేయడానికి అనువర్తనాన్ని అనుమతిస్తుంది."</string> - <!-- no translation found for permlab_readCalendar (6716116972752441641) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (4993979255403945892) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (8837931557573064315) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (4373978642145196715) --> - <skip /> + <string name="permlab_readCalendar" msgid="6716116972752441641">"క్యాలెండర్ ఈవెంట్లు మరియు వివరాలను చదవడం"</string> + <string name="permdesc_readCalendar" product="tablet" msgid="4993979255403945892">"ఈ అనువర్తనం మీ టాబ్లెట్లో నిల్వ చేసిన క్యాలెండర్ ఈవెంట్లన్నీ చదవగలదు మరియు మీ క్యాలెండర్ డేటాను భాగస్వామ్యం చేయగలదు లేదా సేవ్ చేయగలదు."</string> + <string name="permdesc_readCalendar" product="tv" msgid="8837931557573064315">"ఈ అనువర్తనం మీ టీవీలో నిల్వ చేసిన క్యాలెండర్ ఈవెంట్లన్నీ చదవగలదు మరియు మీ క్యాలెండర్ డేటాను భాగస్వామ్యం చేయగలదు లేదా సేవ్ చేయగలదు."</string> + <string name="permdesc_readCalendar" product="default" msgid="4373978642145196715">"ఈ అనువర్తనం మీ ఫోన్లో నిల్వ చేసిన క్యాలెండర్ ఈవెంట్లన్నీ చదవగలదు మరియు మీ క్యాలెండర్ డేటాను భాగస్వామ్యం చేయగలదు లేదా సేవ్ చేయగలదు."</string> <string name="permlab_writeCalendar" msgid="8438874755193825647">"యజమానికి తెలియకుండానే క్యాలెండర్ ఈవెంట్లను జోడించి లేదా సవరించి, అతిథులకు ఇమెయిల్ పంపడం"</string> - <!-- no translation found for permdesc_writeCalendar (1675270619903625982) --> - <skip /> - <!-- no translation found for permdesc_writeCalendar (9017809326268135866) --> - <skip /> - <!-- no translation found for permdesc_writeCalendar (7592791790516943173) --> - <skip /> + <string name="permdesc_writeCalendar" product="tablet" msgid="1675270619903625982">"ఈ అనువర్తనం మీ టాబ్లెట్లో క్యాలెండర్ ఈవెంట్లను జోడించగలదు, తీసివేయగలదు లేదా మార్చగలదు. ఈ అనువర్తనం క్యాలెండర్ యజమానుల నుండి వచ్చినట్లుగా సందేశాలను పంపగలదు లేదా ఈవెంట్లను వాటి యజమానులకు తెలియకుండానే మార్చగలదు."</string> + <string name="permdesc_writeCalendar" product="tv" msgid="9017809326268135866">"ఈ అనువర్తనం మీ టీవీలో క్యాలెండర్ ఈవెంట్లను జోడించగలదు, తీసివేయగలదు లేదా మార్చగలదు. ఈ అనువర్తనం క్యాలెండర్ యజమానుల నుండి వచ్చినట్లుగా సందేశాలను పంపగలదు లేదా ఈవెంట్లను వాటి యజమానులకు తెలియకుండానే మార్చగలదు."</string> + <string name="permdesc_writeCalendar" product="default" msgid="7592791790516943173">"ఈ అనువర్తనం మీ ఫోన్లో క్యాలెండర్ ఈవెంట్లను జోడించగలదు, తీసివేయగలదు లేదా మార్చగలదు. ఈ అనువర్తనం క్యాలెండర్ యజమానుల నుండి వచ్చినట్లుగా సందేశాలను పంపగలదు లేదా ఈవెంట్లను వాటి యజమానులకు తెలియకుండానే మార్చగలదు."</string> <string name="permlab_accessLocationExtraCommands" msgid="2836308076720553837">"అదనపు స్థాన ప్రదాత ఆదేశాలను ప్రాప్యత చేయడం"</string> <string name="permdesc_accessLocationExtraCommands" msgid="6078307221056649927">"అదనపు స్థాన ప్రదాత ఆదేశాలను ప్రాప్యత చేయడానికి అనువర్తనాన్ని అనుమతిస్తుంది. ఇది GPS లేదా ఇతర స్థాన మూలాల నిర్వహణలో అనువర్తనం ప్రమేయం ఉండేలా అనుమతించవచ్చు."</string> <string name="permlab_accessFineLocation" msgid="251034415460950944">"ఖచ్చితమైన స్థానాన్ని (GPS మరియు నెట్వర్క్-ఆధారితం) ప్రాప్యత చేయడం"</string> - <!-- no translation found for permdesc_accessFineLocation (5821994817969957884) --> - <skip /> + <string name="permdesc_accessFineLocation" msgid="5821994817969957884">"ఈ అనువర్తనం GPS ఆధారంగా లేదా సెల్ టవర్లు, Wi-Fi నెట్వర్క్ల వంటి నెట్వర్క్ స్థాన మూలాధారాల ఆధారంగా మీ స్థానాన్ని తెలుసుకోగలదు. అనువర్తనం ఉపయోగించడానికి మీ ఫోన్లో ఈ స్థాన సేవలను తప్పనిసరిగా ఆన్ చేయాలి మరియు అందుబాటులో ఉండాలి. ఇది బ్యాటరీ వినియోగాన్ని పెంచవచ్చు."</string> <string name="permlab_accessCoarseLocation" msgid="7715277613928539434">"ఇంచుమించు స్థానాన్ని (నెట్వర్క్-ఆధారితం) ప్రాప్యత చేయడం"</string> - <!-- no translation found for permdesc_accessCoarseLocation (3373266766487862426) --> - <skip /> - <!-- no translation found for permdesc_accessCoarseLocation (1884022719818788511) --> - <skip /> - <!-- no translation found for permdesc_accessCoarseLocation (7788009094906196995) --> - <skip /> + <string name="permdesc_accessCoarseLocation" product="tablet" msgid="3373266766487862426">"ఈ అనువర్తనం సెల్ టవర్లు మరియు Wi-Fi నెట్వర్క్ల వంటి నెట్వర్క్ మూలాధారాల ఆధారంగా మీ స్థానాన్ని తెలుసుకోగలదు. అనువర్తనం ఉపయోగించడానికి మీ టాబ్లెట్లో ఈ స్థాన సేవలను తప్పనిసరిగా ఆన్ చేయాలి మరియు అందుబాటులో ఉండాలి."</string> + <string name="permdesc_accessCoarseLocation" product="tv" msgid="1884022719818788511">"ఈ అనువర్తనం సెల్ టవర్లు మరియు Wi-Fi నెట్వర్క్ల వంటి నెట్వర్క్ మూలాధారాల ఆధారంగా మీ స్థానాన్ని తెలుసుకోగలదు. అనువర్తనం ఉపయోగించడానికి మీ టీవీలో ఈ స్థాన సేవలను తప్పనిసరిగా ఆన్ చేయాలి మరియు అందుబాటులో ఉండాలి."</string> + <string name="permdesc_accessCoarseLocation" product="default" msgid="7788009094906196995">"ఈ అనువర్తనం సెల్ టవర్లు మరియు Wi-Fi నెట్వర్క్ల వంటి నెట్వర్క్ మూలాధారాల ఆధారంగా మీ స్థానాన్ని తెలుసుకోగలదు. అనువర్తనం ఉపయోగించడానికి మీ ఫోన్లో ఈ స్థాన సేవలను తప్పనిసరిగా ఆన్ చేయాలి మరియు అందుబాటులో ఉండాలి."</string> <string name="permlab_modifyAudioSettings" msgid="6095859937069146086">"మీ ఆడియో సెట్టింగ్లను మార్చడం"</string> <string name="permdesc_modifyAudioSettings" msgid="3522565366806248517">"వాల్యూమ్ మరియు అవుట్పుట్ కోసం ఉపయోగించాల్సిన స్పీకర్ వంటి సార్వజనీన ఆడియో సెట్టింగ్లను సవరించడానికి అనువర్తనాన్ని అనుమతిస్తుంది."</string> <string name="permlab_recordAudio" msgid="3876049771427466323">"ఆడియోను రికార్డ్ చేయడం"</string> - <!-- no translation found for permdesc_recordAudio (4245930455135321433) --> - <skip /> + <string name="permdesc_recordAudio" msgid="4245930455135321433">"ఈ అనువర్తనం మైక్రోఫోన్ని ఉపయోగించి ఎప్పుడైనా ఆడియోను రికార్డ్ చేయగలదు."</string> <string name="permlab_sim_communication" msgid="2935852302216852065">"SIMకి ఆదేశాలను పంపడం"</string> <string name="permdesc_sim_communication" msgid="5725159654279639498">"సిమ్కు ఆదేశాలను పంపడానికి అనువర్తనాన్ని అనుమతిస్తుంది. ఇది చాలా ప్రమాదకరం."</string> <string name="permlab_camera" msgid="3616391919559751192">"చిత్రాలు మరియు వీడియోలు తీయడం"</string> - <!-- no translation found for permdesc_camera (5392231870049240670) --> - <skip /> + <string name="permdesc_camera" msgid="5392231870049240670">"ఈ అనువర్తనం కెమెరాను ఉపయోగించి ఎప్పుడైనా చిత్రాలను తీయగలదు మరియు వీడియోలను రికార్డ్ చేయగలదు."</string> <string name="permlab_vibrate" msgid="7696427026057705834">"వైబ్రేషన్ను నియంత్రించడం"</string> <string name="permdesc_vibrate" msgid="6284989245902300945">"వైబ్రేటర్ను నియంత్రించడానికి అనువర్తనాన్ని అనుమతిస్తుంది."</string> <string name="permlab_callPhone" msgid="3925836347681847954">"ఫోన్ నంబర్లకు నేరుగా కాల్ చేయడం"</string> diff --git a/core/res/res/values-th/strings.xml b/core/res/res/values-th/strings.xml index 7141a8121e56..5395fbabbeca 100644 --- a/core/res/res/values-th/strings.xml +++ b/core/res/res/values-th/strings.xml @@ -46,8 +46,7 @@ <string name="defaultMsisdnAlphaTag" msgid="2850889754919584674">"MSISDN1"</string> <string name="mmiError" msgid="5154499457739052907">"ปัญหาการเชื่อมต่อหรือรหัส MMI ไม่ถูกต้อง"</string> <string name="mmiFdnError" msgid="5224398216385316471">"การดำเนินการถูกจำกัดไว้ที่การจำกัดหมายเลขโทรออกเท่านั้น"</string> - <!-- no translation found for mmiErrorWhileRoaming (762488890299284230) --> - <skip /> + <string name="mmiErrorWhileRoaming" msgid="762488890299284230">"ไม่สามารถเปลี่ยนการตั้งค่าการโอนสายจากโทรศัพท์ในขณะที่โรมมิ่ง"</string> <string name="serviceEnabled" msgid="8147278346414714315">"เปิดใช้งานบริการแล้ว"</string> <string name="serviceEnabledFor" msgid="6856228140453471041">"เปิดการใช้งานบริการสำหรับ:"</string> <string name="serviceDisabled" msgid="1937553226592516411">"ปิดใช้บริการไว้"</string> @@ -98,10 +97,8 @@ <string name="RestrictedOnVoiceData" msgid="996636487106171320">"บริการเสียง/ข้อมูลถูกบล็อก"</string> <string name="RestrictedOnVoiceSms" msgid="1888588152792023873">"บริการเสียง/SMS ถูกปิดกั้น"</string> <string name="RestrictedOnAll" msgid="5643028264466092821">"บริการเสียง/ข้อมูล/SMS ทั้งหมดถูกบล็อก"</string> - <!-- no translation found for NetworkPreferenceSwitchTitle (4008877505368566980) --> - <skip /> - <!-- no translation found for NetworkPreferenceSwitchSummary (7335915397439759249) --> - <skip /> + <string name="NetworkPreferenceSwitchTitle" msgid="4008877505368566980">"เข้าถึงเครือข่ายไม่ได้"</string> + <string name="NetworkPreferenceSwitchSummary" msgid="7335915397439759249">"เพื่อให้การรับสัญญาณดีขึ้น ลองเปลี่ยนประเภทที่เลือกที่ \"การตั้งค่า\" > \"เครือข่ายมือถือ\" > \"ประเภทเครือข่ายที่ต้องการ\""</string> <string name="peerTtyModeFull" msgid="6165351790010341421">"อีกฝั่งหนึ่งขอโหมด TTY เป็น \"เต็ม\""</string> <string name="peerTtyModeHco" msgid="5728602160669216784">"อีกฝั่งหนึ่งขอโหมด TTY เป็น \"HCO\""</string> <string name="peerTtyModeVco" msgid="1742404978686538049">"อีกฝั่งหนึ่งขอโหมด TTY เป็น \"VCO\""</string> @@ -185,10 +182,8 @@ <string name="work_profile_deleted_description" msgid="6305147513054341102">"ลบโปรไฟล์งานแล้วเนื่องจากไม่มีแอปผู้ดูแลระบบ"</string> <string name="work_profile_deleted_details" msgid="226615743462361248">"แอปผู้ดูแลระบบโปรไฟล์งานไม่มีอยู่หรือเสียหาย ระบบจึงทำการลบโปรไฟล์งานและข้อมูลที่เกี่ยวข้องของคุณออก โปรดติดต่อผู้ดูแลระบบเพื่อรับความช่วยเหลือ"</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="6019770344820507579">"โปรไฟล์งานของคุณไม่สามารถใช้บนอุปกรณ์นี้ได้อีกต่อไป"</string> - <!-- no translation found for network_logging_notification_title (1805392571290161924) --> - <skip /> - <!-- no translation found for network_logging_notification_text (4448072433371155729) --> - <skip /> + <string name="network_logging_notification_title" msgid="1805392571290161924">"มีการติดตามดูการจราจรของข้อมูลในเครือข่าย"</string> + <string name="network_logging_notification_text" msgid="4448072433371155729">"แตะเพื่อดูรายละเอียดเพิ่มเติม"</string> <string name="factory_reset_warning" msgid="5423253125642394387">"ระบบจะลบข้อมูลในอุปกรณ์ของคุณ"</string> <string name="factory_reset_message" msgid="4905025204141900666">"แอปผู้ดูแลระบบมีองค์ประกอบไม่ครบหรือเสียหาย และใช้งานไม่ได้ ระบบจะลบข้อมูลอุปกรณ์ของคุณ โปรดติดต่อผู้ดูแลระบบเพื่อรับความช่วยเหลือ"</string> <string name="me" msgid="6545696007631404292">"ฉัน"</string> @@ -306,12 +301,9 @@ <string name="permlab_sendSms" msgid="7544599214260982981">"ส่งและดูข้อความ SMS"</string> <string name="permdesc_sendSms" msgid="7094729298204937667">"อนุญาตให้แอปพลิเคชันส่งข้อความ SMS ซึ่งอาจทำให้มีการเรียกเก็บเงินที่ไม่คาดคิด แอปพลิเคชันที่เป็นอันตรายอาจทำให้คุณเสียค่าใช้จ่ายด้วยการส่งข้อความโดยไม่รอการยืนยันจากคุณ"</string> <string name="permlab_readSms" msgid="8745086572213270480">"อ่านข้อความของคุณ (SMS หรือ MMS)"</string> - <!-- no translation found for permdesc_readSms (4741697454888074891) --> - <skip /> - <!-- no translation found for permdesc_readSms (5796670395641116592) --> - <skip /> - <!-- no translation found for permdesc_readSms (6826832415656437652) --> - <skip /> + <string name="permdesc_readSms" product="tablet" msgid="4741697454888074891">"แอปนี้สามารถอ่านข้อความ SMS (ที่เป็นตัวหนังสือ) ที่จัดเก็บไว้ในแท็บเล็ต"</string> + <string name="permdesc_readSms" product="tv" msgid="5796670395641116592">"แอปนี้สามารถอ่านข้อความ SMS (ที่เป็นตัวหนังสือ) ที่จัดเก็บไว้ในทีวี"</string> + <string name="permdesc_readSms" product="default" msgid="6826832415656437652">"แอปนี้สามารถอ่านข้อความ SMS (ที่เป็นตัวหนังสือ) ที่จัดเก็บไว้ในโทรศัพท์"</string> <string name="permlab_receiveWapPush" msgid="5991398711936590410">"รับข้อความ (WAP)"</string> <string name="permdesc_receiveWapPush" msgid="748232190220583385">"อนุญาตให้แอปพลิเคชันรับและประมวลผลข้อความ WAP การอนุญาตนี้รวมถึงความสามารถในการตรวจสอบหรือลบข้อความที่ส่งมาให้คุณโดยไม่ต้องแสดงให้คุณเห็น"</string> <string name="permlab_getTasks" msgid="6466095396623933906">"เรียกแอปพลิเคชันที่ทำงานอยู่"</string> @@ -324,10 +316,8 @@ <string name="permdesc_enableCarMode" msgid="4853187425751419467">"อนุญาตให้แอปพลิเคชันเปิดใช้งานโหมดรถยนต์"</string> <string name="permlab_killBackgroundProcesses" msgid="3914026687420177202">"ปิดแอปอื่นๆ"</string> <string name="permdesc_killBackgroundProcesses" msgid="4593353235959733119">"อนุญาตให้แอปพลิเคชันหยุดการทำงานในพื้นหลังของแอปพลิเคชันอื่นๆ ซึ่งอาจทำให้แอปพลิเคชันอื่นๆ หยุดการทำงาน"</string> - <!-- no translation found for permlab_systemAlertWindow (7238805243128138690) --> - <skip /> - <!-- no translation found for permdesc_systemAlertWindow (2393776099672266188) --> - <skip /> + <string name="permlab_systemAlertWindow" msgid="7238805243128138690">"แอปนี้สามารถแสดงทับแอปอื่นๆ"</string> + <string name="permdesc_systemAlertWindow" msgid="2393776099672266188">"แอปนี้สามารถปรากฏเหนือแอปอื่นๆ หรือส่วนอื่นของหน้าจอ ซึ่งอาจรบกวนการใช้งานตามปกติของแอปและทำให้ลักษณะการแสดงแอปอื่นๆ เปลี่ยนไป"</string> <string name="permlab_persistentActivity" msgid="8841113627955563938">"ทำให้แอปพลิเคชันทำงานเสมอ"</string> <string name="permdesc_persistentActivity" product="tablet" msgid="8525189272329086137">"อนุญาตให้แอปพลิเคชันทำให้ส่วนหนึ่งของตัวเองคงอยู่ถาวรในหน่วยความจำ ซึ่งจะจำกัดพื้นที่หน่วยความจำที่ใช้งานได้ของแอปพลิเคชันอื่นๆ และทำให้แท็บเล็ตทำงานช้าลง"</string> <string name="permdesc_persistentActivity" product="tv" msgid="5086862529499103587">"อนุญาตให้แอปทำให้บางส่วนของแอปนั้นอยู่ในหน่วยความจำเสมอ ซึ่งอาจจำกัดพื้นที่หน่วยความจำสำหรับแอปอื่นและทำให้ทีวีช้าลง"</string> @@ -353,51 +343,37 @@ <string name="permdesc_writeContacts" product="tv" msgid="5438230957000018959">"อนุญาตให้แอปแก้ไขข้อมูลเกี่ยวกับรายชื่อติดต่อที่เก็บไว้ในทีวี รวมถึงความถี่ในการโทร การส่งอีเมล หรือการสื่อสารแบบอื่นกับรายชื่อติดต่อคนใดคนหนึ่ง สิทธิ์นี้ทำให้แอปสามารถลบข้อมูลรายชื่อติดต่อได้"</string> <string name="permdesc_writeContacts" product="default" msgid="589869224625163558">"อนุญาตให้แอปพลิเคชันเปลี่ยนแปลงข้อมูลผู้ติดต่อที่จัดเก็บไว้ในโทรศัพท์ ซึ่งรวมถึงความถี่ในการโทร ส่งอีเมล หรือการติดต่อด้วยวิธีอื่นๆ กับบุคคลใดบุคคลหนึ่ง การอนุญาตนี้ทำให้แอปพลิเคชันสามารถลบข้อมูลผู้ติดต่อได้"</string> <string name="permlab_readCallLog" msgid="3478133184624102739">"อ่านประวัติการโทร"</string> - <!-- no translation found for permdesc_readCallLog (3204122446463552146) --> - <skip /> + <string name="permdesc_readCallLog" msgid="3204122446463552146">"แอปนี้สามารถอ่านประวัติการโทรของคุณได้"</string> <string name="permlab_writeCallLog" msgid="8552045664743499354">"เขียนประวัติการโทร"</string> <string name="permdesc_writeCallLog" product="tablet" msgid="6661806062274119245">"อนุญาตให้แอปแก้ไขประวัติการโทรจากแท็บเล็ตของคุณ รวมถึงข้อมูลเกี่ยวกับสายเรียกเข้าและการโทรออก แอปที่เป็นอันตรายอาจใช้สิ่งนี้เพื่อลบหรือแก้ไขประวัติการโทรของคุณ"</string> <string name="permdesc_writeCallLog" product="tv" msgid="4225034892248398019">"อนุญาตให้แอปแก้ไขประวัติการโทรของทีวี รวมถึงข้อมูลเกี่ยวกับสายเรียกเข้าและโทรออก แอปที่เป็นอันตรายอาจใช้สิทธิ์นี้เพื่อลบหรือแก้ไขประวัติการโทรได้"</string> <string name="permdesc_writeCallLog" product="default" msgid="683941736352787842">"อนุญาตให้แอปแก้ไขประวัติการโทรจากโทรศัพท์ของคุณ รวมถึงข้อมูลเกี่ยวกับสายเรียกเข้าและการโทรออก แอปที่เป็นอันตรายอาจใช้สิ่งนี้เพื่อลบหรือแก้ไขประวัติการโทรของคุณ"</string> <string name="permlab_bodySensors" msgid="4683341291818520277">"เข้าถึงเซ็นเซอร์ร่างกาย (เช่น ตัววัดอัตราการเต้นของหัวใจ)"</string> <string name="permdesc_bodySensors" product="default" msgid="4380015021754180431">"อนุญาตให้แอปเข้าถึงข้อมูลจากเซ็นเซอร์ที่ตรวจสอบสภาพทางกายภาพ เช่น อัตราการเต้นของหัวใจ"</string> - <!-- no translation found for permlab_readCalendar (6716116972752441641) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (4993979255403945892) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (8837931557573064315) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (4373978642145196715) --> - <skip /> + <string name="permlab_readCalendar" msgid="6716116972752441641">"อ่านกิจกรรมในปฏิทินและรายละเอียด"</string> + <string name="permdesc_readCalendar" product="tablet" msgid="4993979255403945892">"แอปนี้สามารถอ่านกิจกรรมทั้งหมดในปฏิทินที่เก็บไว้ในแท็บเล็ต รวมถึงแชร์หรือบันทึกข้อมูลในปฏิทินของคุณ"</string> + <string name="permdesc_readCalendar" product="tv" msgid="8837931557573064315">"แอปนี้สามารถอ่านกิจกรรมทั้งหมดในปฏิทินที่เก็บไว้ในทีวี รวมถึงแชร์หรือบันทึกข้อมูลในปฏิทินของคุณ"</string> + <string name="permdesc_readCalendar" product="default" msgid="4373978642145196715">"แอปนี้สามารถอ่านกิจกรรมทั้งหมดในปฏิทินที่เก็บไว้ในโทรศัพท์ รวมถึงแชร์หรือบันทึกข้อมูลในปฏิทินของคุณ"</string> <string name="permlab_writeCalendar" msgid="8438874755193825647">"เพิ่มหรือแก้ไขกิจกรรมบนปฏิทินและส่งอีเมลให้ผู้เข้าร่วมโดยที่เจ้าของไม่ทราบ"</string> - <!-- no translation found for permdesc_writeCalendar (1675270619903625982) --> - <skip /> - <!-- no translation found for permdesc_writeCalendar (9017809326268135866) --> - <skip /> - <!-- no translation found for permdesc_writeCalendar (7592791790516943173) --> - <skip /> + <string name="permdesc_writeCalendar" product="tablet" msgid="1675270619903625982">"แอปนี้สามารถเพิ่ม นำออก หรือเปลี่ยนกิจกรรมในปฏิทินบนแท็บเล็ตของคุณ แอปนี้สามารถส่งข้อความที่ดูเหมือนว่ามาจากเจ้าของปฏิทิน หรือเปลี่ยนแปลงกิจกรรมโดยไม่แจ้งให้เจ้าของทราบ"</string> + <string name="permdesc_writeCalendar" product="tv" msgid="9017809326268135866">"แอปนี้สามารถเพิ่ม นำออก หรือเปลี่ยนกิจกรรมในปฏิทินบนทีวีของคุณ แอปนี้สามารถส่งข้อความที่ดูเหมือนว่ามาจากเจ้าของปฏิทิน หรือเปลี่ยนแปลงกิจกรรมโดยไม่แจ้งให้เจ้าของทราบ"</string> + <string name="permdesc_writeCalendar" product="default" msgid="7592791790516943173">"แอปนี้สามารถเพิ่ม นำออก หรือเปลี่ยนกิจกรรมในปฏิทินบนโทรศัพท์ของคุณ แอปนี้สามารถส่งข้อความที่ดูเหมือนว่ามาจากเจ้าของปฏิทิน หรือเปลี่ยนแปลงกิจกรรมโดยไม่แจ้งให้เจ้าของทราบ"</string> <string name="permlab_accessLocationExtraCommands" msgid="2836308076720553837">"เข้าถึงคำสั่งของโปรแกรมแจ้งตำแหน่งพิเศษ"</string> <string name="permdesc_accessLocationExtraCommands" msgid="6078307221056649927">"อนุญาตให้แอปเข้าถึงคำสั่งของผู้ให้บริการตำแหน่งเพิ่มเติม ซึ่งอาจทำให้แอปสามารถแทรกแซงการทำงานของ GPS หรือต้นทางของตำแหน่งอื่นๆ ได้"</string> <string name="permlab_accessFineLocation" msgid="251034415460950944">"เข้าถึงตำแหน่งที่แม่นยำ (อิงจาก GPS และเครือข่าย)"</string> - <!-- no translation found for permdesc_accessFineLocation (5821994817969957884) --> - <skip /> + <string name="permdesc_accessFineLocation" msgid="5821994817969957884">"แอปนี้สามารถรับตำแหน่งของคุณโดยอิงจากแหล่งข้อมูลเครือข่าย เช่น เสาสัญญาณมือถือและเครือข่าย Wi-Fi แอปจะใช้บริการตำแหน่งเหล่านี้ได้ต่อเมื่อคุณเปิดบริการและบริการพร้อมใช้งานในโทรศัพท์ของคุณ การเปิดบริการนี้อาจเพิ่มการใช้แบตเตอรี่"</string> <string name="permlab_accessCoarseLocation" msgid="7715277613928539434">"เข้าถึงตำแหน่งโดยประมาณ (อิงจากเครือข่าย)"</string> - <!-- no translation found for permdesc_accessCoarseLocation (3373266766487862426) --> - <skip /> - <!-- no translation found for permdesc_accessCoarseLocation (1884022719818788511) --> - <skip /> - <!-- no translation found for permdesc_accessCoarseLocation (7788009094906196995) --> - <skip /> + <string name="permdesc_accessCoarseLocation" product="tablet" msgid="3373266766487862426">"แอปนี้สามารถรับตำแหน่งของคุณโดยอิงจากแหล่งข้อมูลเครือข่าย เช่น เสาสัญญาณมือถือและเครือข่าย Wi-Fi แอปจะใช้บริการตำแหน่งเหล่านี้ได้ต่อเมื่อคุณเปิดบริการและบริการพร้อมใช้งานในแท็บเล็ตของคุณ"</string> + <string name="permdesc_accessCoarseLocation" product="tv" msgid="1884022719818788511">"แอปนี้สามารถรับตำแหน่งของคุณโดยอิงจากแหล่งข้อมูลเครือข่าย เช่น เสาสัญญาณมือถือและเครือข่าย Wi-Fi แอปจะใช้บริการตำแหน่งเหล่านี้ได้ต่อเมื่อคุณเปิดบริการและบริการพร้อมใช้งานในทีวีของคุณ"</string> + <string name="permdesc_accessCoarseLocation" product="default" msgid="7788009094906196995">"แอปนี้สามารถรับตำแหน่งของคุณโดยอิงจากแหล่งข้อมูลเครือข่าย เช่น เสาสัญญาณมือถือและเครือข่าย Wi-Fi แอปจะใช้บริการตำแหน่งเหล่านี้ได้ต่อเมื่อคุณเปิดบริการและบริการพร้อมใช้งานในโทรศัพท์ของคุณ"</string> <string name="permlab_modifyAudioSettings" msgid="6095859937069146086">"เปลี่ยนการตั้งค่าเสียงของคุณ"</string> <string name="permdesc_modifyAudioSettings" msgid="3522565366806248517">"อนุญาตให้แอปพลิเคชันปรับเปลี่ยนการตั้งค่าเสียงทั้งหมดได้ เช่น ระดับเสียงและลำโพงที่จะใช้งาน"</string> <string name="permlab_recordAudio" msgid="3876049771427466323">"บันทึกเสียง"</string> - <!-- no translation found for permdesc_recordAudio (4245930455135321433) --> - <skip /> + <string name="permdesc_recordAudio" msgid="4245930455135321433">"แอปนี้สามารถบันทึกเสียงด้วยไมโครโฟนได้ทุกเมื่อ"</string> <string name="permlab_sim_communication" msgid="2935852302216852065">"ส่งคำสั่งไปยังซิม"</string> <string name="permdesc_sim_communication" msgid="5725159654279639498">"อนุญาตให้แอปส่งคำสั่งไปยัง SIM ซึ่งอันตรายมาก"</string> <string name="permlab_camera" msgid="3616391919559751192">"ถ่ายภาพและวิดีโอ"</string> - <!-- no translation found for permdesc_camera (5392231870049240670) --> - <skip /> + <string name="permdesc_camera" msgid="5392231870049240670">"แอปนี้สามารถถ่ายภาพและวิดีโอด้วยกล้องได้ทุกเมื่อ"</string> <string name="permlab_vibrate" msgid="7696427026057705834">"ควบคุมการสั่นเตือน"</string> <string name="permdesc_vibrate" msgid="6284989245902300945">"อนุญาตให้แอปพลิเคชันควบคุมการสั่นเตือน"</string> <string name="permlab_callPhone" msgid="3925836347681847954">"โทรติดต่อหมายเลขโทรศัพท์โดยตรง"</string> diff --git a/core/res/res/values-tl/strings.xml b/core/res/res/values-tl/strings.xml index 37b01cb384c8..bbe45f579cf4 100644 --- a/core/res/res/values-tl/strings.xml +++ b/core/res/res/values-tl/strings.xml @@ -46,8 +46,7 @@ <string name="defaultMsisdnAlphaTag" msgid="2850889754919584674">"MSISDN1"</string> <string name="mmiError" msgid="5154499457739052907">"Problema sa koneksyon o di-wastong MMI code."</string> <string name="mmiFdnError" msgid="5224398216385316471">"Pinaghihigpitan ang pagpapatakbo sa mga fixed dialing number lang."</string> - <!-- no translation found for mmiErrorWhileRoaming (762488890299284230) --> - <skip /> + <string name="mmiErrorWhileRoaming" msgid="762488890299284230">"Hindi maaaring baguhin ang mga setting ng pagpapasa ng tawag mula sa iyong telepono habang naka-roaming ka."</string> <string name="serviceEnabled" msgid="8147278346414714315">"Pinagana ang serbisyo."</string> <string name="serviceEnabledFor" msgid="6856228140453471041">"Pinagana ang serbisyo para sa:"</string> <string name="serviceDisabled" msgid="1937553226592516411">"Hindi pinagana ang serbisyo."</string> @@ -98,10 +97,8 @@ <string name="RestrictedOnVoiceData" msgid="996636487106171320">"Naka-block ang mga serbisyo sa boses/data."</string> <string name="RestrictedOnVoiceSms" msgid="1888588152792023873">"Naka-block ang mga serbisyo ng Voice/SMS."</string> <string name="RestrictedOnAll" msgid="5643028264466092821">"Naka-block ang lahat ng serbisyo sa boses/data/SMS."</string> - <!-- no translation found for NetworkPreferenceSwitchTitle (4008877505368566980) --> - <skip /> - <!-- no translation found for NetworkPreferenceSwitchSummary (7335915397439759249) --> - <skip /> + <string name="NetworkPreferenceSwitchTitle" msgid="4008877505368566980">"Hindi maabot ang network"</string> + <string name="NetworkPreferenceSwitchSummary" msgid="7335915397439759249">"Upang mapahusay ang reception, subukang baguhin ang uring napili sa Mga Setting > Mga cellular network > Gustong uri ng network."</string> <string name="peerTtyModeFull" msgid="6165351790010341421">"Hiniling ng peer ang TTY Mode FULL"</string> <string name="peerTtyModeHco" msgid="5728602160669216784">"Hiniling ng peer ang TTY Mode HCO"</string> <string name="peerTtyModeVco" msgid="1742404978686538049">"Hiniling ng peer ang TTY Mode VCO"</string> @@ -185,10 +182,8 @@ <string name="work_profile_deleted_description" msgid="6305147513054341102">"Na-delete ang profile sa trabaho dahil wala itong admin app."</string> <string name="work_profile_deleted_details" msgid="226615743462361248">"Ang admin app ng profile sa trabaho ay nawawala o sira. Bilang resulta, na-delete na ang iyong profile sa trabaho at nauugnay na data. Makipag-ugnayan sa iyong administrator para sa tulong."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="6019770344820507579">"Hindi na available ang iyong profile sa trabaho sa device na ito."</string> - <!-- no translation found for network_logging_notification_title (1805392571290161924) --> - <skip /> - <!-- no translation found for network_logging_notification_text (4448072433371155729) --> - <skip /> + <string name="network_logging_notification_title" msgid="1805392571290161924">"Sinusubaybayan ang trapiko sa network"</string> + <string name="network_logging_notification_text" msgid="4448072433371155729">"I-tap para sa higit pang detalye"</string> <string name="factory_reset_warning" msgid="5423253125642394387">"Buburahin ang iyong device"</string> <string name="factory_reset_message" msgid="4905025204141900666">"Ang admin app ay may mga kulang na bahagi o sira, at hindi ito magagamit. Buburahin na ngayon ang iyong device. Makipag-ugnayan sa iyong administrator para sa tulong."</string> <string name="me" msgid="6545696007631404292">"Ako"</string> @@ -306,12 +301,9 @@ <string name="permlab_sendSms" msgid="7544599214260982981">"magpadala at tumingin ng mga mensaheng SMS"</string> <string name="permdesc_sendSms" msgid="7094729298204937667">"Pinapayagan ang app na magpadala ng mga mensaheng SMS. Maaari itong magresulta sa mga hindi inaasahang pagsingil. Maaaring magpagastos sa iyo ng pera ang nakakahamak na apps sa pamamagitan ng pagpapadala ng mga mensahe nang wala ng iyong kumpirmasyon."</string> <string name="permlab_readSms" msgid="8745086572213270480">"basahin ang iyong mga text message (SMS o MMS)"</string> - <!-- no translation found for permdesc_readSms (4741697454888074891) --> - <skip /> - <!-- no translation found for permdesc_readSms (5796670395641116592) --> - <skip /> - <!-- no translation found for permdesc_readSms (6826832415656437652) --> - <skip /> + <string name="permdesc_readSms" product="tablet" msgid="4741697454888074891">"Mababasa ng app na ito ang lahat ng mensaheng SMS (text) na naka-store sa iyong tablet."</string> + <string name="permdesc_readSms" product="tv" msgid="5796670395641116592">"Mababasa ng app na ito ang lahat ng mensaheng SMS (text) na naka-store sa iyong TV."</string> + <string name="permdesc_readSms" product="default" msgid="6826832415656437652">"Mababasa ng app na ito ang lahat ng mensaheng SMS (text) na naka-store sa iyong telepono."</string> <string name="permlab_receiveWapPush" msgid="5991398711936590410">"tumanggap ng mga text message (WAP)"</string> <string name="permdesc_receiveWapPush" msgid="748232190220583385">"Pinapayagan ang app na tumanggap at magproseso ng mga mensaheng WAP. Kabilang sa pahintulot na ito ang kakayahang sumubaybay o magtanggal ang app ng mga mensaheng ipinapadala sa iyo nang hindi ipinapakita ang mga ito sa iyo."</string> <string name="permlab_getTasks" msgid="6466095396623933906">"bawiin ang tumatakbong apps"</string> @@ -324,10 +316,8 @@ <string name="permdesc_enableCarMode" msgid="4853187425751419467">"Pinapayagan ang app na paganahin ang car mode."</string> <string name="permlab_killBackgroundProcesses" msgid="3914026687420177202">"isara ang iba pang mga app"</string> <string name="permdesc_killBackgroundProcesses" msgid="4593353235959733119">"Pinapayagan ang app na tapusin ang mga proseso sa background ng iba pang apps. Maaari itong maging sanhi ng paghinto sa paggana ng iba pang apps."</string> - <!-- no translation found for permlab_systemAlertWindow (7238805243128138690) --> - <skip /> - <!-- no translation found for permdesc_systemAlertWindow (2393776099672266188) --> - <skip /> + <string name="permlab_systemAlertWindow" msgid="7238805243128138690">"Maaaring lumabas ang app na ito sa ibabaw ng iba pang mga app"</string> + <string name="permdesc_systemAlertWindow" msgid="2393776099672266188">"Maaaring lumabas ang app na ito sa ibabaw ng iba pang mga app o iba pang mga bahagi ng screen. Maaaring makasagabal ito sa normal na paggamit ng app at mabago nito ang paraan kung paano lumalabas ang iba pang mga app."</string> <string name="permlab_persistentActivity" msgid="8841113627955563938">"palaging patakbuhin ang app"</string> <string name="permdesc_persistentActivity" product="tablet" msgid="8525189272329086137">"Pinapayagan ang app na panatilihin ang ilang bahagi nito sa memory. Maaari nitong limitahan ang memory na available sa iba pang apps na nagpapabagal sa tablet."</string> <string name="permdesc_persistentActivity" product="tv" msgid="5086862529499103587">"Nagbibigay-daan sa app na iimbak sa memory ang mga bahagi nito. Maaari nitong malimitahan ang memory na available sa iba pang mga app na nagpapabagal sa TV."</string> @@ -353,51 +343,37 @@ <string name="permdesc_writeContacts" product="tv" msgid="5438230957000018959">"Nagbibigay-daan sa app na baguhin ang data tungkol sa iyong mga contact na naka-imbak sa iyong TV, kabilang ang dalas kung kailan ka tumawag, nag-email, o nakipag-ugnayan sa iba pang mga paraan sa mga partikular na contact. Nagbibigay-daan ang pahintulot na ito sa mga app na mag-delete ng data sa pakikipag-ugnayan."</string> <string name="permdesc_writeContacts" product="default" msgid="589869224625163558">"Pinapayagan ang app na baguhin ang data tungkol sa iyong mga contact na naka-imbak sa iyong telepono, kabilang ang dalas kung kailan ka tumawag, nag-email, o nakipag-ugnayan sa iba pang mga paraan sa mga tukoy na contact. Pinapayagan ng pahintulot na ito ang apps na magtanggal ng data ng contact."</string> <string name="permlab_readCallLog" msgid="3478133184624102739">"basahin ang log ng tawag"</string> - <!-- no translation found for permdesc_readCallLog (3204122446463552146) --> - <skip /> + <string name="permdesc_readCallLog" msgid="3204122446463552146">"Mababasa ng app na ito ang iyong history ng tawag."</string> <string name="permlab_writeCallLog" msgid="8552045664743499354">"isulat ang log ng tawag"</string> <string name="permdesc_writeCallLog" product="tablet" msgid="6661806062274119245">"Binibigyan-daan ang app na baguhin ang log ng tawag ng iyong tablet, kabilang ang data tungkol sa mga paparating at papalabas na tawag. Maaari itong gamitin ng nakakahamak na apps upang burahin o baguhin ang iyong log ng tawag."</string> <string name="permdesc_writeCallLog" product="tv" msgid="4225034892248398019">"Binibigyan-daan ang app na baguhin ang log ng tawag ng iyong TV, kabilang ang data tungkol sa mga paparating at papalabas na tawag. Maaari itong gamitin ng mga nakakahamak na app upang burahin o baguhin ang iyong log ng tawag."</string> <string name="permdesc_writeCallLog" product="default" msgid="683941736352787842">"Binibigyan-daan ang app na baguhin ang log ng tawag ng iyong telepono, kabilang ang data tungkol sa mga paparating at papalabas na tawag. Maaari itong gamitin ng nakakahamak na apps upang burahin o baguhin ang iyong log ng tawag."</string> <string name="permlab_bodySensors" msgid="4683341291818520277">"i-access ang mga sensor sa katawan (tulad ng mga monitor ng bilis ng tibok ng puso)"</string> <string name="permdesc_bodySensors" product="default" msgid="4380015021754180431">"Pinapayagan ang app na i-access ang data mula sa mga sensor na sumusubaybay sa iyong pisikal na kondisyon, tulad ng iyong heart rate."</string> - <!-- no translation found for permlab_readCalendar (6716116972752441641) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (4993979255403945892) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (8837931557573064315) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (4373978642145196715) --> - <skip /> + <string name="permlab_readCalendar" msgid="6716116972752441641">"Magbasa ng mga kaganapan sa kalendaryo at detalye"</string> + <string name="permdesc_readCalendar" product="tablet" msgid="4993979255403945892">"Mababasa ng app na ito ang lahat ng kaganapan sa kalendaryo na naka-store sa iyong tablet at maibabahagi o mase-save nito ang data ng iyong kalendaryo."</string> + <string name="permdesc_readCalendar" product="tv" msgid="8837931557573064315">"Mababasa ng app na ito ang lahat ng kaganapan sa kalendaryo na naka-store sa iyong TV at maibabahagi o mase-save nito ang data ng iyong kalendaryo."</string> + <string name="permdesc_readCalendar" product="default" msgid="4373978642145196715">"Mababasa ng app na ito ang lahat ng kaganapan sa kalendaryo na naka-store sa iyong telepono at maibabahagi o mase-save nito ang data ng iyong kalendaryo."</string> <string name="permlab_writeCalendar" msgid="8438874755193825647">"magdagdag o magbago ng mga kaganapan sa kalendaryo at magpadala ng email sa mga bisita nang hindi nalalaman ng mga may-ari"</string> - <!-- no translation found for permdesc_writeCalendar (1675270619903625982) --> - <skip /> - <!-- no translation found for permdesc_writeCalendar (9017809326268135866) --> - <skip /> - <!-- no translation found for permdesc_writeCalendar (7592791790516943173) --> - <skip /> + <string name="permdesc_writeCalendar" product="tablet" msgid="1675270619903625982">"Makakapagdagdag, makakapag-alis o makakapagbago ang app na ito ng mga kaganapan sa kalendaryo sa iyong tablet. Magagawa ng app na ito na magpadala ng mga mensahe na maaaring mukhang mula sa mga may-ari ng kalendaryo o magbago ng mga kaganapan nang hindi inaabisuhan ang mga may-ari nito."</string> + <string name="permdesc_writeCalendar" product="tv" msgid="9017809326268135866">"Makakapagdagdag, makakapag-alis o makakapagbago ang app na ito ng mga kaganapan sa kalendaryo sa iyong TV. Magagawa ng app na ito na magpadala ng mga mensahe na maaaring mukhang mula sa mga may-ari ng kalendaryo o magbago ng mga kaganapan nang hindi inaabisuhan ang mga may-ari nito."</string> + <string name="permdesc_writeCalendar" product="default" msgid="7592791790516943173">"Makakapagdagdag, makakapag-alis o makakapagbago ang app na ito ng mga kaganapan sa kalendaryo sa iyong telepono. Magagawa ng app na ito na magpadala ng mga mensahe na maaaring mukhang mula sa mga may-ari ng kalendaryo o magbago ng mga kaganapan nang hindi inaabisuhan ang mga may-ari nito."</string> <string name="permlab_accessLocationExtraCommands" msgid="2836308076720553837">"i-access ang mga dagdag na command ng provider ng lokasyon"</string> <string name="permdesc_accessLocationExtraCommands" msgid="6078307221056649927">"Nagbibigay-daan sa app na mag-access ng mga karagdagang command ng provider ng lokasyon. Maaari nitong bigyang-daan ang app na gambalain ang pagpapatakbo ng GPS o ng iba pang mga pinagmulan ng lokasyon."</string> <string name="permlab_accessFineLocation" msgid="251034415460950944">"i-access ang tumpak na lokasyon (batay sa GPS at network)"</string> - <!-- no translation found for permdesc_accessFineLocation (5821994817969957884) --> - <skip /> + <string name="permdesc_accessFineLocation" msgid="5821994817969957884">"Makukuha ng app na ito ang iyong lokasyon batay sa GPS o mga pinagmulan ng lokasyon ng network gaya ng mga cell tower at Wi-Fi network. Ang mga serbisyo ng lokasyon na ito ay dapat naka-on at available sa iyong telepono para sa app upang magamit ang mga ito. Maaaring tumaas ang pagkonsumo sa baterya dahil dito."</string> <string name="permlab_accessCoarseLocation" msgid="7715277613928539434">"i-access ang tinatantyang lokasyon (batay sa network)"</string> - <!-- no translation found for permdesc_accessCoarseLocation (3373266766487862426) --> - <skip /> - <!-- no translation found for permdesc_accessCoarseLocation (1884022719818788511) --> - <skip /> - <!-- no translation found for permdesc_accessCoarseLocation (7788009094906196995) --> - <skip /> + <string name="permdesc_accessCoarseLocation" product="tablet" msgid="3373266766487862426">"Makukuha ng app na ito ang iyong lokasyon batay sa mga pinagmulan ng network gaya ng mga cell tower at Wi-Fi network. Ang mga serbisyo ng lokasyon na ito ay dapat naka-on at available sa iyong tablet para sa app upang magamit ang mga ito."</string> + <string name="permdesc_accessCoarseLocation" product="tv" msgid="1884022719818788511">"Makukuha ng app na ito ang iyong lokasyon batay sa mga pinagmulan ng network gaya ng mga cell tower at Wi-Fi network. Ang mga serbisyo ng lokasyon na ito ay dapat naka-on at available sa iyong TV para sa app upang magamit ang mga ito."</string> + <string name="permdesc_accessCoarseLocation" product="default" msgid="7788009094906196995">"Makukuha ng app na ito ang iyong lokasyon batay sa mga pinagmulan ng network gaya ng mga cell tower at Wi-Fi network. Ang mga serbisyo ng lokasyon na ito ay dapat naka-on at available sa iyong telepono para sa app upang magamit ang mga ito."</string> <string name="permlab_modifyAudioSettings" msgid="6095859937069146086">"baguhin ang mga setting ng iyong audio"</string> <string name="permdesc_modifyAudioSettings" msgid="3522565366806248517">"Pinapayagan ang app na baguhin ang mga pandaigdigang setting ng audio gaya ng volume at kung aling speaker ang ginagamit para sa output."</string> <string name="permlab_recordAudio" msgid="3876049771427466323">"mag-record ng audio"</string> - <!-- no translation found for permdesc_recordAudio (4245930455135321433) --> - <skip /> + <string name="permdesc_recordAudio" msgid="4245930455135321433">"Makakapag-record ng audio ang app na ito gamit ang mikropono anumang oras."</string> <string name="permlab_sim_communication" msgid="2935852302216852065">"magpadala ng mga command sa SIM"</string> <string name="permdesc_sim_communication" msgid="5725159654279639498">"Pinapahintulutang magpadala ang app ng mga command sa SIM. Napakapanganib nito."</string> <string name="permlab_camera" msgid="3616391919559751192">"kumuha ng mga larawan at video"</string> - <!-- no translation found for permdesc_camera (5392231870049240670) --> - <skip /> + <string name="permdesc_camera" msgid="5392231870049240670">"Makakakuha ng mga larawan at makakapag-record ng mga video ang app na ito gamit ang camera anumang oras."</string> <string name="permlab_vibrate" msgid="7696427026057705834">"kontrolin ang pag-vibrate"</string> <string name="permdesc_vibrate" msgid="6284989245902300945">"Pinapayagan ang app na kontrolin ang vibrator."</string> <string name="permlab_callPhone" msgid="3925836347681847954">"direktang tawagan ang mga numero ng telepono"</string> diff --git a/core/res/res/values-tr/strings.xml b/core/res/res/values-tr/strings.xml index 11215e6311a1..ac184a464230 100644 --- a/core/res/res/values-tr/strings.xml +++ b/core/res/res/values-tr/strings.xml @@ -46,8 +46,7 @@ <string name="defaultMsisdnAlphaTag" msgid="2850889754919584674">"MSISDN1"</string> <string name="mmiError" msgid="5154499457739052907">"Bağlantı sorunu veya geçersiz MMI kodu."</string> <string name="mmiFdnError" msgid="5224398216385316471">"İşlem sadece sabit arama numaralarıyla sınırlandırılmıştır."</string> - <!-- no translation found for mmiErrorWhileRoaming (762488890299284230) --> - <skip /> + <string name="mmiErrorWhileRoaming" msgid="762488890299284230">"Dolaşımdayken telefonunuzdan çağrı yönlendirme ayarları değiştirilemiyor."</string> <string name="serviceEnabled" msgid="8147278346414714315">"Hizmet etkindi."</string> <string name="serviceEnabledFor" msgid="6856228140453471041">"Hizmet şunun için etkinleştirildi:"</string> <string name="serviceDisabled" msgid="1937553226592516411">"Hizmet devre dışı bırakıldı."</string> @@ -98,10 +97,8 @@ <string name="RestrictedOnVoiceData" msgid="996636487106171320">"Ses/Veri hizmetleri engellendi."</string> <string name="RestrictedOnVoiceSms" msgid="1888588152792023873">"Ses/SMS hizmetleri engellendi."</string> <string name="RestrictedOnAll" msgid="5643028264466092821">"Tüm Ses/Veri/SMS hizmetleri engellendi."</string> - <!-- no translation found for NetworkPreferenceSwitchTitle (4008877505368566980) --> - <skip /> - <!-- no translation found for NetworkPreferenceSwitchSummary (7335915397439759249) --> - <skip /> + <string name="NetworkPreferenceSwitchTitle" msgid="4008877505368566980">"Ağa erişilemiyor"</string> + <string name="NetworkPreferenceSwitchSummary" msgid="7335915397439759249">"Sinyal gücünü iyileştirmek için Ayarlar > Hücresel ağlar > Tercih Edilen Ağ Modu\'ndan seçili türü değiştirmeyi deneyin."</string> <string name="peerTtyModeFull" msgid="6165351790010341421">"Karşı taraf TTY Modunu TAM yaptı"</string> <string name="peerTtyModeHco" msgid="5728602160669216784">"Karşı taraf TTY Modunu HCO yaptı"</string> <string name="peerTtyModeVco" msgid="1742404978686538049">"Karşı taraf TTY Modunu VCO yaptı"</string> @@ -185,10 +182,8 @@ <string name="work_profile_deleted_description" msgid="6305147513054341102">"Eksik yönetici uygulaması nedeniyle iş profili silindi."</string> <string name="work_profile_deleted_details" msgid="226615743462361248">"İş profili yönetici uygulaması eksik ya da bozuk. Bunun sonucunda iş profiliniz ve ilgili veriler silindi. Yardım almak için yöneticiniz ile iletişim kurun."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="6019770344820507579">"İş profiliniz arık bu cihazda kullanılamıyor."</string> - <!-- no translation found for network_logging_notification_title (1805392571290161924) --> - <skip /> - <!-- no translation found for network_logging_notification_text (4448072433371155729) --> - <skip /> + <string name="network_logging_notification_title" msgid="1805392571290161924">"Ağ trafiği izleniyor"</string> + <string name="network_logging_notification_text" msgid="4448072433371155729">"Daha fazla ayrıntı için dokunun"</string> <string name="factory_reset_warning" msgid="5423253125642394387">"Cihazınız silinecek"</string> <string name="factory_reset_message" msgid="4905025204141900666">"Yönetici uygulamasında bileşen eksik ya da uygulama bozuk ve kullanılamaz durumda. Cihazınız şimdi silinecek. Yardım için yöneticinizle iletişim kurun."</string> <string name="me" msgid="6545696007631404292">"Ben"</string> @@ -306,12 +301,9 @@ <string name="permlab_sendSms" msgid="7544599214260982981">"SMS iletileri gönderme ve görüntüleme"</string> <string name="permdesc_sendSms" msgid="7094729298204937667">"Uygulamaya SMS iletisi gönderme izni verir. Bu durum beklenmeyen ödemelere neden olabilir. Kötü amaçlı uygulamalar onayınız olmadan iletiler göndererek sizi zarara uğratabilir."</string> <string name="permlab_readSms" msgid="8745086572213270480">"kısa mesajlarımı (SMS veya MMS) oku"</string> - <!-- no translation found for permdesc_readSms (4741697454888074891) --> - <skip /> - <!-- no translation found for permdesc_readSms (5796670395641116592) --> - <skip /> - <!-- no translation found for permdesc_readSms (6826832415656437652) --> - <skip /> + <string name="permdesc_readSms" product="tablet" msgid="4741697454888074891">"Bu uygulama, tabletinizde kayıtlı tüm SMS mesajlarını (kısa mesajları) okuyabilir."</string> + <string name="permdesc_readSms" product="tv" msgid="5796670395641116592">"Bu uygulama, TV\'nizde kayıtlı tüm SMS mesajlarını (kısa mesajları) okuyabilir."</string> + <string name="permdesc_readSms" product="default" msgid="6826832415656437652">"Bu uygulama, telefonunuzda kayıtlı tüm SMS mesajlarını (kısa mesajları) okuyabilir."</string> <string name="permlab_receiveWapPush" msgid="5991398711936590410">"kısa mesajları (WAP) al"</string> <string name="permdesc_receiveWapPush" msgid="748232190220583385">"Uygulamaya WAP mesajlarını alma ve işleme izni verir. Buna, size gönderilen mesajları takip edip size göstermeden silebilme izni de dahildir."</string> <string name="permlab_getTasks" msgid="6466095396623933906">"çalışan uygulamaları al"</string> @@ -324,10 +316,8 @@ <string name="permdesc_enableCarMode" msgid="4853187425751419467">"Uygulamaya, araç modunu etkinleştirme izni verir."</string> <string name="permlab_killBackgroundProcesses" msgid="3914026687420177202">"diğer uygulamaları kapat"</string> <string name="permdesc_killBackgroundProcesses" msgid="4593353235959733119">"Uygulamaya diğer uygulamalara ait arka plan işlemleri sonlandırma izni verir. Bu izin, diğer uygulamaların çalışmayı durdurmasına neden olabilir."</string> - <!-- no translation found for permlab_systemAlertWindow (7238805243128138690) --> - <skip /> - <!-- no translation found for permdesc_systemAlertWindow (2393776099672266188) --> - <skip /> + <string name="permlab_systemAlertWindow" msgid="7238805243128138690">"Bu uygulama, diğer uygulamaların üzerinde görünebilir"</string> + <string name="permdesc_systemAlertWindow" msgid="2393776099672266188">"Bu uygulama, uygulamaların üzerinde veya ekranın diğer kısımlarında görünebilir. Bu durum, normal uygulama kullanımını etkileyebilir ve diğer uygulamaların görünümünü değiştirebilir."</string> <string name="permlab_persistentActivity" msgid="8841113627955563938">"uygulamayı her zaman çalıştırma"</string> <string name="permdesc_persistentActivity" product="tablet" msgid="8525189272329086137">"Uygulamaya kendisinin bir bölümünü bellekte kalıcı yapma izni verir. Bu izin, diğer uygulamaların kullanabileceği belleği sınırlandırarak tabletin yavaş çalışmasına neden olabilir."</string> <string name="permdesc_persistentActivity" product="tv" msgid="5086862529499103587">"Uygulamaya, kendi parçalarını bellekte kalıcı hale getirme izni verir. Bu, TV\'yi yavaşlatan diğer uygulamaların kullanabileceği bellek alanını sınırlayabilir."</string> @@ -353,51 +343,37 @@ <string name="permdesc_writeContacts" product="tv" msgid="5438230957000018959">"Uygulamaya, belirli kişileri arama, bu kişilerle e-posta aracılığıyla haberleşme veya başka yollardan iletişim kurma sıklığınız da dahil olmak üzere, TV\'nizde kayıtlı kişiler ile ilgili verileri değiştirme izni verir. Bu izin, uygulamaların kişi verilerinizi silmesine olanak sağlar."</string> <string name="permdesc_writeContacts" product="default" msgid="589869224625163558">"Uygulamaya telefonunuzda depolanan kişilerinizle ilgili verileri değiştirme izni verir. Bu verilere belirli kişilerle ne sıklıkta çağrı, e-posta veya diğer yöntemlerle iletişim kurduğunuz bilgisi dahildir. Bu izin, uygulamanın kişi verilerinizi silmesine olanak sağlar."</string> <string name="permlab_readCallLog" msgid="3478133184624102739">"çağrı günlüğünü oku"</string> - <!-- no translation found for permdesc_readCallLog (3204122446463552146) --> - <skip /> + <string name="permdesc_readCallLog" msgid="3204122446463552146">"Bu uygulama, çağrı geçmişinizi okuyabilir."</string> <string name="permlab_writeCallLog" msgid="8552045664743499354">"çağrı günlüğüne yaz"</string> <string name="permdesc_writeCallLog" product="tablet" msgid="6661806062274119245">"Uygulamaya tabletinizin çağrı günlüğünde (gelen ve giden çağrılarla ilgili veriler dahil olmak üzere) değişiklik yapma izni verir. Kötü amaçlı uygulamalar bu izni kullanarak çağrı günlüğünüzü silebilir veya değiştirebilir."</string> <string name="permdesc_writeCallLog" product="tv" msgid="4225034892248398019">"Uygulamaya, tabletinizin çağrı kaydında (gelen ve giden çağrılarla ilgili veriler dahil olmak üzere) değişiklik yapma izni verir. Kötü amaçlı uygulamalar bu izni kullanarak çağrı kaydınızı silebilir veya değiştirebilir."</string> <string name="permdesc_writeCallLog" product="default" msgid="683941736352787842">"Uygulamaya telefonunuzun çağrı günlüğünde (gelen ve giden çağrılarla ilgili veriler dahil olmak üzere) değişiklik yapma izni verir. Kötü amaçlı uygulamalar bu izni kullanarak çağrı günlüğünüzü silebilir veya değiştirebilir."</string> <string name="permlab_bodySensors" msgid="4683341291818520277">"vücut sensörlerine erişme (nabız takip cihazları gibi)"</string> <string name="permdesc_bodySensors" product="default" msgid="4380015021754180431">"Uygulamanın, nabzınız gibi fiziksel durumunuzu izleyen sensörlerin gönderdiği verilere erişmesine izin verir."</string> - <!-- no translation found for permlab_readCalendar (6716116972752441641) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (4993979255403945892) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (8837931557573064315) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (4373978642145196715) --> - <skip /> + <string name="permlab_readCalendar" msgid="6716116972752441641">"Takvim etkinlikleri ve ayrıntılarını okuma"</string> + <string name="permdesc_readCalendar" product="tablet" msgid="4993979255403945892">"Bu uygulama, tabletinizde kayıtlı tüm takvim etkinliklerini okuyabilir ve takvim verilerinizi paylaşabilir ya da kaydedebilir."</string> + <string name="permdesc_readCalendar" product="tv" msgid="8837931557573064315">"Bu uygulama, TV\'nizde kayıtlı tüm takvim etkinliklerini okuyabilir ve takvim verilerinizi paylaşabilir ya da kaydedebilir."</string> + <string name="permdesc_readCalendar" product="default" msgid="4373978642145196715">"Bu uygulama, telefonunuzda kayıtlı tüm takvim etkinliklerini okuyabilir ve takvim verilerinizi paylaşabilir ya da kaydedebilir."</string> <string name="permlab_writeCalendar" msgid="8438874755193825647">"sahibin bilgisi olmadan takvim etkinlikleri ekle veya mevcut etkinlikleri değiştir ve misafirlere e-posta gönder"</string> - <!-- no translation found for permdesc_writeCalendar (1675270619903625982) --> - <skip /> - <!-- no translation found for permdesc_writeCalendar (9017809326268135866) --> - <skip /> - <!-- no translation found for permdesc_writeCalendar (7592791790516943173) --> - <skip /> + <string name="permdesc_writeCalendar" product="tablet" msgid="1675270619903625982">"Bu uygulama, tabletinize takvim etkinlikleri ekleyebilir, mevcut etkinlikleri kaldırabilir ve değiştirebilir. Bu uygulama, takvim sahiplerinden gelmiş gibi görünen iletiler gönderebilir veya takvim sahiplerinin bilgisi olmadan etkinlikleri değiştirebilir."</string> + <string name="permdesc_writeCalendar" product="tv" msgid="9017809326268135866">"Bu uygulama, TV\'nize takvim etkinlikleri ekleyebilir, mevcut etkinlikleri kaldırabilir ve değiştirebilir. Bu uygulama, takvim sahiplerinden gelmiş gibi görünen iletiler gönderebilir veya takvim sahiplerinin bilgisi olmadan etkinlikleri değiştirebilir."</string> + <string name="permdesc_writeCalendar" product="default" msgid="7592791790516943173">"Bu uygulama, telefonunuza takvim etkinlikleri ekleyebilir, mevcut etkinlikleri kaldırabilir ve değiştirebilir. Bu uygulama, takvim sahiplerinden gelmiş gibi görünen iletiler gönderebilir veya takvim sahiplerinin bilgisi olmadan etkinlikleri değiştirebilir."</string> <string name="permlab_accessLocationExtraCommands" msgid="2836308076720553837">"ek konum sağlayıcı komutlarına eriş"</string> <string name="permdesc_accessLocationExtraCommands" msgid="6078307221056649927">"Uygulamanın, ekstra konum sağlayıcı komutlarına erişmesine izin verir. Bu izin, uygulamanın GPS veya diğer konum kaynaklarının çalışmasını kesmesine olanak sağlayabilir."</string> <string name="permlab_accessFineLocation" msgid="251034415460950944">"konum bilgilerine hassas olarak erişme (GPS ve ağ tabanlı)"</string> - <!-- no translation found for permdesc_accessFineLocation (5821994817969957884) --> - <skip /> + <string name="permdesc_accessFineLocation" msgid="5821994817969957884">"Bu uygulama baz istasyonu ve kablosuz ağ gibi ağ kaynaklarını kullanarak konumunuzu belirleyebilir. Uygulamanın bu hizmetleri kullanabilmesi için telefonunuzda bu konum hizmetleri açık ve kullanılabilir olmalıdır. Bu hizmet pil tüketimini artırabilir."</string> <string name="permlab_accessCoarseLocation" msgid="7715277613928539434">"konum bilgilerine yaklaşık olarak erişme (ağ tabanlı)"</string> - <!-- no translation found for permdesc_accessCoarseLocation (3373266766487862426) --> - <skip /> - <!-- no translation found for permdesc_accessCoarseLocation (1884022719818788511) --> - <skip /> - <!-- no translation found for permdesc_accessCoarseLocation (7788009094906196995) --> - <skip /> + <string name="permdesc_accessCoarseLocation" product="tablet" msgid="3373266766487862426">"Bu uygulama baz istasyonu ve kablosuz ağ gibi ağ kaynaklarını kullanarak konumunuzu belirleyebilir. Uygulamanın bu hizmetleri kullanabilmesi için tabletinizde bu konum hizmetleri açık ve kullanılabilir olmalıdır."</string> + <string name="permdesc_accessCoarseLocation" product="tv" msgid="1884022719818788511">"Bu uygulama baz istasyonu ve kablosuz ağ gibi ağ kaynaklarını kullanarak konumunuzu belirleyebilir. Uygulamanın bu hizmetleri kullanabilmesi için TV\'nizde bu konum hizmetleri açık ve kullanılabilir olmalıdır."</string> + <string name="permdesc_accessCoarseLocation" product="default" msgid="7788009094906196995">"Bu uygulama baz istasyonu ve kablosuz ağ gibi ağ kaynaklarını kullanarak konumunuzu belirleyebilir. Uygulamanın bu hizmetleri kullanabilmesi için telefonunuzda bu konum hizmetleri açık ve kullanılabilir olmalıdır."</string> <string name="permlab_modifyAudioSettings" msgid="6095859937069146086">"ses ayarlarınızı değiştirin"</string> <string name="permdesc_modifyAudioSettings" msgid="3522565366806248517">"Uygulamaya ses düzeyi ve ses çıkışı için kullanılan hoparlör gibi genel ses ayarlarını değiştirme izni verir."</string> <string name="permlab_recordAudio" msgid="3876049771427466323">"ses kaydet"</string> - <!-- no translation found for permdesc_recordAudio (4245930455135321433) --> - <skip /> + <string name="permdesc_recordAudio" msgid="4245930455135321433">"Bu uygulama, istediği zaman mikrofonu kullanarak ses kaydedebilir."</string> <string name="permlab_sim_communication" msgid="2935852302216852065">"SIM karta komut gönderme"</string> <string name="permdesc_sim_communication" msgid="5725159654279639498">"Uygulamanın SIM karta komut göndermesine izin verir. Bu izin çok tehlikelidir."</string> <string name="permlab_camera" msgid="3616391919559751192">"resim çekme ve görüntü kaydetme"</string> - <!-- no translation found for permdesc_camera (5392231870049240670) --> - <skip /> + <string name="permdesc_camera" msgid="5392231870049240670">"Bu uygulama, herhangi bir zamanda kamerayı kullanarak fotoğraf ve video çekebilir."</string> <string name="permlab_vibrate" msgid="7696427026057705834">"titreşimi denetleme"</string> <string name="permdesc_vibrate" msgid="6284989245902300945">"Uygulamaya, titreşimi denetleme izni verir."</string> <string name="permlab_callPhone" msgid="3925836347681847954">"telefon numaralarına doğrudan çağrı yap"</string> diff --git a/core/res/res/values-uk/strings.xml b/core/res/res/values-uk/strings.xml index 176e0907576b..def0cbf51689 100644 --- a/core/res/res/values-uk/strings.xml +++ b/core/res/res/values-uk/strings.xml @@ -46,8 +46,7 @@ <string name="defaultMsisdnAlphaTag" msgid="2850889754919584674">"MSISDN1"</string> <string name="mmiError" msgid="5154499457739052907">"Пробл. підключення чи недійсний код MMI."</string> <string name="mmiFdnError" msgid="5224398216385316471">"Операція лише для номерів фіксованого набору."</string> - <!-- no translation found for mmiErrorWhileRoaming (762488890299284230) --> - <skip /> + <string name="mmiErrorWhileRoaming" msgid="762488890299284230">"У роумінгу на телефоні не можна змінити налаштування переадресації викликів."</string> <string name="serviceEnabled" msgid="8147278346414714315">"Послугу ввімкнено."</string> <string name="serviceEnabledFor" msgid="6856228140453471041">"Службу ввімкнено для:"</string> <string name="serviceDisabled" msgid="1937553226592516411">"Службу вимкнено."</string> @@ -100,10 +99,8 @@ <string name="RestrictedOnVoiceData" msgid="996636487106171320">"Голосові служби чи служби даних заблоковано."</string> <string name="RestrictedOnVoiceSms" msgid="1888588152792023873">"Голос.служ. чи служ. даних заблок."</string> <string name="RestrictedOnAll" msgid="5643028264466092821">"Усі голосові служби, служби даних і SMS заблоковано."</string> - <!-- no translation found for NetworkPreferenceSwitchTitle (4008877505368566980) --> - <skip /> - <!-- no translation found for NetworkPreferenceSwitchSummary (7335915397439759249) --> - <skip /> + <string name="NetworkPreferenceSwitchTitle" msgid="4008877505368566980">"Не вдається під’єднатися до мережі"</string> + <string name="NetworkPreferenceSwitchSummary" msgid="7335915397439759249">"Щоб покращити якість сигналу, змініть тип у меню \"Налаштування > Мобільні мережі > Тип мережі\"."</string> <string name="peerTtyModeFull" msgid="6165351790010341421">"Пристрій змінив режим TTY на FULL"</string> <string name="peerTtyModeHco" msgid="5728602160669216784">"Пристрій змінив режим TTY на HCO"</string> <string name="peerTtyModeVco" msgid="1742404978686538049">"Пристрій змінив режим TTY на VCO"</string> @@ -189,10 +186,8 @@ <string name="work_profile_deleted_description" msgid="6305147513054341102">"Робочий профіль видалено через відсутність додатка адміністратора."</string> <string name="work_profile_deleted_details" msgid="226615743462361248">"Додаток адміністратора в робочому профілі відсутній або пошкоджений. У результаті ваш робочий профіль і пов’язані з ним дані видалено. Зверніться до свого адміністратора по допомогу."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="6019770344820507579">"Робочий профіль більше не доступний на цьому пристрої."</string> - <!-- no translation found for network_logging_notification_title (1805392571290161924) --> - <skip /> - <!-- no translation found for network_logging_notification_text (4448072433371155729) --> - <skip /> + <string name="network_logging_notification_title" msgid="1805392571290161924">"Відстежується мережевий трафік"</string> + <string name="network_logging_notification_text" msgid="4448072433371155729">"Торкніться, щоб дізнатися більше"</string> <string name="factory_reset_warning" msgid="5423253125642394387">"З вашого пристрою буде стерто всі дані"</string> <string name="factory_reset_message" msgid="4905025204141900666">"Неможливо скористатися додатком адміністратора, оскільки в ньому немає певних компонентів або його пошкоджено. З вашого пристрою буде стерто всі дані. Зверніться до свого адміністратора по допомогу."</string> <string name="me" msgid="6545696007631404292">"Я"</string> @@ -312,12 +307,9 @@ <string name="permlab_sendSms" msgid="7544599214260982981">"надсилати та переглядати SMS-повідомлення"</string> <string name="permdesc_sendSms" msgid="7094729298204937667">"Дозволяє програмі надсилати SMS-повідомлення. Це може спричинити неочікуване стягнення плати. Шкідливі програми можуть надсилати повідомлення без вашого підтвердження, за що з вас стягуватимуться кошти."</string> <string name="permlab_readSms" msgid="8745086572213270480">"читати текстові повідомлення (SMS або MMS)"</string> - <!-- no translation found for permdesc_readSms (4741697454888074891) --> - <skip /> - <!-- no translation found for permdesc_readSms (5796670395641116592) --> - <skip /> - <!-- no translation found for permdesc_readSms (6826832415656437652) --> - <skip /> + <string name="permdesc_readSms" product="tablet" msgid="4741697454888074891">"Цей додаток може переглядати всі SMS-повідомлення, збережені на планшеті."</string> + <string name="permdesc_readSms" product="tv" msgid="5796670395641116592">"Цей додаток може переглядати всі SMS-повідомлення, збережені на телевізорі."</string> + <string name="permdesc_readSms" product="default" msgid="6826832415656437652">"Цей додаток може переглядати всі SMS-повідомлення, збережені на телефоні."</string> <string name="permlab_receiveWapPush" msgid="5991398711936590410">"отримувати текстові повідомлення (WAP)"</string> <string name="permdesc_receiveWapPush" msgid="748232190220583385">"Дозволяє програмі отримувати й обробляти WAP-повідомлення. Це означає, що програма може відстежувати чи видаляти повідомлення, надіслані на ваш пристрій, навіть не показуючи їх вам."</string> <string name="permlab_getTasks" msgid="6466095396623933906">"отримувати запущені програми"</string> @@ -330,10 +322,8 @@ <string name="permdesc_enableCarMode" msgid="4853187425751419467">"Дозволяє програмі вмикати режим автомобіля."</string> <string name="permlab_killBackgroundProcesses" msgid="3914026687420177202">"закривати інші програми"</string> <string name="permdesc_killBackgroundProcesses" msgid="4593353235959733119">"Дозволяє програмі припиняти фонові процеси інших програм. Це може зупиняти запущені програми."</string> - <!-- no translation found for permlab_systemAlertWindow (7238805243128138690) --> - <skip /> - <!-- no translation found for permdesc_systemAlertWindow (2393776099672266188) --> - <skip /> + <string name="permlab_systemAlertWindow" msgid="7238805243128138690">"Цей додаток може відображатися поверх інших додатків"</string> + <string name="permdesc_systemAlertWindow" msgid="2393776099672266188">"Цей додаток може відображатися поверх інших додатків або частин екрана. Це може заважати нормальній взаємодії з додатком або змінити відображення інших додатків."</string> <string name="permlab_persistentActivity" msgid="8841113627955563938">"заставляти програму постійно функціонувати"</string> <string name="permdesc_persistentActivity" product="tablet" msgid="8525189272329086137">"Дозволяє програмі робити свої частини сталими в пам’яті. Це може зменшувати обсяг пам’яті, доступної для інших програм, і сповільнювати роботу планшетного ПК."</string> <string name="permdesc_persistentActivity" product="tv" msgid="5086862529499103587">"Додаток може робити свої частини сталими в пам’яті. Це може зменшувати обсяг пам’яті, доступної для інших додатків, і сповільнювати роботу телевізора."</string> @@ -359,51 +349,37 @@ <string name="permdesc_writeContacts" product="tv" msgid="5438230957000018959">"Додаток може змінювати дані про контакти, які зберігаються в телевізорі, зокрема частоту здійснення дзвінків, надсилання електронних листів або інші способи спілкування з окремими особами. Такий дозвіл дає додаткам змогу видаляти контактні дані."</string> <string name="permdesc_writeContacts" product="default" msgid="589869224625163558">"Дозволяє програмі змінювати дані про контакти, які зберігаються у вашому телефоні, зокрема частоту здійснення дзвінків, надсилання електронних листів або інших способів спілкування з окремими особами. Такий дозвіл дає програмам змогу видаляти контактні дані."</string> <string name="permlab_readCallLog" msgid="3478133184624102739">"читати журнал викликів"</string> - <!-- no translation found for permdesc_readCallLog (3204122446463552146) --> - <skip /> + <string name="permdesc_readCallLog" msgid="3204122446463552146">"Цей додаток може переглядати історію викликів."</string> <string name="permlab_writeCallLog" msgid="8552045664743499354">"записувати в журнал викликів"</string> <string name="permdesc_writeCallLog" product="tablet" msgid="6661806062274119245">"Дозволяє програмі змінювати журнал викликів вашого планшетного ПК, включно з даними про вхідні та вихідні дзвінки. Шкідливі програми можуть використовувати це для стирання або зміни вашого журналу викликів."</string> <string name="permdesc_writeCallLog" product="tv" msgid="4225034892248398019">"Додаток може змінювати журнал викликів телевізора, зокрема дані про вхідні та вихідні дзвінки. Шкідливі додатки можуть використовувати це, щоб стирати чи змінювати ваш журнал викликів."</string> <string name="permdesc_writeCallLog" product="default" msgid="683941736352787842">"Дозволяє програмі змінювати журнал викликів вашого телефону, включно з даними про вхідні та вихідні дзвінки. Шкідливі програми можуть використовувати це для стирання або зміни вашого журналу викликів."</string> <string name="permlab_bodySensors" msgid="4683341291818520277">"отримувати дані з датчиків на тілі (наприклад, з пульсометра)"</string> <string name="permdesc_bodySensors" product="default" msgid="4380015021754180431">"Додаток має доступ до даних із датчиків, які відстежують фізичний стан, зокрема пульс."</string> - <!-- no translation found for permlab_readCalendar (6716116972752441641) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (4993979255403945892) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (8837931557573064315) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (4373978642145196715) --> - <skip /> + <string name="permlab_readCalendar" msgid="6716116972752441641">"Переглядати події календаря й додаткову інформацію"</string> + <string name="permdesc_readCalendar" product="tablet" msgid="4993979255403945892">"Цей додаток може переглядати всі події календаря, збережені на вашому планшеті, а також надсилати та зберігати дані календаря."</string> + <string name="permdesc_readCalendar" product="tv" msgid="8837931557573064315">"Цей додаток може переглядати всі події календаря, збережені на вашому телевізорі, а також надсилати та зберігати дані календаря."</string> + <string name="permdesc_readCalendar" product="default" msgid="4373978642145196715">"Цей додаток може переглядати всі події календаря, збережені на вашому телефоні, а також надсилати та зберігати дані календаря."</string> <string name="permlab_writeCalendar" msgid="8438874755193825647">"додавати та змінювати події календаря, а також надсилати гостям електронні листи без відома власників"</string> - <!-- no translation found for permdesc_writeCalendar (1675270619903625982) --> - <skip /> - <!-- no translation found for permdesc_writeCalendar (9017809326268135866) --> - <skip /> - <!-- no translation found for permdesc_writeCalendar (7592791790516943173) --> - <skip /> + <string name="permdesc_writeCalendar" product="tablet" msgid="1675270619903625982">"Цей додаток може додавати, вилучати та змінювати події календаря на вашому планшеті. Він також може надсилати повідомлення від імені власників календаря або редагувати події без відома власників."</string> + <string name="permdesc_writeCalendar" product="tv" msgid="9017809326268135866">"Цей додаток може додавати, вилучати та змінювати події календаря на вашому телевізорі. Він також може надсилати повідомлення від імені власників календаря або редагувати події без відома власників."</string> + <string name="permdesc_writeCalendar" product="default" msgid="7592791790516943173">"Цей додаток може додавати, вилучати та змінювати події календаря на вашому телефоні. Він також може надсилати повідомлення від імені власників календаря або редагувати події без відома власників."</string> <string name="permlab_accessLocationExtraCommands" msgid="2836308076720553837">"отр. дост. до додат. команд пров. місцезн."</string> <string name="permdesc_accessLocationExtraCommands" msgid="6078307221056649927">"Додаток отримуватиме доступ до додаткових команд постачальника геоданих. Можливе втручання додатка в роботу GPS чи інших джерел геоданих."</string> <string name="permlab_accessFineLocation" msgid="251034415460950944">"отримувати дані про точне місцезнаходження (на основі GPS і мережі)"</string> - <!-- no translation found for permdesc_accessFineLocation (5821994817969957884) --> - <skip /> + <string name="permdesc_accessFineLocation" msgid="5821994817969957884">"Цей додаток може отримувати дані про ваше місцезнаходження на основі даних GPS або джерел мережі, як-от антен мобільного зв’язку та мереж Wi-Fi. Щоб додаток міг користуватися цими службами локації, вони мають бути доступними й увімкненими на вашому телефоні. Це може пришвидшити розряджання акумулятора."</string> <string name="permlab_accessCoarseLocation" msgid="7715277613928539434">"отримувати дані про приблизне місцезнаходження (на основі мережі)"</string> - <!-- no translation found for permdesc_accessCoarseLocation (3373266766487862426) --> - <skip /> - <!-- no translation found for permdesc_accessCoarseLocation (1884022719818788511) --> - <skip /> - <!-- no translation found for permdesc_accessCoarseLocation (7788009094906196995) --> - <skip /> + <string name="permdesc_accessCoarseLocation" product="tablet" msgid="3373266766487862426">"Цей додаток може отримувати дані про ваше місцезнаходження на основі джерел мережі, як-от антен мобільного зв’язку та мереж Wi-Fi. Щоб додаток міг користуватися цими службами локації, вони мають бути доступними й увімкненими на вашому планшеті."</string> + <string name="permdesc_accessCoarseLocation" product="tv" msgid="1884022719818788511">"Цей додаток може отримувати дані про ваше місцезнаходження на основі джерел мережі, як-от антен мобільного зв’язку та мереж Wi-Fi. Щоб додаток міг користуватися цими службами локації, вони мають бути доступними й увімкненими на вашому телевізорі."</string> + <string name="permdesc_accessCoarseLocation" product="default" msgid="7788009094906196995">"Цей додаток може отримувати дані про ваше місцезнаходження на основі джерел мережі, як-от антен мобільного зв’язку та мереж Wi-Fi. Щоб додаток міг користуватися цими службами локації, вони мають бути доступними й увімкненими на вашому телефоні."</string> <string name="permlab_modifyAudioSettings" msgid="6095859937069146086">"змінювати налаштув-ня звуку"</string> <string name="permdesc_modifyAudioSettings" msgid="3522565366806248517">"Дозволяє програмі змінювати загальні налаштування звуку, як-от гучність і динамік, який використовується для виводу сигналу."</string> <string name="permlab_recordAudio" msgid="3876049771427466323">"запис-ти аудіо"</string> - <!-- no translation found for permdesc_recordAudio (4245930455135321433) --> - <skip /> + <string name="permdesc_recordAudio" msgid="4245930455135321433">"Цей додаток може будь-коли записувати звук за допомогою мікрофона."</string> <string name="permlab_sim_communication" msgid="2935852302216852065">"надсилати команди на SIM-карту"</string> <string name="permdesc_sim_communication" msgid="5725159654279639498">"Дозволяє програмі надсилати команди на SIM-карту. Це дуже небезпечно."</string> <string name="permlab_camera" msgid="3616391919559751192">"фотограф. та знімати відео"</string> - <!-- no translation found for permdesc_camera (5392231870049240670) --> - <skip /> + <string name="permdesc_camera" msgid="5392231870049240670">"Цей додаток може будь-коли робити фотографії та записувати відео за допомогою камери."</string> <string name="permlab_vibrate" msgid="7696427026057705834">"контролювати вібросигнал"</string> <string name="permdesc_vibrate" msgid="6284989245902300945">"Дозволяє програмі контролювати вібросигнал."</string> <string name="permlab_callPhone" msgid="3925836347681847954">"прямо набирати номери тел."</string> diff --git a/core/res/res/values-ur-rPK/strings.xml b/core/res/res/values-ur-rPK/strings.xml index e9fdf6dc18d7..17b657dc34e1 100644 --- a/core/res/res/values-ur-rPK/strings.xml +++ b/core/res/res/values-ur-rPK/strings.xml @@ -46,8 +46,7 @@ <string name="defaultMsisdnAlphaTag" msgid="2850889754919584674">"MSISDN1"</string> <string name="mmiError" msgid="5154499457739052907">"کنکشن مسئلہ یا غلط MMI کوڈ۔"</string> <string name="mmiFdnError" msgid="5224398216385316471">"آپریشن صرف متعین ڈائلنگ نمبرز تک محدود ہے۔"</string> - <!-- no translation found for mmiErrorWhileRoaming (762488890299284230) --> - <skip /> + <string name="mmiErrorWhileRoaming" msgid="762488890299284230">"جب آپ رومنگ پر ہوں تو اپنے فون سے کال فارورڈنگ کی ترتیبات تبدیل نہیں کی جا سکتیں۔"</string> <string name="serviceEnabled" msgid="8147278346414714315">"سروس فعال کی گئی۔"</string> <string name="serviceEnabledFor" msgid="6856228140453471041">"سروس فعال کی گئی برائے:"</string> <string name="serviceDisabled" msgid="1937553226592516411">"سروس غیر فعال کر دی گئی ہے۔"</string> @@ -98,10 +97,8 @@ <string name="RestrictedOnVoiceData" msgid="996636487106171320">"صوتی/ڈیٹا سروسز مسدود کر دی گئی ہیں۔"</string> <string name="RestrictedOnVoiceSms" msgid="1888588152792023873">"وائس/SMS سروسز مسدود ہیں۔"</string> <string name="RestrictedOnAll" msgid="5643028264466092821">"سبھی صوتی/ڈیٹا/SMS سروسز مسدود کر دی گئی ہیں۔"</string> - <!-- no translation found for NetworkPreferenceSwitchTitle (4008877505368566980) --> - <skip /> - <!-- no translation found for NetworkPreferenceSwitchSummary (7335915397439759249) --> - <skip /> + <string name="NetworkPreferenceSwitchTitle" msgid="4008877505368566980">"نیٹ ورک تک نہیں پہنچا جا سکتا"</string> + <string name="NetworkPreferenceSwitchSummary" msgid="7335915397439759249">"ریسپشن کو بہتر بنانے کیلئے، ترتیبات > سیلولر نیٹ ورکس > ترجیحی نیٹ ورک کی قسم پرمنتخب کی گئی قسم تبدیل کرنے کی کوشش کریں۔"</string> <string name="peerTtyModeFull" msgid="6165351790010341421">"ہمسر نے TTY وضع مکمل کی درخواست کی"</string> <string name="peerTtyModeHco" msgid="5728602160669216784">"ہمسر نے TTY وضع HCO کی درخواست کی"</string> <string name="peerTtyModeVco" msgid="1742404978686538049">"ہمسر نے TTY وضع VCO کی درخواست کی"</string> @@ -185,10 +182,8 @@ <string name="work_profile_deleted_description" msgid="6305147513054341102">"گمشدہ منتظم ایپ کی وجہ سے دفتری پروفائل حذف کر دیا گیا۔"</string> <string name="work_profile_deleted_details" msgid="226615743462361248">"دفتری پروفائل کی منتظم ایپ یا تو غائب ہے یا خراب ہے۔ اس کی وجہ سے، آپ کا دفتری پروفائل اور متعلقہ ڈیٹا حذف کر دیے گئے ہیں۔ مدد کیلئے اپنے منتظم سے رابطہ کریں۔"</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="6019770344820507579">"آپ کا دفتری پروفائل اس آلہ پر مزید دستیاب نہیں ہے۔"</string> - <!-- no translation found for network_logging_notification_title (1805392571290161924) --> - <skip /> - <!-- no translation found for network_logging_notification_text (4448072433371155729) --> - <skip /> + <string name="network_logging_notification_title" msgid="1805392571290161924">"نیٹ ورک ٹریفک مانیٹر ہو رہی ہے"</string> + <string name="network_logging_notification_text" msgid="4448072433371155729">"مزید معلومات کیلئے تھپتھپائیں"</string> <string name="factory_reset_warning" msgid="5423253125642394387">"آپ کا آلہ صاف کر دیا جائے گا"</string> <string name="factory_reset_message" msgid="4905025204141900666">"منتظم کی ایپ میں گمشدہ اجزاء ہیں یا وہ خراب ہے اور اسے استعمال نہیں کیا جا سکتا ہے۔ آپ کے آلہ کو اب صاف کر دیا جائے گا۔ مدد کیلئے اپنے منتظم سے رابطہ کریں۔"</string> <string name="me" msgid="6545696007631404292">"میں"</string> @@ -306,12 +301,9 @@ <string name="permlab_sendSms" msgid="7544599214260982981">"SMS پیغامات بھیجیں اور دیکھیں"</string> <string name="permdesc_sendSms" msgid="7094729298204937667">"ایپ کو SMS پیغامات بھیجنے کی اجازت دیتا ہے۔ اس کے نتیجے میں غیر متوقع چارجز لگ سکتے ہیں۔ نقصان دہ ایپس آپ کی تصدیق کے بغیر پیغامات بھیج کر آپ کی رقم خرچ کروا سکتی ہیں۔"</string> <string name="permlab_readSms" msgid="8745086572213270480">"اپنے متنی پیغامات (SMS یا MMS) کو پڑھیں"</string> - <!-- no translation found for permdesc_readSms (4741697454888074891) --> - <skip /> - <!-- no translation found for permdesc_readSms (5796670395641116592) --> - <skip /> - <!-- no translation found for permdesc_readSms (6826832415656437652) --> - <skip /> + <string name="permdesc_readSms" product="tablet" msgid="4741697454888074891">"یہ ایپ آپ کے ٹیبلیٹ میں اسٹورکردہ تمام SMS (متنی) پیغامات پڑھ سکتی ہے۔"</string> + <string name="permdesc_readSms" product="tv" msgid="5796670395641116592">"یہ ایپ آپ کے TV میں اسٹورکردہ تمام SMS (متنی) پیغامات پڑھ سکتی ہے۔"</string> + <string name="permdesc_readSms" product="default" msgid="6826832415656437652">"یہ ایپ آپ کے فون میں اسٹورکردہ تمام SMS (متنی) پیغامات پڑھ سکتی ہے۔"</string> <string name="permlab_receiveWapPush" msgid="5991398711936590410">"متنی پیغامات (WAP) حاصل کریں"</string> <string name="permdesc_receiveWapPush" msgid="748232190220583385">"ایپ کو WAP پیغامات حاصل اور ان پر کارروائی کرنے کی اجازت دیتا ہے۔ اس اجازت میں آپ کو مرسلہ پیغامات آپ کو دکھائے بغیر ان پر نگاہ رکھنے یا انہیں حذف کرنے کی اہلیت شامل ہے۔"</string> <string name="permlab_getTasks" msgid="6466095396623933906">"چل رہی ایپس کی بازیافت کریں"</string> @@ -324,10 +316,8 @@ <string name="permdesc_enableCarMode" msgid="4853187425751419467">"ایپ کو کار وضع فعال کرنے کی اجازت دیتا ہے۔"</string> <string name="permlab_killBackgroundProcesses" msgid="3914026687420177202">"دیگر ایپس بند کریں"</string> <string name="permdesc_killBackgroundProcesses" msgid="4593353235959733119">"ایپ کو دوسرے ایپس کے پس منظر کی کارروائیوں کو ختم کرنے کی اجازت دیتا ہے۔ اس کی وجہ سے دوسرے ایپس کا چلنا بند ہوسکتا ہے۔"</string> - <!-- no translation found for permlab_systemAlertWindow (7238805243128138690) --> - <skip /> - <!-- no translation found for permdesc_systemAlertWindow (2393776099672266188) --> - <skip /> + <string name="permlab_systemAlertWindow" msgid="7238805243128138690">"یہ ایپ دیگر ایپس کے اوپر ظاہر ہوسکتی ہے"</string> + <string name="permdesc_systemAlertWindow" msgid="2393776099672266188">"یہ ایپ دیگر ایپس کے اوپر یا سکرین کے دیگر حصوں پر ظاہر ہو سکتی ہے۔ یہ عام ایپ کے استعمال کے ساتھ مداخلت کر سکتی ہے اور دیگر ایپس کے ظاہر ہونے کا طریقہ بدل سکتی ہے۔"</string> <string name="permlab_persistentActivity" msgid="8841113627955563938">"ایپ کو ہمیشہ چلاتے رہیں"</string> <string name="permdesc_persistentActivity" product="tablet" msgid="8525189272329086137">"ایپ کو خود اپنے ہی حصوں کو میموری میں استقلال پذیر بنانے کی اجازت دیتا ہے۔ یہ ٹیبلٹ کو سست بناکر دوسری ایپس کیلئے دستیاب میموری کو محدود کرسکتا ہے۔"</string> <string name="permdesc_persistentActivity" product="tv" msgid="5086862529499103587">"ایپ کو خود اپنے ہی حصوں کو میموری میں استقلال پذیر بنانے کی اجازت دیتا ہے۔ یہ TV کو سُست بناکر دوسری ایپس کیلئے دستیاب میموری کو محدود کرسکتا ہے۔"</string> @@ -353,51 +343,37 @@ <string name="permdesc_writeContacts" product="tv" msgid="5438230957000018959">"ایپ کو آپ کے TV پر اسٹور کردہ آپ کے رابطوں، بشمول مخصوص رابطوں کو جس تعدد سے آپ نے کال، ای میل کیا ہے یا دوسرے طریقوں سے ان کے ساتھ مواصلت کی ہے ان کے بارے میں ڈیٹا میں ترمیم کی اجازت دیتا ہے۔ یہ اجازت ایپس کو رابطے کا ڈیٹا حذف کرنے کی اجازت دیتی ہے۔"</string> <string name="permdesc_writeContacts" product="default" msgid="589869224625163558">"ایپ کو آپ کے فون پر اسٹور کردہ آپ کے رابطوں، بشمول مخصوص رابطوں کو جس تعدد سے آپ نے کال، ای میل کیا ہے یا دوسرے طریقوں سے ان کے ساتھ مواصلت کی ہے اس کے بارے میں ڈیٹا میں ترمیم کی اجازت دیتا ہے۔ یہ اجازت ایپس کو رابطے کا ڈیٹا حذف کرنے کی اجازت دیتی ہے۔"</string> <string name="permlab_readCallLog" msgid="3478133184624102739">"کال لاگ پڑھیں"</string> - <!-- no translation found for permdesc_readCallLog (3204122446463552146) --> - <skip /> + <string name="permdesc_readCallLog" msgid="3204122446463552146">"یہ ایپ آپ کی کال کی سرگزشت پڑھ سکتی ہے۔"</string> <string name="permlab_writeCallLog" msgid="8552045664743499354">"کال لاگ لکھیں"</string> <string name="permdesc_writeCallLog" product="tablet" msgid="6661806062274119245">"ایپ کو آپ کے ٹیبلٹ کی کال لاگ، بشمول آنے والی اور باہر جانے والی کالوں کے بارے میں ڈیٹا میں ترمیم کرنے کی اجازت دیتا ہے۔ نقصان دہ ایپس آپ کی کال لاگ مٹانے یا اس میں ترمیم کرنے کیلئے اسے استعمال کرسکتی ہیں۔"</string> <string name="permdesc_writeCallLog" product="tv" msgid="4225034892248398019">"انکمنگ اور آؤٹ گوئنگ کالز کے بارے میں ڈیٹا سمیت، ایپ کو آپ کے TV کے کال لاگ میں ترمیم کرنے کی اجازت دیتا ہے۔ نقصان دہ ایپس آپ کی کال لاگ مٹانے یا اس میں ترمیم کرنے کیلئے اسے استعمال کرسکتی ہیں۔"</string> <string name="permdesc_writeCallLog" product="default" msgid="683941736352787842">"ایپ کو آپ کے فون کی کال لاگ، بشمول آنے والی اور باہر جانے والی کالوں کے بارے میں ڈیٹا میں ترمیم کرنے کی اجازت دیتا ہے۔ نقصان دہ ایپس آپ کی کال لاگ مٹانے یا اس میں ترمیم کرنے کیلئے اسے استعمال کرسکتی ہیں۔"</string> <string name="permlab_bodySensors" msgid="4683341291818520277">"باڈی سینسرز تک رسائی حاصل کریں (جیسے حرکت قلب شرح مانیٹرز)"</string> <string name="permdesc_bodySensors" product="default" msgid="4380015021754180431">"ان سینسرز سے ڈیٹا تک رسائی حاصل کرنے کی اجازت دیتی ہے جو آپ کی حرکت قلب کی شرح جیسی آپ کی فزیکل صورتحال کو مانیٹر کرتے ہیں۔"</string> - <!-- no translation found for permlab_readCalendar (6716116972752441641) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (4993979255403945892) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (8837931557573064315) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (4373978642145196715) --> - <skip /> + <string name="permlab_readCalendar" msgid="6716116972752441641">"کیلنڈر ایونٹس اور تفاصیل پڑھیں"</string> + <string name="permdesc_readCalendar" product="tablet" msgid="4993979255403945892">"یہ ایپ آپ کے ٹیبلیٹ پر اسٹور کردہ سبھی کیلنڈر ایونٹس کو پڑھ سکتی ہے اور آپ کے کیلنڈر ڈیٹا کا اشتراک یا اسے محفوظ کر سکتی ہے۔"</string> + <string name="permdesc_readCalendar" product="tv" msgid="8837931557573064315">"یہ ایپ آپ کے TV پر اسٹور کردہ سبھی کیلنڈر ایونٹس کو پڑھ سکتی ہے اور آپ کے کیلنڈر ڈیٹا کا اشتراک یا اسے محفوظ کر سکتی ہے۔"</string> + <string name="permdesc_readCalendar" product="default" msgid="4373978642145196715">"یہ ایپ آپ کے فون پر اسٹور کردہ سبھی کیلنڈر ایونٹس کو پڑھ سکتی ہے اور آپ کے کیلنڈر ڈیٹا کا اشتراک یا اسے محفوظ کر سکتی ہے۔"</string> <string name="permlab_writeCalendar" msgid="8438874755193825647">"کیلنڈر ایونٹس شامل یا ان میں ترمیم کریں اور مالک کو بتائے بغیر مہمانوں کو ای میل بھیجیں"</string> - <!-- no translation found for permdesc_writeCalendar (1675270619903625982) --> - <skip /> - <!-- no translation found for permdesc_writeCalendar (9017809326268135866) --> - <skip /> - <!-- no translation found for permdesc_writeCalendar (7592791790516943173) --> - <skip /> + <string name="permdesc_writeCalendar" product="tablet" msgid="1675270619903625982">"یہ اپپ آپ کے ٹیبلیٹ پر کیلنڈر ایونٹس کو شامل، ہٹا یا ترمیم کر سکتی ہے۔ یہ ایپ وہ پیغامات بھیج سکتی ہے جو کیلنڈر کے مالکان کی جانب سے آنے والے معلوم ہو سکتے ہیں یا ان مالکان کو اطلاع دیے بغیر ایونٹس تبدیل کر سکتی ہے۔"</string> + <string name="permdesc_writeCalendar" product="tv" msgid="9017809326268135866">"یہ اپپ آپ کے TV پر کیلنڈر ایونٹس کو شامل، ہٹا یا ترمیم کر سکتی ہے۔ یہ ایپ وہ پیغامات بھیج سکتی ہے جو کیلنڈر کے مالکان کی جانب سے آنے والے معلوم ہو سکتے ہیں یا ان مالکان کو اطلاع دیے بغیر ایونٹس تبدیل کر سکتی ہے۔"</string> + <string name="permdesc_writeCalendar" product="default" msgid="7592791790516943173">"یہ اپپ آپ کے فون پر کیلنڈر ایونٹس کو شامل، ہٹا یا ترمیم کر سکتی ہے۔ یہ ایپ وہ پیغامات بھیج سکتی ہے جو کیلنڈر کے مالکان کی جانب سے آنے والے معلوم ہو سکتے ہیں یا ان مالکان کو اطلاع دیے بغیر ایونٹس تبدیل کر سکتی ہے۔"</string> <string name="permlab_accessLocationExtraCommands" msgid="2836308076720553837">"اضافی مقام فراہم کنندہ کی کمانڈز تک رسائی حاصل کریں"</string> <string name="permdesc_accessLocationExtraCommands" msgid="6078307221056649927">"ایپ کو اضافی مقام فراہم کنندہ کی کمانڈز تک رسائی حاصل کرنے کی اجازت دیتی ہے۔ یہ ایپ کو GPS یا دوسرے مقام کے مآخذ کے عمل کے ساتھ مداخلت کرنے کی اجازت دے سکتی ہے۔"</string> <string name="permlab_accessFineLocation" msgid="251034415460950944">"قطعی مقام تک رسائی حاصل کریں (GPS اور نیٹ ورک پر مبنی)"</string> - <!-- no translation found for permdesc_accessFineLocation (5821994817969957884) --> - <skip /> + <string name="permdesc_accessFineLocation" msgid="5821994817969957884">"GPS یا نیٹ ورک مقام کے مآخذات جیسے کہ سیل ٹاورز اور Wi-Fi نیٹ ورکس کی بنیاد پر یہ ایپ آپ کا مقام حاصل کر سکتی ہے۔ ایپ کو ان مقام کی سروسز کو استعمال کرنے کیلئے ان کا آن ہونا اور آپ کے فون پر دستیاب ہونا ضروری ہے۔ اس سے بیٹری کے استعمال میں اضافہ ہوسکتا ہے۔"</string> <string name="permlab_accessCoarseLocation" msgid="7715277613928539434">"تخمینی مقام تک رسائی حاصل کریں (نیٹ ورک پر مبنی)"</string> - <!-- no translation found for permdesc_accessCoarseLocation (3373266766487862426) --> - <skip /> - <!-- no translation found for permdesc_accessCoarseLocation (1884022719818788511) --> - <skip /> - <!-- no translation found for permdesc_accessCoarseLocation (7788009094906196995) --> - <skip /> + <string name="permdesc_accessCoarseLocation" product="tablet" msgid="3373266766487862426">"نیٹ ورک مآخذات جیسے کہ سیل ٹاورز اور Wi-Fi نیٹ ورکس کی بنیاد پر یہ ایپ آپ کا مقام حاصل کر سکتی ہے۔ ایپ کو ان مقام کی سروسز کو استعمال کرنے کیلئے ان کا آن ہونا اور آپ کے ٹیبلیٹ پر دستیاب ہونا ضروری ہے۔"</string> + <string name="permdesc_accessCoarseLocation" product="tv" msgid="1884022719818788511">"نیٹ ورک مآخذات جیسے کہ سیل ٹاورز اور Wi-Fi نیٹ ورکس کی بنیاد پر یہ ایپ آپ کا مقام حاصل کر سکتی ہے۔ ایپ کو ان مقام کی سروسز کو استعمال کرنے کیلئے ان کا آن ہونا اور آپ کے TV پر دستیاب ہونا ضروری ہے۔"</string> + <string name="permdesc_accessCoarseLocation" product="default" msgid="7788009094906196995">"نیٹ ورک مآخذات جیسے کہ سیل ٹاورز اور Wi-Fi نیٹ ورکس کی بنیاد پر یہ ایپ آپ کا مقام حاصل کر سکتی ہے۔ ایپ کو ان مقام کی سروسز کو استعمال کرنے کیلئے ان کا آن ہونا اور آپ کے فون پر دستیاب ہونا ضروری ہے۔"</string> <string name="permlab_modifyAudioSettings" msgid="6095859937069146086">"اپنے آڈیو کی ترتیبات کو تبدیل کریں"</string> <string name="permdesc_modifyAudioSettings" msgid="3522565366806248517">"ایپ کو مجموعی آڈیو ترتیبات جیسے والیوم اور آؤٹ پٹ کیلئے جو اسپیکر استعمال ہوتا ہے اس میں ترمیم کرنے کی اجازت دیتا ہے۔"</string> <string name="permlab_recordAudio" msgid="3876049771427466323">"آڈیو ریکارڈ کریں"</string> - <!-- no translation found for permdesc_recordAudio (4245930455135321433) --> - <skip /> + <string name="permdesc_recordAudio" msgid="4245930455135321433">"یہ ایپ کسی بھی وقت مائیکروفون استعمال کرتے ہوئے آڈیو ریکارڈ کر سکتی ہے۔"</string> <string name="permlab_sim_communication" msgid="2935852302216852065">"SIM کو ہدایات بھیجیں"</string> <string name="permdesc_sim_communication" msgid="5725159654279639498">"ایپ کو SIM کو کمانڈز بھیجنے کی اجازت دیتا ہے۔ یہ بہت خطرناک ہے۔"</string> <string name="permlab_camera" msgid="3616391919559751192">"تصاویر لیں اور ویڈیوز بنائیں"</string> - <!-- no translation found for permdesc_camera (5392231870049240670) --> - <skip /> + <string name="permdesc_camera" msgid="5392231870049240670">"یہ ایپ کسی بھی وقت کیمرا استعمال کرتے ہوئے تصاویر لے سکتی ہے اور ویڈیوز ریکارڈ کر سکتی ہے۔"</string> <string name="permlab_vibrate" msgid="7696427026057705834">"ارتعاش کو کنٹرول کریں"</string> <string name="permdesc_vibrate" msgid="6284989245902300945">"ایپ کو وائبریٹر کنٹرول کرنے کی اجازت دیتا ہے۔"</string> <string name="permlab_callPhone" msgid="3925836347681847954">"براہ راست فون نمبرز پر کال کریں"</string> diff --git a/core/res/res/values-uz-rUZ/strings.xml b/core/res/res/values-uz-rUZ/strings.xml index 1498feb77946..bc17d6ed899a 100644 --- a/core/res/res/values-uz-rUZ/strings.xml +++ b/core/res/res/values-uz-rUZ/strings.xml @@ -46,8 +46,7 @@ <string name="defaultMsisdnAlphaTag" msgid="2850889754919584674">"MSISDN1"</string> <string name="mmiError" msgid="5154499457739052907">"Tarmoqda xato yoki MMI kod noto‘g‘ri."</string> <string name="mmiFdnError" msgid="5224398216385316471">"Bu amal faqat ruxsat etilgan raqamlar uchun mavjud."</string> - <!-- no translation found for mmiErrorWhileRoaming (762488890299284230) --> - <skip /> + <string name="mmiErrorWhileRoaming" msgid="762488890299284230">"Rouming vaqtida telefondagi chaqiruvni boshqa raqamga uzatish sozlamalarini o‘zgartirib bo‘lmadi."</string> <string name="serviceEnabled" msgid="8147278346414714315">"Xizmat yoqildi."</string> <string name="serviceEnabledFor" msgid="6856228140453471041">"Xizmat quyidagi uchun yoqildi:"</string> <string name="serviceDisabled" msgid="1937553226592516411">"Xizmat o‘chirib qo‘yilgan."</string> @@ -98,10 +97,8 @@ <string name="RestrictedOnVoiceData" msgid="996636487106171320">"Ovozli/internet xizmatlari to‘sib qo‘yilgan."</string> <string name="RestrictedOnVoiceSms" msgid="1888588152792023873">"Ovoz/SMS xizmatlari bloklandi."</string> <string name="RestrictedOnAll" msgid="5643028264466092821">"Barcha ovozli/internet/SMS xizmatlari to‘sib qo‘yilgan."</string> - <!-- no translation found for NetworkPreferenceSwitchTitle (4008877505368566980) --> - <skip /> - <!-- no translation found for NetworkPreferenceSwitchSummary (7335915397439759249) --> - <skip /> + <string name="NetworkPreferenceSwitchTitle" msgid="4008877505368566980">"Tarmoq bilan bog‘lanib bo‘lmadi"</string> + <string name="NetworkPreferenceSwitchSummary" msgid="7335915397439759249">"Qabul qilish sifatini yaxshilash uchun Sozlamalar > Mobil tarmoqlar > Asosiy tarmoq turi orqali tarmoqni o‘zgartirib ko‘ring."</string> <string name="peerTtyModeFull" msgid="6165351790010341421">"Teng huquqli ishtirokchi teletayp rejimini FULL (to‘liq) qilib o‘zgartirdi"</string> <string name="peerTtyModeHco" msgid="5728602160669216784">"Teng huquqli ishtirokchi teletayp rejimini HCO (eshitadi, gapirolmaydi) qilib o‘zgartirdi"</string> <string name="peerTtyModeVco" msgid="1742404978686538049">"Teng huquqli ishtirokchi teletayp rejimini VCO (gapiradi, eshitolmaydi) qilib o‘zgartirdi"</string> @@ -185,10 +182,8 @@ <string name="work_profile_deleted_description" msgid="6305147513054341102">"Administrator ilovasi yo‘qligi sababli ishchi profil o‘chirib tashlandi"</string> <string name="work_profile_deleted_details" msgid="226615743462361248">"Ishchi profilning administrator ilovasi yo‘q yoki buzilgan. Shuning uchun, ishchi profilingiz va unga aloqador ma’lumotlar o‘chirib tashlandi. Yordam olish uchun administratoringizga murojaat qiling."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="6019770344820507579">"Bu qurilmada endi ishchi profilingiz mavjud emas."</string> - <!-- no translation found for network_logging_notification_title (1805392571290161924) --> - <skip /> - <!-- no translation found for network_logging_notification_text (4448072433371155729) --> - <skip /> + <string name="network_logging_notification_title" msgid="1805392571290161924">"Tarmoq trafigi nazorat qilinmoqda"</string> + <string name="network_logging_notification_text" msgid="4448072433371155729">"Tafsilotlar uchun bosing"</string> <string name="factory_reset_warning" msgid="5423253125642394387">"Qurilmangizdagi ma’lumotlar o‘chirib tashlanadi"</string> <string name="factory_reset_message" msgid="4905025204141900666">"Administrator ilovasining ba’zi qismlari yo‘qolgan yoki buzilgan, shuning uchun undan foydalanib bo‘lmaydi. Qurilmangizdagi ma’lumotlar o‘chirib tashlanadi. Yordam olish uchun administratoringizga murojaat qiling."</string> <string name="me" msgid="6545696007631404292">"Men"</string> @@ -306,12 +301,9 @@ <string name="permlab_sendSms" msgid="7544599214260982981">"SMS xabarlarni yuborish va ko‘rish"</string> <string name="permdesc_sendSms" msgid="7094729298204937667">"Ilovaga SMS xabarlarini jo‘natish uchun ruxsat beradi. Bu kutilmagan xarajatlarga sabab bo‘lishi mumkin. Zararli ilovalar sizdan so‘roqsiz xabarlar jo‘natish orqali pulingizni sarflashi mumkin."</string> <string name="permlab_readSms" msgid="8745086572213270480">"matn xabarlaringizni o‘qish (SMS yoki MMS)"</string> - <!-- no translation found for permdesc_readSms (4741697454888074891) --> - <skip /> - <!-- no translation found for permdesc_readSms (5796670395641116592) --> - <skip /> - <!-- no translation found for permdesc_readSms (6826832415656437652) --> - <skip /> + <string name="permdesc_readSms" product="tablet" msgid="4741697454888074891">"Bu ilova planshetdagi barcha SMS xabarlarini o‘qiy oladi."</string> + <string name="permdesc_readSms" product="tv" msgid="5796670395641116592">"Bu ilova televizordagi barcha SMS xabarlarini o‘qiy oladi."</string> + <string name="permdesc_readSms" product="default" msgid="6826832415656437652">"Bu ilova telefondagi barcha SMS xabarlarini o‘qiy oladi."</string> <string name="permlab_receiveWapPush" msgid="5991398711936590410">"WAP xabarlarni olish"</string> <string name="permdesc_receiveWapPush" msgid="748232190220583385">"Ilovaga WAP xabarlarni qabul qilish va ularni qayta ishlash uchun ruxsat beradi. Ushbu huquq sizga ko‘rsatmasdan sizga yuborilgan xabarlarni kuzatish yoki o‘chirish xususiyatiga ham ega."</string> <string name="permlab_getTasks" msgid="6466095396623933906">"ishlab turgan ilovalar to‘g‘risida ma’lumot olish"</string> @@ -324,10 +316,8 @@ <string name="permdesc_enableCarMode" msgid="4853187425751419467">"Ilova avtomobil rejimini yoqishi mumkin."</string> <string name="permlab_killBackgroundProcesses" msgid="3914026687420177202">"boshqa ilovalarni yopish"</string> <string name="permdesc_killBackgroundProcesses" msgid="4593353235959733119">"Ilovaga boshqa ilovalarning orqa fonda amalga oshirilayotgan jarayonlarini to‘xtatish uchun ruxsat beradi. Bu boshqa ilovalarning to‘xtatilishiga sabab bo‘lishi mumkin."</string> - <!-- no translation found for permlab_systemAlertWindow (7238805243128138690) --> - <skip /> - <!-- no translation found for permdesc_systemAlertWindow (2393776099672266188) --> - <skip /> + <string name="permlab_systemAlertWindow" msgid="7238805243128138690">"Bu ilova boshqa oynalar ustidan ko‘rsatilishi mumkin"</string> + <string name="permdesc_systemAlertWindow" msgid="2393776099672266188">"Bu ilova ilovalar yoki ekranning boshqa qismlaridan yuqorida ko‘rinishi mumkin. Bu ilovadan odatiy foydalanishga halaqit berishi va boshqa ilovalar ko‘rinishining usullarini o‘zgartirib yuborishi mumkin."</string> <string name="permlab_persistentActivity" msgid="8841113627955563938">"ilovani doim ishlab turadigan qilish"</string> <string name="permdesc_persistentActivity" product="tablet" msgid="8525189272329086137">"Ilovaga o‘zining komponentlarini xotirada doimiy saqlashga ruxsat beradi. Bu mavjud xotirani cheklashi va planshetni sekin ishlashiga sabab bo‘lishi mumkin."</string> <string name="permdesc_persistentActivity" product="tv" msgid="5086862529499103587">"Ilovaga o‘zining muayyan qismlarining xotiraning turg‘un qismiga aylantirish huquqini beradi. Bunda, boshqa ilovalar uchun xotiradan ajratilgan joy cheklanib, televizorning ishlashi sekinlashishi mumkin."</string> @@ -353,51 +343,37 @@ <string name="permdesc_writeContacts" product="tv" msgid="5438230957000018959">"Ilovaga televizoringizga saqlangan kontaktlar haqidagi ma’lumotlarni, jumladan, muayyan shaxslar bilan qo‘ng‘iroqlashish, e-pochta orqali xabarlashish yoki boshqa usullarda muloqot qilish oralig‘ini o‘zgartirish huquqini beradi. Ushbu ruxsatnoma ilovalarga kontaktlar haqidagi ma’lumotlarni o‘chirish huquqini beradi."</string> <string name="permdesc_writeContacts" product="default" msgid="589869224625163558">"Ilovaga telefoningizda saqlangan kontaktlar ma’lumotlarini, shuningdek, ba‘zi shaxslarga qilgan qo‘ng‘iroqlar muntazamligi, ularga yozgan e-pochta xabarlari yoki boshqa xabar almashish yo‘llari orqali xabarlashganingiz haqidagi ma’lumotlarni o‘zgartirishga ruxsat beradi. Ushbu ruxsat ilovalarga kontaktlar ma’lumotlarini o‘chirishga ruxsat beradi."</string> <string name="permlab_readCallLog" msgid="3478133184624102739">"qo‘ng‘iroq jurnallarini o‘qish"</string> - <!-- no translation found for permdesc_readCallLog (3204122446463552146) --> - <skip /> + <string name="permdesc_readCallLog" msgid="3204122446463552146">"Bu ilova chaqiruvlar tarixini o‘qiy oladi."</string> <string name="permlab_writeCallLog" msgid="8552045664743499354">"qo‘ng‘iroq jurnaliga yozish"</string> <string name="permdesc_writeCallLog" product="tablet" msgid="6661806062274119245">"Ilovaga planshetingizdagi qo‘ng‘iroq jurnallari, kiruvchi va chiquvchi qo‘ng‘rioqlar haqidagi ma’lumotlarni o‘zgartirishga ruxsat beradi. Zararli ilovalar bundan qo‘ng‘iroqlar jurnalini o‘zgartirish yoki o‘chirish uchun foydalanishi mumkin."</string> <string name="permdesc_writeCallLog" product="tv" msgid="4225034892248398019">"Ilovaga televizoringizdagi qo‘ng‘iroqlar jurnali, kirish va chiqish qo‘ng‘rioqlari haqidagi ma’lumotlarni o‘zgartirish huquqini beradi. Zararli ilovalar undan qo‘ng‘iroqlar jurnalini o‘zgartirish yoki o‘chirish uchun foydalanishi mumkin."</string> <string name="permdesc_writeCallLog" product="default" msgid="683941736352787842">"Ilovaga telefoningizdagi qo‘ng‘iroq jurnallari, kiruvchi va chiquvchi qo‘ng‘rioqlar haqidagi ma’lumotlarni o‘zgartirishga ruxsat beradi. Zararli ilovalar bundan qo‘ng‘iroqlar jurnalini o‘zgartirish yoki o‘chirish uchun foydalanishi mumkin."</string> <string name="permlab_bodySensors" msgid="4683341291818520277">"tana sezgichlari (m-n, yurak urishi sensori) ma’lumotlaridan foydalanishga ruxsat"</string> <string name="permdesc_bodySensors" product="default" msgid="4380015021754180431">"Ilovaga sezgichlardan olingan jismoniy holatingiz haqidagi ma’lumotlarni, masalan, yurak urishini kuzatish uchun ruxsat beradi."</string> - <!-- no translation found for permlab_readCalendar (6716116972752441641) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (4993979255403945892) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (8837931557573064315) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (4373978642145196715) --> - <skip /> + <string name="permlab_readCalendar" msgid="6716116972752441641">"Taqvim tadbirlari va tafsilotlarini o‘qish"</string> + <string name="permdesc_readCalendar" product="tablet" msgid="4993979255403945892">"Bu ilova planshetdagi barcha taqvim tadbirlarini o‘qiy olishi hamda taqvim ma’lumotlarini ulashishi yoki saqlashi mumkin."</string> + <string name="permdesc_readCalendar" product="tv" msgid="8837931557573064315">"Bu ilova televizordagi barcha taqvim tadbirlarini o‘qiy olishi hamda taqvim ma’lumotlarini ulashishi yoki saqlashi mumkin."</string> + <string name="permdesc_readCalendar" product="default" msgid="4373978642145196715">"Bu ilova telefondagi barcha taqvim tadbirlarini o‘qiy olishi hamda taqvim ma’lumotlarini ulashishi yoki saqlashi mumkin."</string> <string name="permlab_writeCalendar" msgid="8438874755193825647">"taqvimga tadbir qo‘shish/o‘zgartirish yoki taqvim egasini ogohlantirmasdan mehmonlarga elektron xat yuborish"</string> - <!-- no translation found for permdesc_writeCalendar (1675270619903625982) --> - <skip /> - <!-- no translation found for permdesc_writeCalendar (9017809326268135866) --> - <skip /> - <!-- no translation found for permdesc_writeCalendar (7592791790516943173) --> - <skip /> + <string name="permdesc_writeCalendar" product="tablet" msgid="1675270619903625982">"Bu ilova planshetga taqvim tadbirlarini qo‘shishi, olib tashlashi yoki o‘zgartirishi mumkin. Bu ilova taqvim egalari nomidan ko‘rinadigan SMS yuborishi yoki egalarini ogohlantirmasdan tadbirlarni o‘zgartirishi mumkin."</string> + <string name="permdesc_writeCalendar" product="tv" msgid="9017809326268135866">"Bu ilova televizorga taqvim tadbirlarini qo‘shishi, olib tashlashi yoki o‘zgartirishi mumkin. Bu ilova taqvim egalari nomidan ko‘rinadigan SMS yuborishi yoki egalarini ogohlantirmasdan tadbirlarni o‘zgartirishi mumkin."</string> + <string name="permdesc_writeCalendar" product="default" msgid="7592791790516943173">"Bu ilova telefonga taqvim tadbirlarini qo‘shishi, olib tashlashi yoki o‘zgartirishi mumkin. Bu ilova taqvim egalari nomidan ko‘rinadigan SMS yuborishi yoki egalarini ogohlantirmasdan tadbirlarni o‘zgartirishi mumkin."</string> <string name="permlab_accessLocationExtraCommands" msgid="2836308076720553837">"qo‘shimcha manzillarga kirish buyruqlari"</string> <string name="permdesc_accessLocationExtraCommands" msgid="6078307221056649927">"Ilovaga qo‘shimcha joylashuv xizmati buyruqlaridan foydalanishga ruxsat beradi. Uning yordamida ilova GPS yoki boshqa joylashuv ma’lumoti manbalarining ishlashiga xalaqit qilishi mumkin."</string> <string name="permlab_accessFineLocation" msgid="251034415460950944">"aniq joylashuv ma’lumotiga kirish (GPS va tarmoq asosida)"</string> - <!-- no translation found for permdesc_accessFineLocation (5821994817969957884) --> - <skip /> + <string name="permdesc_accessFineLocation" msgid="5821994817969957884">"Bu ilova Wi-Fi va uyali tarmoq antennalari kabi tarmoq manbalari yoki GPS asosida joylashuvingiz axborotini olishi mumkin. Ilova ushbu joylashuv xizmatlaridan foydalana olishi uchun ular telefonda yoniq bo‘lishi va ishlashi kerak."</string> <string name="permlab_accessCoarseLocation" msgid="7715277613928539434">"taxminiy joylashuv (tarmoq asosida) ma’lumotlaridan foydalanishga ruxsat"</string> - <!-- no translation found for permdesc_accessCoarseLocation (3373266766487862426) --> - <skip /> - <!-- no translation found for permdesc_accessCoarseLocation (1884022719818788511) --> - <skip /> - <!-- no translation found for permdesc_accessCoarseLocation (7788009094906196995) --> - <skip /> + <string name="permdesc_accessCoarseLocation" product="tablet" msgid="3373266766487862426">"Bu ilova Wi-Fi va uyali tarmoq antennalari kabi tarmoq manbalari asosida joylashuvingiz axborotini olishi mumkin. Ilova ushbu joylashuv xizmatlaridan foydalana olishi uchun ular planshetda yoniq bo‘lishi va ishlashi kerak."</string> + <string name="permdesc_accessCoarseLocation" product="tv" msgid="1884022719818788511">"Bu ilova Wi-Fi va uyali tarmoq antennalari kabi tarmoq manbalari asosida joylashuvingiz axborotini olishi mumkin. Ilova ushbu joylashuv xizmatlaridan foydalana olishi uchun ular televizorda yoniq bo‘lishi va ishlashi kerak."</string> + <string name="permdesc_accessCoarseLocation" product="default" msgid="7788009094906196995">"Bu ilova Wi-Fi va uyali tarmoq antennalari kabi tarmoq manbalari asosida joylashuvingiz axborotini olishi mumkin. Ilova ushbu joylashuv xizmatlaridan foydalana olishi uchun ular telefoningizda yoniq bo‘lishi va ishlashi kerak."</string> <string name="permlab_modifyAudioSettings" msgid="6095859937069146086">"audio sozlamalaringizni o‘zgartirish"</string> <string name="permdesc_modifyAudioSettings" msgid="3522565366806248517">"Ilovalarga tovush va ovoz chiqarish uchun foydalaniladigan karnay kabi global audio sozlamalarini o‘zgartirish uchun ruxsat beradi."</string> <string name="permlab_recordAudio" msgid="3876049771427466323">"ovoz yozib olish"</string> - <!-- no translation found for permdesc_recordAudio (4245930455135321433) --> - <skip /> + <string name="permdesc_recordAudio" msgid="4245930455135321433">"Bu ilova xohlagan vaqtda mikrofon yordami audio yozib olishi mumkin."</string> <string name="permlab_sim_communication" msgid="2935852302216852065">"SIM kartaga buyruqlar yuborish"</string> <string name="permdesc_sim_communication" msgid="5725159654279639498">"Dasturga SIM kartaga buyruqlar jo‘natishga ruxsat beradi. Bu juda ham xavfli."</string> <string name="permlab_camera" msgid="3616391919559751192">"rasm va videoga olish"</string> - <!-- no translation found for permdesc_camera (5392231870049240670) --> - <skip /> + <string name="permdesc_camera" msgid="5392231870049240670">"Bu ilova xohlagan vaqtda kamera orqali suratga olishi va video yozib olishi mumkin."</string> <string name="permlab_vibrate" msgid="7696427026057705834">"tebranishni boshqarish"</string> <string name="permdesc_vibrate" msgid="6284989245902300945">"Ilova tebranishli signallarni boshqarishi mumkin."</string> <string name="permlab_callPhone" msgid="3925836347681847954">"telefon raqamlariga tog‘ridan to‘g‘ri qo‘ng‘iroq qilish"</string> diff --git a/core/res/res/values-vi/strings.xml b/core/res/res/values-vi/strings.xml index da97fbf784da..8448f38032bc 100644 --- a/core/res/res/values-vi/strings.xml +++ b/core/res/res/values-vi/strings.xml @@ -182,10 +182,8 @@ <string name="work_profile_deleted_description" msgid="6305147513054341102">"Đã xóa hồ sơ công việc do thiếu ứng dụng quản trị."</string> <string name="work_profile_deleted_details" msgid="226615743462361248">"Ứng dụng quản trị hồ sơ công việc bị thiếu hoặc hỏng. Do vậy, hồ sơ công việc của bạn và dữ liệu liên quan đã bị xóa. Hãy liên hệ với quản trị viên để được trợ giúp."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="6019770344820507579">"Hồ sơ công việc của bạn không có sẵn trên thiết bị này nữa."</string> - <!-- no translation found for network_logging_notification_title (1805392571290161924) --> - <skip /> - <!-- no translation found for network_logging_notification_text (4448072433371155729) --> - <skip /> + <string name="network_logging_notification_title" msgid="1805392571290161924">"Lưu lượng truy cập mạng đang được giám sát"</string> + <string name="network_logging_notification_text" msgid="4448072433371155729">"Nhấn để biết thêm chi tiết"</string> <string name="factory_reset_warning" msgid="5423253125642394387">"Thiết bị của bạn sẽ bị xóa"</string> <string name="factory_reset_message" msgid="4905025204141900666">"Ứng dụng quản trị đang bị thiếu thành phần hoặc bị hỏng và không thể sử dụng được. Bây giờ, thiết bị của bạn sẽ bị xóa. Hãy liên hệ với quản trị viên của bạn để được trợ giúp."</string> <string name="me" msgid="6545696007631404292">"Tôi"</string> diff --git a/core/res/res/values-zh-rCN/strings.xml b/core/res/res/values-zh-rCN/strings.xml index 231c55f0478f..4d80c82cc39c 100644 --- a/core/res/res/values-zh-rCN/strings.xml +++ b/core/res/res/values-zh-rCN/strings.xml @@ -46,8 +46,7 @@ <string name="defaultMsisdnAlphaTag" msgid="2850889754919584674">"MSISDN1"</string> <string name="mmiError" msgid="5154499457739052907">"出现连接问题或 MMI 码无效。"</string> <string name="mmiFdnError" msgid="5224398216385316471">"只能对固定拨号号码执行此类操作。"</string> - <!-- no translation found for mmiErrorWhileRoaming (762488890299284230) --> - <skip /> + <string name="mmiErrorWhileRoaming" msgid="762488890299284230">"漫游时无法通过您的手机来更改来电转接设置。"</string> <string name="serviceEnabled" msgid="8147278346414714315">"已启用服务。"</string> <string name="serviceEnabledFor" msgid="6856228140453471041">"已针对以下内容启用了服务："</string> <string name="serviceDisabled" msgid="1937553226592516411">"已停用服务。"</string> @@ -98,10 +97,8 @@ <string name="RestrictedOnVoiceData" msgid="996636487106171320">"语音/数据服务已停用。"</string> <string name="RestrictedOnVoiceSms" msgid="1888588152792023873">"语音/短信服务已停用。"</string> <string name="RestrictedOnAll" msgid="5643028264466092821">"所有语音/数据/短信服务都已停用。"</string> - <!-- no translation found for NetworkPreferenceSwitchTitle (4008877505368566980) --> - <skip /> - <!-- no translation found for NetworkPreferenceSwitchSummary (7335915397439759249) --> - <skip /> + <string name="NetworkPreferenceSwitchTitle" msgid="4008877505368566980">"无法连接网络"</string> + <string name="NetworkPreferenceSwitchSummary" msgid="7335915397439759249">"要改善信号情况，请尝试更改在“设置”>“移动网络”>“首选网络类型”中选择的类型。"</string> <string name="peerTtyModeFull" msgid="6165351790010341421">"对方请求使用“TTY 完整”模式"</string> <string name="peerTtyModeHco" msgid="5728602160669216784">"对方请求使用“TTY HCO”模式"</string> <string name="peerTtyModeVco" msgid="1742404978686538049">"对方请求使用“TTY VCO”模式"</string> @@ -185,10 +182,8 @@ <string name="work_profile_deleted_description" msgid="6305147513054341102">"由于缺少管理应用，工作资料已被删除。"</string> <string name="work_profile_deleted_details" msgid="226615743462361248">"工作资料管理应用缺失或损坏，因此系统已删除您的工作资料及相关数据。请与您的管理员联系以寻求帮助。"</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="6019770344820507579">"您的工作资料已不在此设备上。"</string> - <!-- no translation found for network_logging_notification_title (1805392571290161924) --> - <skip /> - <!-- no translation found for network_logging_notification_text (4448072433371155729) --> - <skip /> + <string name="network_logging_notification_title" msgid="1805392571290161924">"网络流量正受到监控"</string> + <string name="network_logging_notification_text" msgid="4448072433371155729">"点按可显示详情"</string> <string name="factory_reset_warning" msgid="5423253125642394387">"系统将清空您的设备"</string> <string name="factory_reset_message" msgid="4905025204141900666">"由于缺少组件或软件包已损坏，无法使用此管理应用。系统现在将清空您的设备。请与您的管理员联系以寻求帮助。"</string> <string name="me" msgid="6545696007631404292">"我"</string> @@ -306,12 +301,9 @@ <string name="permlab_sendSms" msgid="7544599214260982981">"发送和查看短信"</string> <string name="permdesc_sendSms" msgid="7094729298204937667">"允许该应用发送短信。此权限可能会导致意外收费。恶意应用可能会未经您的确认而发送短信，由此产生相关费用。"</string> <string name="permlab_readSms" msgid="8745086572213270480">"读取您的讯息（短信或彩信）"</string> - <!-- no translation found for permdesc_readSms (4741697454888074891) --> - <skip /> - <!-- no translation found for permdesc_readSms (5796670395641116592) --> - <skip /> - <!-- no translation found for permdesc_readSms (6826832415656437652) --> - <skip /> + <string name="permdesc_readSms" product="tablet" msgid="4741697454888074891">"此应用可读取您平板电脑上存储的所有短信。"</string> + <string name="permdesc_readSms" product="tv" msgid="5796670395641116592">"此应用可读取您电视上存储的所有短信。"</string> + <string name="permdesc_readSms" product="default" msgid="6826832415656437652">"此应用可读取您手机上存储的所有短信。"</string> <string name="permlab_receiveWapPush" msgid="5991398711936590410">"接收讯息 (WAP)"</string> <string name="permdesc_receiveWapPush" msgid="748232190220583385">"允许该应用接收和处理 WAP 消息。此权限包括监视发送给您的消息或删除发送给您的消息而不向您显示的功能。"</string> <string name="permlab_getTasks" msgid="6466095396623933906">"检索正在运行的应用"</string> @@ -324,10 +316,8 @@ <string name="permdesc_enableCarMode" msgid="4853187425751419467">"允许应用启用车载模式。"</string> <string name="permlab_killBackgroundProcesses" msgid="3914026687420177202">"关闭其他应用"</string> <string name="permdesc_killBackgroundProcesses" msgid="4593353235959733119">"允许该应用结束其他应用的后台进程。此权限可导致其他应用停止运行。"</string> - <!-- no translation found for permlab_systemAlertWindow (7238805243128138690) --> - <skip /> - <!-- no translation found for permdesc_systemAlertWindow (2393776099672266188) --> - <skip /> + <string name="permlab_systemAlertWindow" msgid="7238805243128138690">"此应用可显示在其他应用上方"</string> + <string name="permdesc_systemAlertWindow" msgid="2393776099672266188">"此应用可显示在其他应用上方或屏幕的其他部分。这可能会妨碍您正常地使用应用，且其他应用的显示方式可能会受到影响。"</string> <string name="permlab_persistentActivity" msgid="8841113627955563938">"让应用始终运行"</string> <string name="permdesc_persistentActivity" product="tablet" msgid="8525189272329086137">"允许该应用在内存中持续保留其自身的某些组件。这会限制其他应用可用的内存，从而减缓平板电脑运行速度。"</string> <string name="permdesc_persistentActivity" product="tv" msgid="5086862529499103587">"允许应用在内存中持续保留其自身的部分组件。此权限可能会限制其他应用可用的内存，从而减缓电视运行速度。"</string> @@ -353,51 +343,37 @@ <string name="permdesc_writeContacts" product="tv" msgid="5438230957000018959">"允许应用修改您的电视上存储的联系人相关数据，包括您与特定联系人通话、发送电子邮件或通过其他方式进行通信的频率。此权限可让应用删除联系人数据。"</string> <string name="permdesc_writeContacts" product="default" msgid="589869224625163558">"允许该应用修改您手机上存储的联系人的相关数据，包括您通过打电话、发送电子邮件或以其他方式与特定联系人通信的频率。此权限可让应用删除联系人数据。"</string> <string name="permlab_readCallLog" msgid="3478133184624102739">"读取通话记录"</string> - <!-- no translation found for permdesc_readCallLog (3204122446463552146) --> - <skip /> + <string name="permdesc_readCallLog" msgid="3204122446463552146">"此应用可读取您的通话记录。"</string> <string name="permlab_writeCallLog" msgid="8552045664743499354">"写入通话记录"</string> <string name="permdesc_writeCallLog" product="tablet" msgid="6661806062274119245">"允许该应用修改平板电脑的通话记录，包括有关来电和外拨电话的数据。恶意应用可能会借此清除或修改您的通话记录。"</string> <string name="permdesc_writeCallLog" product="tv" msgid="4225034892248398019">"允许应用修改电视的通话记录，包括有关来电和外拨电话的数据。恶意应用可能会借此清除或修改您的通话记录。"</string> <string name="permdesc_writeCallLog" product="default" msgid="683941736352787842">"允许该应用修改手机的通话记录，包括有关来电和外拨电话的数据。恶意应用可能会借此清除或修改您的通话记录。"</string> <string name="permlab_bodySensors" msgid="4683341291818520277">"访问身体传感器（如心率监测器）"</string> <string name="permdesc_bodySensors" product="default" msgid="4380015021754180431">"允许该应用存取监测您身体状况的传感器所收集的数据，例如您的心率。"</string> - <!-- no translation found for permlab_readCalendar (6716116972752441641) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (4993979255403945892) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (8837931557573064315) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (4373978642145196715) --> - <skip /> + <string name="permlab_readCalendar" msgid="6716116972752441641">"读取日历活动和详情"</string> + <string name="permdesc_readCalendar" product="tablet" msgid="4993979255403945892">"此应用可读取您平板电脑上存储的所有日历活动，并分享或保存您的日历数据。"</string> + <string name="permdesc_readCalendar" product="tv" msgid="8837931557573064315">"此应用可读取您电视上存储的所有日历活动，并分享或保存您的日历数据。"</string> + <string name="permdesc_readCalendar" product="default" msgid="4373978642145196715">"此应用可读取您手机上存储的所有日历活动，并分享或保存您的日历数据。"</string> <string name="permlab_writeCalendar" msgid="8438874755193825647">"添加或修改日历活动，并在所有者不知情的情况下向邀请对象发送电子邮件"</string> - <!-- no translation found for permdesc_writeCalendar (1675270619903625982) --> - <skip /> - <!-- no translation found for permdesc_writeCalendar (9017809326268135866) --> - <skip /> - <!-- no translation found for permdesc_writeCalendar (7592791790516943173) --> - <skip /> + <string name="permdesc_writeCalendar" product="tablet" msgid="1675270619903625982">"此应用可在平板电脑上添加、移除或更改日历活动。此应用可能会以日历所有者的身份发送消息，或在不通知所有者的情况下更改活动。"</string> + <string name="permdesc_writeCalendar" product="tv" msgid="9017809326268135866">"此应用可在电视上添加、移除或更改日历活动。此应用可能会以日历所有者的身份发送消息，或在不通知所有者的情况下更改活动。"</string> + <string name="permdesc_writeCalendar" product="default" msgid="7592791790516943173">"此应用可在手机上添加、移除或更改日历活动。此应用可能会以日历所有者的身份发送消息，或在不通知所有者的情况下更改活动。"</string> <string name="permlab_accessLocationExtraCommands" msgid="2836308076720553837">"获取额外的位置信息提供程序命令"</string> <string name="permdesc_accessLocationExtraCommands" msgid="6078307221056649927">"允许该应用使用其他的位置信息提供程序命令。此权限使该应用可以干扰GPS或其他位置信息源的运作。"</string> <string name="permlab_accessFineLocation" msgid="251034415460950944">"访问确切位置信息（以 GPS 和网络为依据）"</string> - <!-- no translation found for permdesc_accessFineLocation (5821994817969957884) --> - <skip /> + <string name="permdesc_accessFineLocation" msgid="5821994817969957884">"此应用可根据 GPS 或网络来源（例如基站和 WLAN 网络）获取您的位置信息。您的手机必须支持并开启这些位置信息服务，此应用才能使用这些服务。这可能会增加耗电量。"</string> <string name="permlab_accessCoarseLocation" msgid="7715277613928539434">"访问大致位置信息（以网络为依据）"</string> - <!-- no translation found for permdesc_accessCoarseLocation (3373266766487862426) --> - <skip /> - <!-- no translation found for permdesc_accessCoarseLocation (1884022719818788511) --> - <skip /> - <!-- no translation found for permdesc_accessCoarseLocation (7788009094906196995) --> - <skip /> + <string name="permdesc_accessCoarseLocation" product="tablet" msgid="3373266766487862426">"此应用可根据网络来源（例如基站和 WLAN 网络）获取您的位置信息。您的平板电脑必须支持并开启这些位置信息服务，此应用才能使用这些服务。"</string> + <string name="permdesc_accessCoarseLocation" product="tv" msgid="1884022719818788511">"此应用可根据网络来源（例如基站和 WLAN 网络）获取您的位置信息。您的电视必须支持并开启这些位置信息服务，此应用才能使用这些服务。"</string> + <string name="permdesc_accessCoarseLocation" product="default" msgid="7788009094906196995">"此应用可根据网络来源（例如基站和 WLAN 网络）获取您的位置信息。您的手机必须支持并开启这些位置信息服务，此应用才能使用这些服务。"</string> <string name="permlab_modifyAudioSettings" msgid="6095859937069146086">"更改您的音频设置"</string> <string name="permdesc_modifyAudioSettings" msgid="3522565366806248517">"允许该应用修改全局音频设置，例如音量和用于输出的扬声器。"</string> <string name="permlab_recordAudio" msgid="3876049771427466323">"录音"</string> - <!-- no translation found for permdesc_recordAudio (4245930455135321433) --> - <skip /> + <string name="permdesc_recordAudio" msgid="4245930455135321433">"此应用可随时使用麦克风进行录音。"</string> <string name="permlab_sim_communication" msgid="2935852302216852065">"向 SIM 卡发送命令"</string> <string name="permdesc_sim_communication" msgid="5725159654279639498">"允许应用向SIM卡发送命令（此权限具有很高的危险性）。"</string> <string name="permlab_camera" msgid="3616391919559751192">"拍摄照片和视频"</string> - <!-- no translation found for permdesc_camera (5392231870049240670) --> - <skip /> + <string name="permdesc_camera" msgid="5392231870049240670">"此应用可随时使用相机拍摄照片和录制视频。"</string> <string name="permlab_vibrate" msgid="7696427026057705834">"控制振动"</string> <string name="permdesc_vibrate" msgid="6284989245902300945">"允许应用控制振动器。"</string> <string name="permlab_callPhone" msgid="3925836347681847954">"直接拨打电话号码"</string> diff --git a/core/res/res/values-zh-rHK/strings.xml b/core/res/res/values-zh-rHK/strings.xml index 6f3192873fff..410548e11e0e 100644 --- a/core/res/res/values-zh-rHK/strings.xml +++ b/core/res/res/values-zh-rHK/strings.xml @@ -46,8 +46,7 @@ <string name="defaultMsisdnAlphaTag" msgid="2850889754919584674">"MSISDN1"</string> <string name="mmiError" msgid="5154499457739052907">"連線發生問題或 MMI 碼無效。"</string> <string name="mmiFdnError" msgid="5224398216385316471">"僅限對固定撥號號碼執行這項運作。"</string> - <!-- no translation found for mmiErrorWhileRoaming (762488890299284230) --> - <skip /> + <string name="mmiErrorWhileRoaming" msgid="762488890299284230">"使用漫遊服務時，不可從手機變更來電轉駁設定。"</string> <string name="serviceEnabled" msgid="8147278346414714315">"服務已啟用。"</string> <string name="serviceEnabledFor" msgid="6856228140453471041">"已啟用服務："</string> <string name="serviceDisabled" msgid="1937553226592516411">"已停用服務。"</string> @@ -98,10 +97,8 @@ <string name="RestrictedOnVoiceData" msgid="996636487106171320">"已封鎖語音/數據服務。"</string> <string name="RestrictedOnVoiceSms" msgid="1888588152792023873">"已封鎖語音/SMS 服務。"</string> <string name="RestrictedOnAll" msgid="5643028264466092821">"已封鎖所有語音/數據傳輸/SMS 服務。"</string> - <!-- no translation found for NetworkPreferenceSwitchTitle (4008877505368566980) --> - <skip /> - <!-- no translation found for NetworkPreferenceSwitchSummary (7335915397439759249) --> - <skip /> + <string name="NetworkPreferenceSwitchTitle" msgid="4008877505368566980">"無法連接網絡"</string> + <string name="NetworkPreferenceSwitchSummary" msgid="7335915397439759249">"如要改善接收品質，請嘗試前往「設定」>「流動網絡」>「偏好網絡類型」以變更所選類型。"</string> <string name="peerTtyModeFull" msgid="6165351790010341421">"對方曾要求 TTY 模式 (FULL)"</string> <string name="peerTtyModeHco" msgid="5728602160669216784">"對方曾要求 TTY 模式 (HCO)"</string> <string name="peerTtyModeVco" msgid="1742404978686538049">"對方曾要求 TTY 模式 (VCO)"</string> @@ -185,10 +182,8 @@ <string name="work_profile_deleted_description" msgid="6305147513054341102">"由於沒有管理員應用程式，工作設定檔已被刪除。"</string> <string name="work_profile_deleted_details" msgid="226615743462361248">"找不到工作設定檔應用程式，或工作設定檔應用程式已受損。因此，您的工作設定檔現在將被清除。請聯絡您的管理員以取得協助。"</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="6019770344820507579">"無法在此裝置上再使用您的工作設定檔。"</string> - <!-- no translation found for network_logging_notification_title (1805392571290161924) --> - <skip /> - <!-- no translation found for network_logging_notification_text (4448072433371155729) --> - <skip /> + <string name="network_logging_notification_title" msgid="1805392571290161924">"網絡流量現正受監控"</string> + <string name="network_logging_notification_text" msgid="4448072433371155729">"輕按以瞭解詳情"</string> <string name="factory_reset_warning" msgid="5423253125642394387">"您的裝置將被清除"</string> <string name="factory_reset_message" msgid="4905025204141900666">"找不到管理員應用程式的元件，或管理員應用程式已受損並不能使用。您的裝置現在將被清除。請聯絡您的管理員以取得協助。"</string> <string name="me" msgid="6545696007631404292">"我本人"</string> @@ -306,12 +301,9 @@ <string name="permlab_sendSms" msgid="7544599214260982981">"傳送和查看 SMS 短訊"</string> <string name="permdesc_sendSms" msgid="7094729298204937667">"允許應用程式傳送短訊，但可能產生未預期的費用。惡意應用程式可能會未經您確認擅自傳送短訊，增加您的支出。"</string> <string name="permlab_readSms" msgid="8745086572213270480">"讀取您的短訊 (SMS 或 MMS)"</string> - <!-- no translation found for permdesc_readSms (4741697454888074891) --> - <skip /> - <!-- no translation found for permdesc_readSms (5796670395641116592) --> - <skip /> - <!-- no translation found for permdesc_readSms (6826832415656437652) --> - <skip /> + <string name="permdesc_readSms" product="tablet" msgid="4741697454888074891">"此應用程式可以讀取所有儲存在您的平板電腦中的短訊。"</string> + <string name="permdesc_readSms" product="tv" msgid="5796670395641116592">"此應用程式可以讀取所有儲存在您的電視中的短訊。"</string> + <string name="permdesc_readSms" product="default" msgid="6826832415656437652">"此應用程式可以讀取所有儲存在您的手機中的短訊。"</string> <string name="permlab_receiveWapPush" msgid="5991398711936590410">"接收短訊 (WAP)"</string> <string name="permdesc_receiveWapPush" msgid="748232190220583385">"允許應用程式接收和處理 WAP 訊息。這項權限也能讓應用程式監控訊息，或在您閱讀訊息前擅自刪除訊息。"</string> <string name="permlab_getTasks" msgid="6466095396623933906">"擷取執行中的應用程式"</string> @@ -324,10 +316,8 @@ <string name="permdesc_enableCarMode" msgid="4853187425751419467">"允許應用程式啟用車用模式。"</string> <string name="permlab_killBackgroundProcesses" msgid="3914026687420177202">"關閉其他應用程式"</string> <string name="permdesc_killBackgroundProcesses" msgid="4593353235959733119">"允許應用程式終止其他應用程式的背景處理程序。這樣可能會導致其他應用程式停止運行。"</string> - <!-- no translation found for permlab_systemAlertWindow (7238805243128138690) --> - <skip /> - <!-- no translation found for permdesc_systemAlertWindow (2393776099672266188) --> - <skip /> + <string name="permlab_systemAlertWindow" msgid="7238805243128138690">"此應用程式可以出現在其他應用程式上"</string> + <string name="permdesc_systemAlertWindow" msgid="2393776099672266188">"此應用程式可以出現在其他應用程式或螢幕的其他部分上。這可能會影響應用程式的正常使用，並變更其他應用程式的顯示方式。"</string> <string name="permlab_persistentActivity" msgid="8841113627955563938">"一律執行應用程式"</string> <string name="permdesc_persistentActivity" product="tablet" msgid="8525189272329086137">"允許應用程式設定本身的某些部分持續佔用記憶體。這樣可能會限制其他應用程式可用的記憶體，並拖慢平板電腦的運作速度。"</string> <string name="permdesc_persistentActivity" product="tv" msgid="5086862529499103587">"允許應用程式長期佔用部分記憶體。這會限制其他應用程式可用的記憶體，減慢電視操作。"</string> @@ -353,51 +343,37 @@ <string name="permdesc_writeContacts" product="tv" msgid="5438230957000018959">"允許應用程式修改電視上儲存的聯絡人資料，包括您與特定聯絡人通話、電郵或以其他通訊方式聯絡的頻率。這項權限允許應用程式刪除聯絡人資料。"</string> <string name="permdesc_writeContacts" product="default" msgid="589869224625163558">"允許應用程式修改手機上儲存的聯絡人資料，包括您與個別聯絡人通話、電郵或以其他通訊方式聯絡的頻率。這項權限允許應用程式刪除聯絡人資料。"</string> <string name="permlab_readCallLog" msgid="3478133184624102739">"讀取通話記錄"</string> - <!-- no translation found for permdesc_readCallLog (3204122446463552146) --> - <skip /> + <string name="permdesc_readCallLog" msgid="3204122446463552146">"此應用程式可以讀取您的通話記錄。"</string> <string name="permlab_writeCallLog" msgid="8552045664743499354">"寫入通話記錄"</string> <string name="permdesc_writeCallLog" product="tablet" msgid="6661806062274119245">"允許應用程式修改平板電腦的通話記錄，包括來電和已撥電話相關資料。惡意應用程式可能會藉此刪除或修改您的通話記錄。"</string> <string name="permdesc_writeCallLog" product="tv" msgid="4225034892248398019">"允許應用程式修改電視的通話記錄，包括來電和撥出電話的相關資料。惡意應用程式可能會藉此清除或修改您的通話記錄。"</string> <string name="permdesc_writeCallLog" product="default" msgid="683941736352787842">"允許應用程式修改手機的通話記錄，包括來電和已撥電話相關資料。惡意應用程式可能會藉此刪除或修改您的通話記錄。"</string> <string name="permlab_bodySensors" msgid="4683341291818520277">"存取身體感應器 (例如心跳監測器)"</string> <string name="permdesc_bodySensors" product="default" msgid="4380015021754180431">"允許應用程式存取感應器所收集的資料 (這類感應器可監測您的體能狀態，例如您的心跳速率)。"</string> - <!-- no translation found for permlab_readCalendar (6716116972752441641) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (4993979255403945892) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (8837931557573064315) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (4373978642145196715) --> - <skip /> + <string name="permlab_readCalendar" msgid="6716116972752441641">"讀取日曆活動和詳情"</string> + <string name="permdesc_readCalendar" product="tablet" msgid="4993979255403945892">"此應用程式可以讀取所有儲存在您的平板電腦的日曆活動，並分享或儲存您的日曆資料。"</string> + <string name="permdesc_readCalendar" product="tv" msgid="8837931557573064315">"此應用程式可以讀取所有儲存在您的電視中的日曆活動，並分享或儲存您的日曆資料。"</string> + <string name="permdesc_readCalendar" product="default" msgid="4373978642145196715">"此應用程式可以讀取所有儲存在您的手機中的日曆活動，並分享或儲存您的日曆資料。"</string> <string name="permlab_writeCalendar" msgid="8438874755193825647">"在機主不知情下，新增或修改日曆活動，以及發送電郵給嘉賓"</string> - <!-- no translation found for permdesc_writeCalendar (1675270619903625982) --> - <skip /> - <!-- no translation found for permdesc_writeCalendar (9017809326268135866) --> - <skip /> - <!-- no translation found for permdesc_writeCalendar (7592791790516943173) --> - <skip /> + <string name="permdesc_writeCalendar" product="tablet" msgid="1675270619903625982">"此應用程式可以加入、移除或變更您的平板電腦中的日曆活動。此應用程式可以傳送看似來自日曆擁有者的訊息，或變更活動而不通知其擁有者。"</string> + <string name="permdesc_writeCalendar" product="tv" msgid="9017809326268135866">"此應用程式可以加入、移除或變更您的電視中的日曆活動。此應用程式可以傳送看似來自日曆擁有者的訊息，或變更活動而不通知其擁有者。"</string> + <string name="permdesc_writeCalendar" product="default" msgid="7592791790516943173">"此應用程式可以加入、移除或變更您的手機中的日曆活動。此應用程式可以傳送看似來自日曆擁有者的訊息，或變更活動而不通知其擁有者。"</string> <string name="permlab_accessLocationExtraCommands" msgid="2836308076720553837">"接收額外的位置提供者指令"</string> <string name="permdesc_accessLocationExtraCommands" msgid="6078307221056649927">"允許應用程式存取額外的位置提供者指令。這項設定可能會使應用程式干擾 GPS 或其他位置來源的運作。"</string> <string name="permlab_accessFineLocation" msgid="251034415460950944">"存取精確位置 (根據 GPS 和網絡)"</string> - <!-- no translation found for permdesc_accessFineLocation (5821994817969957884) --> - <skip /> + <string name="permdesc_accessFineLocation" msgid="5821994817969957884">"此應用程式可以根據 GPS 或網絡位置來源 (例如手機訊號塔和 Wi-Fi 網絡) 取得您的位置。您的手機必須支援並啟用這些位置資訊服務，應用程式方可使用這項功能。這可能會增加耗電量。"</string> <string name="permlab_accessCoarseLocation" msgid="7715277613928539434">"存取約略位置 (根據網絡)"</string> - <!-- no translation found for permdesc_accessCoarseLocation (3373266766487862426) --> - <skip /> - <!-- no translation found for permdesc_accessCoarseLocation (1884022719818788511) --> - <skip /> - <!-- no translation found for permdesc_accessCoarseLocation (7788009094906196995) --> - <skip /> + <string name="permdesc_accessCoarseLocation" product="tablet" msgid="3373266766487862426">"此應用程式可以根據您的網絡來源 (例如手機訊號塔和 Wi-Fi 網絡) 取得您的位置。您的平板電腦必須支援並啟用這些位置資訊服務，應用程式方可使用這項功能。"</string> + <string name="permdesc_accessCoarseLocation" product="tv" msgid="1884022719818788511">"此應用程式可以根據您的網絡來源 (例如手機訊號塔和 Wi-Fi 網絡) 取得您的位置。您的電視必須支援並啟用這些位置資訊服務，應用程式方可使用這項功能。"</string> + <string name="permdesc_accessCoarseLocation" product="default" msgid="7788009094906196995">"此應用程式可以根據您的網絡來源 (例如手機訊號塔和 Wi-Fi 網絡) 取得您的位置。您的手機必須支援並啟用這些位置資訊服務，應用程式方可使用這項功能。"</string> <string name="permlab_modifyAudioSettings" msgid="6095859937069146086">"更改音效設定"</string> <string name="permdesc_modifyAudioSettings" msgid="3522565366806248517">"允許應用程式修改全域音頻設定，例如音量和用於輸出的喇叭。"</string> <string name="permlab_recordAudio" msgid="3876049771427466323">"錄製音效"</string> - <!-- no translation found for permdesc_recordAudio (4245930455135321433) --> - <skip /> + <string name="permdesc_recordAudio" msgid="4245930455135321433">"此應用程式可以隨時使用麥克風錄音。"</string> <string name="permlab_sim_communication" msgid="2935852302216852065">"發送指令至 SIM 卡"</string> <string name="permdesc_sim_communication" msgid="5725159654279639498">"允許應用程式傳送指令到 SIM 卡。這項操作具有高危險性。"</string> <string name="permlab_camera" msgid="3616391919559751192">"拍照和拍攝影片"</string> - <!-- no translation found for permdesc_camera (5392231870049240670) --> - <skip /> + <string name="permdesc_camera" msgid="5392231870049240670">"此應用程式可以隨時使用相機拍照和攝錄。"</string> <string name="permlab_vibrate" msgid="7696427026057705834">"控制震動"</string> <string name="permdesc_vibrate" msgid="6284989245902300945">"允許應用程式控制震動。"</string> <string name="permlab_callPhone" msgid="3925836347681847954">"直接撥打電話號碼"</string> diff --git a/core/res/res/values-zh-rTW/strings.xml b/core/res/res/values-zh-rTW/strings.xml index 24cca0ac6608..51f6d7d04bd3 100644 --- a/core/res/res/values-zh-rTW/strings.xml +++ b/core/res/res/values-zh-rTW/strings.xml @@ -46,8 +46,7 @@ <string name="defaultMsisdnAlphaTag" msgid="2850889754919584674">"MSISDN1"</string> <string name="mmiError" msgid="5154499457739052907">"連線發生問題或錯誤的 MMI 碼。"</string> <string name="mmiFdnError" msgid="5224398216385316471">"僅限對固定撥號號碼執行此作業。"</string> - <!-- no translation found for mmiErrorWhileRoaming (762488890299284230) --> - <skip /> + <string name="mmiErrorWhileRoaming" msgid="762488890299284230">"漫遊時無法透過你的手機變更來電轉接設定。"</string> <string name="serviceEnabled" msgid="8147278346414714315">"服務已啟用。"</string> <string name="serviceEnabledFor" msgid="6856228140453471041">"已啟用服務："</string> <string name="serviceDisabled" msgid="1937553226592516411">"服務已停用。"</string> @@ -98,10 +97,8 @@ <string name="RestrictedOnVoiceData" msgid="996636487106171320">"已封鎖語音/數據傳輸服務。"</string> <string name="RestrictedOnVoiceSms" msgid="1888588152792023873">"已封鎖語音/SMS 服務。"</string> <string name="RestrictedOnAll" msgid="5643028264466092821">"已封鎖所有語音/數據傳輸/簡訊服務。"</string> - <!-- no translation found for NetworkPreferenceSwitchTitle (4008877505368566980) --> - <skip /> - <!-- no translation found for NetworkPreferenceSwitchSummary (7335915397439759249) --> - <skip /> + <string name="NetworkPreferenceSwitchTitle" msgid="4008877505368566980">"無法連上網路"</string> + <string name="NetworkPreferenceSwitchSummary" msgid="7335915397439759249">"如要改善收訊狀況，請依序開啟 [設定] > [行動網路] > [偏好的網路類型]，然後選取其他網路類型。"</string> <string name="peerTtyModeFull" msgid="6165351790010341421">"通訊對象要求使用 TTY 的 FULL 模式"</string> <string name="peerTtyModeHco" msgid="5728602160669216784">"通訊對象要求使用 TTY 的 HCO 模式"</string> <string name="peerTtyModeVco" msgid="1742404978686538049">"通訊對象要求使用 TTY 的 VCO 模式"</string> @@ -185,10 +182,8 @@ <string name="work_profile_deleted_description" msgid="6305147513054341102">"Work 設定檔因管理員應用程式遺失而遭到刪除。"</string> <string name="work_profile_deleted_details" msgid="226615743462361248">"Work 設定檔管理員應用程式遺失或已毀損，因此系統刪除了您的 Work 設定檔和相關資料。如需協助，請與您的管理員聯絡。"</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="6019770344820507579">"您的 Work 設定檔已不在這台裝置上。"</string> - <!-- no translation found for network_logging_notification_title (1805392571290161924) --> - <skip /> - <!-- no translation found for network_logging_notification_text (4448072433371155729) --> - <skip /> + <string name="network_logging_notification_title" msgid="1805392571290161924">"網路流量目前受到監控"</string> + <string name="network_logging_notification_text" msgid="4448072433371155729">"輕觸即可查看更多詳細資料"</string> <string name="factory_reset_warning" msgid="5423253125642394387">"您的裝置資料將遭到清除"</string> <string name="factory_reset_message" msgid="4905025204141900666">"管理員應用程式因遺失元件或已毀損而無法使用，您的裝置資料將隨即遭到清除。如需相關協助，請與您的管理員聯絡。"</string> <string name="me" msgid="6545696007631404292">"我"</string> @@ -306,12 +301,9 @@ <string name="permlab_sendSms" msgid="7544599214260982981">"傳送及查看簡訊"</string> <string name="permdesc_sendSms" msgid="7094729298204937667">"允許應用程式傳送簡訊，但可能產生非預期的費用。惡意應用程式可能利用此功能擅自傳送簡訊，增加您不必要的額外支出。"</string> <string name="permlab_readSms" msgid="8745086572213270480">"讀取您的簡訊 (SMS 或 MMS)"</string> - <!-- no translation found for permdesc_readSms (4741697454888074891) --> - <skip /> - <!-- no translation found for permdesc_readSms (5796670395641116592) --> - <skip /> - <!-- no translation found for permdesc_readSms (6826832415656437652) --> - <skip /> + <string name="permdesc_readSms" product="tablet" msgid="4741697454888074891">"這個應用程式可讀取所有儲存在平板電腦上的簡訊。"</string> + <string name="permdesc_readSms" product="tv" msgid="5796670395641116592">"這個應用程式可讀取所有儲存在電視上的簡訊。"</string> + <string name="permdesc_readSms" product="default" msgid="6826832415656437652">"這個應用程式可讀取所有儲存在手機上的簡訊。"</string> <string name="permlab_receiveWapPush" msgid="5991398711936590410">"接收簡訊 (WAP)"</string> <string name="permdesc_receiveWapPush" msgid="748232190220583385">"允許應用程式接收和處理 WAP 訊息。這項權限也能讓應用程式監控訊息，或在您閱讀訊息前擅自刪除訊息。"</string> <string name="permlab_getTasks" msgid="6466095396623933906">"擷取執行中的應用程式"</string> @@ -324,10 +316,8 @@ <string name="permdesc_enableCarMode" msgid="4853187425751419467">"允許應用程式啟用車用模式。"</string> <string name="permlab_killBackgroundProcesses" msgid="3914026687420177202">"關閉其他應用程式"</string> <string name="permdesc_killBackgroundProcesses" msgid="4593353235959733119">"允許應用程式終止其他應用程式的背景處理程序。這項設定可能會導致其他應用程式停止執行。"</string> - <!-- no translation found for permlab_systemAlertWindow (7238805243128138690) --> - <skip /> - <!-- no translation found for permdesc_systemAlertWindow (2393776099672266188) --> - <skip /> + <string name="permlab_systemAlertWindow" msgid="7238805243128138690">"這個應用程式可顯示在其他應用程式上方"</string> + <string name="permdesc_systemAlertWindow" msgid="2393776099672266188">"這個應用程式可顯示在其他應用程式上方或畫面中的其他位置。你可能會無法照常使用應用程式，且其他應用程式的顯示方式可能會受到影響。"</string> <string name="permlab_persistentActivity" msgid="8841113627955563938">"一律執行應用程式"</string> <string name="permdesc_persistentActivity" product="tablet" msgid="8525189272329086137">"允許應用程式的部分內容常駐在記憶體中。這項設定可能會限制其他應用程式可用的記憶體，並拖慢平板電腦運作速度。"</string> <string name="permdesc_persistentActivity" product="tv" msgid="5086862529499103587">"允許應用程式的部分內容常駐在記憶體中。這項設定可能會限制其他應用程式可用的記憶體，造成電視的運作速度變慢。"</string> @@ -353,51 +343,37 @@ <string name="permdesc_writeContacts" product="tv" msgid="5438230957000018959">"允許應用程式修改電視上儲存的聯絡人資料，包括您與特定聯絡人通話、傳送電子郵件或使用其他通訊方式的互動頻率。這項權限可讓應用程式刪除聯絡人資料。"</string> <string name="permdesc_writeContacts" product="default" msgid="589869224625163558">"允許應用程式讀取手機上儲存的聯絡人資料，包括您與特定聯絡人通話、傳送電子郵件或使用其他通訊方式的互動頻率。這項權限可讓應用程式刪除聯絡人資料。"</string> <string name="permlab_readCallLog" msgid="3478133184624102739">"讀取通話紀錄"</string> - <!-- no translation found for permdesc_readCallLog (3204122446463552146) --> - <skip /> + <string name="permdesc_readCallLog" msgid="3204122446463552146">"這個應用程式可讀取通話紀錄。"</string> <string name="permlab_writeCallLog" msgid="8552045664743499354">"寫入通話紀錄"</string> <string name="permdesc_writeCallLog" product="tablet" msgid="6661806062274119245">"允許應用程式修改平板電腦的通話紀錄，包括來電和已撥電話相關資料。請注意，惡意應用程式可能濫用此功能刪除或修改您的通話紀錄。"</string> <string name="permdesc_writeCallLog" product="tv" msgid="4225034892248398019">"允許應用程式修改電視的通話紀錄，包括來電和已撥電話相關資料。惡意應用程式可能會藉此清除或修改您的通話紀錄。"</string> <string name="permdesc_writeCallLog" product="default" msgid="683941736352787842">"允許應用程式修改手機的通話紀錄，包括來電和已撥電話相關資料。請注意，惡意應用程式可能濫用此功能刪除或修改您的通話紀錄。"</string> <string name="permlab_bodySensors" msgid="4683341291818520277">"存取身體感應器 (例如心跳速率監測器)"</string> <string name="permdesc_bodySensors" product="default" msgid="4380015021754180431">"允許應用程式存取感測器所收集的資料 (這類感測器可監測您的體能狀態，例如您的心跳速率)。"</string> - <!-- no translation found for permlab_readCalendar (6716116972752441641) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (4993979255403945892) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (8837931557573064315) --> - <skip /> - <!-- no translation found for permdesc_readCalendar (4373978642145196715) --> - <skip /> + <string name="permlab_readCalendar" msgid="6716116972752441641">"讀取日曆活動和詳細資訊"</string> + <string name="permdesc_readCalendar" product="tablet" msgid="4993979255403945892">"這個應用程式可讀取所有儲存在平板電腦上的日曆活動資訊，以及共用或儲存日曆資料。"</string> + <string name="permdesc_readCalendar" product="tv" msgid="8837931557573064315">"這個應用程式可讀取所有儲存在電視上的日曆活動資訊，以及共用或儲存日曆資料。"</string> + <string name="permdesc_readCalendar" product="default" msgid="4373978642145196715">"這個應用程式可讀取所有儲存在手機上的日曆活動資訊，以及共用或儲存日曆資料。"</string> <string name="permlab_writeCalendar" msgid="8438874755193825647">"在未經擁有者同意的情況下新增或修改日曆活動，以及傳送電子郵件給邀請對象"</string> - <!-- no translation found for permdesc_writeCalendar (1675270619903625982) --> - <skip /> - <!-- no translation found for permdesc_writeCalendar (9017809326268135866) --> - <skip /> - <!-- no translation found for permdesc_writeCalendar (7592791790516943173) --> - <skip /> + <string name="permdesc_writeCalendar" product="tablet" msgid="1675270619903625982">"這個應用程式可在平板電腦上新增、移除或變更日曆活動。提醒您，這個應用程式可能會以日曆擁有者的名義傳送訊息，或是在不通知日曆擁有者的情況下變更活動內容。"</string> + <string name="permdesc_writeCalendar" product="tv" msgid="9017809326268135866">"這個應用程式可在電視上新增、移除或變更日曆活動。提醒您，這個應用程式可能會以日曆擁有者的名義傳送訊息，或是在不通知日曆擁有者的情況下變更活動內容。"</string> + <string name="permdesc_writeCalendar" product="default" msgid="7592791790516943173">"這個應用程式可在手機上新增、移除或變更日曆活動。提醒您，這個應用程式可能會以日曆擁有者的名義傳送訊息，或是在不通知日曆擁有者的情況下變更活動內容。"</string> <string name="permlab_accessLocationExtraCommands" msgid="2836308076720553837">"接收額外的位置提供者指令"</string> <string name="permdesc_accessLocationExtraCommands" msgid="6078307221056649927">"允許應用程式存取額外位置資訊提供者指令。這項設定可能會造成應用程式干擾 GPS 或其他位置資訊來源的運作。"</string> <string name="permlab_accessFineLocation" msgid="251034415460950944">"存取精確位置 (以 GPS 和網路為依據)"</string> - <!-- no translation found for permdesc_accessFineLocation (5821994817969957884) --> - <skip /> + <string name="permdesc_accessFineLocation" msgid="5821994817969957884">"這個應用程式可根據 GPS 或網路位置來源 (例如基地台和 Wi-Fi 網路) 取得你的位置資訊。你必須在手機上開啟這類定位服務，才能讓這個應用程式取得位置資訊。不過這可能會增加耗電量。"</string> <string name="permlab_accessCoarseLocation" msgid="7715277613928539434">"存取概略位置 (以網路為依據)"</string> - <!-- no translation found for permdesc_accessCoarseLocation (3373266766487862426) --> - <skip /> - <!-- no translation found for permdesc_accessCoarseLocation (1884022719818788511) --> - <skip /> - <!-- no translation found for permdesc_accessCoarseLocation (7788009094906196995) --> - <skip /> + <string name="permdesc_accessCoarseLocation" product="tablet" msgid="3373266766487862426">"這個應用程式可根據網路來源 (例如基地台和 Wi-Fi 網路) 取得你的位置資訊。你必須在平板電腦上開啟這類定位服務，才能讓這個應用程式取得位置資訊。"</string> + <string name="permdesc_accessCoarseLocation" product="tv" msgid="1884022719818788511">"這個應用程式可根據網路來源 (例如基地台和 Wi-Fi 網路) 取得你的位置資訊。你必須在電視上開啟這類定位服務，才能讓這個應用程式取得位置資訊。"</string> + <string name="permdesc_accessCoarseLocation" product="default" msgid="7788009094906196995">"這個應用程式可根據網路來源 (例如基地台和 Wi-Fi 網路) 取得你的位置資訊。你必須在手機上開啟這類定位服務，才能讓這個應用程式取得位置資訊。"</string> <string name="permlab_modifyAudioSettings" msgid="6095859937069146086">"變更音訊設定"</string> <string name="permdesc_modifyAudioSettings" msgid="3522565366806248517">"允許應用程式修改全域音訊設定，例如音量和用來輸出的喇叭。"</string> <string name="permlab_recordAudio" msgid="3876049771427466323">"錄製音訊"</string> - <!-- no translation found for permdesc_recordAudio (4245930455135321433) --> - <skip /> + <string name="permdesc_recordAudio" msgid="4245930455135321433">"這個應用程式隨時可使用麥克風錄音。"</string> <string name="permlab_sim_communication" msgid="2935852302216852065">"傳送指令到 SIM 卡"</string> <string name="permdesc_sim_communication" msgid="5725159654279639498">"允許應用程式傳送指令到 SIM 卡。這麼做非常危險。"</string> <string name="permlab_camera" msgid="3616391919559751192">"拍攝相片和影片"</string> - <!-- no translation found for permdesc_camera (5392231870049240670) --> - <skip /> + <string name="permdesc_camera" msgid="5392231870049240670">"這個應用程式隨時可使用相機拍照及錄影。"</string> <string name="permlab_vibrate" msgid="7696427026057705834">"控制震動"</string> <string name="permdesc_vibrate" msgid="6284989245902300945">"允許應用程式控制震動。"</string> <string name="permlab_callPhone" msgid="3925836347681847954">"直接撥打電話號碼"</string> diff --git a/core/res/res/values-zu/strings.xml b/core/res/res/values-zu/strings.xml index 53aa86632611..a26c7651dd6f 100644 --- a/core/res/res/values-zu/strings.xml +++ b/core/res/res/values-zu/strings.xml @@ -182,10 +182,8 @@ <string name="work_profile_deleted_description" msgid="6305147513054341102">"Iphrofayela yomsebenzi isusiwe ngenxa yohlelo lokusebenza lomlawuli elingekho."</string> <string name="work_profile_deleted_details" msgid="226615743462361248">"Uhlelo lokusebenza lomlawuli lephrofayela yomsebenzi kungenzeka alukho noma lumoshekile. Njengomphumela walokho, iphrofayela yakho yomsebenzi nedatha ehlobene kususiwe. Xhumana nomlawuli wakho ukuze uthole usizo."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="6019770344820507579">"Iphrofayela yakho yomsebenzi ayisatholakali kule divayisi."</string> - <!-- no translation found for network_logging_notification_title (1805392571290161924) --> - <skip /> - <!-- no translation found for network_logging_notification_text (4448072433371155729) --> - <skip /> + <string name="network_logging_notification_title" msgid="1805392571290161924">"Ithrafikhi yenethiwekhi iyangamelwa"</string> + <string name="network_logging_notification_text" msgid="4448072433371155729">"Thepha ukuze uthole imininingwane engeziwe"</string> <string name="factory_reset_warning" msgid="5423253125642394387">"Idivayisi yakho izosulwa"</string> <string name="factory_reset_message" msgid="4905025204141900666">"Uhlelo lokusebenza lomlawuli lushoda ngezingxenye noma lumoshekile, futhi alikwazi ukusetshenziswa. Idivayisi yakho manje izosulwa. Xhumana nomlawuli wakho ukuze uthole usizo."</string> <string name="me" msgid="6545696007631404292">"Mina"</string> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 989a79db7837..d02e156e61dc 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -1482,10 +1482,10 @@ <java-symbol type="id" name="media_route_volume_layout" /> <java-symbol type="id" name="media_route_volume_slider" /> <java-symbol type="id" name="media_route_control_frame" /> - <java-symbol type="id" name="media_route_disconnect_button" /> <java-symbol type="id" name="media_route_extended_settings_button" /> <java-symbol type="string" name="media_route_chooser_title" /> <java-symbol type="string" name="media_route_chooser_title_for_remote_display" /> + <java-symbol type="string" name="media_route_controller_disconnect" /> <java-symbol type="string" name="bluetooth_a2dp_audio_route_name" /> <java-symbol type="dimen" name="config_minScalingSpan" /> diff --git a/core/tests/coretests/AndroidManifest.xml b/core/tests/coretests/AndroidManifest.xml index ba1a55d7f9a6..cd419878bb50 100644 --- a/core/tests/coretests/AndroidManifest.xml +++ b/core/tests/coretests/AndroidManifest.xml @@ -1156,6 +1156,7 @@ </activity> <activity android:name="android.app.EmptyActivity"> </activity> + <activity android:name="com.android.internal.app.ChooserWrapperActivity"/> <receiver android:name="android.app.activity.AbortReceiver"> <intent-filter android:priority="1"> diff --git a/core/tests/coretests/src/android/net/ScoredNetworkTest.java b/core/tests/coretests/src/android/net/ScoredNetworkTest.java index 9c3346e1238b..e818c564a639 100644 --- a/core/tests/coretests/src/android/net/ScoredNetworkTest.java +++ b/core/tests/coretests/src/android/net/ScoredNetworkTest.java @@ -166,4 +166,52 @@ public class ScoredNetworkTest { assertTrue(newNetwork.meteredHint); assertNull(newNetwork.attributes); } + + @Test + public void calculateBadgeShouldReturnNoBadgeWhenNoAttributesBundle() { + ScoredNetwork network = new ScoredNetwork(KEY, CURVE); + assertEquals(ScoredNetwork.BADGING_NONE, network.calculateBadge(TEST_RSSI)); + } + + @Test + public void calculateBadgeShouldReturnNoBadgeWhenNoBadgingCurveInBundle() { + ScoredNetwork network = new ScoredNetwork(KEY, CURVE, false /* meteredHint */, ATTRIBUTES); + assertEquals(ScoredNetwork.BADGING_NONE, network.calculateBadge(TEST_RSSI)); + } + + @Test + public void calculateBadgeShouldReturn4kBadge() { + ScoredNetwork network = + buildScoredNetworkWithGivenBadgeForTestRssi(ScoredNetwork.BADGING_4K); + assertEquals(ScoredNetwork.BADGING_4K, network.calculateBadge(TEST_RSSI)); + } + + @Test + public void calculateBadgeShouldReturnHdBadge() { + ScoredNetwork network = + buildScoredNetworkWithGivenBadgeForTestRssi(ScoredNetwork.BADGING_HD); + assertEquals(ScoredNetwork.BADGING_HD, network.calculateBadge(TEST_RSSI)); + } + + @Test + public void calculateBadgeShouldReturnSdBadge() { + ScoredNetwork network = + buildScoredNetworkWithGivenBadgeForTestRssi(ScoredNetwork.BADGING_SD); + assertEquals(ScoredNetwork.BADGING_SD, network.calculateBadge(TEST_RSSI)); + } + + @Test + public void calculateBadgeShouldReturnNoBadge() { + ScoredNetwork network = + buildScoredNetworkWithGivenBadgeForTestRssi(ScoredNetwork.BADGING_NONE); + assertEquals(ScoredNetwork.BADGING_NONE, network.calculateBadge(TEST_RSSI)); + } + + private ScoredNetwork buildScoredNetworkWithGivenBadgeForTestRssi(int badge) { + RssiCurve badgingCurve = + new RssiCurve(RSSI_START, 10, new byte[] {0, 0, 0, 0, 0, 0, (byte) badge}); + Bundle attr = new Bundle(); + attr.putParcelable(ScoredNetwork.ATTRIBUTES_KEY_BADGING_CURVE, badgingCurve); + return new ScoredNetwork(KEY, CURVE, false /* meteredHint */, attr); + } } diff --git a/core/tests/coretests/src/android/widget/TextViewTest.java b/core/tests/coretests/src/android/widget/TextViewTest.java index 3ccbf17c815e..8989462a916d 100644 --- a/core/tests/coretests/src/android/widget/TextViewTest.java +++ b/core/tests/coretests/src/android/widget/TextViewTest.java @@ -18,17 +18,23 @@ package android.widget; import android.app.Activity; import android.content.Intent; +import android.graphics.Paint; import android.platform.test.annotations.Presubmit; import android.test.ActivityInstrumentationTestCase2; import android.test.suitebuilder.annotation.SmallTest; import android.text.GetChars; +import android.text.Layout; import android.text.Selection; import android.text.Spannable; +import android.util.Log; +import android.view.View; +import java.util.Locale; /** * TextViewTest tests {@link TextView}. */ public class TextViewTest extends ActivityInstrumentationTestCase2<TextViewActivity> { + private static final String TAG = "TextViewTest"; private TextView mTextView; public TextViewTest() { @@ -169,4 +175,54 @@ public class TextViewTest extends ActivityInstrumentationTestCase2<TextViewActiv assertEquals(originalText, mTextView.getText().toString()); } + + @SmallTest + public void testHyphenationWidth() { + TextView textView = new TextView(getActivity()); + textView.setHyphenationFrequency(Layout.HYPHENATION_FREQUENCY_FULL); + textView.setTextLocale(Locale.US); + + Paint paint = textView.getPaint(); + + String word = "thisissuperlonglongword"; + float wordWidth = paint.measureText(word, 0, word.length()); + + StringBuilder sb = new StringBuilder(); + for (int i = 0; i < 100; ++i) { + sb.append(word); + sb.append(" "); + } + textView.setText(sb.toString()); + + int width = (int)(wordWidth * 0.7); + int height = 4096; // enough for all text. + + textView.measure( + View.MeasureSpec.makeMeasureSpec(width, View.MeasureSpec.EXACTLY), + View.MeasureSpec.makeMeasureSpec(height, View.MeasureSpec.EXACTLY)); + textView.layout(0, 0, width, height); + + Layout layout = textView.getLayout(); + assertNotNull(layout); + + int lineCount = layout.getLineCount(); + boolean hyphenationHappend = false; + for (int i = 0; i < lineCount; ++i) { + if (layout.getHyphen(i) != 1) { + continue; // Hyphantion does not happen. + } + hyphenationHappend = true; + + int start = layout.getLineStart(i); + int end = layout.getLineEnd(i); + + float withoutHyphenLength = paint.measureText(sb, start, end); + float withHyphenLength = layout.getLineWidth(i); + + assertTrue("LineWidth should take account of hyphen length.", + withHyphenLength > withoutHyphenLength); + } + assertTrue("Hyphenation must happen on TextView narrower than the word width", + hyphenationHappend); + } } diff --git a/core/tests/coretests/src/com/android/internal/app/ChooserActivityTest.java b/core/tests/coretests/src/com/android/internal/app/ChooserActivityTest.java new file mode 100644 index 000000000000..8a7b881e4ae8 --- /dev/null +++ b/core/tests/coretests/src/com/android/internal/app/ChooserActivityTest.java @@ -0,0 +1,178 @@ +/* + * 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. + */ + +package com.android.internal.app; + +import com.android.internal.R; +import com.android.internal.app.ResolverActivity.ResolvedComponentInfo; + +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mockito; + +import android.content.Intent; +import android.content.pm.ResolveInfo; +import android.support.test.InstrumentationRegistry; +import android.support.test.rule.ActivityTestRule; +import android.support.test.runner.AndroidJUnit4; + +import java.util.ArrayList; +import java.util.List; + +import static android.support.test.espresso.Espresso.onView; +import static android.support.test.espresso.action.ViewActions.click; +import static android.support.test.espresso.assertion.ViewAssertions.matches; +import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed; +import static android.support.test.espresso.matcher.ViewMatchers.withId; +import static android.support.test.espresso.matcher.ViewMatchers.withText; +import static com.android.internal.app.ChooserWrapperActivity.sOverrides; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.CoreMatchers.not; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.mockito.Mockito.when; + +/** + * Chooser activity instrumentation tests + */ +@RunWith(AndroidJUnit4.class) +public class ChooserActivityTest { + @Rule + public ActivityTestRule<ChooserWrapperActivity> mActivityRule = + new ActivityTestRule<>(ChooserWrapperActivity.class, false, + false); + + @Before + public void cleanOverrideData() { + sOverrides.reset(); + } + + @Test + public void customTitle() throws InterruptedException { + Intent sendIntent = createSendImageIntent(); + when(sOverrides.resolverListController.getResolversForIntent(Mockito.anyBoolean(), + Mockito.anyBoolean(), + Mockito.isA(List.class))).thenReturn(null); + mActivityRule.launchActivity(Intent.createChooser(sendIntent, "chooser test")); + waitForIdle(); + onView(withId(R.id.title)).check(matches(withText("chooser test"))); + } + + @Test + public void emptyTitle() throws InterruptedException { + sOverrides.isVoiceInteraction = false; + Intent sendIntent = createSendImageIntent(); + when(sOverrides.resolverListController.getResolversForIntent(Mockito.anyBoolean(), + Mockito.anyBoolean(), + Mockito.isA(List.class))).thenReturn(null); + mActivityRule.launchActivity(Intent.createChooser(sendIntent, null)); + waitForIdle(); + onView(withId(R.id.title)) + .check(matches(withText(R.string.whichSendApplication))); + } + + @Test + public void twoOptionsAndUserSelectsOne() throws InterruptedException { + Intent sendIntent = createSendImageIntent(); + List<ResolvedComponentInfo> resolvedComponentInfos = createResolvedComponentsForTest(2); + + when(sOverrides.resolverListController.getResolversForIntent(Mockito.anyBoolean(), + Mockito.anyBoolean(), + Mockito.isA(List.class))).thenReturn(resolvedComponentInfos); + + final ChooserWrapperActivity activity = mActivityRule + .launchActivity(Intent.createChooser(sendIntent, null)); + waitForIdle(); + + assertThat(activity.getAdapter().getCount(), is(2)); + onView(withId(R.id.profile_button)).check(matches(not(isDisplayed()))); + + ResolveInfo[] chosen = new ResolveInfo[1]; + sOverrides.onSafelyStartCallback = targetInfo -> { + chosen[0] = targetInfo.getResolveInfo(); + return true; + }; + + ResolveInfo toChoose = resolvedComponentInfos.get(0).getResolveInfoAt(0); + onView(withText(toChoose.activityInfo.name)) + .perform(click()); + waitForIdle(); + assertThat(chosen[0], is(toChoose)); + } + + @Test + public void noResultsFromPackageManager() { + when(sOverrides.resolverListController.getResolversForIntent(Mockito.anyBoolean(), + Mockito.anyBoolean(), + Mockito.isA(List.class))).thenReturn(null); + Intent sendIntent = createSendImageIntent(); + final ChooserWrapperActivity activity = mActivityRule + .launchActivity(Intent.createChooser(sendIntent, null)); + waitForIdle(); + assertThat(activity.isFinishing(), is(false)); + + onView(withId(R.id.empty)).check(matches(isDisplayed())); + onView(withId(R.id.resolver_list)).check(matches(not(isDisplayed()))); + InstrumentationRegistry.getInstrumentation().runOnMainSync( + () -> activity.getAdapter().handlePackagesChanged() + ); + // backward compatibility. looks like we finish when data is empty after package change + assertThat(activity.isFinishing(), is(true)); + } + + @Test + public void autoLaunchSingleResult() throws InterruptedException { + ResolveInfo[] chosen = new ResolveInfo[1]; + sOverrides.onSafelyStartCallback = targetInfo -> { + chosen[0] = targetInfo.getResolveInfo(); + return true; + }; + + List<ResolvedComponentInfo> resolvedComponentInfos = createResolvedComponentsForTest(1); + when(sOverrides.resolverListController.getResolversForIntent(Mockito.anyBoolean(), + Mockito.anyBoolean(), + Mockito.isA(List.class))).thenReturn(resolvedComponentInfos); + + Intent sendIntent = createSendImageIntent(); + final ChooserWrapperActivity activity = mActivityRule + .launchActivity(Intent.createChooser(sendIntent, null)); + waitForIdle(); + + assertThat(chosen[0], is(resolvedComponentInfos.get(0).getResolveInfoAt(0))); + assertThat(activity.isFinishing(), is(true)); + } + + private Intent createSendImageIntent() { + Intent sendIntent = new Intent(); + sendIntent.setAction(Intent.ACTION_SEND); + sendIntent.putExtra(Intent.EXTRA_TEXT, "testing intent sending"); + sendIntent.setType("image/jpeg"); + return sendIntent; + } + + private List<ResolvedComponentInfo> createResolvedComponentsForTest(int numberOfResults) { + List<ResolvedComponentInfo> infoList = new ArrayList<>(numberOfResults); + for (int i = 0; i < numberOfResults; i++) { + infoList.add(ChooserDataProvider.createResolvedComponentInfo(i)); + } + return infoList; + } + + private void waitForIdle() { + InstrumentationRegistry.getInstrumentation().waitForIdleSync(); + } +}
\ No newline at end of file diff --git a/core/tests/coretests/src/com/android/internal/app/ChooserDataProvider.java b/core/tests/coretests/src/com/android/internal/app/ChooserDataProvider.java new file mode 100644 index 000000000000..f6f63f1de81e --- /dev/null +++ b/core/tests/coretests/src/com/android/internal/app/ChooserDataProvider.java @@ -0,0 +1,75 @@ +/* + * Copyright (C) 2008 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.internal.app; + +import android.content.ComponentName; +import android.content.Intent; +import android.content.pm.ActivityInfo; +import android.content.pm.ApplicationInfo; +import android.content.pm.ResolveInfo; +import android.os.UserHandle; +import android.service.chooser.ChooserTarget; + +import java.util.HashMap; +import java.util.Map; +import java.util.concurrent.atomic.AtomicInteger; + +/** + * Utility class used by chooser tests to create mock data + */ +class ChooserDataProvider { + + static ResolverActivity.ResolvedComponentInfo createResolvedComponentInfo(int i) { + return new ResolverActivity.ResolvedComponentInfo(createComponentName(i), + createResolverIntent(i), createResolveInfo(i)); + } + + static ComponentName createComponentName(int i) { + final String name = "component" + i; + return new ComponentName("foo.bar." + name, name); + } + + static ResolveInfo createResolveInfo(int i) { + final ResolveInfo resolveInfo = new ResolveInfo(); + resolveInfo.activityInfo = createActivityInfo(i); + resolveInfo.targetUserId = UserHandle.USER_CURRENT; + return resolveInfo; + } + + static ActivityInfo createActivityInfo(int i) { + ActivityInfo ai = new ActivityInfo(); + ai.name = "activity_name" + i; + ai.packageName = "foo_bar" + i; + ai.enabled = true; + ai.exported = true; + ai.permission = null; + ai.applicationInfo = createApplicationInfo(); + return ai; + } + + static ApplicationInfo createApplicationInfo() { + ApplicationInfo ai = new ApplicationInfo(); + ai.name = "app_name"; + ai.packageName = "foo.bar"; + ai.enabled = true; + return ai; + } + + static Intent createResolverIntent(int i) { + return new Intent("intentAction" + i); + } +}
\ No newline at end of file diff --git a/core/tests/coretests/src/com/android/internal/app/ChooserWrapperActivity.java b/core/tests/coretests/src/com/android/internal/app/ChooserWrapperActivity.java new file mode 100644 index 000000000000..66fb45148a6e --- /dev/null +++ b/core/tests/coretests/src/com/android/internal/app/ChooserWrapperActivity.java @@ -0,0 +1,85 @@ +/* + * Copyright (C) 2008 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.internal.app; + +import android.content.pm.PackageManager; + +import java.util.function.Function; + +import static org.mockito.Mockito.mock; + + +/** + * Simple wrapper around chooser activity to be able to initiate it under test + */ +public class ChooserWrapperActivity extends ChooserActivity { + static final OverrideData sOverrides = new OverrideData(); + + ResolveListAdapter getAdapter() { + return mAdapter; + } + + @Override + public boolean isVoiceInteraction() { + if (sOverrides.isVoiceInteraction != null) { + return sOverrides.isVoiceInteraction; + } + return super.isVoiceInteraction(); + } + + @Override + public void safelyStartActivity(TargetInfo cti) { + if (sOverrides.onSafelyStartCallback != null && + sOverrides.onSafelyStartCallback.apply(cti)) { + return; + } + super.safelyStartActivity(cti); + } + + @Override + protected ResolverListController createListController() { + return sOverrides.resolverListController; + } + + @Override + public PackageManager getPackageManager() { + if (sOverrides.createPackageManager != null) { + return sOverrides.createPackageManager.apply(super.getPackageManager()); + } + return super.getPackageManager(); + } + + /** + * We cannot directly mock the activity created since instrumentation creates it. + * <p> + * Instead, we use static instances of this object to modify behavior. + */ + static class OverrideData { + @SuppressWarnings("Since15") + public Function<PackageManager, PackageManager> createPackageManager; + public Function<TargetInfo, Boolean> onSafelyStartCallback; + public ResolverListController resolverListController; + public Boolean isVoiceInteraction; + + public void reset() { + onSafelyStartCallback = null; + isVoiceInteraction = null; + createPackageManager = null; + resolverListController = mock(ResolverListController.class); + } + } +}
\ No newline at end of file diff --git a/docs/html/google/play/billing/billing_admin.jd b/docs/html/google/play/billing/billing_admin.jd index 9936489d7d45..1dc58e2516be 100644 --- a/docs/html/google/play/billing/billing_admin.jd +++ b/docs/html/google/play/billing/billing_admin.jd @@ -125,7 +125,10 @@ number of in-app items.</p> </dd> </dl> </li> - <li><p>Enter additional information about the item, then click <strong>Save</strong>.</p> + <li><p>Enter additional information about the item. If you're adding a + subscription, also include + <a href="#billing-form-add-subscription">subscription-specific details</a>. + After you've provided this information, click <strong>Save</strong>.</p> <dl> <dt>Publishing State</dt> <dd> @@ -185,6 +188,73 @@ number of in-app items.</p> </figcaption> </figure> +<h4 id="billing-form-add-subscription"> + Adding subscription details +</h4> + +<p> + When you add a subscription to a product list, you must define its billing + period. All other settings related to subscriptions are optional. The + following list shows each property that you can set: +</p> + +<dl> + <dt>Billing period</dt> + <dd> + <p> + Sets the frequency at which a user is charged while their subscription + is active. + </p> + + <p> + If the billing period for the new subscription is Seasonal, you must + specify when the season starts and ends using the <strong>Start + date</strong> and <strong>End date</strong> options. The subscription is + active only between these two dates. + </p> + + <p> + To allow users to activate a seasonal subscription for a discounted price + after the season begins, you can provide prorated pricing by selecting + <strong>Add Prorated Price</strong>. In the text boxes that appear after + you select this option, specify a discounted price for your subscription, + as well as the first date during the season when users can activate the + subscription for the discounted price. You can set multiple prorated + prices for a single subscription, with each price point taking effect on + a different start date. + </p> + + <p class="note"> + <strong>Note:</strong> After you activate a subscription, you cannot + change the subscription's billing period. For a seasonal subscription, + this restriction means that you also cannot change the season's start and + end dates. However, you can still add, change, and remove the prorated + prices that you've associated with a seasonal subscription. + </p> + </dd> + + <dt>Free trial period</dt> + <dd> + Sets the number of days that users can access the subscription for free + after they first activate it. The trial period must be at least 7 days. + </dd> + + <dt>Grace period</dt> + <dd> + Determines the amount of time that the user can continue accessing the + subscription after their payment is declined. If the user doesn't fix their + payment issue after the grace period has ended, their access to the + subscription is revoked. + </dd> +</dl> + +<p> + To learn more about how you can manage subscriptions using the In-app Billing + service, see the + <a href="/google/play/billing/billing_subscriptions.html">In-app + Subscriptions</a> guide. +</p> + <h3 id="billing-bulk-add">Adding a batch of items to a product list</h3> <p>To add a batch of items to a product list using a CSV file, you first need to diff --git a/docs/html/google/play/billing/billing_testing.jd b/docs/html/google/play/billing/billing_testing.jd index 44b7ad3081cf..22480a2d0b77 100644 --- a/docs/html/google/play/billing/billing_testing.jd +++ b/docs/html/google/play/billing/billing_testing.jd @@ -199,6 +199,15 @@ reserved product IDs. Also, you cannot specify the form of payment when you make with a reserved product ID. Figure 1 shows the checkout flow for the reserved item that has the product ID android.test.purchased.</p> +<p class="note"> + <strong>Note:</strong> If you're testing subscription purchases, you must use + the product ID of an actual subscription, not a reserved product ID. To verify + that Google Play is processing the test subscription purchases correctly, you + should + <a href="/google/play/billing/billing/billing_admin.html#billing-testing-setup">set + up test accounts</a> for your app. +</p> + <img src="{@docRoot}images/billing_test_flow.png" height="381" id="figure1" /> <p class="img-caption"> <strong>Figure 1.</strong>Purchase flow for the special reserved item android.test.purchased. diff --git a/graphics/java/android/graphics/Bitmap.java b/graphics/java/android/graphics/Bitmap.java index b6db327bff48..a259937c0b73 100644 --- a/graphics/java/android/graphics/Bitmap.java +++ b/graphics/java/android/graphics/Bitmap.java @@ -372,6 +372,16 @@ public final class Bitmap implements Parcelable { } /** + * This is called by methods that want to throw an exception if the bitmap + * is {@link Config#HARDWARE}. + */ + private void checkHardware(String errorMessage) { + if (getConfig() == Config.HARDWARE) { + throw new IllegalStateException(errorMessage); + } + } + + /** * Common code for checking that x and y are >= 0 * * @param x x coordinate to ensure is >= 0 @@ -512,8 +522,11 @@ public final class Bitmap implements Parcelable { * <p>After this method returns, the current position of the buffer is * updated: the position is incremented by the number of elements written * in the buffer.</p> + * @throws IllegalStateException if the bitmap's config is {@link Config#HARDWARE} */ public void copyPixelsToBuffer(Buffer dst) { + checkHardware("unable to copyPixelsToBuffer, " + + "pixel access is not supported on Config#HARDWARE bitmaps"); int elements = dst.remaining(); int shift; if (dst instanceof ByteBuffer) { @@ -550,9 +563,11 @@ public final class Bitmap implements Parcelable { * updated: the position is incremented by the number of elements read from * the buffer. If you need to read the bitmap from the buffer again you must * first rewind the buffer.</p> + * @throws IllegalStateException if the bitmap's config is {@link Config#HARDWARE} */ public void copyPixelsFromBuffer(Buffer src) { checkRecycled("copyPixelsFromBuffer called on recycled bitmap"); + checkHardware("unable to copyPixelsFromBuffer, Config#HARDWARE bitmaps are immutable"); int elements = src.remaining(); int shift; @@ -753,6 +768,11 @@ public final class Bitmap implements Parcelable { return source; } + boolean isHardware = source.getConfig() == Config.HARDWARE; + if (isHardware) { + source = nativeCopyPreserveInternalConfig(source.mNativePtr); + } + int neww = width; int newh = height; Canvas canvas = new Canvas(); @@ -824,7 +844,9 @@ public final class Bitmap implements Parcelable { canvas.setBitmap(bitmap); canvas.drawBitmap(source, srcR, dstR, paint); canvas.setBitmap(null); - + if (isHardware) { + return bitmap.copy(Config.HARDWARE, false); + } return bitmap; } @@ -1428,9 +1450,8 @@ public final class Bitmap implements Parcelable { @ColorInt public int getPixel(int x, int y) { checkRecycled("Can't call getPixel() on a recycled bitmap"); - if (getConfig() == Config.HARDWARE) { - throw new IllegalStateException("Can't access pixels in hardware Bitmaps"); - } + checkHardware("unable to getPixel(), " + + "pixel access is not supported on Config#HARDWARE bitmaps"); checkPixelAccess(x, y); return nativeGetPixel(mNativePtr, x, y); } @@ -1462,9 +1483,8 @@ public final class Bitmap implements Parcelable { public void getPixels(@ColorInt int[] pixels, int offset, int stride, int x, int y, int width, int height) { checkRecycled("Can't call getPixels() on a recycled bitmap"); - if (getConfig() == Config.HARDWARE) { - throw new IllegalStateException("Can't access pixels in hardware Bitmaps"); - } + checkHardware("unable to getPixels(), " + + "pixel access is not supported on Config#HARDWARE bitmaps"); if (width == 0 || height == 0) { return; // nothing to do } @@ -1773,4 +1793,5 @@ public final class Bitmap implements Parcelable { private static native boolean nativeSameAs(long nativeBitmap0, long nativeBitmap1); private static native void nativePrepareToDraw(long nativeBitmap); private static native int nativeGetAllocationByteCount(long nativeBitmap); + private static native Bitmap nativeCopyPreserveInternalConfig(long nativeBitmap); } diff --git a/location/java/android/location/GnssMeasurement.java b/location/java/android/location/GnssMeasurement.java index 761ee2209a20..70339005581f 100644 --- a/location/java/android/location/GnssMeasurement.java +++ b/location/java/android/location/GnssMeasurement.java @@ -63,7 +63,7 @@ public final class GnssMeasurement implements Parcelable { */ @Retention(RetentionPolicy.SOURCE) @IntDef({MULTIPATH_INDICATOR_UNKNOWN, MULTIPATH_INDICATOR_DETECTED, - MULTIPATH_INDICATOR_NOT_USED}) + MULTIPATH_INDICATOR_NOT_DETECTED}) public @interface MultipathIndicator {} /** @@ -81,9 +81,6 @@ public final class GnssMeasurement implements Parcelable { */ public static final int MULTIPATH_INDICATOR_NOT_DETECTED = 2; - /** @removed */ - public static final int MULTIPATH_INDICATOR_NOT_USED = 2; - /** This GNSS measurement's tracking state is invalid or unknown. */ public static final int STATE_UNKNOWN = 0; /** This GNSS measurement's tracking state has code lock. */ @@ -803,8 +800,8 @@ public final class GnssMeasurement implements Parcelable { return "Unknown"; case MULTIPATH_INDICATOR_DETECTED: return "Detected"; - case MULTIPATH_INDICATOR_NOT_USED: - return "NotUsed"; + case MULTIPATH_INDICATOR_NOT_DETECTED: + return "NotDetected"; default: return "<Invalid:" + mMultipathIndicator + ">"; } diff --git a/location/java/android/location/GnssMeasurementsEvent.java b/location/java/android/location/GnssMeasurementsEvent.java index 7db04663c83b..d66fd9c48b88 100644 --- a/location/java/android/location/GnssMeasurementsEvent.java +++ b/location/java/android/location/GnssMeasurementsEvent.java @@ -34,13 +34,6 @@ import java.util.Collections; * Events are delivered to registered instances of {@link Callback}. */ public final class GnssMeasurementsEvent implements Parcelable { - /** @removed */ - public static final int STATUS_NOT_SUPPORTED = 0; - /** @removed */ - public static final int STATUS_READY = 1; - /** @removed */ - public static final int STATUS_GNSS_LOCATION_DISABLED = 2; - private final GnssClock mClock; private final Collection<GnssMeasurement> mReadOnlyMeasurements; diff --git a/location/java/android/location/GnssNavigationMessageEvent.java b/location/java/android/location/GnssNavigationMessageEvent.java deleted file mode 100644 index f7e566517fc2..000000000000 --- a/location/java/android/location/GnssNavigationMessageEvent.java +++ /dev/null @@ -1,125 +0,0 @@ -/* - * 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 - */ - -package android.location; - -import android.annotation.IntDef; -import android.annotation.NonNull; -import android.os.Parcel; -import android.os.Parcelable; - -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.security.InvalidParameterException; - -/** - * A class implementing a container for data associated with a navigation message event. - * Events are delivered to registered instances of {@link Callback}. - * @removed - */ -public final class GnssNavigationMessageEvent implements Parcelable { - /** - * The status of GNSS measurements event. - * @hide - */ - @Retention(RetentionPolicy.SOURCE) - @IntDef({STATUS_NOT_SUPPORTED, STATUS_READY, STATUS_GNSS_LOCATION_DISABLED}) - public @interface GnssNavigationMessageStatus {} - - /** - * The system does not support tracking of GNSS Navigation Messages. - * - * This status will not change in the future. - */ - public static final int STATUS_NOT_SUPPORTED = 0; - - /** - * GNSS Navigation Messages are successfully being tracked, it will receive updates once they - * are available. - */ - public static final int STATUS_READY = 1; - - /** - * GNSS provider or Location is disabled, updated will not be received until they are enabled. - */ - public static final int STATUS_GNSS_LOCATION_DISABLED = 2; - - private final GnssNavigationMessage mNavigationMessage; - - /** - * Used for receiving GNSS satellite Navigation Messages from the GNSS engine. - * - * <p>You can implement this interface and call - * {@link LocationManager#registerGnssNavigationMessageCallback}. - */ - public static abstract class Callback { - - /** - * Returns the latest collected GNSS Navigation Message. - */ - public void onGnssNavigationMessageReceived(GnssNavigationMessageEvent event) {} - - /** - * Returns the latest status of the GNSS Navigation Messages sub-system. - */ - public void onStatusChanged(@GnssNavigationMessageStatus int status) {} - } - - public GnssNavigationMessageEvent(GnssNavigationMessage message) { - if (message == null) { - throw new InvalidParameterException("Parameter 'message' must not be null."); - } - mNavigationMessage = message; - } - - @NonNull - public GnssNavigationMessage getNavigationMessage() { - return mNavigationMessage; - } - - public static final Creator<GnssNavigationMessageEvent> CREATOR = - new Creator<GnssNavigationMessageEvent>() { - @Override - public GnssNavigationMessageEvent createFromParcel(Parcel in) { - ClassLoader classLoader = getClass().getClassLoader(); - GnssNavigationMessage navigationMessage = in.readParcelable(classLoader); - return new GnssNavigationMessageEvent(navigationMessage); - } - - @Override - public GnssNavigationMessageEvent[] newArray(int size) { - return new GnssNavigationMessageEvent[size]; - } - }; - - @Override - public int describeContents() { - return 0; - } - - @Override - public void writeToParcel(Parcel parcel, int flags) { - parcel.writeParcelable(mNavigationMessage, flags); - } - - @Override - public String toString() { - StringBuilder builder = new StringBuilder("[ GnssNavigationMessageEvent:\n\n"); - builder.append(mNavigationMessage.toString()); - builder.append("\n]"); - return builder.toString(); - } -} diff --git a/location/java/android/location/GnssStatus.java b/location/java/android/location/GnssStatus.java index e68821b5a220..f10514427455 100644 --- a/location/java/android/location/GnssStatus.java +++ b/location/java/android/location/GnssStatus.java @@ -111,11 +111,6 @@ public final class GnssStatus { mAzimuths = azimuths; } - /** @removed */ - public int getNumSatellites() { - return getSatelliteCount(); - } - /** * Gets the total number of satellites in satellite list. */ @@ -191,11 +186,6 @@ public final class GnssStatus { return mAzimuths[satIndex]; } - /** @removed */ - public boolean hasEphemeris(int satIndex) { - return hasEphemerisData(satIndex); - } - /** * Reports whether the satellite at the specified index has ephemeris data. * @@ -205,11 +195,6 @@ public final class GnssStatus { return (mSvidWithFlags[satIndex] & GNSS_SV_FLAGS_HAS_EPHEMERIS_DATA) != 0; } - /** @removed */ - public boolean hasAlmanac(int satIndex) { - return hasAlmanacData(satIndex); - } - /** * Reports whether the satellite at the specified index has almanac data. * diff --git a/location/java/android/location/GnssStatusCallback.java b/location/java/android/location/GnssStatusCallback.java deleted file mode 100644 index bf295ef7d817..000000000000 --- a/location/java/android/location/GnssStatusCallback.java +++ /dev/null @@ -1,45 +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. - */ - -package android.location; - -/** - * Used for receiving notifications when GNSS events happen. - * @removed - */ -public abstract class GnssStatusCallback { - /** - * Called when GNSS system has started. - */ - public void onStarted() {} - - /** - * Called when GNSS system has stopped. - */ - public void onStopped() {} - - /** - * Called when the GNSS system has received its first fix since starting. - * @param ttffMillis the time from start to first fix in milliseconds. - */ - public void onFirstFix(int ttffMillis) {} - - /** - * Called periodically to report GNSS satellite status. - * @param status the current status of all satellites. - */ - public void onSatelliteStatusChanged(GnssStatus status) {} -} diff --git a/location/java/android/location/LocationManager.java b/location/java/android/location/LocationManager.java index da0e515cda4b..087e74f54006 100644 --- a/location/java/android/location/LocationManager.java +++ b/location/java/android/location/LocationManager.java @@ -70,16 +70,10 @@ public class LocationManager { new HashMap<>(); private final HashMap<GpsStatus.NmeaListener, GnssStatusListenerTransport> mGpsNmeaListeners = new HashMap<>(); - private final HashMap<GnssStatusCallback, GnssStatusListenerTransport> - mOldGnssStatusListeners = new HashMap<>(); private final HashMap<GnssStatus.Callback, GnssStatusListenerTransport> mGnssStatusListeners = new HashMap<>(); - private final HashMap<GnssNmeaListener, GnssStatusListenerTransport> mOldGnssNmeaListeners = - new HashMap<>(); private final HashMap<OnNmeaMessageListener, GnssStatusListenerTransport> mGnssNmeaListeners = new HashMap<>(); - private final HashMap<GnssNavigationMessageEvent.Callback, GnssNavigationMessage.Callback> - mNavigationMessageBridge = new HashMap<>(); private GnssStatus mGnssStatus; private int mTimeToFirstFix; @@ -1398,9 +1392,7 @@ public class LocationManager { private final GpsStatus.Listener mGpsListener; private final GpsStatus.NmeaListener mGpsNmeaListener; - private final GnssStatusCallback mOldGnssCallback; private final GnssStatus.Callback mGnssCallback; - private final GnssNmeaListener mOldGnssNmeaListener; private final OnNmeaMessageListener mGnssNmeaListener; private class GnssHandler extends Handler { @@ -1464,7 +1456,6 @@ public class LocationManager { mGnssHandler = new GnssHandler(handler); mGpsNmeaListener = null; mNmeaBuffer = null; - mOldGnssCallback = null; mGnssCallback = mGpsListener != null ? new GnssStatus.Callback() { @Override public void onStarted() { @@ -1486,7 +1477,6 @@ public class LocationManager { mGpsListener.onGpsStatusChanged(GpsStatus.GPS_EVENT_SATELLITE_STATUS); } } : null; - mOldGnssNmeaListener = null; mGnssNmeaListener = null; } @@ -1499,9 +1489,7 @@ public class LocationManager { mGnssHandler = new GnssHandler(handler); mGpsNmeaListener = listener; mNmeaBuffer = new ArrayList<Nmea>(); - mOldGnssCallback = null; mGnssCallback = null; - mOldGnssNmeaListener = null; mGnssNmeaListener = mGpsNmeaListener != null ? new OnNmeaMessageListener() { @Override public void onNmeaMessage(String nmea, long timestamp) { @@ -1510,85 +1498,26 @@ public class LocationManager { } : null; } - GnssStatusListenerTransport(GnssStatusCallback callback) { - this(callback, null); - } - - GnssStatusListenerTransport(GnssStatusCallback callback, Handler handler) { - mOldGnssCallback = callback; - mGnssCallback = mOldGnssCallback != null ? new GnssStatus.Callback() { - @Override - public void onStarted() { - mOldGnssCallback.onStarted(); - } - - @Override - public void onStopped() { - mOldGnssCallback.onStopped(); - } - - @Override - public void onFirstFix(int ttff) { - mOldGnssCallback.onFirstFix(ttff); - } - - @Override - public void onSatelliteStatusChanged(GnssStatus status) { - mOldGnssCallback.onSatelliteStatusChanged(status); - } - } : null; - mGnssHandler = new GnssHandler(handler); - mOldGnssNmeaListener = null; - mGnssNmeaListener = null; - mNmeaBuffer = null; - mGpsListener = null; - mGpsNmeaListener = null; - } - GnssStatusListenerTransport(GnssStatus.Callback callback) { this(callback, null); } GnssStatusListenerTransport(GnssStatus.Callback callback, Handler handler) { - mOldGnssCallback = null; mGnssCallback = callback; mGnssHandler = new GnssHandler(handler); - mOldGnssNmeaListener = null; mGnssNmeaListener = null; mNmeaBuffer = null; mGpsListener = null; mGpsNmeaListener = null; } - GnssStatusListenerTransport(GnssNmeaListener listener) { - this(listener, null); - } - - GnssStatusListenerTransport(GnssNmeaListener listener, Handler handler) { - mGnssCallback = null; - mOldGnssCallback = null; - mGnssHandler = new GnssHandler(handler); - mOldGnssNmeaListener = listener; - mGnssNmeaListener = mOldGnssNmeaListener != null ? new OnNmeaMessageListener() { - @Override - public void onNmeaMessage(String message, long timestamp) { - mOldGnssNmeaListener.onNmeaReceived(timestamp, message); - } - } : null; - mGpsListener = null; - mGpsNmeaListener = null; - mNmeaBuffer = new ArrayList<Nmea>(); - } - GnssStatusListenerTransport(OnNmeaMessageListener listener) { this(listener, null); } GnssStatusListenerTransport(OnNmeaMessageListener listener, Handler handler) { - mOldGnssCallback = null; mGnssCallback = null; mGnssHandler = new GnssHandler(handler); - mOldGnssNmeaListener = null; mGnssNmeaListener = listener; mGpsListener = null; mGpsNmeaListener = null; @@ -1703,73 +1632,9 @@ public class LocationManager { } /** - * Registers a GNSS status listener. - * - * @param callback GNSS status listener object to register - * - * @return true if the listener was successfully added - * - * @throws SecurityException if the ACCESS_FINE_LOCATION permission is not present - * @removed - */ - @RequiresPermission(ACCESS_FINE_LOCATION) - public boolean registerGnssStatusCallback(GnssStatusCallback callback) { - return registerGnssStatusCallback(callback, null); - } - - /** - * Registers a GNSS status listener. - * - * @param callback GNSS status listener object to register - * @param handler the handler that the callback runs on. - * - * @return true if the listener was successfully added - * - * @throws SecurityException if the ACCESS_FINE_LOCATION permission is not present - * @removed - */ - @RequiresPermission(ACCESS_FINE_LOCATION) - public boolean registerGnssStatusCallback(GnssStatusCallback callback, Handler handler) { - boolean result; - if (mOldGnssStatusListeners.get(callback) != null) { - // listener is already registered - return true; - } - try { - GnssStatusListenerTransport transport = - new GnssStatusListenerTransport(callback, handler); - result = mService.registerGnssStatusCallback(transport, mContext.getPackageName()); - if (result) { - mOldGnssStatusListeners.put(callback, transport); - } - } catch (RemoteException e) { - throw e.rethrowFromSystemServer(); - } - - return result; - } - - /** - * Removes a GNSS status listener. - * - * @param callback GNSS status listener object to remove - * @removed - */ - public void unregisterGnssStatusCallback(GnssStatusCallback callback) { - try { - GnssStatusListenerTransport transport = mOldGnssStatusListeners.remove(callback); - if (transport != null) { - mService.unregisterGnssStatusCallback(transport); - } - } catch (RemoteException e) { - throw e.rethrowFromSystemServer(); - } - } - - /** - * Registers a GNSS status listener. + * Registers a GNSS status callback. * - * @param callback GNSS status listener object to register + * @param callback GNSS status callback object to register * * @return true if the listener was successfully added * @@ -1781,9 +1646,9 @@ public class LocationManager { } /** - * Registers a GNSS status listener. + * Registers a GNSS status callback. * - * @param callback GNSS status listener object to register + * @param callback GNSS status callback object to register * @param handler the handler that the callback runs on. * * @return true if the listener was successfully added @@ -1812,9 +1677,9 @@ public class LocationManager { } /** - * Removes a GNSS status listener. + * Removes a GNSS status callback. * - * @param callback GNSS status listener object to remove + * @param callback GNSS status callback object to remove */ public void unregisterGnssStatusCallback(GnssStatus.Callback callback) { try { @@ -1880,71 +1745,6 @@ public class LocationManager { /** * Adds an NMEA listener. * - * @param listener a {@link GnssNmeaListener} object to register - * - * @return true if the listener was successfully added - * - * @throws SecurityException if the ACCESS_FINE_LOCATION permission is not present - * @removed - */ - @RequiresPermission(ACCESS_FINE_LOCATION) - public boolean addNmeaListener(GnssNmeaListener listener) { - return addNmeaListener(listener, null); - } - - /** - * Adds an NMEA listener. - * - * @param listener a {@link GnssNmeaListener} object to register - * @param handler the handler that the listener runs on. - * - * @return true if the listener was successfully added - * - * @throws SecurityException if the ACCESS_FINE_LOCATION permission is not present - * @removed - */ - @RequiresPermission(ACCESS_FINE_LOCATION) - public boolean addNmeaListener(GnssNmeaListener listener, Handler handler) { - boolean result; - - if (mGpsNmeaListeners.get(listener) != null) { - // listener is already registered - return true; - } - try { - GnssStatusListenerTransport transport = - new GnssStatusListenerTransport(listener, handler); - result = mService.registerGnssStatusCallback(transport, mContext.getPackageName()); - if (result) { - mOldGnssNmeaListeners.put(listener, transport); - } - } catch (RemoteException e) { - throw e.rethrowFromSystemServer(); - } - - return result; - } - - /** - * Removes an NMEA listener. - * - * @param listener a {@link GnssNmeaListener} object to remove - * @removed - */ - public void removeNmeaListener(GnssNmeaListener listener) { - try { - GnssStatusListenerTransport transport = mOldGnssNmeaListeners.remove(listener); - if (transport != null) { - mService.unregisterGnssStatusCallback(transport); - } - } catch (RemoteException e) { - throw e.rethrowFromSystemServer(); - } - } - - /** - * Adds an NMEA listener. - * * @param listener a {@link OnNmeaMessageListener} object to register * * @return true if the listener was successfully added @@ -2088,58 +1888,6 @@ public class LocationManager { /** * Registers a GNSS Navigation Message callback. * - * @param callback a {@link GnssNavigationMessageEvent.Callback} object to register. - * @return {@code true} if the callback was added successfully, {@code false} otherwise. - * @removed - */ - public boolean registerGnssNavigationMessageCallback( - GnssNavigationMessageEvent.Callback callback) { - return registerGnssNavigationMessageCallback(callback, null); - } - - /** - * Registers a GNSS Navigation Message callback. - * - * @param callback a {@link GnssNavigationMessageEvent.Callback} object to register. - * @param handler the handler that the callback runs on. - * @return {@code true} if the callback was added successfully, {@code false} otherwise. - * @removed - */ - @RequiresPermission(ACCESS_FINE_LOCATION) - public boolean registerGnssNavigationMessageCallback( - final GnssNavigationMessageEvent.Callback callback, Handler handler) { - GnssNavigationMessage.Callback bridge = new GnssNavigationMessage.Callback() { - @Override - public void onGnssNavigationMessageReceived(GnssNavigationMessage message) { - GnssNavigationMessageEvent event = new GnssNavigationMessageEvent(message); - callback.onGnssNavigationMessageReceived(event); - } - - @Override - public void onStatusChanged(int status) { - callback.onStatusChanged(status); - } - }; - mNavigationMessageBridge.put(callback, bridge); - return mGnssNavigationMessageCallbackTransport.add(bridge, handler); - } - - /** - * Unregisters a GNSS Navigation Message callback. - * - * @param callback a {@link GnssNavigationMessageEvent.Callback} object to remove. - * @removed - */ - public void unregisterGnssNavigationMessageCallback( - GnssNavigationMessageEvent.Callback callback) { - mGnssNavigationMessageCallbackTransport.remove( - mNavigationMessageBridge.remove( - callback)); - } - - /** - * Registers a GNSS Navigation Message callback. - * * @param callback a {@link GnssNavigationMessage.Callback} object to register. * @return {@code true} if the callback was added successfully, {@code false} otherwise. */ diff --git a/media/java/android/media/AudioAttributes.java b/media/java/android/media/AudioAttributes.java index 5440f0fc214f..dc8264a81427 100644 --- a/media/java/android/media/AudioAttributes.java +++ b/media/java/android/media/AudioAttributes.java @@ -169,6 +169,11 @@ public final class AudioAttributes implements Parcelable { * source, such as audio capture devices. */ public final static int USAGE_VIRTUAL_SOURCE = 15; + /** + * Usage value to use for audio responses to user queries, audio instructions or help + * utterances. + */ + public final static int USAGE_ASSISTANT = 16; /** * IMPORTANT: when adding new usage types, add them to SDK_USAGES and update SUPPRESSIBLE_USAGES @@ -227,7 +232,8 @@ public final class AudioAttributes implements Parcelable { USAGE_ASSISTANCE_ACCESSIBILITY, USAGE_ASSISTANCE_NAVIGATION_GUIDANCE, USAGE_ASSISTANCE_SONIFICATION, - USAGE_GAME + USAGE_GAME, + USAGE_ASSISTANT, }; /** @@ -473,6 +479,7 @@ public final class AudioAttributes implements Parcelable { * {@link AudioAttributes#USAGE_NOTIFICATION_COMMUNICATION_INSTANT}, * {@link AudioAttributes#USAGE_NOTIFICATION_COMMUNICATION_DELAYED}, * {@link AudioAttributes#USAGE_NOTIFICATION_EVENT}, + * {@link AudioAttributes#USAGE_ASSISTANT}, * {@link AudioAttributes#USAGE_ASSISTANCE_ACCESSIBILITY}, * {@link AudioAttributes#USAGE_ASSISTANCE_NAVIGATION_GUIDANCE}, * {@link AudioAttributes#USAGE_ASSISTANCE_SONIFICATION}, @@ -497,6 +504,7 @@ public final class AudioAttributes implements Parcelable { case USAGE_ASSISTANCE_SONIFICATION: case USAGE_GAME: case USAGE_VIRTUAL_SOURCE: + case USAGE_ASSISTANT: mUsage = usage; break; default: @@ -844,6 +852,8 @@ public final class AudioAttributes implements Parcelable { return new String("USAGE_ASSISTANCE_SONIFICATION"); case USAGE_GAME: return new String("USAGE_GAME"); + case USAGE_ASSISTANT: + return new String("USAGE_ASSISTANT"); default: return new String("unknown usage " + usage); } @@ -923,6 +933,7 @@ public final class AudioAttributes implements Parcelable { case USAGE_MEDIA: case USAGE_GAME: case USAGE_ASSISTANCE_NAVIGATION_GUIDANCE: + case USAGE_ASSISTANT: return AudioSystem.STREAM_MUSIC; case USAGE_ASSISTANCE_SONIFICATION: return AudioSystem.STREAM_SYSTEM; @@ -972,7 +983,8 @@ public final class AudioAttributes implements Parcelable { USAGE_ASSISTANCE_ACCESSIBILITY, USAGE_ASSISTANCE_NAVIGATION_GUIDANCE, USAGE_ASSISTANCE_SONIFICATION, - USAGE_GAME + USAGE_GAME, + USAGE_ASSISTANT, }) @Retention(RetentionPolicy.SOURCE) public @interface AttributeUsage {} diff --git a/media/java/android/media/AudioManager.java b/media/java/android/media/AudioManager.java index 23bb6f94a1c3..1d124c5e7f91 100644 --- a/media/java/android/media/AudioManager.java +++ b/media/java/android/media/AudioManager.java @@ -3482,6 +3482,20 @@ public class AudioManager { return delay; } + /** + * Indicate A2DP device configuration has changed. + * @param device Bluetooth device whose configuration has changed. + * {@hide} + */ + public void handleBluetoothA2dpDeviceConfigChange(BluetoothDevice device) { + IAudioService service = getService(); + try { + service.handleBluetoothA2dpDeviceConfigChange(device); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } + } + /** {@hide} */ public IRingtonePlayer getRingtonePlayer() { try { diff --git a/media/java/android/media/AudioPlaybackConfiguration.java b/media/java/android/media/AudioPlaybackConfiguration.java index 3382cd95163c..147c5dffca48 100644 --- a/media/java/android/media/AudioPlaybackConfiguration.java +++ b/media/java/android/media/AudioPlaybackConfiguration.java @@ -36,6 +36,11 @@ import java.util.Objects; public final class AudioPlaybackConfiguration implements Parcelable { private final static String TAG = new String("AudioPlaybackConfiguration"); + /** @hide */ + public final static int PLAYER_PIID_INVALID = -1; + /** @hide */ + public final static int PLAYER_UPID_INVALID = -1; + // information about the implementation /** * @hide @@ -63,10 +68,16 @@ public final class AudioPlaybackConfiguration implements Parcelable { public final static int PLAYER_TYPE_JAM_SOUNDPOOL = 3; /** * @hide - * Player backed by a C OpenSL ES AudioPlayer player + * Player backed by a C OpenSL ES AudioPlayer player with a BufferQueue source + */ + @SystemApi + public final static int PLAYER_TYPE_SLES_AUDIOPLAYER_BUFFERQUEUE = 11; + /** + * @hide + * Player backed by a C OpenSL ES AudioPlayer player with a URI or FD source */ @SystemApi - public final static int PLAYER_TYPE_SLES_AUDIOPLAYER = 11; + public final static int PLAYER_TYPE_SLES_AUDIOPLAYER_URI_FD = 12; /** @hide */ @IntDef({ @@ -74,7 +85,8 @@ public final class AudioPlaybackConfiguration implements Parcelable { PLAYER_TYPE_JAM_AUDIOTRACK, PLAYER_TYPE_JAM_MEDIAPLAYER, PLAYER_TYPE_JAM_SOUNDPOOL, - PLAYER_TYPE_SLES_AUDIOPLAYER + PLAYER_TYPE_SLES_AUDIOPLAYER_BUFFERQUEUE, + PLAYER_TYPE_SLES_AUDIOPLAYER_URI_FD, }) @Retention(RetentionPolicy.SOURCE) public @interface PlayerType {} @@ -149,11 +161,11 @@ public final class AudioPlaybackConfiguration implements Parcelable { /** * @hide */ - public AudioPlaybackConfiguration(PlayerBase.PlayerIdCard pic) { - mPlayerIId = pic.mPIId; + public AudioPlaybackConfiguration(PlayerBase.PlayerIdCard pic, int piid, int uid, int pid) { + mPlayerIId = piid; mPlayerType = pic.mPlayerType; - mClientUid = pic.mClientUid; - mClientPid = pic.mClientPid; + mClientUid = uid; + mClientPid = pid; mPlayerState = PLAYER_STATE_IDLE; mPlayerAttr = pic.mAttributes; } @@ -177,8 +189,8 @@ public final class AudioPlaybackConfiguration implements Parcelable { .build(); // anonymized data anonymCopy.mPlayerType = PLAYER_TYPE_UNKNOWN; - anonymCopy.mClientUid = 0; - anonymCopy.mClientPid = 0; + anonymCopy.mClientUid = PLAYER_UPID_INVALID; + anonymCopy.mClientPid = PLAYER_UPID_INVALID; return anonymCopy; } @@ -214,8 +226,8 @@ public final class AudioPlaybackConfiguration implements Parcelable { * @hide * Return the type of player linked to this configuration. The return value is one of * {@link #PLAYER_TYPE_JAM_AUDIOTRACK}, {@link #PLAYER_TYPE_JAM_MEDIAPLAYER}, - * {@link #PLAYER_TYPE_JAM_SOUNDPOOL}, {@link #PLAYER_TYPE_SLES_AUDIOPLAYER}, - * or {@link #PLAYER_TYPE_UNKNOWN}. + * {@link #PLAYER_TYPE_JAM_SOUNDPOOL}, {@link #PLAYER_TYPE_SLES_AUDIOPLAYER_BUFFERQUEUE}, + * {@link #PLAYER_TYPE_SLES_AUDIOPLAYER_URI_FD}, or {@link #PLAYER_TYPE_UNKNOWN}. * @return the type of the player. */ @SystemApi @@ -360,7 +372,10 @@ public final class AudioPlaybackConfiguration implements Parcelable { case PLAYER_TYPE_JAM_AUDIOTRACK: return "android.media.AudioTrack"; case PLAYER_TYPE_JAM_MEDIAPLAYER: return "android.media.MediaPlayer"; case PLAYER_TYPE_JAM_SOUNDPOOL: return "android.media.SoundPool"; - case PLAYER_TYPE_SLES_AUDIOPLAYER: return "OpenSL ES AudioPlayer"; + case PLAYER_TYPE_SLES_AUDIOPLAYER_BUFFERQUEUE: + return "OpenSL ES AudioPlayer (Buffer Queue)"; + case PLAYER_TYPE_SLES_AUDIOPLAYER_URI_FD: + return "OpenSL ES AudioPlayer (URI/FD)"; default: return "unknown player type - FIXME"; } diff --git a/media/java/android/media/AudioSystem.java b/media/java/android/media/AudioSystem.java index 179289952e65..b44a710a1cb7 100644 --- a/media/java/android/media/AudioSystem.java +++ b/media/java/android/media/AudioSystem.java @@ -689,6 +689,9 @@ public class AudioSystem public static native int setDeviceConnectionState(int device, int state, String device_address, String device_name); public static native int getDeviceConnectionState(int device, String device_address); + public static native int handleDeviceConfigChange(int device, + String device_address, + String device_name); public static native int setPhoneState(int state); public static native int setForceUse(int usage, int config); public static native int getForceUse(int usage); diff --git a/media/java/android/media/IAudioService.aidl b/media/java/android/media/IAudioService.aidl index 151b4d58fd65..393ef0dfe44b 100644 --- a/media/java/android/media/IAudioService.aidl +++ b/media/java/android/media/IAudioService.aidl @@ -42,6 +42,13 @@ import android.view.KeyEvent; */ interface IAudioService { + // WARNING: When methods are inserted or deleted, the transaction IDs in + // frameworks/native/include/audiomanager/IAudioManager.h must be updated to match the order + // in this file. + // + // When a method's argument list is changed, BnAudioManager's corresponding serialization code + // (if any) in frameworks/native/services/audiomanager/IAudioManager.cpp must be updated. + oneway void adjustSuggestedStreamVolume(int direction, int suggestedStreamType, int flags, String callingPackage, String caller); @@ -136,6 +143,8 @@ interface IAudioService { int setBluetoothA2dpDeviceConnectionState(in BluetoothDevice device, int state, int profile); + void handleBluetoothA2dpDeviceConfigChange(in BluetoothDevice device); + AudioRoutesInfo startWatchingRoutes(in IAudioRoutesObserver observer); boolean isCameraSoundForced(); @@ -175,11 +184,13 @@ interface IAudioService { List<AudioPlaybackConfiguration> getActivePlaybackConfigurations(); - oneway void trackPlayer(in PlayerBase.PlayerIdCard pic); + int trackPlayer(in PlayerBase.PlayerIdCard pic); oneway void playerAttributes(in int piid, in AudioAttributes attr); oneway void playerEvent(in int piid, in int event); oneway void releasePlayer(in int piid); + + // WARNING: read warning at top of file, it is recommended to add new methods at the end } diff --git a/media/java/android/media/MediaPlayer.java b/media/java/android/media/MediaPlayer.java index 77a0fbde6eb1..500556aa7256 100644 --- a/media/java/android/media/MediaPlayer.java +++ b/media/java/android/media/MediaPlayer.java @@ -2291,7 +2291,7 @@ public class MediaPlayer extends PlayerBase * {@link #setSubtitleAnchor(SubtitleController, Anchor)} (e.g. {@link VideoView} provides one). */ private synchronized void setSubtitleAnchor() { - if (mSubtitleController == null) { + if ((mSubtitleController == null) && (ActivityThread.currentApplication() != null)) { final HandlerThread thread = new HandlerThread("SetSubtitleAnchorThread"); thread.start(); Handler handler = new Handler(thread.getLooper()); @@ -2442,10 +2442,7 @@ public class MediaPlayer extends PlayerBase } private void scanInternalSubtitleTracks() { - if (mSubtitleController == null) { - Log.d(TAG, "setSubtitleAnchor in MediaPlayer"); - setSubtitleAnchor(); - } + setSubtitleAnchor(); populateInbandTracks(); diff --git a/media/java/android/media/PlayerBase.java b/media/java/android/media/PlayerBase.java index 49c89a35a0cb..4eacb3880a94 100644 --- a/media/java/android/media/PlayerBase.java +++ b/media/java/android/media/PlayerBase.java @@ -78,7 +78,7 @@ public abstract class PlayerBase { } mAttributes = attr; mImplType = implType; - mPlayerIId = AudioSystem.newAudioPlayerId(); + int newPiid = AudioPlaybackConfiguration.PLAYER_PIID_INVALID; IBinder b = ServiceManager.getService(Context.APP_OPS_SERVICE); mAppOps = IAppOpsService.Stub.asInterface(b); // initialize mHasAppOpsPlayAudio @@ -100,10 +100,11 @@ public abstract class PlayerBase { mHasAppOpsPlayAudio = false; } try { - getService().trackPlayer(new PlayerIdCard(mPlayerIId, mImplType, mAttributes)); + newPiid = getService().trackPlayer(new PlayerIdCard(mImplType, mAttributes)); } catch (RemoteException e) { Log.e(TAG, "Error talking to audio service, player will not be tracked", e); } + mPlayerIId = newPiid; } @@ -311,26 +312,20 @@ public abstract class PlayerBase { * Class holding all the information about a player that needs to be known at registration time */ public static class PlayerIdCard implements Parcelable { - public final int mPIId; public final int mPlayerType; - public final int mClientUid; - public final int mClientPid; public final static int AUDIO_ATTRIBUTES_NONE = 0; public final static int AUDIO_ATTRIBUTES_DEFINED = 1; public final AudioAttributes mAttributes; - PlayerIdCard(int piid, int type, @NonNull AudioAttributes attr) { - mPIId = piid; + PlayerIdCard(int type, @NonNull AudioAttributes attr) { mPlayerType = type; - mClientUid = Binder.getCallingUid(); - mClientPid = Binder.getCallingPid(); mAttributes = attr; } @Override public int hashCode() { - return Objects.hash(mPIId, mPlayerType); + return Objects.hash(mPlayerType); } @Override @@ -340,10 +335,7 @@ public abstract class PlayerBase { @Override public void writeToParcel(Parcel dest, int flags) { - dest.writeInt(mPIId); dest.writeInt(mPlayerType); - dest.writeInt(mClientUid); - dest.writeInt(mClientPid); mAttributes.writeToParcel(dest, 0); } @@ -363,10 +355,7 @@ public abstract class PlayerBase { }; private PlayerIdCard(Parcel in) { - mPIId = in.readInt(); mPlayerType = in.readInt(); - mClientUid = in.readInt(); - mClientPid = in.readInt(); mAttributes = AudioAttributes.CREATOR.createFromParcel(in); } @@ -377,7 +366,8 @@ public abstract class PlayerBase { PlayerIdCard that = (PlayerIdCard) o; - return (mPIId == that.mPIId); + // FIXME change to the binder player interface once supported as a member + return ((mPlayerType == that.mPlayerType) && mAttributes.equals(that.mAttributes)); } } diff --git a/packages/Keyguard/res/values-nl/strings.xml b/packages/Keyguard/res/values-nl/strings.xml index c44381efc817..fe87df8e5f5d 100644 --- a/packages/Keyguard/res/values-nl/strings.xml +++ b/packages/Keyguard/res/values-nl/strings.xml @@ -44,7 +44,7 @@ <string name="keyguard_permanent_disabled_sim_message_short" msgid="8340813989586622356">"Onbruikbare simkaart."</string> <string name="keyguard_permanent_disabled_sim_instructions" msgid="5892940909699723544">"Je simkaart is permanent uitgeschakeld.\n Neem contact op met je mobiele serviceprovider voor een nieuwe simkaart."</string> <string name="keyguard_sim_locked_message" msgid="6875773413306380902">"Simkaart is vergrendeld."</string> - <string name="keyguard_sim_puk_locked_message" msgid="3747232467471801633">"Simkaart is vergrendeld met PUK-code."</string> + <string name="keyguard_sim_puk_locked_message" msgid="3747232467471801633">"Simkaart is vergrendeld met pukcode."</string> <string name="keyguard_sim_unlock_progress_dialog_message" msgid="7975221805033614426">"Simkaart ontgrendelen…"</string> <string name="keyguard_accessibility_pin_area" msgid="7903959476607833485">"Gebied voor pincode"</string> <string name="keyguard_accessibility_sim_pin_area" msgid="3887780775111719336">"Gebied voor sim-pincode"</string> @@ -62,14 +62,14 @@ <string name="kg_sim_pin_instructions_multi" msgid="7818515973197201434">"Voer de pincode in voor de simkaart van \'<xliff:g id="CARRIER">%1$s</xliff:g>\'"</string> <string name="kg_pin_instructions" msgid="2377242233495111557">"Pincode opgeven"</string> <string name="kg_password_instructions" msgid="5753646556186936819">"Wachtwoord invoeren"</string> - <string name="kg_puk_enter_puk_hint" msgid="453227143861735537">"De simkaart is nu uitgeschakeld. Geef de PUK-code op om door te gaan. Neem contact op met de provider voor informatie."</string> - <string name="kg_puk_enter_puk_hint_multi" msgid="363822494559783025">"Simkaart van \'<xliff:g id="CARRIER">%1$s</xliff:g>\' is nu uitgeschakeld. Voer de PUK-code in om door te gaan. Neem contact op met je provider voor meer informatie."</string> + <string name="kg_puk_enter_puk_hint" msgid="453227143861735537">"De simkaart is nu uitgeschakeld. Geef de pukcode op om door te gaan. Neem contact op met de provider voor informatie."</string> + <string name="kg_puk_enter_puk_hint_multi" msgid="363822494559783025">"Simkaart van \'<xliff:g id="CARRIER">%1$s</xliff:g>\' is nu uitgeschakeld. Voer de pukcode in om door te gaan. Neem contact op met je provider voor meer informatie."</string> <string name="kg_puk_enter_pin_hint" msgid="7871604527429602024">"Gewenste pincode opgeven"</string> <string name="kg_enter_confirm_pin_hint" msgid="325676184762529976">"Gewenste pincode bevestigen"</string> <string name="kg_sim_unlock_progress_dialog_message" msgid="8950398016976865762">"Simkaart ontgrendelen..."</string> <string name="kg_invalid_sim_pin_hint" msgid="8795159358110620001">"Voer een pincode van 4 tot 8 cijfers in."</string> - <string name="kg_invalid_sim_puk_hint" msgid="7553388325654369575">"De PUK-code is minimaal acht nummers lang."</string> - <string name="kg_invalid_puk" msgid="3638289409676051243">"Geef de juiste PUK-code opnieuw op. Bij herhaalde pogingen wordt de simkaart permanent uitgeschakeld."</string> + <string name="kg_invalid_sim_puk_hint" msgid="7553388325654369575">"De pukcode is minimaal acht nummers lang."</string> + <string name="kg_invalid_puk" msgid="3638289409676051243">"Geef de juiste pukcode opnieuw op. Bij herhaalde pogingen wordt de simkaart permanent uitgeschakeld."</string> <string name="kg_invalid_confirm_pin_hint" product="default" msgid="7003469261464593516">"Pincodes komen niet overeen"</string> <string name="kg_login_too_many_attempts" msgid="6486842094005698475">"Te veel patroonpogingen"</string> <string name="kg_too_many_failed_pin_attempts_dialog_message" msgid="8276745642049502550">"Je hebt je pincode <xliff:g id="NUMBER_0">%1$d</xliff:g> keer onjuist getypt. \n\nProbeer het opnieuw over <xliff:g id="NUMBER_1">%2$d</xliff:g> seconden."</string> diff --git a/packages/SettingsLib/res/layout/settings_with_drawer.xml b/packages/SettingsLib/res/layout/settings_with_drawer.xml index a68a44e09371..abe310a6e38a 100644 --- a/packages/SettingsLib/res/layout/settings_with_drawer.xml +++ b/packages/SettingsLib/res/layout/settings_with_drawer.xml @@ -18,7 +18,7 @@ android:id="@+id/drawer_layout" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="?android:attr/colorPrimaryDark"> + android:background="?android:attr/statusBarColor"> <!-- The main content view --> <LinearLayout android:id="@+id/content_parent" diff --git a/packages/SettingsLib/res/values-nl/strings.xml b/packages/SettingsLib/res/values-nl/strings.xml index 0f2e6d4046a9..89d7fabeda1a 100644 --- a/packages/SettingsLib/res/values-nl/strings.xml +++ b/packages/SettingsLib/res/values-nl/strings.xml @@ -325,7 +325,7 @@ <string name="disabled_by_admin_summary_text" msgid="6750513964908334617">"Ingesteld door beheerder"</string> <string name="enabled_by_admin" msgid="2386503803463071894">"Ingeschakeld door beheerder"</string> <string name="disabled_by_admin" msgid="3669999613095206948">"Uitgeschakeld door beheerder"</string> - <string name="home" msgid="3256884684164448244">"Startpagina voor instellingen"</string> + <string name="home" msgid="3256884684164448244">"Homepage voor instellingen"</string> <string-array name="battery_labels"> <item msgid="8494684293649631252">"0%"</item> <item msgid="8934126114226089439">"50%"</item> diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/BluetoothEventManager.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/BluetoothEventManager.java index a33233213101..80b943c31183 100755 --- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/BluetoothEventManager.java +++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/BluetoothEventManager.java @@ -38,7 +38,7 @@ import java.util.Set; * API and dispatches the event on the UI thread to the right class in the * Settings. */ -public final class BluetoothEventManager { +public class BluetoothEventManager { private static final String TAG = "BluetoothEventManager"; private final LocalBluetoothAdapter mLocalAdapter; diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java index 52e686c9bce9..e279a09c2bd2 100644 --- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java +++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java @@ -42,7 +42,7 @@ import java.util.List; * functionality that can be performed on the device (connect, pair, disconnect, * etc.). */ -public final class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice> { +public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice> { private static final String TAG = "CachedBluetoothDevice"; private static final boolean DEBUG = Utils.V; diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDeviceManager.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDeviceManager.java index a9f4bd31e42b..a3ae9269b1f7 100755 --- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDeviceManager.java +++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDeviceManager.java @@ -28,7 +28,7 @@ import java.util.List; /** * CachedBluetoothDeviceManager manages the set of remote Bluetooth devices. */ -public final class CachedBluetoothDeviceManager { +public class CachedBluetoothDeviceManager { private static final String TAG = "CachedBluetoothDeviceManager"; private static final boolean DEBUG = Utils.D; diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/LocalBluetoothAdapter.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/LocalBluetoothAdapter.java index 26836099c9de..115c62298d9f 100755 --- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/LocalBluetoothAdapter.java +++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/LocalBluetoothAdapter.java @@ -35,7 +35,7 @@ import java.util.Set; * are handled by {@link CachedBluetoothDeviceManager}, * {@link BluetoothEventManager}, and {@link LocalBluetoothProfileManager}. */ -public final class LocalBluetoothAdapter { +public class LocalBluetoothAdapter { private static final String TAG = "LocalBluetoothAdapter"; /** This class does not allow direct access to the BluetoothAdapter. */ diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/LocalBluetoothManager.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/LocalBluetoothManager.java index 623ccc39a842..1993b459da53 100644 --- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/LocalBluetoothManager.java +++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/LocalBluetoothManager.java @@ -25,7 +25,7 @@ import android.util.Log; * if there is no Bluetooth adapter on this device, and callers must be * prepared to handle this case. */ -public final class LocalBluetoothManager { +public class LocalBluetoothManager { private static final String TAG = "LocalBluetoothManager"; /** Singleton instance. */ diff --git a/packages/SettingsLib/src/com/android/settingslib/drawer/TileUtils.java b/packages/SettingsLib/src/com/android/settingslib/drawer/TileUtils.java index baf12a0ceefe..a0109e29831a 100644 --- a/packages/SettingsLib/src/com/android/settingslib/drawer/TileUtils.java +++ b/packages/SettingsLib/src/com/android/settingslib/drawer/TileUtils.java @@ -414,13 +414,28 @@ public class TileUtils { return false; } - private static int getIconFromUri(Context context, String uriString, + /** + * Gets the icon resource id from content provider. + * @param Context context + * @param uriString URI for the content provider + * @param providerMap Maps URI authorities to providers + * @return Resource id if returned by the content provider, otherwise 0 + */ + public static int getIconFromUri(Context context, String uriString, Map<String, IContentProvider> providerMap) { Bundle bundle = getBundleFromUri(context, uriString, providerMap); return (bundle != null) ? bundle.getInt(META_DATA_PREFERENCE_ICON, 0) : 0; } - private static String getTextFromUri(Context context, String uriString, + /** + * Gets text associated with the input key from the content provider. + * @param Context context + * @param uriString URI for the content provider + * @param providerMap Maps URI authorities to providers + * @param key Key mapping to the text in bundle returned by the content provider + * @return Text associated with the key, if returned by the content provider + */ + public static String getTextFromUri(Context context, String uriString, Map<String, IContentProvider> providerMap, String key) { Bundle bundle = getBundleFromUri(context, uriString, providerMap); return (bundle != null) ? bundle.getString(key) : null; diff --git a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java index d784a3a5d731..a645a5683a7b 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java @@ -446,20 +446,6 @@ class DatabaseHelper extends SQLiteOpenHelper { } if (upgradeVersion == 32) { - // The Wi-Fi watchdog SSID list is now seeded with the value of - // the property ro.com.android.wifi-watchlist - String wifiWatchList = SystemProperties.get("ro.com.android.wifi-watchlist"); - if (!TextUtils.isEmpty(wifiWatchList)) { - db.beginTransaction(); - try { - db.execSQL("INSERT OR IGNORE INTO secure(name,value) values('" + - Settings.Secure.WIFI_WATCHDOG_WATCH_LIST + "','" + - wifiWatchList + "');"); - db.setTransactionSuccessful(); - } finally { - db.endTransaction(); - } - } upgradeVersion = 33; } @@ -2435,11 +2421,6 @@ class DatabaseHelper extends SQLiteOpenHelper { loadStringSetting(stmt, Settings.Secure.LOCATION_PROVIDERS_ALLOWED, R.string.def_location_providers_allowed); - String wifiWatchList = SystemProperties.get("ro.com.android.wifi-watchlist"); - if (!TextUtils.isEmpty(wifiWatchList)) { - loadSetting(stmt, Settings.Secure.WIFI_WATCHDOG_WATCH_LIST, wifiWatchList); - } - // Don't do this. The SystemServer will initialize ADB_ENABLED from a // persistent system property instead. //loadSetting(stmt, Settings.Secure.ADB_ENABLED, 0); diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsService.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsService.java index 080805112c65..6b01d6687c65 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsService.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsService.java @@ -208,6 +208,8 @@ final public class SettingsService extends Binder { // keep going; there's another PUT arg } else if (mValue == null) { mValue = arg; + // what we have so far is a valid command + valid = true; // keep going; there may be another PUT arg } else if (mToken == null) { mToken = arg; diff --git a/packages/SystemUI/AndroidManifest.xml b/packages/SystemUI/AndroidManifest.xml index 5c2787b0f04a..5574753bee6c 100644 --- a/packages/SystemUI/AndroidManifest.xml +++ b/packages/SystemUI/AndroidManifest.xml @@ -427,6 +427,7 @@ android:supportsPictureInPicture="true" android:stateNotNeeded="true" android:taskAffinity="" + android:launchMode="singleTop" androidprv:alwaysFocusable="true" /> <!-- platform logo easter egg activity --> diff --git a/packages/SystemUI/res/color/tint_color_selector.xml b/packages/SystemUI/res/color/tint_color_selector.xml new file mode 100644 index 000000000000..cb244256fb70 --- /dev/null +++ b/packages/SystemUI/res/color/tint_color_selector.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- 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. +--> +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:state_enabled="false" + android:alpha="0.25" + android:color="?android:attr/colorForeground"/> + <item android:state_activated="false" + android:alpha="0.3" + android:color="?android:attr/colorForeground"/> + <item android:color="?android:attr/colorForeground"/> +</selector>
\ No newline at end of file diff --git a/packages/SystemUI/res/drawable/ic_device_thermostat_24.xml b/packages/SystemUI/res/drawable/ic_device_thermostat_24.xml new file mode 100644 index 000000000000..1972f6e4427c --- /dev/null +++ b/packages/SystemUI/res/drawable/ic_device_thermostat_24.xml @@ -0,0 +1,25 @@ +<!-- +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. +--> +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0" + android:tint="?attr/colorControlNormal"> + <path + android:fillColor="#FFFFFFFF" + android:pathData="M15,13L15,5c0,-1.66 -1.34,-3 -3,-3S9,3.34 9,5v8c-1.21,0.91 -2,2.37 -2,4 0,2.76 2.24,5 5,5s5,-2.24 5,-5c0,-1.63 -0.79,-3.09 -2,-4zM11,5c0,-0.55 0.45,-1 1,-1s1,0.45 1,1h-1v1h1v2h-1v1h1v2h-2L11,5z"/> +</vector> diff --git a/packages/SystemUI/res/drawable/ic_hotspot_unavailable.xml b/packages/SystemUI/res/drawable/ic_hotspot_unavailable.xml index 736cfd8256b4..83f46e590a1d 100644 --- a/packages/SystemUI/res/drawable/ic_hotspot_unavailable.xml +++ b/packages/SystemUI/res/drawable/ic_hotspot_unavailable.xml @@ -20,7 +20,8 @@ android:width="48dp" android:viewportHeight="48" android:viewportWidth="48" - android:tint="@color/qs_tile_tint_unavailable" > + android:alpha="0.25" + android:tint="?android:attr/colorControlNormal" > <group android:name="ic_hotspot" android:translateX="23.97354" diff --git a/packages/SystemUI/res/layout/notification_guts.xml b/packages/SystemUI/res/layout/notification_guts.xml index e84ed23fbc86..3948dc4b8771 100644 --- a/packages/SystemUI/res/layout/notification_guts.xml +++ b/packages/SystemUI/res/layout/notification_guts.xml @@ -16,150 +16,109 @@ --> <com.android.systemui.statusbar.NotificationGuts - xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:id="@+id/notification_guts" + android:visibility="gone" + android:clickable="true" + android:gravity="top|start" + android:orientation="vertical" + android:paddingStart="@*android:dimen/notification_content_margin_start" + android:paddingEnd="8dp" + android:background="@color/notification_guts_bg_color" + android:theme="@*android:style/Theme.DeviceDefault.Light"> + + <!-- header --> + <RelativeLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:id="@+id/notification_guts" - android:visibility="gone" - android:clickable="true" - android:gravity="top|start" - android:orientation="vertical" - android:paddingStart="@*android:dimen/notification_content_margin_start" + android:paddingTop="20dp" android:paddingEnd="8dp" - android:background="@color/notification_guts_bg_color" - android:theme="@*android:style/Theme.DeviceDefault.Light"> - - <!-- header --> - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:paddingTop="15dp" - android:paddingEnd="8dp" - android:id="@+id/notification_guts_header" - android:orientation="horizontal" - android:layout_gravity="start"> - - <ImageView - android:id="@+id/app_icon" - android:layout_width="18dp" - android:layout_height="18dp" - android:layout_marginEnd="6dp" - android:src="@android:drawable/arrow_down_float" /> + android:paddingBottom="15dp" + android:id="@+id/notification_guts_header"> <TextView - android:id="@+id/pkgname" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - style="@style/TextAppearance.NotificationGuts.Header" /> + android:id="@+id/pkgname" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentStart="true" + style="@style/TextAppearance.NotificationGuts.Secondary" /> <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:id="@+id/debug_info" - android:layout_weight="0" - style="@style/TextAppearance.NotificationGuts.Header" - android:layout_gravity="bottom|start" - android:visibility="gone" /> - </LinearLayout> + android:id="@+id/channel_name" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentStart="true" + android:layout_below="@id/pkgname" + style="@style/TextAppearance.NotificationGuts.Header" /> + <Switch + android:id="@+id/channel_enabled_switch" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentRight="true" + android:layout_centerVertical="true" + android:background="@null" /> + </RelativeLayout> <!-- Importance radio buttons --> - <RadioGroup + <LinearLayout + android:id="@+id/importance" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal"> + <RadioGroup android:id="@+id/importance_buttons" - android:layout_width="match_parent" + android:layout_width="wrap_content" android:layout_height="wrap_content" - android:paddingStart="3dp" - android:paddingTop="4dp" - android:paddingEnd="8dp" > - <RadioButton - android:id="@+id/silent_importance" + android:paddingEnd="@*android:dimen/notification_content_margin_end"> + <RadioButton + android:id="@+id/high_importance" android:layout_width="wrap_content" - android:layout_height="40dp" - android:paddingStart="22dp" - android:text="@string/show_silently" + android:layout_height="@dimen/notification_inline_importance_height" style="@style/TextAppearance.NotificationGuts.Radio" android:buttonTint="@color/notification_guts_buttons" /> - <RadioButton - android:id="@+id/block_importance" + <RadioButton + android:id="@+id/default_importance" android:layout_width="wrap_content" - android:layout_height="40dp" - android:paddingStart="22dp" - android:text="@string/block" + android:layout_height="@dimen/notification_inline_importance_height" style="@style/TextAppearance.NotificationGuts.Radio" android:buttonTint="@color/notification_guts_buttons" /> - <RadioButton - android:id="@+id/reset_importance" + <RadioButton + android:id="@+id/low_importance" android:layout_width="wrap_content" - android:layout_height="40dp" - android:paddingStart="22dp" + android:layout_height="@dimen/notification_inline_importance_height" style="@style/TextAppearance.NotificationGuts.Radio" android:buttonTint="@color/notification_guts_buttons" /> - </RadioGroup> - <!-- Importance slider --> - <LinearLayout - android:id="@+id/importance_slider" + <RadioButton + android:id="@+id/min_importance" + android:layout_width="wrap_content" + android:layout_height="@dimen/notification_inline_importance_height" + style="@style/TextAppearance.NotificationGuts.Radio" + android:buttonTint="@color/notification_guts_buttons" /> + </RadioGroup> + <LinearLayout + android:id="@+id/importance_buttons_text" android:layout_width="match_parent" android:layout_height="wrap_content" - android:gravity="center_vertical" - android:orientation="vertical" - android:clickable="false" - android:focusable="false" - android:paddingEnd="8dp" - android:paddingTop="4dp" - android:visibility="gone"> - <TextView - android:id="@+id/title" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:singleLine="true" - style="@style/TextAppearance.NotificationGuts.Primary" - android:ellipsize="marquee" - android:fadingEdge="horizontal" - android:paddingBottom="2dp"/> - - <TextView - android:id="@+id/summary" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_alignStart="@android:id/title" - android:textAlignment="viewStart" - style="@style/TextAppearance.NotificationGuts.Secondary" - android:maxLines="3" - android:minLines="2" - android:paddingBottom="4dp" /> - - <FrameLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:paddingTop="8dp" > - - <ImageView - android:id="@+id/auto_importance" - android:src="@drawable/notification_auto_importance" - android:layout_gravity="center_vertical|start" - android:layout_width="48dp" - android:layout_height="48dp" /> - - <SeekBar - android:id="@+id/seekbar" - android:layout_marginStart="56dp" - android:layout_marginEnd="32dp" - android:layout_gravity="center_vertical" - android:layout_width="match_parent" - android:layout_height="48dp" - android:focusable="true" - android:background="#00ffffff" - android:progressBackgroundTint="@color/notification_guts_secondary_slider_color" - android:thumbTint="?android:attr/colorAccent" - android:progressTint="?android:attr/colorAccent" - style="@android:style/Widget.Material.SeekBar.Discrete" - android:tickMarkTint="@android:color/black" /> - - </FrameLayout> + android:orientation="vertical"> + <include layout="@layout/notification_guts_importance_text"/> + <include layout="@layout/notification_guts_importance_text"/> + <include layout="@layout/notification_guts_importance_text"/> + <include layout="@layout/notification_guts_importance_text"/> + </LinearLayout> </LinearLayout> - <!-- buttons --> + <!-- Channel Disabled Text --> + <TextView + android:id="@+id/channel_disabled" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/notification_channel_disabled" + style="@style/TextAppearance.NotificationGuts.Secondary" /> + <!-- Settings and Done buttons --> <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:gravity="end" - android:paddingTop="16dp" - android:paddingBottom="8dp" > + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:gravity="end" + android:paddingTop="16dp" + android:paddingBottom="8dp" > <TextView android:id="@+id/more_settings" diff --git a/packages/SystemUI/res/layout/notification_guts_importance_text.xml b/packages/SystemUI/res/layout/notification_guts_importance_text.xml new file mode 100644 index 000000000000..5df4e0a96ba6 --- /dev/null +++ b/packages/SystemUI/res/layout/notification_guts_importance_text.xml @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright 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. +--> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="@dimen/notification_inline_importance_height" + android:paddingTop="4dp" + android:orientation="vertical"> + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:ellipsize="end" + android:textAlignment="viewStart" + android:singleLine="true" + android:text="@string/high_importance" + android:textAppearance="@style/TextAppearance.NotificationGuts.Primary" /> + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:ellipsize="end" + android:textAlignment="viewStart" + android:singleLine="true" + android:text="@string/notification_importance_high" + android:textAppearance="@style/TextAppearance.NotificationGuts.Secondary" /> +</LinearLayout> diff --git a/packages/SystemUI/res/layout/pip_menu_activity.xml b/packages/SystemUI/res/layout/pip_menu_activity.xml index 054bfabb2f84..cadc09b23c4e 100644 --- a/packages/SystemUI/res/layout/pip_menu_activity.xml +++ b/packages/SystemUI/res/layout/pip_menu_activity.xml @@ -19,7 +19,7 @@ android:id="@+id/menu" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="#33000000"> + android:background="#66000000"> <LinearLayout android:id="@+id/actions" @@ -45,7 +45,7 @@ android:text="@string/pip_phone_dismiss" android:background="?android:selectableItemBackground" /> <TextView - android:id="@+id/minimize" + android:id="@+id/expand" android:layout_width="0dp" android:layout_height="match_parent" android:layout_weight="1" @@ -53,7 +53,7 @@ android:textSize="12sp" android:textColor="#ffffffff" android:fontFamily="sans-serif" - android:text="@string/pip_phone_minimize" + android:text="@string/pip_phone_expand" android:background="?android:selectableItemBackground" /> </LinearLayout> </FrameLayout> diff --git a/packages/SystemUI/res/layout/screen_pinning_request_buttons.xml b/packages/SystemUI/res/layout/screen_pinning_request_buttons.xml index e3662f17b336..c2b1009c3137 100644 --- a/packages/SystemUI/res/layout/screen_pinning_request_buttons.xml +++ b/packages/SystemUI/res/layout/screen_pinning_request_buttons.xml @@ -108,7 +108,25 @@ android:layout_height="@dimen/screen_pinning_request_button_height" android:layout_weight="0" android:paddingStart="@dimen/screen_pinning_request_frame_padding" - android:paddingEnd="@dimen/screen_pinning_request_frame_padding" > + android:paddingEnd="@dimen/screen_pinning_request_frame_padding" + android:theme="@*android:style/ThemeOverlay.DeviceDefault.Accent"> + + <ImageView + android:id="@+id/screen_pinning_recents_bg_light" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:scaleType="matrix" + android:src="@drawable/screen_pinning_light_bg_circ" /> + + <ImageView + android:id="@+id/screen_pinning_recents_bg" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:paddingEnd="@dimen/screen_pinning_request_inner_padding" + android:paddingStart="@dimen/screen_pinning_request_inner_padding" + android:paddingTop="@dimen/screen_pinning_request_inner_padding" + android:scaleType="matrix" + android:src="@drawable/screen_pinning_bg_circ" /> <ImageView android:layout_width="match_parent" diff --git a/packages/SystemUI/res/layout/screen_pinning_request_buttons_land.xml b/packages/SystemUI/res/layout/screen_pinning_request_buttons_land.xml index 3649ffba91a3..b5ef1d72fd8f 100644 --- a/packages/SystemUI/res/layout/screen_pinning_request_buttons_land.xml +++ b/packages/SystemUI/res/layout/screen_pinning_request_buttons_land.xml @@ -38,7 +38,25 @@ 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: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: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:paddingLeft="@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" diff --git a/packages/SystemUI/res/values/colors.xml b/packages/SystemUI/res/values/colors.xml index c7149dff9c86..ba8c64410443 100644 --- a/packages/SystemUI/res/values/colors.xml +++ b/packages/SystemUI/res/values/colors.xml @@ -144,10 +144,6 @@ <color name="remote_input_accent">#eeeeee</color> - <color name="qs_tile_tint_unavailable">#40ffffff</color> - <color name="qs_tile_tint_inactive">#4dffffff</color> - <color name="qs_tile_tint_active">#ffffffff</color> - <!-- Keyboard shortcuts colors --> <color name="ksh_application_group_color">#fff44336</color> <color name="ksh_keyword_color">#d9000000</color> diff --git a/packages/SystemUI/res/values/config.xml b/packages/SystemUI/res/values/config.xml index 0f5d37ea3691..c025f932adf8 100644 --- a/packages/SystemUI/res/values/config.xml +++ b/packages/SystemUI/res/values/config.xml @@ -290,4 +290,6 @@ <bool name="quick_settings_show_full_alarm">false</bool> + <bool name="config_showTemperatureWarning">false</bool> + </resources> diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml index ff4ec5bdaf3f..ca4214bda2cf 100644 --- a/packages/SystemUI/res/values/dimens.xml +++ b/packages/SystemUI/res/values/dimens.xml @@ -302,6 +302,9 @@ <!-- The height of the divider between the individual notifications when the notification wants it to be increased. This is currently the case for notification groups --> <dimen name="notification_divider_height_increased">6dp</dimen> + <!-- The height of an importance selection in the inline notification controls --> + <dimen name="notification_inline_importance_height">55dp</dimen> + <!-- The minimum amount of top overscroll to go to the quick settings. --> <dimen name="min_top_overscroll_to_qs">36dp</dimen> diff --git a/packages/SystemUI/res/values/ids.xml b/packages/SystemUI/res/values/ids.xml index 2a895f98eefd..7ef2abdf9b2a 100644 --- a/packages/SystemUI/res/values/ids.xml +++ b/packages/SystemUI/res/values/ids.xml @@ -53,6 +53,7 @@ <item type="id" name="notification_screenshot"/> <item type="id" name="notification_hidden"/> <item type="id" name="notification_volumeui"/> + <item type="id" name="notification_temperature"/> <item type="id" name="transformation_start_x_tag"/> <item type="id" name="transformation_start_y_tag"/> <item type="id" name="transformation_start_scale_x_tag"/> diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml index c0334e759682..d7033b26f563 100644 --- a/packages/SystemUI/res/values/strings.xml +++ b/packages/SystemUI/res/values/strings.xml @@ -1108,7 +1108,9 @@ <!-- Screen pinning dialog title. --> <string name="screen_pinning_title">Screen is pinned</string> <!-- Screen pinning dialog description. --> - <string name="screen_pinning_description">This keeps it in view until you unpin. Touch & hold Back to unpin.</string> + <string name="screen_pinning_description">This keeps it in view until you unpin. Touch & hold Back and Overview to unpin.</string> + <!-- Screen pinning dialog description. --> + <string name="screen_pinning_description_accessible">This keeps it in view until you unpin. Touch & hold Overview to unpin.</string> <!-- Screen pinning positive response. --> <string name="screen_pinning_positive">Got it</string> <!-- Screen pinning negative response. --> @@ -1149,9 +1151,9 @@ <string name="stream_alarm">Alarm</string> <!-- STREAM_ALARM --> <string name="stream_notification">Notification</string> <!-- STREAM_NOTIFICATION --> <string name="stream_bluetooth_sco">Bluetooth</string> <!-- STREAM_BLUETOOTH_SCO --> - <string name="stream_system_enforced">System enforced</string> <!-- STREAM_SYSTEM_ENFORCED --> + <string name="stream_system_enforced" translatable="false">System enforced</string> <!-- STREAM_SYSTEM_ENFORCED --> <string name="stream_dtmf">Dual multi tone frequency</string> <!-- STREAM_DTMF --> - <string name="stream_tts">Text to speech</string> <!-- STREAM_TTS --> + <string name="stream_tts" translatable="false">Transmitted Through Speaker</string> <!-- STREAM_TTS --> <string name="stream_accessibility">Accessibility</string> <!-- STREAM_ACCESSIBILITY --> <string name="volume_stream_muted" translatable="false">%s silent</string> @@ -1332,41 +1334,38 @@ \n- Block all notifications from the app </string> - <!-- Notification importance title, user unspecified status--> - <string name="user_unspecified_importance">Importance: Automatic</string> - <!-- Notification importance title, blocked status--> - <string name="blocked_importance">Importance: Level 0</string> + <!-- Notification Inline Controls: Header for apps that are not yet using notification channels. --> + <string name="notification_header_default_channel">Notifications</string> + + <!-- Notification Inline Controls: Shown when a channel's notifications are currently blocked --> + <string name="notification_channel_disabled">You won\'t get these notifications anymore.</string> + + <!-- Notification Inline Controls: Header text for describing from which app this notification + originates. The line below this in the layout will display the channel name. + Note for localization: For languages in which the two separate lines cannot be a continuous + sentence, translate this as a separate statement: "[Calendar] notifications" --> + <string name="notification_importance_header_app"><xliff:g id="app" example="Calendar">%s</xliff:g> notifications for</string> + <!-- Notification importance title, min status--> - <string name="min_importance">Importance: Level 1</string> + <string name="min_importance">Low</string> <!-- Notification importance title, low status--> - <string name="low_importance">Importance: Level 2</string> + <string name="low_importance">Medium</string> <!-- Notification importance title, normal status--> - <string name="default_importance">Importance: Level 3</string> + <string name="default_importance">High</string> <!-- Notification importance title, high status--> - <string name="high_importance">Importance: Level 4</string> - <!-- Notification importance title, max status--> - <string name="max_importance">Importance: Level 5</string> - - <!-- [CHAR LIMIT=100] Notification Importance slider: blocked importance level description --> - <string name="notification_importance_user_unspecified">App determines importance for each notification.</string> - - <!-- [CHAR LIMIT=100] Notification Importance slider: blocked importance level description --> - <string name="notification_importance_blocked">Never show notifications from this app.</string> + <string name="high_importance">Urgent</string> <!-- [CHAR LIMIT=100] Notification Importance slider: min importance level description --> - <string name="notification_importance_min">No full screen interruption, peeking, sound, or vibration. Hide from lock screen and status bar.</string> + <string name="notification_importance_min">No sound or visual interruption</string> <!-- [CHAR LIMIT=100] Notification Importance slider: low importance level description --> - <string name="notification_importance_low">No full screen interruption, peeking, sound, or vibration.</string> + <string name="notification_importance_low">Show silently</string> <!-- [CHAR LIMIT=100] Notification Importance slider: normal importance level description --> - <string name="notification_importance_default">No full screen interruption or peeking.</string> + <string name="notification_importance_default">Make sound</string> <!-- [CHAR LIMIT=100] Notification Importance slider: high importance level description --> - <string name="notification_importance_high">Always peek. No full screen interruption.</string> - - <!-- [CHAR LIMIT=100] Notification Importance slider: max importance level description --> - <string name="notification_importance_max">Always peek, and allow full screen interruption.</string> + <string name="notification_importance_high">Make sound and pop on screen</string> <!-- Notification: Control panel: Label for button that launches notification settings. [CHAR LIMIT=NONE] --> <string name="notification_more_settings">More settings</string> @@ -1767,4 +1766,12 @@ <!-- Tuner string --> <string name="default_theme" translatable="false">Default</string> + <!-- Title for notification (and dialog) that user's phone has reached a certain temperature and may start to slow down in order to cool down. [CHAR LIMIT=30] --> + <string name="high_temp_title">Phone is getting warm</string> + <!-- Message body for notification that user's phone has reached a certain temperature and may start to slow down in order to cool down. [CHAR LIMIT=70] --> + <string name="high_temp_notif_message">Some features limited while phone cools down</string> + <!-- Text body for dialog alerting user that their phone has reached a certain temperature and may start to slow down in order to cool down. [CHAR LIMIT=300] --> + <string name="high_temp_dialog_message">Your phone will automatically try to cool down. You can still use your phone, but it may run slower.\n\nOnce your phone has cooled down, it will run normally.</string> + + </resources> diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml index 93b696591c1f..614472a7fd01 100644 --- a/packages/SystemUI/res/values/styles.xml +++ b/packages/SystemUI/res/values/styles.xml @@ -4,9 +4,9 @@ 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. @@ -68,7 +68,7 @@ <item name="android:windowIsTranslucent">true</item> <item name="android:windowNoTitle">true</item> <item name="android:windowContentOverlay">@null</item> - <item name="android:windowBackground">@drawable/forced_resizable_background</item> + <item name="android:windowBackground">@null</item> <item name="android:colorBackgroundCacheHint">@null</item> <item name="android:statusBarColor">@color/transparent</item> <item name="android:windowAnimationStyle">@style/Animation.PipPhoneOverlayControl</item> @@ -359,12 +359,14 @@ </style> <style name="TextAppearance.NotificationGuts.Header"> - <item name="android:alpha">.38</item> - <item name="android:textSize">12sp</item> + <item name="android:textColor">?android:attr/textColorPrimary</item> + <item name="android:textSize">20sp</item> </style> <style name="TextAppearance.NotificationGuts.Secondary"> - <item name="android:textColor">?android:attr/textColorSecondary</item> + <item name="android:textColor">?android:attr/textColorPrimary</item> + <item name="android:alpha">.38</item> + <item name="android:textSize">12sp</item> </style> <style name="TextAppearance.NotificationGuts.Primary"> diff --git a/packages/SystemUI/src/com/android/systemui/BatteryMeterDrawable.java b/packages/SystemUI/src/com/android/systemui/BatteryMeterDrawable.java index c4698c39075d..07ef5e09fc58 100755 --- a/packages/SystemUI/src/com/android/systemui/BatteryMeterDrawable.java +++ b/packages/SystemUI/src/com/android/systemui/BatteryMeterDrawable.java @@ -491,6 +491,12 @@ public class BatteryMeterDrawable extends Drawable implements @Override public void setColorFilter(@Nullable ColorFilter colorFilter) { + mFramePaint.setColorFilter(colorFilter); + mBatteryPaint.setColorFilter(colorFilter); + mWarningTextPaint.setColorFilter(colorFilter); + mTextPaint.setColorFilter(colorFilter); + mBoltPaint.setColorFilter(colorFilter); + mPlusPaint.setColorFilter(colorFilter); } @Override diff --git a/packages/SystemUI/src/com/android/systemui/ExpandHelper.java b/packages/SystemUI/src/com/android/systemui/ExpandHelper.java index 7a5e32227db1..d98bb23d88da 100644 --- a/packages/SystemUI/src/com/android/systemui/ExpandHelper.java +++ b/packages/SystemUI/src/com/android/systemui/ExpandHelper.java @@ -326,7 +326,8 @@ public class ExpandHelper implements Gefingerpoken { case MotionEvent.ACTION_CANCEL: case MotionEvent.ACTION_UP: if (DEBUG) Log.d(TAG, "up/cancel"); - finishExpanding(false, getCurrentVelocity()); + finishExpanding(ev.getActionMasked() == MotionEvent.ACTION_CANCEL, + getCurrentVelocity()); clearView(); break; } @@ -390,7 +391,8 @@ public class ExpandHelper implements Gefingerpoken { @Override public boolean onTouchEvent(MotionEvent ev) { - if (!isEnabled()) { + if (!isEnabled() && !mExpanding) { + // In case we're expanding we still want to finish the current motion. return false; } trackVelocity(ev); @@ -485,7 +487,8 @@ public class ExpandHelper implements Gefingerpoken { case MotionEvent.ACTION_UP: case MotionEvent.ACTION_CANCEL: if (DEBUG) Log.d(TAG, "up/cancel"); - finishExpanding(false, getCurrentVelocity()); + finishExpanding(!isEnabled() || ev.getActionMasked() == MotionEvent.ACTION_CANCEL, + getCurrentVelocity()); clearView(); break; } @@ -526,28 +529,37 @@ public class ExpandHelper implements Gefingerpoken { return true; } - private void finishExpanding(boolean force, float velocity) { + /** + * Finish the current expand motion + * @param forceAbort whether the expansion should be forcefully aborted and returned to the old + * state + * @param velocity the velocity this was expanded/ collapsed with + */ + private void finishExpanding(boolean forceAbort, float velocity) { if (!mExpanding) return; if (DEBUG) Log.d(TAG, "scale in finishing on view: " + mResizedView); float currentHeight = mScaler.getHeight(); - float h = mScaler.getHeight(); final boolean wasClosed = (mOldHeight == mSmallSize); boolean nowExpanded; - int naturalHeight = mScaler.getNaturalHeight(); - if (wasClosed) { - nowExpanded = (force || currentHeight > mOldHeight && velocity >= 0); + if (!forceAbort) { + if (wasClosed) { + nowExpanded = currentHeight > mOldHeight && velocity >= 0; + } else { + nowExpanded = currentHeight >= mOldHeight || velocity > 0; + } + nowExpanded |= mNaturalHeight == mSmallSize; } else { - nowExpanded = !force && (currentHeight >= mOldHeight || velocity > 0); + nowExpanded = !wasClosed; } - nowExpanded |= mNaturalHeight == mSmallSize; if (mScaleAnimation.isRunning()) { mScaleAnimation.cancel(); } mCallback.expansionStateChanged(false); + int naturalHeight = mScaler.getNaturalHeight(); float targetHeight = nowExpanded ? naturalHeight : mSmallSize; - if (targetHeight != currentHeight) { + if (targetHeight != currentHeight && mEnabled) { mScaleAnimation.setFloatValues(targetHeight); mScaleAnimation.setupStartValues(); final View scaledView = mResizedView; @@ -597,7 +609,7 @@ public class ExpandHelper implements Gefingerpoken { * Use this to abort any pending expansions in progress. */ public void cancel() { - finishExpanding(true, 0f /* velocity */); + finishExpanding(true /* forceAbort */, 0f /* velocity */); clearView(); // reset the gesture detector diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java index d4da9a415237..8e5db97dd27d 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java +++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java @@ -198,6 +198,7 @@ public class KeyguardViewMediator extends SystemUI { private boolean mSystemReady; private boolean mBootCompleted; private boolean mBootSendUserPresent; + private boolean mShuttingDown; /** High level access to the power manager for WakeLocks */ private PowerManager mPM; @@ -483,7 +484,7 @@ public class KeyguardViewMediator extends SystemUI { } private void onSimAbsentLocked() { - if (isSecure() && mLockWhenSimRemoved) { + if (isSecure() && mLockWhenSimRemoved && !mShuttingDown) { mLockWhenSimRemoved = false; MetricsLogger.action(mContext, MetricsProto.MetricsEvent.ACTION_LOCK_BECAUSE_SIM_REMOVED, mShowing); @@ -652,9 +653,11 @@ public class KeyguardViewMediator extends SystemUI { mShowKeyguardWakeLock = mPM.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "show keyguard"); mShowKeyguardWakeLock.setReferenceCounted(false); - mContext.registerReceiver(mBroadcastReceiver, new IntentFilter(DELAYED_KEYGUARD_ACTION)); - mContext.registerReceiver( - mBroadcastReceiver, new IntentFilter(DELAYED_LOCK_PROFILE_ACTION)); + IntentFilter filter = new IntentFilter(); + filter.addAction(DELAYED_KEYGUARD_ACTION); + filter.addAction(DELAYED_LOCK_PROFILE_ACTION); + filter.addAction(Intent.ACTION_SHUTDOWN); + mContext.registerReceiver(mBroadcastReceiver, filter); mKeyguardDisplayManager = new KeyguardDisplayManager(mContext); @@ -1418,6 +1421,10 @@ public class KeyguardViewMediator extends SystemUI { } } } + } else if (Intent.ACTION_SHUTDOWN.equals(intent.getAction())) { + synchronized (KeyguardViewMediator.this){ + mShuttingDown = true; + } } } }; @@ -1972,6 +1979,7 @@ public class KeyguardViewMediator extends SystemUI { pw.print(" mBootCompleted: "); pw.println(mBootCompleted); pw.print(" mBootSendUserPresent: "); pw.println(mBootSendUserPresent); pw.print(" mExternallyEnabled: "); pw.println(mExternallyEnabled); + pw.print(" mShuttingDown: "); pw.println(mShuttingDown); pw.print(" mNeedToReshowWhenReenabled: "); pw.println(mNeedToReshowWhenReenabled); pw.print(" mShowing: "); pw.println(mShowing); pw.print(" mInputRestricted: "); pw.println(mInputRestricted); diff --git a/packages/SystemUI/src/com/android/systemui/pip/phone/PipMenuActivity.java b/packages/SystemUI/src/com/android/systemui/pip/phone/PipMenuActivity.java index fe8ee6f6b27f..e4f78161faed 100644 --- a/packages/SystemUI/src/com/android/systemui/pip/phone/PipMenuActivity.java +++ b/packages/SystemUI/src/com/android/systemui/pip/phone/PipMenuActivity.java @@ -16,13 +16,16 @@ package com.android.systemui.pip.phone; +import android.animation.Animator; +import android.animation.AnimatorListenerAdapter; +import android.animation.ObjectAnimator; import android.annotation.Nullable; import android.app.Activity; import android.app.ActivityManager; -import android.app.PendingIntent.CanceledException; import android.app.RemoteAction; import android.content.Intent; import android.content.pm.ParceledListSlice; +import android.graphics.PointF; import android.os.Bundle; import android.os.Handler; import android.os.Message; @@ -30,11 +33,15 @@ import android.os.Messenger; import android.os.RemoteException; import android.util.Log; import android.view.LayoutInflater; +import android.view.MotionEvent; import android.view.View; +import android.view.ViewConfiguration; import android.view.ViewGroup; +import android.view.WindowManager.LayoutParams; import android.widget.ImageView; import android.widget.TextView; +import com.android.systemui.Interpolators; import com.android.systemui.R; import java.util.ArrayList; @@ -47,28 +54,40 @@ public class PipMenuActivity extends Activity { private static final String TAG = "PipMenuActivity"; - public static final int MESSAGE_FINISH_SELF = 1; - public static final int MESSAGE_UPDATE_ACTIONS = 2; + public static final int MESSAGE_SHOW_MENU = 1; + public static final int MESSAGE_HIDE_MENU = 2; + public static final int MESSAGE_UPDATE_ACTIONS = 3; private static final long INITIAL_DISMISS_DELAY = 2000; private static final long POST_INTERACTION_DISMISS_DELAY = 1500; + private static final long MENU_FADE_DURATION = 125; - private List<RemoteAction> mActions = new ArrayList<>(); + private boolean mMenuVisible; + private final List<RemoteAction> mActions = new ArrayList<>(); + private View mMenuContainer; private View mDismissButton; - private View mMinimizeButton; + private View mExpandButton; + private ObjectAnimator mMenuContainerAnimator; + + private PointF mDownPosition = new PointF(); + private PointF mDownDelta = new PointF(); + private ViewConfiguration mViewConfig; private Handler mHandler = new Handler(); private Messenger mToControllerMessenger; private Messenger mMessenger = new Messenger(new Handler() { @Override public void handleMessage(Message msg) { switch (msg.what) { + case MESSAGE_SHOW_MENU: + showMenu(); + break; + case MESSAGE_HIDE_MENU: + hideMenu(); + break; case MESSAGE_UPDATE_ACTIONS: setActions(((ParceledListSlice) msg.obj).getList()); break; - case MESSAGE_FINISH_SELF: - finish(); - break; } } }); @@ -76,12 +95,17 @@ public class PipMenuActivity extends Activity { private final Runnable mFinishRunnable = new Runnable() { @Override public void run() { - finish(); + hideMenu(); } }; @Override protected void onCreate(@Nullable Bundle savedInstanceState) { + // Set the flags to allow us to watch for outside touches and also hide the menu and start + // manipulating the PIP in the same touch gesture + mViewConfig = ViewConfiguration.get(this); + getWindow().addFlags(LayoutParams.FLAG_WATCH_OUTSIDE_TOUCH | LayoutParams.FLAG_SLIPPERY); + super.onCreate(savedInstanceState); setContentView(R.layout.pip_menu_activity); @@ -94,44 +118,74 @@ public class PipMenuActivity extends Activity { setActions(actions.getList()); } - findViewById(R.id.menu).setOnClickListener((v) -> { + mMenuContainer = findViewById(R.id.menu); + mMenuContainer.setOnClickListener((v) -> { expandPip(); }); mDismissButton = findViewById(R.id.dismiss); mDismissButton.setOnClickListener((v) -> { dismissPip(); }); - mMinimizeButton = findViewById(R.id.minimize); - mMinimizeButton.setOnClickListener((v) -> { - minimizePip(); + mExpandButton = findViewById(R.id.expand); + mExpandButton.setOnClickListener((v) -> { + expandPip(); }); + + notifyActivityCallback(mMessenger); + showMenu(); + } + + @Override + protected void onNewIntent(Intent intent) { + super.onNewIntent(intent); + showMenu(); } @Override protected void onStart() { super.onStart(); - notifyActivityVisibility(true); + notifyMenuVisibility(true); repostDelayedFinish(INITIAL_DISMISS_DELAY); } @Override + public void onPictureInPictureModeChanged(boolean isInPictureInPictureMode) { + if (!isInPictureInPictureMode) { + finish(); + } + } + + @Override public void onUserInteraction() { repostDelayedFinish(POST_INTERACTION_DISMISS_DELAY); } @Override - protected void onStop() { - super.onStop(); - finish(); + public boolean dispatchTouchEvent(MotionEvent ev) { + // On the first action outside the window, hide the menu + switch (ev.getAction()) { + case MotionEvent.ACTION_OUTSIDE: + hideMenu(); + break; + case MotionEvent.ACTION_DOWN: + mDownPosition.set(ev.getX(), ev.getY()); + break; + case MotionEvent.ACTION_MOVE: + mDownDelta.set(ev.getX() - mDownPosition.x, ev.getY() - mDownPosition.y); + if (mDownDelta.length() > mViewConfig.getScaledTouchSlop() && mMenuVisible) { + hideMenu(); + mMenuVisible = false; + } + } + return super.dispatchTouchEvent(ev); } @Override public void finish() { - View v = getWindow().getDecorView(); - v.removeCallbacks(mFinishRunnable); - notifyActivityVisibility(false); + notifyActivityCallback(null); super.finish(); - overridePendingTransition(0, R.anim.forced_resizable_exit); + // Hide without an animation (the menu should already be invisible at this point) + overridePendingTransition(0, 0); } @Override @@ -139,6 +193,51 @@ public class PipMenuActivity extends Activity { // Do nothing } + private void showMenu() { + if (!mMenuVisible) { + if (mMenuContainerAnimator != null) { + mMenuContainerAnimator.cancel(); + } + + notifyMenuVisibility(true); + mMenuContainerAnimator = ObjectAnimator.ofFloat(mMenuContainer, View.ALPHA, + mMenuContainer.getAlpha(), 1f); + mMenuContainerAnimator.setInterpolator(Interpolators.ALPHA_IN); + mMenuContainerAnimator.setDuration(MENU_FADE_DURATION); + mMenuContainerAnimator.addListener(new AnimatorListenerAdapter() { + @Override + public void onAnimationEnd(Animator animation) { + repostDelayedFinish(INITIAL_DISMISS_DELAY); + } + }); + mMenuContainerAnimator.start(); + } + } + + private void hideMenu() { + hideMenu(null /* animationFinishedRunnable */); + } + + private void hideMenu(final Runnable animationFinishedRunnable) { + if (mMenuVisible) { + cancelDelayedFinish(); + notifyMenuVisibility(false); + mMenuContainerAnimator = ObjectAnimator.ofFloat(mMenuContainer, View.ALPHA, + mMenuContainer.getAlpha(), 0f); + mMenuContainerAnimator.setInterpolator(Interpolators.ALPHA_OUT); + mMenuContainerAnimator.setDuration(MENU_FADE_DURATION); + mMenuContainerAnimator.addListener(new AnimatorListenerAdapter() { + @Override + public void onAnimationEnd(Animator animation) { + if (animationFinishedRunnable != null) { + animationFinishedRunnable.run(); + } + } + }); + mMenuContainerAnimator.start(); + } + } + private void setActions(List<RemoteAction> actions) { mActions.clear(); mActions.addAll(actions); @@ -173,17 +272,19 @@ public class PipMenuActivity extends Activity { } } - private void notifyActivityVisibility(boolean visible) { + private void notifyMenuVisibility(boolean visible) { + mMenuVisible = visible; Message m = Message.obtain(); - m.what = PipMenuActivityController.MESSAGE_ACTIVITY_VISIBILITY_CHANGED; + m.what = PipMenuActivityController.MESSAGE_MENU_VISIBILITY_CHANGED; m.arg1 = visible ? 1 : 0; - m.replyTo = visible ? mMessenger : null; sendMessage(m, "Could not notify controller of PIP menu visibility"); } private void expandPip() { - sendEmptyMessage(PipMenuActivityController.MESSAGE_EXPAND_PIP, - "Could not notify controller to expand PIP"); + hideMenu(() -> { + sendEmptyMessage(PipMenuActivityController.MESSAGE_EXPAND_PIP, + "Could not notify controller to expand PIP"); + }); } private void minimizePip() { @@ -192,8 +293,17 @@ public class PipMenuActivity extends Activity { } private void dismissPip() { - sendEmptyMessage(PipMenuActivityController.MESSAGE_DISMISS_PIP, - "Could not notify controller to dismiss PIP"); + hideMenu(() -> { + sendEmptyMessage(PipMenuActivityController.MESSAGE_DISMISS_PIP, + "Could not notify controller to dismiss PIP"); + }); + } + + private void notifyActivityCallback(Messenger callback) { + Message m = Message.obtain(); + m.what = PipMenuActivityController.MESSAGE_UPDATE_ACTIVITY_CALLBACK; + m.replyTo = callback; + sendMessage(m, "Could not notify controller of activity finished"); } private void sendEmptyMessage(int what, String errorMsg) { @@ -210,6 +320,11 @@ public class PipMenuActivity extends Activity { } } + private void cancelDelayedFinish() { + View v = getWindow().getDecorView(); + v.removeCallbacks(mFinishRunnable); + } + private void repostDelayedFinish(long delay) { View v = getWindow().getDecorView(); v.removeCallbacks(mFinishRunnable); diff --git a/packages/SystemUI/src/com/android/systemui/pip/phone/PipMenuActivityController.java b/packages/SystemUI/src/com/android/systemui/pip/phone/PipMenuActivityController.java index 64e2d1a7ff07..0350cc60a97a 100644 --- a/packages/SystemUI/src/com/android/systemui/pip/phone/PipMenuActivityController.java +++ b/packages/SystemUI/src/com/android/systemui/pip/phone/PipMenuActivityController.java @@ -25,10 +25,11 @@ public class PipMenuActivityController { public static final String EXTRA_CONTROLLER_MESSENGER = "messenger"; public static final String EXTRA_ACTIONS = "actions"; - public static final int MESSAGE_ACTIVITY_VISIBILITY_CHANGED = 100; + public static final int MESSAGE_MENU_VISIBILITY_CHANGED = 100; public static final int MESSAGE_EXPAND_PIP = 101; public static final int MESSAGE_MINIMIZE_PIP = 102; public static final int MESSAGE_DISMISS_PIP = 103; + public static final int MESSAGE_UPDATE_ACTIVITY_CALLBACK = 104; /** * A listener interface to receive notification on changes in PIP. @@ -67,34 +68,25 @@ public class PipMenuActivityController { @Override public void handleMessage(Message msg) { switch (msg.what) { - case MESSAGE_ACTIVITY_VISIBILITY_CHANGED: { + case MESSAGE_MENU_VISIBILITY_CHANGED: { boolean visible = msg.arg1 > 0; - int listenerCount = mListeners.size(); - for (int i = 0; i < listenerCount; i++) { - mListeners.get(i).onPipMenuVisibilityChanged(visible); - } - mToActivityMessenger = msg.replyTo; + mListeners.forEach(l -> l.onPipMenuVisibilityChanged(visible)); break; } case MESSAGE_EXPAND_PIP: { - int listenerCount = mListeners.size(); - for (int i = 0; i < listenerCount; i++) { - mListeners.get(i).onPipExpand(); - } + mListeners.forEach(l -> l.onPipExpand()); break; } case MESSAGE_MINIMIZE_PIP: { - int listenerCount = mListeners.size(); - for (int i = 0; i < listenerCount; i++) { - mListeners.get(i).onPipMinimize(); - } + mListeners.forEach(l -> l.onPipMinimize()); break; } case MESSAGE_DISMISS_PIP: { - int listenerCount = mListeners.size(); - for (int i = 0; i < listenerCount; i++) { - mListeners.get(i).onPipDismiss(); - } + mListeners.forEach(l -> l.onPipDismiss()); + break; + } + case MESSAGE_UPDATE_ACTIVITY_CALLBACK: { + mToActivityMessenger = msg.replyTo; break; } } @@ -121,24 +113,34 @@ public class PipMenuActivityController { * Shows the menu activity. */ public void showMenu() { - // Start the menu activity on the top task of the pinned stack - try { - StackInfo pinnedStackInfo = mActivityManager.getStackInfo(PINNED_STACK_ID); - if (pinnedStackInfo != null && pinnedStackInfo.taskIds != null && - pinnedStackInfo.taskIds.length > 0) { - Intent intent = new Intent(mContext, PipMenuActivity.class); - intent.putExtra(EXTRA_CONTROLLER_MESSENGER, mMessenger); - intent.putExtra(EXTRA_ACTIONS, mActions); - ActivityOptions options = ActivityOptions.makeBasic(); - options.setLaunchTaskId( - pinnedStackInfo.taskIds[pinnedStackInfo.taskIds.length - 1]); - options.setTaskOverlay(true); - mContext.startActivityAsUser(intent, options.toBundle(), UserHandle.CURRENT); - } else { - Log.e(TAG, "No PIP tasks found"); + if (mToActivityMessenger != null) { + Message m = Message.obtain(); + m.what = PipMenuActivity.MESSAGE_SHOW_MENU; + try { + mToActivityMessenger.send(m); + } catch (RemoteException e) { + Log.e(TAG, "Could not notify menu to show", e); + } + } else { + // Start the menu activity on the top task of the pinned stack + try { + StackInfo pinnedStackInfo = mActivityManager.getStackInfo(PINNED_STACK_ID); + if (pinnedStackInfo != null && pinnedStackInfo.taskIds != null && + pinnedStackInfo.taskIds.length > 0) { + Intent intent = new Intent(mContext, PipMenuActivity.class); + intent.putExtra(EXTRA_CONTROLLER_MESSENGER, mMessenger); + intent.putExtra(EXTRA_ACTIONS, mActions); + ActivityOptions options = ActivityOptions.makeCustomAnimation(mContext, 0, 0); + options.setLaunchTaskId( + pinnedStackInfo.taskIds[pinnedStackInfo.taskIds.length - 1]); + options.setTaskOverlay(true); + mContext.startActivityAsUser(intent, options.toBundle(), UserHandle.CURRENT); + } else { + Log.e(TAG, "No PIP tasks found"); + } + } catch (RemoteException e) { + Log.e(TAG, "Error showing PIP menu activity", e); } - } catch (RemoteException e) { - Log.e(TAG, "Error showing PIP menu activity", e); } } @@ -148,13 +150,12 @@ public class PipMenuActivityController { public void hideMenu() { if (mToActivityMessenger != null) { Message m = Message.obtain(); - m.what = PipMenuActivity.MESSAGE_FINISH_SELF; + m.what = PipMenuActivity.MESSAGE_HIDE_MENU; try { mToActivityMessenger.send(m); } catch (RemoteException e) { - Log.e(TAG, "Could not notify menu activity to finish", e); + Log.e(TAG, "Could not notify menu to hide", e); } - mToActivityMessenger = null; } } diff --git a/packages/SystemUI/src/com/android/systemui/pip/phone/PipTouchHandler.java b/packages/SystemUI/src/com/android/systemui/pip/phone/PipTouchHandler.java index ff3cc7981bd9..380e4683a7f4 100644 --- a/packages/SystemUI/src/com/android/systemui/pip/phone/PipTouchHandler.java +++ b/packages/SystemUI/src/com/android/systemui/pip/phone/PipTouchHandler.java @@ -174,7 +174,7 @@ public class PipTouchHandler implements TunerService.Tunable { @Override public void onPipDismiss() { - animateDismissPinnedStack(mPinnedStackBounds); + BackgroundThread.getHandler().post(PipTouchHandler.this::dismissPinnedStack); } } @@ -328,26 +328,31 @@ public class PipTouchHandler implements TunerService.Tunable { * Registers the input consumer. */ private void registerInputConsumer() { - final InputChannel inputChannel = new InputChannel(); - try { - mWindowManager.destroyInputConsumer(INPUT_CONSUMER_PIP); - mWindowManager.createInputConsumer(INPUT_CONSUMER_PIP, inputChannel); - } catch (RemoteException e) { - Log.e(TAG, "Failed to create PIP input consumer", e); + if (mInputEventReceiver == null) { + final InputChannel inputChannel = new InputChannel(); + try { + mWindowManager.destroyInputConsumer(INPUT_CONSUMER_PIP); + mWindowManager.createInputConsumer(INPUT_CONSUMER_PIP, inputChannel); + } catch (RemoteException e) { + Log.e(TAG, "Failed to create PIP input consumer", e); + } + mInputEventReceiver = new PipInputEventReceiver(inputChannel, Looper.myLooper()); } - mInputEventReceiver = new PipInputEventReceiver(inputChannel, Looper.myLooper()); } /** * Unregisters the input consumer. */ private void unregisterInputConsumer() { - try { - mWindowManager.destroyInputConsumer(INPUT_CONSUMER_PIP); - } catch (RemoteException e) { - Log.e(TAG, "Failed to destroy PIP input consumer", e); + if (mInputEventReceiver != null) { + try { + mWindowManager.destroyInputConsumer(INPUT_CONSUMER_PIP); + } catch (RemoteException e) { + Log.e(TAG, "Failed to destroy PIP input consumer", e); + } + mInputEventReceiver.dispose(); + mInputEventReceiver = null; } - mInputEventReceiver.dispose(); } /** @@ -761,10 +766,6 @@ public class PipTouchHandler implements TunerService.Tunable { private PipTouchGesture mTapThroughGesture = new PipTouchGesture() { @Override boolean onMove(PipTouchState touchState) { - if (mEnableTapThrough && touchState.startedDragging()) { - mIsTappingThrough = false; - mMenuController.hideMenu(); - } return false; } diff --git a/packages/SystemUI/src/com/android/systemui/power/PowerNotificationWarnings.java b/packages/SystemUI/src/com/android/systemui/power/PowerNotificationWarnings.java index 8a500c3219f0..7a45dd299151 100644 --- a/packages/SystemUI/src/com/android/systemui/power/PowerNotificationWarnings.java +++ b/packages/SystemUI/src/com/android/systemui/power/PowerNotificationWarnings.java @@ -50,7 +50,8 @@ public class PowerNotificationWarnings implements PowerUI.WarningsUI { private static final String TAG = PowerUI.TAG + ".Notification"; private static final boolean DEBUG = PowerUI.DEBUG; - private static final String TAG_NOTIFICATION = "low_battery"; + private static final String TAG_NOTIFICATION_BATTERY = "low_battery"; + private static final String TAG_NOTIFICATION_TEMPERATURE = "high_temp"; private static final int SHOWING_NOTHING = 0; private static final int SHOWING_WARNING = 1; @@ -65,6 +66,8 @@ public class PowerNotificationWarnings implements PowerUI.WarningsUI { private static final String ACTION_SHOW_BATTERY_SETTINGS = "PNW.batterySettings"; private static final String ACTION_START_SAVER = "PNW.startSaver"; private static final String ACTION_DISMISSED_WARNING = "PNW.dismissedWarning"; + private static final String ACTION_CLICKED_TEMP_WARNING = "PNW.clickedTempWarning"; + private static final String ACTION_DISMISSED_TEMP_WARNING = "PNW.dismissedTempWarning"; private static final AudioAttributes AUDIO_ATTRIBUTES = new AudioAttributes.Builder() .setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION) @@ -89,6 +92,8 @@ public class PowerNotificationWarnings implements PowerUI.WarningsUI { private boolean mPlaySound; private boolean mInvalidCharger; private SystemUIDialog mSaverConfirmation; + private boolean mTempWarning; + private SystemUIDialog mHighTempDialog; public PowerNotificationWarnings(Context context, NotificationManager notificationManager, PhoneStatusBar phoneStatusBar) { @@ -105,6 +110,8 @@ public class PowerNotificationWarnings implements PowerUI.WarningsUI { pw.print("mInvalidCharger="); pw.println(mInvalidCharger); pw.print("mShowing="); pw.println(SHOWING_STRINGS[mShowing]); pw.print("mSaverConfirmation="); pw.println(mSaverConfirmation != null ? "not null" : null); + pw.print("mTempWarning="); pw.println(mTempWarning); + pw.print("mHighTempDialog="); pw.println(mHighTempDialog != null ? "not null" : null); } @Override @@ -129,7 +136,7 @@ public class PowerNotificationWarnings implements PowerUI.WarningsUI { showWarningNotification(); mShowing = SHOWING_WARNING; } else { - mNoMan.cancelAsUser(TAG_NOTIFICATION, R.id.notification_power, UserHandle.ALL); + mNoMan.cancelAsUser(TAG_NOTIFICATION_BATTERY, R.id.notification_power, UserHandle.ALL); mShowing = SHOWING_NOTHING; } } @@ -148,7 +155,7 @@ public class PowerNotificationWarnings implements PowerUI.WarningsUI { com.android.internal.R.color.system_notification_accent_color)); SystemUI.overrideNotificationAppName(mContext, nb); final Notification n = nb.build(); - mNoMan.notifyAsUser(TAG_NOTIFICATION, R.id.notification_power, n, UserHandle.ALL); + mNoMan.notifyAsUser(TAG_NOTIFICATION_BATTERY, R.id.notification_power, n, UserHandle.ALL); } private void showWarningNotification() { @@ -178,12 +185,8 @@ public class PowerNotificationWarnings implements PowerUI.WarningsUI { mPlaySound = false; } SystemUI.overrideNotificationAppName(mContext, nb); - mNoMan.notifyAsUser(TAG_NOTIFICATION, R.id.notification_power, nb.build(), UserHandle.ALL); - } - - private PendingIntent pendingActivity(Intent intent) { - return PendingIntent.getActivityAsUser(mContext, - 0, intent, 0, null, UserHandle.CURRENT); + mNoMan.notifyAsUser( + TAG_NOTIFICATION_BATTERY, R.id.notification_power, nb.build(), UserHandle.ALL); } private PendingIntent pendingBroadcast(String action) { @@ -205,6 +208,53 @@ public class PowerNotificationWarnings implements PowerUI.WarningsUI { } @Override + public void dismissTemperatureWarning() { + if (!mTempWarning) { + return; + } + mTempWarning = false; + mNoMan.cancelAsUser( + TAG_NOTIFICATION_TEMPERATURE, R.id.notification_temperature, UserHandle.ALL); + } + + @Override + public void showTemperatureWarning() { + if (mTempWarning) { + return; + } + mTempWarning = true; + final Notification.Builder nb = new Notification.Builder(mContext) + .setSmallIcon(R.drawable.ic_device_thermostat_24) + .setWhen(0) + .setShowWhen(false) + .setContentTitle(mContext.getString(R.string.high_temp_title)) + .setContentText(mContext.getString(R.string.high_temp_notif_message)) + .setPriority(Notification.PRIORITY_HIGH) + .setVisibility(Notification.VISIBILITY_PUBLIC) + .setContentIntent(pendingBroadcast(ACTION_CLICKED_TEMP_WARNING)) + .setDeleteIntent(pendingBroadcast(ACTION_DISMISSED_TEMP_WARNING)) + .setColor(mContext.getColor( + com.android.internal.R.color.battery_saver_mode_color)); + SystemUI.overrideNotificationAppName(mContext, nb); + final Notification n = nb.build(); + mNoMan.notifyAsUser( + TAG_NOTIFICATION_TEMPERATURE, R.id.notification_temperature, n, UserHandle.ALL); + + } + + private void showTemperatureDialog() { + if (mHighTempDialog != null) return; + final SystemUIDialog d = new SystemUIDialog(mContext); + d.setTitle(R.string.high_temp_title); + d.setMessage(R.string.high_temp_dialog_message); + d.setPositiveButton(com.android.internal.R.string.ok, null); + d.setShowForAllUsers(true); + d.setOnDismissListener(dialog -> mHighTempDialog = null); + d.show(); + mHighTempDialog = d; + } + + @Override public void updateLowBatteryWarning() { updateNotification(); } @@ -317,6 +367,8 @@ public class PowerNotificationWarnings implements PowerUI.WarningsUI { filter.addAction(ACTION_SHOW_BATTERY_SETTINGS); filter.addAction(ACTION_START_SAVER); filter.addAction(ACTION_DISMISSED_WARNING); + filter.addAction(ACTION_CLICKED_TEMP_WARNING); + filter.addAction(ACTION_DISMISSED_TEMP_WARNING); mContext.registerReceiverAsUser(this, UserHandle.ALL, filter, android.Manifest.permission.STATUS_BAR_SERVICE, mHandler); } @@ -333,6 +385,11 @@ public class PowerNotificationWarnings implements PowerUI.WarningsUI { showStartSaverConfirmation(); } else if (action.equals(ACTION_DISMISSED_WARNING)) { dismissLowBatteryWarning(); + } else if (ACTION_CLICKED_TEMP_WARNING.equals(action)) { + dismissTemperatureWarning(); + showTemperatureDialog(); + } else if (ACTION_DISMISSED_TEMP_WARNING.equals(action)) { + dismissTemperatureWarning(); } } } diff --git a/packages/SystemUI/src/com/android/systemui/power/PowerUI.java b/packages/SystemUI/src/com/android/systemui/power/PowerUI.java index b651f2d99523..a7cbb3d94557 100644 --- a/packages/SystemUI/src/com/android/systemui/power/PowerUI.java +++ b/packages/SystemUI/src/com/android/systemui/power/PowerUI.java @@ -25,12 +25,15 @@ import android.content.IntentFilter; import android.database.ContentObserver; import android.os.BatteryManager; import android.os.Handler; +import android.os.HardwarePropertiesManager; import android.os.PowerManager; import android.os.SystemClock; import android.os.UserHandle; import android.provider.Settings; +import android.text.format.DateUtils; import android.util.Log; import android.util.Slog; +import com.android.systemui.R; import com.android.systemui.SystemUI; import com.android.systemui.statusbar.phone.PhoneStatusBar; import java.io.FileDescriptor; @@ -40,11 +43,13 @@ import java.util.Arrays; public class PowerUI extends SystemUI { static final String TAG = "PowerUI"; static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG); + private static final long TEMPERATURE_INTERVAL = 30 * DateUtils.SECOND_IN_MILLIS; private final Handler mHandler = new Handler(); private final Receiver mReceiver = new Receiver(); private PowerManager mPowerManager; + private HardwarePropertiesManager mHardwarePropertiesManager; private WarningsUI mWarnings; private int mBatteryLevel = 100; private int mBatteryStatus = BatteryManager.BATTERY_STATUS_UNKNOWN; @@ -56,8 +61,12 @@ public class PowerUI extends SystemUI { private long mScreenOffTime = -1; + private float mThrottlingTemp; + public void start() { mPowerManager = (PowerManager) mContext.getSystemService(Context.POWER_SERVICE); + mHardwarePropertiesManager = (HardwarePropertiesManager) + mContext.getSystemService(Context.HARDWARE_PROPERTIES_SERVICE); mScreenOffTime = mPowerManager.isScreenOn() ? -1 : SystemClock.elapsedRealtime(); mWarnings = new PowerNotificationWarnings( mContext, @@ -76,6 +85,8 @@ public class PowerUI extends SystemUI { false, obs, UserHandle.USER_ALL); updateBatteryWarningLevels(); mReceiver.init(); + + initTemperatureWarning(); } void updateBatteryWarningLevels() { @@ -211,6 +222,53 @@ public class PowerUI extends SystemUI { } }; + private void initTemperatureWarning() { + if (!mContext.getResources().getBoolean(R.bool.config_showTemperatureWarning)) { + return; + } + + // Get the throttling temperature. No need to check if we're not throttling. + float[] throttlingTemps = mHardwarePropertiesManager.getDeviceTemperatures( + HardwarePropertiesManager.DEVICE_TEMPERATURE_SKIN, + HardwarePropertiesManager.TEMPERATURE_THROTTLING); + if (throttlingTemps == null + || throttlingTemps.length == 0 + || throttlingTemps[0] == HardwarePropertiesManager.UNDEFINED_TEMPERATURE) { + return; + } + mThrottlingTemp = throttlingTemps[0]; + + // We have passed all of the checks, start checking the temp + updateTemperatureWarning(); + } + + private void updateTemperatureWarning() { + PhoneStatusBar phoneStatusBar = getComponent(PhoneStatusBar.class); + if (phoneStatusBar != null && phoneStatusBar.isDeviceInVrMode()) { + // ensure the warning isn't showing, since VR shows its own warning + mWarnings.dismissTemperatureWarning(); + } else { + float[] temps = mHardwarePropertiesManager.getDeviceTemperatures( + HardwarePropertiesManager.DEVICE_TEMPERATURE_SKIN, + HardwarePropertiesManager.TEMPERATURE_CURRENT); + boolean shouldShowTempWarning = false; + for (float temp : temps) { + if (temp >= mThrottlingTemp) { + shouldShowTempWarning = true; + break; + } + } + if (shouldShowTempWarning) { + mWarnings.showTemperatureWarning(); + } else { + mWarnings.dismissTemperatureWarning(); + } + } + + // TODO: skip this when in VR mode since we already get a callback + mHandler.postDelayed(this::updateTemperatureWarning, TEMPERATURE_INTERVAL); + } + public void dump(FileDescriptor fd, PrintWriter pw, String[] args) { pw.print("mLowBatteryAlertCloseLevel="); pw.println(mLowBatteryAlertCloseLevel); @@ -237,6 +295,8 @@ public class PowerUI extends SystemUI { Settings.Global.LOW_BATTERY_SOUND_TIMEOUT, 0)); pw.print("bucket: "); pw.println(Integer.toString(findBatteryLevelBucket(mBatteryLevel))); + pw.print("mThrottlingTemp="); + pw.println(Float.toString(mThrottlingTemp)); mWarnings.dump(pw); } @@ -248,6 +308,8 @@ public class PowerUI extends SystemUI { void showInvalidChargerWarning(); void updateLowBatteryWarning(); boolean isInvalidChargerWarningShowing(); + void dismissTemperatureWarning(); + void showTemperatureWarning(); void dump(PrintWriter pw); void userSwitched(); } diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSAnimator.java b/packages/SystemUI/src/com/android/systemui/qs/QSAnimator.java index dc42adc6e344..fdefcf91da6d 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSAnimator.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSAnimator.java @@ -362,6 +362,11 @@ public class QSAnimator implements Callback, PageListener, Listener, OnLayoutCha private final TouchAnimator.Listener mNonFirstPageListener = new TouchAnimator.ListenerAdapter() { @Override + public void onAnimationAtEnd() { + mQuickQsPanel.setVisibility(View.INVISIBLE); + } + + @Override public void onAnimationStarted() { mQuickQsPanel.setVisibility(View.VISIBLE); } diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSPanel.java b/packages/SystemUI/src/com/android/systemui/qs/QSPanel.java index 6b24a1eeef1e..9feaa0aaf820 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSPanel.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSPanel.java @@ -351,7 +351,10 @@ public class QSPanel extends LinearLayout implements Tunable, Callback { @Override public void onAnnouncementRequested(CharSequence announcement) { - announceForAccessibility(announcement); + if (announcement != null) { + mHandler.obtainMessage(H.ANNOUNCE_FOR_ACCESSIBILITY, announcement) + .sendToTarget(); + } } }; r.tile.addCallback(callback); @@ -526,10 +529,13 @@ public class QSPanel extends LinearLayout implements Tunable, Callback { private class H extends Handler { private static final int SHOW_DETAIL = 1; private static final int SET_TILE_VISIBILITY = 2; + private static final int ANNOUNCE_FOR_ACCESSIBILITY = 3; @Override public void handleMessage(Message msg) { if (msg.what == SHOW_DETAIL) { handleShowDetail((Record)msg.obj, msg.arg1 != 0); + } else if (msg.what == ANNOUNCE_FOR_ACCESSIBILITY) { + announceForAccessibility((CharSequence)msg.obj); } } } diff --git a/packages/SystemUI/src/com/android/systemui/qs/external/CustomTile.java b/packages/SystemUI/src/com/android/systemui/qs/external/CustomTile.java index 1fcb45b3348d..9e3889bea903 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/external/CustomTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/external/CustomTile.java @@ -15,6 +15,9 @@ */ package com.android.systemui.qs.external; +import static android.view.Display.DEFAULT_DISPLAY; +import static android.view.WindowManager.LayoutParams.TYPE_QS_DIALOG; + import android.app.ActivityManager; import android.content.ComponentName; import android.content.Context; @@ -24,7 +27,6 @@ import android.content.pm.PackageManager.NameNotFoundException; import android.content.pm.ResolveInfo; import android.content.pm.ServiceInfo; import android.graphics.drawable.Drawable; -import android.graphics.drawable.Icon; import android.net.Uri; import android.os.Binder; import android.os.IBinder; @@ -37,19 +39,14 @@ import android.text.SpannableStringBuilder; import android.text.style.ForegroundColorSpan; import android.util.Log; import android.view.IWindowManager; -import android.view.WindowManager; import android.view.WindowManagerGlobal; import com.android.internal.logging.MetricsLogger; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; -import com.android.systemui.R; import com.android.systemui.qs.QSTile; import com.android.systemui.qs.external.TileLifecycleManager.TileChangeListener; import com.android.systemui.statusbar.phone.QSTileHost; import libcore.util.Objects; -import static android.view.Display.DEFAULT_DISPLAY; -import static android.view.WindowManager.LayoutParams.TYPE_QS_DIALOG; - public class CustomTile extends QSTile<QSTile.State> implements TileChangeListener { public static final String PREFIX = "custom("; @@ -301,7 +298,7 @@ public class CustomTile extends QSTile<QSTile.State> implements TileChangeListen tileState = Tile.STATE_UNAVAILABLE; drawable = mDefaultIcon.loadDrawable(mAppContext); } - int color = mContext.getColor(getColor(tileState)); + final int color = TileColorPicker.getInstance(mContext).getColor(tileState); drawable.setTint(color); state.icon = mHasRes ? new DrawableIconWithRes(drawable, icon.getResId()) : new DrawableIcon(drawable); @@ -335,18 +332,6 @@ public class CustomTile extends QSTile<QSTile.State> implements TileChangeListen }); } - private static int getColor(int state) { - switch (state) { - case Tile.STATE_UNAVAILABLE: - return R.color.qs_tile_tint_unavailable; - case Tile.STATE_INACTIVE: - return R.color.qs_tile_tint_inactive; - case Tile.STATE_ACTIVE: - return R.color.qs_tile_tint_active; - } - return 0; - } - public static String toSpec(ComponentName name) { return PREFIX + name.flattenToShortString() + ")"; } diff --git a/packages/SystemUI/src/com/android/systemui/qs/external/TileColorPicker.java b/packages/SystemUI/src/com/android/systemui/qs/external/TileColorPicker.java new file mode 100644 index 000000000000..0cc17ff37241 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/qs/external/TileColorPicker.java @@ -0,0 +1,60 @@ +/* + * 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 + */ +package com.android.systemui.qs.external; + +import android.content.Context; +import android.content.res.ColorStateList; +import android.service.quicksettings.Tile; +import android.support.annotation.VisibleForTesting; +import com.android.systemui.R; + +public class TileColorPicker { + @VisibleForTesting static final int[] DISABLE_STATE_SET = {-android.R.attr.state_enabled}; + @VisibleForTesting static final int[] ENABLE_STATE_SET = {android.R.attr.state_enabled, + android.R.attr.state_activated}; + @VisibleForTesting static final int[] INACTIVE_STATE_SET = {-android.R.attr.state_activated}; + private static TileColorPicker sInstance; + + private ColorStateList mColorStateList; + + private TileColorPicker(Context context) { + mColorStateList = context.getResources(). + getColorStateList(R.color.tint_color_selector, context.getTheme()); + } + + public static TileColorPicker getInstance(Context context) { + if (sInstance == null) { + sInstance = new TileColorPicker(context); + } + return sInstance; + } + + public int getColor(int state) { + final int defaultColor = 0; + + switch (state) { + case Tile.STATE_UNAVAILABLE: + return mColorStateList.getColorForState(DISABLE_STATE_SET, defaultColor); + case Tile.STATE_INACTIVE: + return mColorStateList.getColorForState(INACTIVE_STATE_SET, defaultColor); + case Tile.STATE_ACTIVE: + return mColorStateList.getColorForState(ENABLE_STATE_SET, defaultColor); + default: + return mColorStateList.getColorForState(ENABLE_STATE_SET, defaultColor); + } + } + +} diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/BatteryTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/BatteryTile.java index fc1c1ac05ed0..87b00a7febbd 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/BatteryTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/BatteryTile.java @@ -19,7 +19,10 @@ import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.content.IntentFilter; +import android.graphics.PorterDuff.Mode; +import android.graphics.PorterDuffColorFilter; import android.graphics.drawable.Drawable; +import android.service.quicksettings.Tile; import android.text.SpannableStringBuilder; import android.text.Spanned; import android.text.style.RelativeSizeSpan; @@ -40,6 +43,7 @@ import com.android.systemui.BatteryMeterDrawable; import com.android.systemui.R; import com.android.systemui.plugins.qs.QS.DetailAdapter; import com.android.systemui.qs.QSTile; +import com.android.systemui.qs.external.TileColorPicker; import com.android.systemui.statusbar.policy.BatteryController; import java.text.NumberFormat; @@ -120,6 +124,8 @@ public class BatteryTile extends QSTile<QSTile.State> implements BatteryControll context.getColor(R.color.batterymeter_frame_color)); drawable.onBatteryLevelChanged(mLevel, mPluggedIn, mCharging); drawable.onPowerSaveChanged(mPowerSave); + final int color = TileColorPicker.getInstance(context).getColor(Tile.STATE_ACTIVE); + drawable.setColorFilter(new PorterDuffColorFilter(color, Mode.SRC_IN)); return drawable; } @@ -205,6 +211,11 @@ public class BatteryTile extends QSTile<QSTile.State> implements BatteryControll mDrawable.onBatteryLevelChanged(100, false, false); mDrawable.onPowerSaveChanged(true); mDrawable.disableShowPercent(); + + final int color = TileColorPicker.getInstance(mCurrentView.getContext()) + .getColor(Tile.STATE_ACTIVE); + mDrawable.setColorFilter(new PorterDuffColorFilter(color, Mode.SRC_IN)); + ((ImageView) mCurrentView.findViewById(android.R.id.icon)).setImageDrawable(mDrawable); Checkable checkbox = (Checkable) mCurrentView.findViewById(android.R.id.toggle); checkbox.setChecked(mPowerSave); diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/FlashlightTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/FlashlightTile.java index 5b1638fe9898..d86aebfd0255 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/FlashlightTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/FlashlightTile.java @@ -20,6 +20,7 @@ import android.app.ActivityManager; import android.content.Intent; import android.graphics.drawable.Drawable; import android.provider.MediaStore; +import android.service.quicksettings.Tile; import android.text.SpannableStringBuilder; import android.text.style.ForegroundColorSpan; import android.widget.Switch; @@ -28,6 +29,7 @@ import com.android.internal.logging.MetricsLogger; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.systemui.R; import com.android.systemui.qs.QSTile; +import com.android.systemui.qs.external.TileColorPicker; import com.android.systemui.statusbar.policy.FlashlightController; /** Quick settings tile: Control flashlight **/ @@ -104,7 +106,8 @@ public class FlashlightTile extends QSTile<QSTile.BooleanState> implements if (!mFlashlightController.isAvailable()) { Drawable icon = mHost.getContext().getDrawable(R.drawable.ic_signal_flashlight_disable) .mutate(); - final int disabledColor = mHost.getContext().getColor(R.color.qs_tile_tint_unavailable); + final int disabledColor = TileColorPicker.getInstance(mContext) + .getColor(Tile.STATE_UNAVAILABLE); icon.setTint(disabledColor); state.icon = new DrawableIcon(icon); state.label = new SpannableStringBuilder().append(state.label, diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/HotspotTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/HotspotTile.java index dcee659a0463..99485bb90943 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/HotspotTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/HotspotTile.java @@ -22,6 +22,7 @@ import android.os.UserManager; import android.provider.Settings; import android.provider.Settings.Global; +import android.service.quicksettings.Tile; import android.text.SpannableStringBuilder; import android.text.style.ForegroundColorSpan; import android.widget.Switch; @@ -31,6 +32,7 @@ import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.systemui.R; import com.android.systemui.qs.GlobalSetting; import com.android.systemui.qs.QSTile; +import com.android.systemui.qs.external.TileColorPicker; import com.android.systemui.statusbar.policy.HotspotController; /** Quick settings tile: Hotspot **/ @@ -124,7 +126,8 @@ public class HotspotTile extends QSTile<QSTile.AirplaneBooleanState> { boolean wasAirplane = state.isAirplaneMode; state.isAirplaneMode = mAirplaneMode.getValue() != 0; if (state.isAirplaneMode) { - final int disabledColor = mHost.getContext().getColor(R.color.qs_tile_tint_unavailable); + final int disabledColor = TileColorPicker.getInstance(mContext) + .getColor(Tile.STATE_UNAVAILABLE); state.label = new SpannableStringBuilder().append(state.label, new ForegroundColorSpan(disabledColor), SpannableStringBuilder.SPAN_INCLUSIVE_INCLUSIVE); diff --git a/packages/SystemUI/src/com/android/systemui/recents/RecentsImpl.java b/packages/SystemUI/src/com/android/systemui/recents/RecentsImpl.java index 137138127775..7547bc37d424 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/RecentsImpl.java +++ b/packages/SystemUI/src/com/android/systemui/recents/RecentsImpl.java @@ -204,6 +204,8 @@ public class RecentsImpl implements ActivityOptions.OnAnimationFinishedListener Resources res = mContext.getResources(); reloadResources(); mDummyStackView.reloadOnConfigurationChange(); + mDummyStackView.getStackAlgorithm().getGridState().setHasDockedTasks( + Recents.getSystemServices().hasDockedTask()); } /** @@ -721,7 +723,7 @@ public class RecentsImpl implements ActivityOptions.OnAnimationFinishedListener if (task.isFreeformTask()) { mTmpTransform = stackLayout.getStackTransformScreenCoordinates(task, stackScroller.getStackScroll(), mTmpTransform, null, - windowOverrideRect, false /* useGridLayout */); + windowOverrideRect); Bitmap thumbnail = drawThumbnailTransitionBitmap(task, mTmpTransform, mThumbTransitionBitmapCache); Rect toTaskRect = new Rect(); @@ -770,9 +772,9 @@ public class RecentsImpl implements ActivityOptions.OnAnimationFinishedListener // Get the transform for the running task stackView.updateLayoutAlgorithm(true /* boundScroll */); stackView.updateToInitialState(); + boolean isInSplitScreen = Recents.getSystemServices().hasDockedTask(); stackView.getStackAlgorithm().getStackTransformScreenCoordinates(launchTask, - stackView.getScroller().getStackScroll(), mTmpTransform, null, windowOverrideRect, - Recents.getConfiguration().isGridEnabled); + stackView.getScroller().getStackScroll(), mTmpTransform, null, windowOverrideRect); return mTmpTransform; } diff --git a/packages/SystemUI/src/com/android/systemui/recents/ScreenPinningRequest.java b/packages/SystemUI/src/com/android/systemui/recents/ScreenPinningRequest.java index 002515d10a01..0336905cd855 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/ScreenPinningRequest.java +++ b/packages/SystemUI/src/com/android/systemui/recents/ScreenPinningRequest.java @@ -231,10 +231,12 @@ public class ScreenPinningRequest implements View.OnClickListener { .setVisibility(View.INVISIBLE); } + boolean touchExplorationEnabled = mAccessibilityService.isTouchExplorationEnabled(); ((TextView) mLayout.findViewById(R.id.screen_pinning_description)) - .setText(R.string.screen_pinning_description); - final int backBgVisibility = - mAccessibilityService.isEnabled() ? View.INVISIBLE : View.VISIBLE; + .setText(touchExplorationEnabled + ? R.string.screen_pinning_description_accessible + : R.string.screen_pinning_description); + final int backBgVisibility = touchExplorationEnabled ? View.INVISIBLE : View.VISIBLE; mLayout.findViewById(R.id.screen_pinning_back_bg).setVisibility(backBgVisibility); mLayout.findViewById(R.id.screen_pinning_back_bg_light).setVisibility(backBgVisibility); diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/RecentsView.java b/packages/SystemUI/src/com/android/systemui/recents/views/RecentsView.java index d8fdd7a281e8..ee79330f816a 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/views/RecentsView.java +++ b/packages/SystemUI/src/com/android/systemui/recents/views/RecentsView.java @@ -91,6 +91,7 @@ public class RecentsView extends FrameLayout { private static final int DEFAULT_UPDATE_SCRIM_DURATION = 200; private static final float DEFAULT_SCRIM_ALPHA = 0.33f; + private static final float GRID_LAYOUT_SCRIM_ALPHA = 0.45f; private static final int SHOW_STACK_ACTION_BUTTON_DURATION = 134; private static final int HIDE_STACK_ACTION_BUTTON_DURATION = 100; @@ -106,8 +107,8 @@ public class RecentsView extends FrameLayout { Rect mSystemInsets = new Rect(); private int mDividerSize; - private Drawable mBackgroundScrim = new ColorDrawable( - Color.argb((int) (DEFAULT_SCRIM_ALPHA * 255), 0, 0, 0)).mutate(); + private final float mScrimAlpha; + private final Drawable mBackgroundScrim; private Animator mBackgroundScrimAnimator; private RecentsTransitionHelper mTransitionHelper; @@ -136,6 +137,10 @@ public class RecentsView extends FrameLayout { mDividerSize = ssp.getDockedDividerSize(context); mTouchHandler = new RecentsViewTouchHandler(this); mFlingAnimationUtils = new FlingAnimationUtils(context, 0.3f); + mScrimAlpha = Recents.getConfiguration().isGridEnabled + ? GRID_LAYOUT_SCRIM_ALPHA : DEFAULT_SCRIM_ALPHA; + mBackgroundScrim = new ColorDrawable( + Color.argb((int) (mScrimAlpha * 255), 0, 0, 0)).mutate(); LayoutInflater inflater = LayoutInflater.from(context); if (RecentsDebugFlags.Static.EnableStackActionButton) { @@ -337,8 +342,7 @@ public class RecentsView extends FrameLayout { if (RecentsDebugFlags.Static.EnableStackActionButton) { // Measure the stack action button within the constraints of the space above the stack - Rect buttonBounds = mTaskStackView.mLayoutAlgorithm.getStackActionButtonRect( - mTaskStackView.useGridLayout()); + Rect buttonBounds = mTaskStackView.mLayoutAlgorithm.getStackActionButtonRect(); measureChild(mStackActionButton, MeasureSpec.makeMeasureSpec(buttonBounds.width(), MeasureSpec.AT_MOST), MeasureSpec.makeMeasureSpec(buttonBounds.height(), MeasureSpec.AT_MOST)); @@ -758,7 +762,7 @@ public class RecentsView extends FrameLayout { private void animateBackgroundScrim(float alpha, int duration) { Utilities.cancelAnimationWithoutCallbacks(mBackgroundScrimAnimator); // Calculate the absolute alpha to animate from - int fromAlpha = (int) ((mBackgroundScrim.getAlpha() / (DEFAULT_SCRIM_ALPHA * 255)) * 255); + int fromAlpha = (int) ((mBackgroundScrim.getAlpha() / (mScrimAlpha * 255)) * 255); int toAlpha = (int) (alpha * 255); mBackgroundScrimAnimator = ObjectAnimator.ofInt(mBackgroundScrim, Utilities.DRAWABLE_ALPHA, fromAlpha, toAlpha); @@ -773,8 +777,7 @@ public class RecentsView extends FrameLayout { * @return the bounds of the stack action button. */ private Rect getStackActionButtonBoundsFromStackLayout() { - Rect actionButtonRect = new Rect(mTaskStackView.mLayoutAlgorithm.getStackActionButtonRect( - mTaskStackView.useGridLayout())); + Rect actionButtonRect = new Rect(mTaskStackView.mLayoutAlgorithm.getStackActionButtonRect()); int left = isLayoutRtl() ? actionButtonRect.left - mStackActionButton.getPaddingLeft() : actionButtonRect.right + mStackActionButton.getPaddingRight() diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackAnimationHelper.java b/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackAnimationHelper.java index c1f4c8a4c1dd..34c0c64b3d13 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackAnimationHelper.java +++ b/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackAnimationHelper.java @@ -157,7 +157,7 @@ public class TaskStackAnimationHelper { // Get the current transform for the task, which will be used to position it offscreen stackLayout.getStackTransform(task, stackScroller.getStackScroll(), mTmpTransform, - null, mStackView.useGridLayout()); + null); if (hideTask) { tv.setVisibility(View.INVISIBLE); @@ -230,7 +230,7 @@ public class TaskStackAnimationHelper { // Get the current transform for the task, which will be updated to the final transform // to animate to depending on how recents was invoked stackLayout.getStackTransform(task, stackScroller.getStackScroll(), mTmpTransform, - null, mStackView.useGridLayout()); + null); if (launchState.launchedFromApp && !launchState.launchedViaDockGesture) { if (task.isLaunchTarget) { @@ -424,7 +424,7 @@ public class TaskStackAnimationHelper { final ReferenceCountedTrigger postAnimationTrigger) { TaskStackLayoutAlgorithm stackLayout = mStackView.getStackAlgorithm(); - int offscreenXOffset = mStackView.getMeasuredWidth() - stackLayout.mTaskRect.left; + int offscreenXOffset = mStackView.getMeasuredWidth() - stackLayout.getTaskRect().left; int taskViewCount = taskViews.size(); for (int i = taskViewCount - 1; i >= 0; i--) { 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 052985647453..3499dfd2234c 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackLayoutAlgorithm.java +++ b/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackLayoutAlgorithm.java @@ -212,6 +212,41 @@ public class TaskStackLayoutAlgorithm { } } + /** + * The state telling the algorithm whether to use grid layout or not. + */ + public static class GridState { + private boolean mDraggingOverDockedState; + private boolean mHasDockedTask; + + private GridState() { + mDraggingOverDockedState = false; + mHasDockedTask = false; + } + + /** + * Check whether we should use the grid layout. + * We use the grid layout for Recents iff all the following is true: + * 1. Grid-mode is enabled. + * 2. The activity is not in split screen mode (there's no docked task). + * 3. The user is not dragging a task view over the dock state. + * @return True if we should use the grid layout. + */ + boolean useGridLayout() { + return Recents.getConfiguration().isGridEnabled && + !mDraggingOverDockedState && + !mHasDockedTask; + } + + public void setDragging(boolean draggingOverDockedState) { + mDraggingOverDockedState = draggingOverDockedState; + } + + public void setHasDockedTasks(boolean hasDockedTask) { + mHasDockedTask = hasDockedTask; + } + } + // A report of the visibility state of the stack public class VisibilityReport { public int numVisibleTasks; @@ -226,6 +261,7 @@ public class TaskStackLayoutAlgorithm { Context mContext; private StackState mState = StackState.SPLIT; + private GridState mGridState = new GridState(); private TaskStackLayoutAlgorithmCallbacks mCb; // The task bounds (untransformed) for layout. This rect is anchored at mTaskRoot. @@ -732,8 +768,8 @@ public class TaskStackLayoutAlgorithm { } } - public Rect getStackActionButtonRect(boolean useGridLayout) { - return useGridLayout + public Rect getStackActionButtonRect() { + return mGridState.useGridLayout() ? mTaskGridLayoutAlgorithm.getStackActionButtonRect() : mStackActionButtonRect; } @@ -759,6 +795,13 @@ public class TaskStackLayoutAlgorithm { } /** + * Returns the current grid layout state. + */ + public GridState getGridState() { + return mGridState; + } + + /** * Returns whether this stack layout has been initialized. */ public boolean isInitialized() { @@ -841,26 +884,25 @@ public class TaskStackLayoutAlgorithm { * is what the view is measured and laid out with. */ public TaskViewTransform getStackTransform(Task task, float stackScroll, - TaskViewTransform transformOut, TaskViewTransform frontTransform, - boolean useGridLayout) { + TaskViewTransform transformOut, TaskViewTransform frontTransform) { return getStackTransform(task, stackScroll, mFocusState, transformOut, frontTransform, - false /* forceUpdate */, false /* ignoreTaskOverrides */, useGridLayout); + false /* forceUpdate */, false /* ignoreTaskOverrides */); } public TaskViewTransform getStackTransform(Task task, float stackScroll, TaskViewTransform transformOut, TaskViewTransform frontTransform, - boolean ignoreTaskOverrides, boolean useGridLayout) { + boolean ignoreTaskOverrides) { return getStackTransform(task, stackScroll, mFocusState, transformOut, frontTransform, - false /* forceUpdate */, ignoreTaskOverrides, useGridLayout); + false /* forceUpdate */, ignoreTaskOverrides); } public TaskViewTransform getStackTransform(Task task, float stackScroll, int focusState, TaskViewTransform transformOut, TaskViewTransform frontTransform, boolean forceUpdate, - boolean ignoreTaskOverrides, boolean useGridLayout) { + boolean ignoreTaskOverrides) { if (mFreeformLayoutAlgorithm.isTransformAvailable(task, this)) { mFreeformLayoutAlgorithm.getTransform(task, transformOut, this); return transformOut; - } else if (useGridLayout) { + } else if (mGridState.useGridLayout()) { int taskIndex = mTaskIndexMap.get(task.key.id); int taskCount = mTaskIndexMap.size(); mTaskGridLayoutAlgorithm.getTransform(taskIndex, taskCount, transformOut, this); @@ -886,10 +928,10 @@ public class TaskStackLayoutAlgorithm { */ public TaskViewTransform getStackTransformScreenCoordinates(Task task, float stackScroll, TaskViewTransform transformOut, TaskViewTransform frontTransform, - Rect windowOverrideRect, boolean useGridLayout) { + Rect windowOverrideRect) { TaskViewTransform transform = getStackTransform(task, stackScroll, mFocusState, transformOut, frontTransform, true /* forceUpdate */, - false /* ignoreTaskOverrides */, useGridLayout); + false /* ignoreTaskOverrides */); return transformToScreenCoordinates(transform, windowOverrideRect); } @@ -1277,6 +1319,13 @@ public class TaskStackLayoutAlgorithm { mFrontOfStackTransform.visible = true; } + /** + * Returns the proper task rectangle according to the current grid state. + */ + public Rect getTaskRect() { + return mGridState.useGridLayout() ? mTaskGridLayoutAlgorithm.getTaskGridRect() : mTaskRect; + } + public void dump(String prefix, PrintWriter writer) { String innerPrefix = prefix + " "; 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 4625ca76c5cc..760bf54a540c 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java +++ b/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java @@ -159,7 +159,6 @@ public class TaskStackView extends FrameLayout implements TaskStack.TaskStackCal private int mTaskCornerRadiusPx; private int mDividerSize; private int mStartTimerIndicatorDuration; - private boolean mDraggingOverDockState; @ViewDebug.ExportedProperty(category="recents") private boolean mTaskViewsClipDirty = true; @@ -501,13 +500,13 @@ public class TaskStackView extends FrameLayout implements TaskStack.TaskStackCal // Calculate the current and (if necessary) the target transform for the task transform = mLayoutAlgorithm.getStackTransform(task, curStackScroll, - taskTransforms.get(i), frontTransform, ignoreTaskOverrides, useGridLayout()); + taskTransforms.get(i), frontTransform, ignoreTaskOverrides); if (useTargetStackScroll && !transform.visible) { // If we have a target stack scroll and the task is not currently visible, then we // just update the transform at the new scroll // TODO: Optimize this transformAtTarget = mLayoutAlgorithm.getStackTransform(task, targetStackScroll, - new TaskViewTransform(), frontTransformAtTarget, useGridLayout()); + new TaskViewTransform(), frontTransformAtTarget); if (transformAtTarget.visible) { transform.copyFrom(transformAtTarget); } @@ -738,7 +737,7 @@ public class TaskStackView extends FrameLayout implements TaskStack.TaskStackCal } else { mLayoutAlgorithm.getStackTransform(task, mStackScroller.getStackScroll(), focusState, transform, null, true /* forceUpdate */, - false /* ignoreTaskOverrides */, useGridLayout()); + false /* ignoreTaskOverrides */); } transform.visible = true; } @@ -755,7 +754,7 @@ public class TaskStackView extends FrameLayout implements TaskStack.TaskStackCal Task task = tasks.get(i); TaskViewTransform transform = transformsOut.get(i); mLayoutAlgorithm.getStackTransform(task, stackScroll, focusState, transform, null, - true /* forceUpdate */, ignoreTaskOverrides, useGridLayout()); + true /* forceUpdate */, ignoreTaskOverrides); transform.visible = true; } } @@ -1269,8 +1268,8 @@ public class TaskStackView extends FrameLayout implements TaskStack.TaskStackCal if (tv.getBackground() != null) { tv.getBackground().getPadding(padding); } - mTmpRect.set(mStableLayoutAlgorithm.mTaskRect); - mTmpRect.union(mLayoutAlgorithm.mTaskRect); + mTmpRect.set(mStableLayoutAlgorithm.getTaskRect()); + mTmpRect.union(mLayoutAlgorithm.getTaskRect()); tv.measure( MeasureSpec.makeMeasureSpec(mTmpRect.width() + padding.left + padding.right, MeasureSpec.EXACTLY), @@ -1315,8 +1314,8 @@ public class TaskStackView extends FrameLayout implements TaskStack.TaskStackCal if (tv.getBackground() != null) { tv.getBackground().getPadding(padding); } - mTmpRect.set(mStableLayoutAlgorithm.mTaskRect); - mTmpRect.union(mLayoutAlgorithm.mTaskRect); + mTmpRect.set(mStableLayoutAlgorithm.getTaskRect()); + mTmpRect.union(mLayoutAlgorithm.getTaskRect()); tv.cancelTransformAnimation(); tv.layout(mTmpRect.left - padding.left, mTmpRect.top - padding.top, mTmpRect.right + padding.right, mTmpRect.bottom + padding.bottom); @@ -1598,7 +1597,8 @@ public class TaskStackView extends FrameLayout implements TaskStack.TaskStackCal // If the doze trigger has already fired, then update the state for this task view if (mUIDozeTrigger.isAsleep() || - Recents.getSystemServices().hasFreeformWorkspaceSupport()) { + Recents.getSystemServices().hasFreeformWorkspaceSupport() || + useGridLayout()) { tv.setNoUserInteractionState(); } @@ -1835,7 +1835,7 @@ public class TaskStackView extends FrameLayout implements TaskStack.TaskStackCal // Enlarge the dragged view slightly float finalScale = event.taskView.getScaleX() * DRAG_SCALE_FACTOR; mLayoutAlgorithm.getStackTransform(event.task, getScroller().getStackScroll(), - mTmpTransform, null, useGridLayout()); + mTmpTransform, null); mTmpTransform.scale = finalScale; mTmpTransform.translationZ = mLayoutAlgorithm.mMaxTranslationZ + 1; mTmpTransform.dimAlpha = 0f; @@ -1856,7 +1856,7 @@ public class TaskStackView extends FrameLayout implements TaskStack.TaskStackCal Interpolators.FAST_OUT_SLOW_IN); boolean ignoreTaskOverrides = false; if (event.dropTarget instanceof TaskStack.DockState) { - mDraggingOverDockState = true; + mLayoutAlgorithm.getGridState().setDragging(true); // Calculate the new task stack bounds that matches the window size that Recents will // have after the drop final TaskStack.DockState dockState = (TaskStack.DockState) event.dropTarget; @@ -1876,7 +1876,7 @@ public class TaskStackView extends FrameLayout implements TaskStack.TaskStackCal updateLayoutAlgorithm(true /* boundScroll */); ignoreTaskOverrides = true; } else { - mDraggingOverDockState = false; + mLayoutAlgorithm.getGridState().setDragging(false); // Restore the pre-drag task stack bounds, but ensure that we don't layout the dragging // task view, so add it back to the ignore set after updating the layout removeIgnoreTask(event.task); @@ -1887,7 +1887,7 @@ public class TaskStackView extends FrameLayout implements TaskStack.TaskStackCal } public final void onBusEvent(final DragEndEvent event) { - mDraggingOverDockState = false; + mLayoutAlgorithm.getGridState().setDragging(false); // We don't handle drops on the dock regions if (event.dropTarget instanceof TaskStack.DockState) { // However, we do need to reset the overrides, since the last state of this task stack @@ -2077,6 +2077,10 @@ public class TaskStackView extends FrameLayout implements TaskStack.TaskStackCal public void reloadOnConfigurationChange() { mStableLayoutAlgorithm.reloadOnConfigurationChange(getContext()); mLayoutAlgorithm.reloadOnConfigurationChange(getContext()); + + boolean hasDockedTask = Recents.getSystemServices().hasDockedTask(); + mStableLayoutAlgorithm.getGridState().setHasDockedTasks(hasDockedTask); + mLayoutAlgorithm.getGridState().setHasDockedTasks(hasDockedTask); } /** @@ -2131,16 +2135,9 @@ public class TaskStackView extends FrameLayout implements TaskStack.TaskStackCal /** * Check whether we should use the grid layout. - * We use the grid layout for Recents iff all the following is true: - * 1. Grid-mode is enabled. - * 2. The activity is not in multi-window mode. - * 3. The user is not dragging a task view over the dock state. - * @return True if we should use the grid layout. */ public boolean useGridLayout() { - return Recents.getConfiguration().isGridEnabled - && !((RecentsActivity) mContext).isInMultiWindowMode() - && !mDraggingOverDockState; + return mLayoutAlgorithm.getGridState().useGridLayout(); } /** 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 65a8ee27c7a1..be3af040c748 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 @@ -52,6 +52,69 @@ public class TaskGridLayoutAlgorithm { private float mAppAspectRatio; private Rect mSystemInsets = new Rect(); + /** + * When the amount of tasks is determined, the size and position of every task view can be + * decided. Each instance of TaskGridRectInfo store the task view information for a certain + * amount of tasks. + */ + class TaskGridRectInfo { + Rect size; + int[] xOffsets; + int[] yOffsets; + + public TaskGridRectInfo(int taskCount) { + size = new Rect(); + xOffsets = new int[taskCount]; + yOffsets = new int[taskCount]; + + int layoutTaskCount = Math.min(MAX_LAYOUT_TASK_COUNT, taskCount); + + int tasksPerLine = layoutTaskCount < 2 ? 1 : ( + layoutTaskCount < 5 ? 2 : ( + layoutTaskCount < 7 ? 3 : 4)); + int lines = layoutTaskCount < 3 ? 1 : 2; + + int taskWidth, taskHeight; + int maxTaskWidth = (mDisplayRect.width() - 2 * mPaddingLeftRight + - (tasksPerLine - 1) * mPaddingTaskView) / tasksPerLine; + int maxTaskHeight = (mDisplayRect.height() - 2 * mPaddingTopBottom + - (lines - 1) * mPaddingTaskView) / lines; + + if (maxTaskHeight >= maxTaskWidth / mAppAspectRatio + mTitleBarHeight) { + // Width bound. + taskWidth = maxTaskWidth; + taskHeight = (int) (maxTaskWidth / mAppAspectRatio + mTitleBarHeight); + } else { + // Height bound. + taskHeight = maxTaskHeight; + taskWidth = (int) ((taskHeight - mTitleBarHeight) * mAppAspectRatio); + } + size.set(0, 0, taskWidth, taskHeight); + + int emptySpaceX = mDisplayRect.width() - 2 * mPaddingLeftRight + - (tasksPerLine * taskWidth) - (tasksPerLine - 1) * mPaddingTaskView; + int emptySpaceY = mDisplayRect.height() - 2 * mPaddingTopBottom + - (lines * taskHeight) - (lines - 1) * mPaddingTaskView; + for (int taskIndex = 0; taskIndex < taskCount; taskIndex++) { + // We also need to invert the index in order to display the most recent tasks first. + int taskLayoutIndex = taskCount - taskIndex - 1; + + int xIndex = taskLayoutIndex % tasksPerLine; + int yIndex = taskLayoutIndex / tasksPerLine; + xOffsets[taskIndex] = + emptySpaceX / 2 + mPaddingLeftRight + (taskWidth + mPaddingTaskView) * xIndex; + yOffsets[taskIndex] = + emptySpaceY / 2 + mPaddingTopBottom + (taskHeight + mPaddingTaskView) * yIndex; + } + } + } + + /** + * We can find task view sizes and positions from mTaskGridRectInfoList[k - 1] when there + * are k tasks. + */ + TaskGridRectInfo[] mTaskGridRectInfoList; + public TaskGridLayoutAlgorithm(Context context) { reloadOnConfigurationChange(context); } @@ -75,46 +138,17 @@ public class TaskGridLayoutAlgorithm { public TaskViewTransform getTransform(int taskIndex, int taskCount, TaskViewTransform transformOut, TaskStackLayoutAlgorithm stackLayout) { - int layoutTaskCount = Math.min(MAX_LAYOUT_TASK_COUNT, taskCount); - - // We also need to invert the index in order to display the most recent tasks first. - int taskLayoutIndex = taskCount - taskIndex - 1; - - int tasksPerLine = layoutTaskCount < 2 ? 1 : ( - layoutTaskCount < 5 ? 2 : ( - layoutTaskCount < 7 ? 3 : 4)); - int lines = layoutTaskCount < 3 ? 1 : 2; - - int taskWidth, taskHeight; - int maxTaskWidth = (mDisplayRect.width() - 2 * mPaddingLeftRight - - (tasksPerLine - 1) * mPaddingTaskView) / tasksPerLine; - int maxTaskHeight = (mDisplayRect.height() - 2 * mPaddingTopBottom - - (lines - 1) * mPaddingTaskView) / lines; - - if (maxTaskHeight >= maxTaskWidth / mAppAspectRatio + mTitleBarHeight) { - // Width bound. - taskWidth = maxTaskWidth; - taskHeight = (int) (maxTaskWidth / mAppAspectRatio + mTitleBarHeight); - } else { - // Height bound. - taskHeight = maxTaskHeight; - taskWidth = (int) ((taskHeight - mTitleBarHeight) * mAppAspectRatio); - } - int emptySpaceX = mDisplayRect.width() - 2 * mPaddingLeftRight - - (tasksPerLine * taskWidth) - (tasksPerLine - 1) * mPaddingTaskView; - int emptySpaceY = mDisplayRect.height() - 2 * mPaddingTopBottom - - (lines * taskHeight) - (lines - 1) * mPaddingTaskView; + TaskGridRectInfo gridInfo = mTaskGridRectInfoList[taskCount - 1]; + mTaskGridRect.set(gridInfo.size); - mTaskGridRect.set(0, 0, taskWidth, taskHeight); - - int xIndex = taskLayoutIndex % tasksPerLine; - int yIndex = taskLayoutIndex / tasksPerLine; - int x = emptySpaceX / 2 + mPaddingLeftRight + (taskWidth + mPaddingTaskView) * xIndex; - int y = emptySpaceY / 2 + mPaddingTopBottom + (taskHeight + mPaddingTaskView) * yIndex; + int x = gridInfo.xOffsets[taskIndex]; + int y = gridInfo.yOffsets[taskIndex]; float z = stackLayout.mMaxTranslationZ; float dimAlpha = 0f; float viewOutlineAlpha = 0f; + // We also need to invert the index in order to display the most recent tasks first. + int taskLayoutIndex = taskCount - taskIndex - 1; boolean isTaskViewVisible = (taskLayoutIndex < MAX_LAYOUT_TASK_COUNT); // Fill out the transform @@ -134,6 +168,13 @@ public class TaskGridLayoutAlgorithm { public void initialize(Rect displayRect, Rect windowRect) { mDisplayRect = displayRect; mWindowRect = windowRect; + + // Pre-calculate the positions and offsets of task views so that we can reuse them directly + // in the future. + mTaskGridRectInfoList = new TaskGridRectInfo[MAX_LAYOUT_TASK_COUNT]; + for (int i = 0; i < MAX_LAYOUT_TASK_COUNT; i++) { + mTaskGridRectInfoList[i] = new TaskGridRectInfo(i + 1); + } } public void setSystemInsets(Rect systemInsets) { @@ -154,4 +195,8 @@ public class TaskGridLayoutAlgorithm { buttonRect.bottom = buttonRect.top + mPaddingTopBottom; return buttonRect; } + + public Rect getTaskGridRect() { + return mTaskGridRect; + } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java index 352d26271035..80b43e6e813b 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java @@ -21,6 +21,7 @@ import android.animation.AnimatorListenerAdapter; import android.app.ActivityManager; import android.app.ActivityManager.StackId; import android.app.ActivityOptions; +import android.app.INotificationManager; import android.app.KeyguardManager; import android.app.Notification; import android.app.NotificationManager; @@ -1058,74 +1059,43 @@ public abstract class BaseStatusBar extends SystemUI implements row.setTag(sbn.getPackageName()); final NotificationGuts guts = row.getGuts(); guts.setClosedListener(this); + + final INotificationManager iNotificationManager = INotificationManager.Stub.asInterface( + ServiceManager.getService(Context.NOTIFICATION_SERVICE)); + final String pkg = sbn.getPackageName(); - String appname = pkg; - Drawable pkgicon = null; - int appUid = -1; - try { - final ApplicationInfo info = pmUser.getApplicationInfo(pkg, - PackageManager.MATCH_UNINSTALLED_PACKAGES - | PackageManager.MATCH_DISABLED_COMPONENTS); - if (info != null) { - appname = String.valueOf(pmUser.getApplicationLabel(info)); - pkgicon = pmUser.getApplicationIcon(info); - appUid = info.uid; - } - } catch (NameNotFoundException e) { - // app is gone, just show package name and generic icon - pkgicon = pmUser.getDefaultActivityIcon(); - } - - ((ImageView) guts.findViewById(R.id.app_icon)).setImageDrawable(pkgicon); - ((TextView) guts.findViewById(R.id.pkgname)).setText(appname); - - final TextView settingsButton = (TextView) guts.findViewById(R.id.more_settings); - if (appUid >= 0) { - final int appUidF = appUid; - settingsButton.setOnClickListener(new View.OnClickListener() { - public void onClick(View v) { + final NotificationGuts.OnSettingsClickListener onSettingsClick = + (View v, int appUid) -> { MetricsLogger.action(mContext, MetricsEvent.ACTION_NOTE_INFO); guts.resetFalsingCheck(); - startAppNotificationSettingsActivity(pkg, appUidF); - } - }); - settingsButton.setText(R.string.notification_more_settings); - } else { - settingsButton.setVisibility(View.GONE); - } - - guts.bindImportance(pmUser, sbn, mNonBlockablePkgs, - mNotificationData.getImportance(sbn.getKey())); - - final TextView doneButton = (TextView) guts.findViewById(R.id.done); - doneButton.setText(R.string.notification_done); - doneButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - // If the user has security enabled, show challenge if the setting is changed. - if (guts.hasImportanceChanged() - && isLockscreenPublicMode(sbn.getUser().getIdentifier()) - && (mState == StatusBarState.KEYGUARD - || mState == StatusBarState.SHADE_LOCKED)) { - OnDismissAction dismissAction = new OnDismissAction() { - @Override - public boolean onDismiss() { - saveImportanceCloseControls(sbn, row, guts, v); - return true; - } - }; - onLockedNotificationImportanceChange(dismissAction); - } else { - saveImportanceCloseControls(sbn, row, guts, v); - } - } - }); + startAppNotificationSettingsActivity(pkg, appUid); + }; + final View.OnClickListener onDoneClick = + (View v) -> { + // If the user has security enabled, show challenge if the setting is changed. + if (guts.hasImportanceChanged() + && isLockscreenPublicMode(sbn.getUser().getIdentifier()) + && (mState == StatusBarState.KEYGUARD + || mState == StatusBarState.SHADE_LOCKED)) { + OnDismissAction dismissAction = new OnDismissAction() { + @Override + public boolean onDismiss() { + closeControls(row, guts, v); + return true; + } + }; + onLockedNotificationImportanceChange(dismissAction); + } else { + closeControls(row, guts, v); + } + }; + guts.bindNotification(pmUser, iNotificationManager, sbn, onSettingsClick, onDoneClick, + mNonBlockablePkgs); } - private void saveImportanceCloseControls(StatusBarNotification sbn, + private void closeControls( ExpandableNotificationRow row, NotificationGuts guts, View done) { guts.resetFalsingCheck(); - guts.saveImportance(sbn); int[] rowLocation = new int[2]; int[] doneLocation = new int[2]; @@ -1222,7 +1192,7 @@ public abstract class BaseStatusBar extends SystemUI implements public void dismissPopups(int x, int y, boolean resetGear, boolean animate) { if (mNotificationGutsExposed != null) { - mNotificationGutsExposed.closeControls(x, y, true /* notify */); + mNotificationGutsExposed.closeControls(x, y, true /* save */); } if (resetGear) { mStackScroller.resetExposedGearView(animate, true /* force */); @@ -1722,13 +1692,6 @@ public abstract class BaseStatusBar extends SystemUI implements } entry.autoRedacted = entry.notification.getNotification().publicVersion == null; - if (MULTIUSER_DEBUG) { - TextView debug = (TextView) row.findViewById(R.id.debug_info); - if (debug != null) { - debug.setVisibility(View.VISIBLE); - debug.setText("CU " + mCurrentUserId +" NU " + entry.notification.getUserId()); - } - } entry.row = row; entry.row.setOnActivatedListener(this); entry.row.setExpandable(bigContentViewLocal != null); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/DragDownHelper.java b/packages/SystemUI/src/com/android/systemui/statusbar/DragDownHelper.java index 2dabf5d32016..19132da9b3bd 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/DragDownHelper.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/DragDownHelper.java @@ -228,6 +228,10 @@ public class DragDownHelper implements Gefingerpoken { return mCallback.getChildAtRawPosition(x, y); } + public boolean isDraggingDown() { + return mDraggingDown; + } + public interface DragDownCallback { /** diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/EmptyShadeView.java b/packages/SystemUI/src/com/android/systemui/statusbar/EmptyShadeView.java index 19b32af8b919..92b0890a5d2b 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/EmptyShadeView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/EmptyShadeView.java @@ -28,6 +28,8 @@ import com.android.systemui.statusbar.stack.StackScrollState; public class EmptyShadeView extends StackScrollerDecorView { + private TextView mEmptyText; + public EmptyShadeView(Context context, AttributeSet attrs) { super(context, attrs); } @@ -35,7 +37,7 @@ public class EmptyShadeView extends StackScrollerDecorView { @Override protected void onConfigurationChanged(Configuration newConfig) { super.onConfigurationChanged(newConfig); - ((TextView) findViewById(R.id.no_notifications)).setText(R.string.empty_shade_text); + mEmptyText.setText(R.string.empty_shade_text); } @Override @@ -44,17 +46,23 @@ public class EmptyShadeView extends StackScrollerDecorView { } @Override + protected void onFinishInflate() { + super.onFinishInflate(); + mEmptyText = (TextView) findContentView(); + } + + @Override public ExpandableViewState createNewViewState(StackScrollState stackScrollState) { return new EmptyShadeViewState(); } - public static class EmptyShadeViewState extends ExpandableViewState { + public class EmptyShadeViewState extends ExpandableViewState { @Override public void applyToView(View view) { super.applyToView(view); if (view instanceof EmptyShadeView) { EmptyShadeView emptyShadeView = (EmptyShadeView) view; - boolean visible = this.clipTopAmount <= 0; + boolean visible = this.clipTopAmount <= mEmptyText.getPaddingTop() * 0.6f; emptyShadeView.performVisibilityAnimation( visible && !emptyShadeView.willBeGone()); } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java b/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java index f91ddd6ed110..8980580e4378 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java @@ -1338,7 +1338,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView { if (isUserLocked()) { return getActualHeight(); } - if (mGuts != null && mGuts.areGutsExposed()) { + if (mGuts != null && mGuts.isExposed()) { return mGuts.getHeight(); } else if ((isChildInGroup() && !isGroupExpanded())) { return mPrivateLayout.getMinHeight(); @@ -1502,6 +1502,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView { NotificationContentView showingLayout = getShowingLayout(); showingLayout.updateBackgroundColor(animated); mPrivateLayout.updateExpandButtons(isExpandable()); + showingLayout.setDark(isDark(), false /* animate */, 0 /* delay */); mShowingPublicInitialized = true; } @@ -1588,7 +1589,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView { } public boolean areGutsExposed() { - return (mGuts != null && mGuts.areGutsExposed()); + return (mGuts != null && mGuts.isExposed()); } @Override @@ -1633,7 +1634,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView { @Override public void setActualHeight(int height, boolean notifyListeners) { super.setActualHeight(height, notifyListeners); - if (mGuts != null && mGuts.areGutsExposed()) { + if (mGuts != null && mGuts.isExposed()) { mGuts.setActualHeight(height); return; } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationGuts.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationGuts.java index 58b828456b6a..088f5382b684 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationGuts.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationGuts.java @@ -19,8 +19,10 @@ package com.android.systemui.statusbar; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; import android.app.INotificationManager; +import android.app.NotificationChannel; import android.app.NotificationManager; import android.content.Context; +import android.content.pm.ApplicationInfo; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.content.res.ColorStateList; @@ -33,13 +35,17 @@ import android.os.ServiceManager; import android.service.notification.NotificationListenerService; import android.service.notification.StatusBarNotification; import android.util.AttributeSet; +import android.util.Log; import android.view.View; import android.view.ViewAnimationUtils; +import android.view.ViewGroup; +import android.widget.CompoundButton; import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.RadioButton; import android.widget.RadioGroup; import android.widget.SeekBar; +import android.widget.Switch; import android.widget.TextView; import com.android.internal.logging.MetricsLogger; @@ -48,16 +54,14 @@ import com.android.settingslib.Utils; import com.android.systemui.Interpolators; import com.android.systemui.R; import com.android.systemui.statusbar.stack.StackStateAnimator; -import com.android.systemui.tuner.TunerService; import java.util.Set; /** * The guts of a notification revealed when performing a long press. */ -public class NotificationGuts extends LinearLayout implements TunerService.Tunable { - public static final String SHOW_SLIDER = "show_importance_slider"; - +public class NotificationGuts extends LinearLayout { + private static final String TAG = "NotificationGuts"; private static final long CLOSE_GUTS_DELAY = 8000; private Drawable mBackground; @@ -67,22 +71,20 @@ public class NotificationGuts extends LinearLayout implements TunerService.Tunab private boolean mExposed; private INotificationManager mINotificationManager; private int mStartingUserImportance; - private int mNotificationImportance; - private boolean mShowSlider; + private StatusBarNotification mStatusBarNotification; - private SeekBar mSeekBar; private ImageView mAutoButton; - private ColorStateList mActiveSliderTint; - private ColorStateList mInactiveSliderTint; - private float mActiveSliderAlpha = 1.0f; - private float mInactiveSliderAlpha; private TextView mImportanceSummary; private TextView mImportanceTitle; private boolean mAuto; - private RadioButton mBlock; - private RadioButton mSilent; - private RadioButton mReset; + private View mImportanceGroup; + private View mChannelDisabled; + private Switch mChannelEnabledSwitch; + private RadioButton mMinImportanceButton; + private RadioButton mLowImportanceButton; + private RadioButton mDefaultImportanceButton; + private RadioButton mHighImportanceButton; private Handler mHandler; private Runnable mFalsingCheck; @@ -101,29 +103,15 @@ public class NotificationGuts extends LinearLayout implements TunerService.Tunab @Override public void run() { if (mNeedsFalsingProtection && mExposed) { - closeControls(-1 /* x */, -1 /* y */, true /* notify */); + closeControls(-1 /* x */, -1 /* y */, false /* save */); } } }; final TypedArray ta = context.obtainStyledAttributes(attrs, com.android.internal.R.styleable.Theme, 0, 0); - mInactiveSliderAlpha = - ta.getFloat(com.android.internal.R.styleable.Theme_disabledAlpha, 0.5f); ta.recycle(); } - @Override - protected void onAttachedToWindow() { - super.onAttachedToWindow(); - TunerService.get(mContext).addTunable(this, SHOW_SLIDER); - } - - @Override - protected void onDetachedFromWindow() { - TunerService.get(mContext).removeTunable(this); - super.onDetachedFromWindow(); - } - public void resetFalsingCheck() { mHandler.removeCallbacks(mFalsingCheck); if (mNeedsFalsingProtection && mExposed) { @@ -177,203 +165,213 @@ public class NotificationGuts extends LinearLayout implements TunerService.Tunab } } - void bindImportance(final PackageManager pm, final StatusBarNotification sbn, - final Set<String> nonBlockablePkgs, final int importance) { - mINotificationManager = INotificationManager.Stub.asInterface( - ServiceManager.getService(Context.NOTIFICATION_SERVICE)); - mStartingUserImportance = NotificationManager.IMPORTANCE_UNSPECIFIED; - mNotificationImportance = importance; + interface OnSettingsClickListener { + void onClick(View v, int appUid); + } + + void bindNotification(final PackageManager pm, final INotificationManager iNotificationManager, + final StatusBarNotification sbn, OnSettingsClickListener onSettingsClick, + OnClickListener onDoneClick, final Set<String> nonBlockablePkgs) { + mINotificationManager = iNotificationManager; + mStatusBarNotification = sbn; + final NotificationChannel channel = sbn.getNotificationChannel(); + mStartingUserImportance = channel.getImportance(); + + final String pkg = sbn.getPackageName(); + int appUid = -1; + String appname = pkg; + Drawable pkgicon = null; + try { + final ApplicationInfo info = pm.getApplicationInfo(pkg, + PackageManager.MATCH_UNINSTALLED_PACKAGES + | PackageManager.MATCH_DISABLED_COMPONENTS + | PackageManager.MATCH_DIRECT_BOOT_UNAWARE + | PackageManager.MATCH_DIRECT_BOOT_AWARE); + if (info != null) { + appUid = info.uid; + appname = String.valueOf(pm.getApplicationLabel(info)); + pkgicon = pm.getApplicationIcon(info); + } + } catch (PackageManager.NameNotFoundException e) { + // app is gone, just show package name and generic icon + pkgicon = pm.getDefaultActivityIcon(); + } + + // If this is the placeholder channel, don't use our channel-specific text. + String appNameText; + CharSequence channelNameText; + if (channel.getId().equals(NotificationChannel.DEFAULT_CHANNEL_ID)) { + appNameText = appname; + channelNameText = mContext.getString(R.string.notification_header_default_channel); + } else { + appNameText = mContext.getString(R.string.notification_importance_header_app, appname); + channelNameText = channel.getName(); + } + ((TextView) findViewById(R.id.pkgname)).setText(appNameText); + ((TextView) findViewById(R.id.channel_name)).setText(channelNameText); + + // Settings button. + final TextView settingsButton = (TextView) findViewById(R.id.more_settings); + if (appUid >= 0 && onSettingsClick != null) { + final int appUidF = appUid; + settingsButton.setOnClickListener( + (View view) -> { onSettingsClick.onClick(view, appUidF); }); + settingsButton.setText(R.string.notification_more_settings); + } else { + settingsButton.setVisibility(View.GONE); + } + + // Done button. + final TextView doneButton = (TextView) findViewById(R.id.done); + doneButton.setText(R.string.notification_done); + doneButton.setOnClickListener(onDoneClick); + boolean nonBlockable = false; try { - final PackageInfo info = - pm.getPackageInfo(sbn.getPackageName(), PackageManager.GET_SIGNATURES); + final PackageInfo info = pm.getPackageInfo(pkg, PackageManager.GET_SIGNATURES); nonBlockable = Utils.isSystemPackage(getResources(), pm, info); } catch (PackageManager.NameNotFoundException e) { // unlikely. } if (nonBlockablePkgs != null) { - nonBlockable |= nonBlockablePkgs.contains(sbn.getPackageName()); + nonBlockable |= nonBlockablePkgs.contains(pkg); } - final View importanceSlider = findViewById(R.id.importance_slider); final View importanceButtons = findViewById(R.id.importance_buttons); - if (mShowSlider) { - bindSlider(importanceSlider, nonBlockable); - importanceSlider.setVisibility(View.VISIBLE); - importanceButtons.setVisibility(View.GONE); - } else { - bindToggles(importanceButtons, mStartingUserImportance, nonBlockable); - importanceButtons.setVisibility(View.VISIBLE); - importanceSlider.setVisibility(View.GONE); + bindToggles(importanceButtons, mStartingUserImportance, nonBlockable); + + // Importance Text (hardcoded to 4 importance levels) + final ViewGroup importanceTextGroup = + (ViewGroup) findViewById(R.id.importance_buttons_text); + final int size = importanceTextGroup.getChildCount(); + for (int i = 0; i < size; i++) { + int importanceNameResId = 0; + int importanceDescResId = 0; + switch (i) { + case 0: + importanceNameResId = R.string.high_importance; + importanceDescResId = R.string.notification_importance_high; + break; + case 1: + importanceNameResId = R.string.default_importance; + importanceDescResId = R.string.notification_importance_default; + break; + case 2: + importanceNameResId = R.string.low_importance; + importanceDescResId = R.string.notification_importance_low; + break; + case 3: + importanceNameResId = R.string.min_importance; + importanceDescResId = R.string.notification_importance_min; + break; + default: + Log.e(TAG, "Too many importance groups in this layout."); + break; + } + final ViewGroup importanceChildGroup = (ViewGroup) importanceTextGroup.getChildAt(i); + ((TextView) importanceChildGroup.getChildAt(0)).setText(importanceNameResId); + ((TextView) importanceChildGroup.getChildAt(1)).setText(importanceDescResId); } + + // Top-level importance group + mImportanceGroup = findViewById(R.id.importance); + mChannelDisabled = findViewById(R.id.channel_disabled); + updateImportanceGroup(); } public boolean hasImportanceChanged() { return mStartingUserImportance != getSelectedImportance(); } - void saveImportance(final StatusBarNotification sbn) { - int progress = getSelectedImportance(); + private void saveImportance() { + int selectedImportance = getSelectedImportance(); + if (selectedImportance == mStartingUserImportance) { + return; + } + final NotificationChannel channel = mStatusBarNotification.getNotificationChannel(); MetricsLogger.action(mContext, MetricsEvent.ACTION_SAVE_IMPORTANCE, - progress - mStartingUserImportance); + selectedImportance - mStartingUserImportance); + channel.setImportance(selectedImportance); + try { + mINotificationManager.updateNotificationChannelForPackage( + mStatusBarNotification.getPackageName(), mStatusBarNotification.getUid(), + channel); + } catch (RemoteException e) { + // :( + } } private int getSelectedImportance() { - if (mSeekBar!= null && mSeekBar.isShown()) { - if (mSeekBar.isEnabled()) { - return mSeekBar.getProgress(); - } else { - return NotificationManager.IMPORTANCE_UNSPECIFIED; - } + if (!mChannelEnabledSwitch.isChecked()) { + return NotificationManager.IMPORTANCE_NONE; + } else if (mMinImportanceButton.isChecked()) { + return NotificationManager.IMPORTANCE_MIN; + } else if (mLowImportanceButton.isChecked()) { + return NotificationManager.IMPORTANCE_LOW; + } else if (mDefaultImportanceButton.isChecked()) { + return NotificationManager.IMPORTANCE_DEFAULT; + } else if (mHighImportanceButton.isChecked()) { + return NotificationManager.IMPORTANCE_HIGH; } else { - if (mBlock.isChecked()) { - return NotificationManager.IMPORTANCE_NONE; - } else if (mSilent.isChecked()) { - return NotificationManager.IMPORTANCE_LOW; - } else { - return NotificationManager.IMPORTANCE_UNSPECIFIED; - } + return NotificationManager.IMPORTANCE_NONE; } } private void bindToggles(final View importanceButtons, final int importance, final boolean nonBlockable) { - ((RadioGroup) importanceButtons).setOnCheckedChangeListener( - new RadioGroup.OnCheckedChangeListener() { - @Override - public void onCheckedChanged(RadioGroup group, int checkedId) { - resetFalsingCheck(); - } - }); - mBlock = (RadioButton) importanceButtons.findViewById(R.id.block_importance); - mSilent = (RadioButton) importanceButtons.findViewById(R.id.silent_importance); - mReset = (RadioButton) importanceButtons.findViewById(R.id.reset_importance); - if (nonBlockable) { - mBlock.setVisibility(View.GONE); - mReset.setText(mContext.getString(R.string.do_not_silence)); - } else { - mReset.setText(mContext.getString(R.string.do_not_silence_block)); - } - mBlock.setText(mContext.getString(R.string.block)); - mSilent.setText(mContext.getString(R.string.show_silently)); - if (importance == NotificationManager.IMPORTANCE_LOW) { - mSilent.setChecked(true); - } else { - mReset.setChecked(true); - } - } - - private void bindSlider(final View importanceSlider, final boolean nonBlockable) { - mActiveSliderTint = ColorStateList.valueOf(Utils.getColorAccent(mContext)); - mInactiveSliderTint = loadColorStateList(R.color.notification_guts_disabled_slider_color); - - mImportanceSummary = ((TextView) importanceSlider.findViewById(R.id.summary)); - mImportanceTitle = ((TextView) importanceSlider.findViewById(R.id.title)); - mSeekBar = (SeekBar) importanceSlider.findViewById(R.id.seekbar); - - final int minProgress = nonBlockable ? - NotificationManager.IMPORTANCE_MIN - : NotificationManager.IMPORTANCE_NONE; - mSeekBar.setMax(NotificationManager.IMPORTANCE_HIGH); - mSeekBar.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() { - @Override - public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) { - resetFalsingCheck(); - if (progress < minProgress) { - seekBar.setProgress(minProgress); - progress = minProgress; - } - updateTitleAndSummary(progress); - if (fromUser) { - MetricsLogger.action(mContext, MetricsEvent.ACTION_MODIFY_IMPORTANCE_SLIDER); - } - } - - @Override - public void onStartTrackingTouch(SeekBar seekBar) { - resetFalsingCheck(); - } - - @Override - public void onStopTrackingTouch(SeekBar seekBar) { - // no-op - } - - - }); - mSeekBar.setProgress(mNotificationImportance); - - mAutoButton = (ImageView) importanceSlider.findViewById(R.id.auto_importance); - mAutoButton.setOnClickListener(new OnClickListener() { - @Override - public void onClick(View v) { - mAuto = !mAuto; - applyAuto(); - } - }); - mAuto = mStartingUserImportance == NotificationManager.IMPORTANCE_UNSPECIFIED; - applyAuto(); - } - - private void applyAuto() { - mSeekBar.setEnabled(!mAuto); - - final ColorStateList starTint = mAuto ? mActiveSliderTint : mInactiveSliderTint; - final float alpha = mAuto ? mInactiveSliderAlpha : mActiveSliderAlpha; - Drawable icon = mAutoButton.getDrawable().mutate(); - icon.setTintList(starTint); - mAutoButton.setImageDrawable(icon); - mSeekBar.setAlpha(alpha); - - if (mAuto) { - mSeekBar.setProgress(mNotificationImportance); - mImportanceSummary.setText(mContext.getString( - R.string.notification_importance_user_unspecified)); - mImportanceTitle.setText(mContext.getString( - R.string.user_unspecified_importance)); - } else { - updateTitleAndSummary(mSeekBar.getProgress()); - } - } - - private void updateTitleAndSummary(int progress) { - switch (progress) { + // Enabled Switch + mChannelEnabledSwitch = (Switch) findViewById(R.id.channel_enabled_switch); + mChannelEnabledSwitch.setChecked(importance != NotificationManager.IMPORTANCE_NONE); + mChannelEnabledSwitch.setVisibility(nonBlockable ? View.INVISIBLE : View.VISIBLE); + + // Importance Buttons + mMinImportanceButton = (RadioButton) importanceButtons.findViewById(R.id.min_importance); + mLowImportanceButton = (RadioButton) importanceButtons.findViewById(R.id.low_importance); + mDefaultImportanceButton = + (RadioButton) importanceButtons.findViewById(R.id.default_importance); + mHighImportanceButton = (RadioButton) importanceButtons.findViewById(R.id.high_importance); + + // Set to current importance setting + switch (importance) { case NotificationManager.IMPORTANCE_NONE: - mImportanceSummary.setText(mContext.getString( - R.string.notification_importance_blocked)); - mImportanceTitle.setText(mContext.getString(R.string.blocked_importance)); break; case NotificationManager.IMPORTANCE_MIN: - mImportanceSummary.setText(mContext.getString( - R.string.notification_importance_min)); - mImportanceTitle.setText(mContext.getString(R.string.min_importance)); + case NotificationManager.IMPORTANCE_UNSPECIFIED: + mMinImportanceButton.setChecked(true); break; case NotificationManager.IMPORTANCE_LOW: - mImportanceSummary.setText(mContext.getString( - R.string.notification_importance_low)); - mImportanceTitle.setText(mContext.getString(R.string.low_importance)); + mLowImportanceButton.setChecked(true); break; case NotificationManager.IMPORTANCE_DEFAULT: - mImportanceSummary.setText(mContext.getString( - R.string.notification_importance_default)); - mImportanceTitle.setText(mContext.getString(R.string.default_importance)); + mDefaultImportanceButton.setChecked(true); break; case NotificationManager.IMPORTANCE_HIGH: case NotificationManager.IMPORTANCE_MAX: - mImportanceSummary.setText(mContext.getString( - R.string.notification_importance_high)); - mImportanceTitle.setText(mContext.getString(R.string.high_importance)); + mHighImportanceButton.setChecked(true); break; } + + // Callback when checked. + mChannelEnabledSwitch.setOnCheckedChangeListener((buttonView, isChecked) -> { + resetFalsingCheck(); + updateImportanceGroup(); + }); + ((RadioGroup) importanceButtons).setOnCheckedChangeListener( + (buttonView, isChecked) -> { resetFalsingCheck(); }); } - private ColorStateList loadColorStateList(int colorResId) { - return ColorStateList.valueOf(mContext.getColor(colorResId)); + private void updateImportanceGroup() { + final boolean disabled = getSelectedImportance() == NotificationManager.IMPORTANCE_NONE; + mImportanceGroup.setVisibility(disabled ? View.GONE : View.VISIBLE); + mChannelDisabled.setVisibility(disabled ? View.VISIBLE : View.GONE); } - public void closeControls(int x, int y, boolean notify) { + public void closeControls(int x, int y, boolean saveImportance) { + if (saveImportance) { + saveImportance(); + } if (getWindowToken() == null) { - if (notify && mListener != null) { + if (mListener != null) { mListener.onGutsClosed(this); } return; @@ -398,7 +396,7 @@ public class NotificationGuts extends LinearLayout implements TunerService.Tunab }); a.start(); setExposed(false, mNeedsFalsingProtection); - if (notify && mListener != null) { + if (mListener != null) { mListener.onGutsClosed(this); } } @@ -442,14 +440,7 @@ public class NotificationGuts extends LinearLayout implements TunerService.Tunab } } - public boolean areGutsExposed() { + public boolean isExposed() { return mExposed; } - - @Override - public void onTuningChanged(String key, String newValue) { - if (SHOW_SLIDER.equals(key)) { - mShowSlider = newValue != null && Integer.parseInt(newValue) != 0; - } - } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java index fa7a237b8a54..5bdfd25e6f73 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java @@ -22,7 +22,6 @@ import static android.app.StatusBarManager.NAVIGATION_HINT_IME_SHOWN; import static android.app.StatusBarManager.WINDOW_STATE_HIDDEN; import static android.app.StatusBarManager.WINDOW_STATE_SHOWING; import static android.app.StatusBarManager.windowStateToString; - import static com.android.systemui.statusbar.phone.BarTransitions.MODE_LIGHTS_OUT; import static com.android.systemui.statusbar.phone.BarTransitions.MODE_LIGHTS_OUT_TRANSPARENT; import static com.android.systemui.statusbar.phone.BarTransitions.MODE_OPAQUE; @@ -35,13 +34,14 @@ import android.animation.Animator; import android.animation.AnimatorListenerAdapter; import android.annotation.NonNull; import android.app.ActivityManager; +import android.app.ActivityManagerNative; import android.app.ActivityOptions; -import android.app.admin.DevicePolicyManager; import android.app.IActivityManager; import android.app.Notification; import android.app.NotificationManager; import android.app.PendingIntent; import android.app.StatusBarManager; +import android.app.admin.DevicePolicyManager; import android.content.BroadcastReceiver; import android.content.ComponentCallbacks2; import android.content.ComponentName; @@ -113,6 +113,7 @@ import android.view.ViewStub; import android.view.ViewTreeObserver; import android.view.WindowManager; import android.view.WindowManagerGlobal; +import android.view.accessibility.AccessibilityEvent; import android.view.animation.AccelerateInterpolator; import android.view.animation.Interpolator; import android.widget.ImageView; @@ -148,7 +149,6 @@ import com.android.systemui.plugins.qs.QS.ActivityStarter; import com.android.systemui.plugins.qs.QS.BaseStatusBarHeader; import com.android.systemui.qs.QSFragment; import com.android.systemui.qs.QSPanel; -import com.android.systemui.recents.Recents; import com.android.systemui.recents.ScreenPinningRequest; import com.android.systemui.recents.events.EventBus; import com.android.systemui.recents.events.activity.AppTransitionFinishedEvent; @@ -186,6 +186,7 @@ import com.android.systemui.statusbar.policy.EncryptionHelper; import com.android.systemui.statusbar.policy.FlashlightControllerImpl; import com.android.systemui.statusbar.policy.HeadsUpManager; import com.android.systemui.statusbar.policy.HotspotControllerImpl; +import com.android.systemui.statusbar.policy.KeyButtonView; import com.android.systemui.statusbar.policy.KeyguardMonitorImpl; import com.android.systemui.statusbar.policy.KeyguardUserSwitcher; import com.android.systemui.statusbar.policy.LocationControllerImpl; @@ -200,8 +201,7 @@ import com.android.systemui.statusbar.policy.UserInfoControllerImpl; import com.android.systemui.statusbar.policy.UserSwitcherController; import com.android.systemui.statusbar.policy.ZenModeController; import com.android.systemui.statusbar.stack.NotificationStackScrollLayout; -import com.android.systemui.statusbar.stack.NotificationStackScrollLayout - .OnChildLocationsChangedListener; +import com.android.systemui.statusbar.stack.NotificationStackScrollLayout.OnChildLocationsChangedListener; import com.android.systemui.statusbar.stack.StackStateAnimator; import com.android.systemui.volume.VolumeComponent; @@ -670,6 +670,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, private RankingMap mLatestRankingMap; private boolean mNoAnimationOnNextBarModeChange; private FalsingManager mFalsingManager; + private long mLastLockToAppLongPress; private KeyguardUpdateMonitorCallback mUpdateCallback = new KeyguardUpdateMonitorCallback() { @Override @@ -1347,28 +1348,6 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, } }; - private View.OnLongClickListener mLongPressBackListener = new View.OnLongClickListener() { - @Override - public boolean onLongClick(View v) { - return handleLongPressBack(); - } - }; - - private View.OnLongClickListener mRecentsLongClickListener = new View.OnLongClickListener() { - - @Override - public boolean onLongClick(View v) { - if (mRecents == null || !ActivityManager.supportsMultiWindow() - || !getComponent(Divider.class).getView().getSnapAlgorithm() - .isSplitScreenFeasible()) { - return false; - } - - return toggleSplitScreenMode(MetricsEvent.ACTION_WINDOW_DOCK_LONGPRESS, - MetricsEvent.ACTION_WINDOW_UNDOCK_LONGPRESS); - } - }; - @Override protected boolean toggleSplitScreenMode(int metricsDockAction, int metricsUndockAction) { if (mRecents == null) { @@ -1460,11 +1439,11 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, recentsButton.setOnClickListener(mRecentsClickListener); recentsButton.setOnTouchListener(mRecentsPreloadOnTouchListener); recentsButton.setLongClickable(true); - recentsButton.setOnLongClickListener(mRecentsLongClickListener); + recentsButton.setOnLongClickListener(this::handleLongPressBackRecents); ButtonDispatcher backButton = mNavigationBarView.getBackButton(); backButton.setLongClickable(true); - backButton.setOnLongClickListener(mLongPressBackListener); + backButton.setOnLongClickListener(this::handleLongPressBackRecents); ButtonDispatcher homeButton = mNavigationBarView.getHomeButton(); homeButton.setOnTouchListener(mHomeActionListener); @@ -3613,17 +3592,14 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, final boolean dismissShade, final boolean afterKeyguardGone, final boolean deferred) { - final Runnable dismissAction = () -> { - if (runnable != null) { - AsyncTask.execute(runnable); - } - }; dismissKeyguardThenExecute(() -> { - if (mStatusBarKeyguardViewManager.isShowing() - && mStatusBarKeyguardViewManager.isOccluded()) { - mStatusBarKeyguardViewManager.addAfterKeyguardGoneRunnable(runnable); - } else { - dismissAction.run(); + if (runnable != null) { + if (mStatusBarKeyguardViewManager.isShowing() + && mStatusBarKeyguardViewManager.isOccluded()) { + mStatusBarKeyguardViewManager.addAfterKeyguardGoneRunnable(runnable); + } else { + AsyncTask.execute(runnable); + } } if (dismissShade) { if (mExpandedVisible) { @@ -4713,7 +4689,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, /* Only ever called as a consequence of a lockscreen expansion gesture. */ @Override public boolean onDraggedDown(View startingChild, int dragLengthY) { - if (hasActiveNotifications()) { + if (hasActiveNotifications() && (!isDozing() || isPulsing())) { EventLogTags.writeSysuiLockscreenGesture( EventLogConstants.SYSUI_LOCKSCREEN_GESTURE_SWIPE_DOWN_FULL_SHADE, (int) (dragLengthY / mDisplayMetrics.density), @@ -4727,8 +4703,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, } return true; } else { - - // No notifications - abort gesture. + // abort gesture. return false; } } @@ -4992,16 +4967,59 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, } /** - * Handles long press for back button. This exits screen pinning. + * This handles long-press of both back and recents. They are + * handled together to capture them both being long-pressed + * at the same time to exit screen pinning (lock task). + * + * When accessibility mode is on, only a long-press from recents + * is required to exit. + * + * In all other circumstances we try to pass through long-press events + * for Back, so that apps can still use it. Which can be from two things. + * 1) Not currently in screen pinning (lock task). + * 2) Back is long-pressed without recents. */ - private boolean handleLongPressBack() { + private boolean handleLongPressBackRecents(View v) { try { - IActivityManager activityManager = ActivityManager.getService(); - if (activityManager.isInLockTaskMode()) { - activityManager.stopSystemLockTaskMode(); - - // When exiting refresh disabled flags. - mNavigationBarView.setDisabledFlags(mDisabled1, true); + boolean sendBackLongPress = false; + IActivityManager activityManager = ActivityManagerNative.getDefault(); + boolean touchExplorationEnabled = mAccessibilityManager.isTouchExplorationEnabled(); + boolean inLockTaskMode = activityManager.isInLockTaskMode(); + if (inLockTaskMode && !touchExplorationEnabled) { + long time = System.currentTimeMillis(); + // If we recently long-pressed the other button then they were + // long-pressed 'together' + if ((time - mLastLockToAppLongPress) < LOCK_TO_APP_GESTURE_TOLERENCE) { + activityManager.stopLockTaskMode(); + // When exiting refresh disabled flags. + mNavigationBarView.setDisabledFlags(mDisabled1, true); + return true; + } else if ((v.getId() == R.id.back) + && !mNavigationBarView.getRecentsButton().getCurrentView().isPressed()) { + // If we aren't pressing recents right now then they presses + // won't be together, so send the standard long-press action. + sendBackLongPress = true; + } + mLastLockToAppLongPress = time; + } else { + // If this is back still need to handle sending the long-press event. + if (v.getId() == R.id.back) { + sendBackLongPress = true; + } else if (touchExplorationEnabled && inLockTaskMode) { + // When in accessibility mode a long press that is recents (not back) + // should stop lock task. + activityManager.stopLockTaskMode(); + // When exiting refresh disabled flags. + mNavigationBarView.setDisabledFlags(mDisabled1, true); + return true; + } else if (v.getId() == R.id.recent_apps) { + return handleLongPressRecents(); + } + } + if (sendBackLongPress) { + KeyButtonView keyButtonView = (KeyButtonView) v; + keyButtonView.sendEvent(KeyEvent.ACTION_DOWN, KeyEvent.FLAG_LONG_PRESS); + keyButtonView.sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_LONG_CLICKED); return true; } } catch (RemoteException e) { @@ -5010,6 +5028,17 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, return false; } + private boolean handleLongPressRecents() { + if (mRecents == null || !ActivityManager.supportsMultiWindow() + || !getComponent(Divider.class).getView().getSnapAlgorithm() + .isSplitScreenFeasible()) { + return false; + } + + return toggleSplitScreenMode(MetricsEvent.ACTION_WINDOW_DOCK_LONGPRESS, + MetricsEvent.ACTION_WINDOW_UNDOCK_LONGPRESS); + } + @Override public void showScreenPinningRequest(int taskId) { if (mKeyguardMonitor.isShowing()) { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowView.java index 487f0e73959c..1b73a3f53997 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowView.java @@ -285,13 +285,10 @@ public class StatusBarWindowView extends FrameLayout { @Override public boolean onTouchEvent(MotionEvent ev) { - if (mService.isDozing() && !mService.isPulsing()) { - // Discard all touch events in always-on. - return true; - } - - boolean handled = false; - if (mService.getBarState() == StatusBarState.KEYGUARD) { + boolean handled = mService.isDozing() && !mService.isPulsing(); + if (mService.getBarState() == StatusBarState.KEYGUARD + && (!handled || mDragDownHelper.isDraggingDown())) { + // we still want to finish our drag down gesture when locking the screen handled = mDragDownHelper.onTouchEvent(ev); } if (!handled) { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationChildrenContainer.java b/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationChildrenContainer.java index b4cbec1296aa..1a2d778d206b 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationChildrenContainer.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationChildrenContainer.java @@ -138,15 +138,14 @@ public class NotificationChildrenContainer extends ViewGroup { @Override protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { - int ownMaxHeight = mMaxNotificationHeight; int heightMode = MeasureSpec.getMode(heightMeasureSpec); boolean hasFixedHeight = heightMode == MeasureSpec.EXACTLY; boolean isHeightLimited = heightMode == MeasureSpec.AT_MOST; int size = MeasureSpec.getSize(heightMeasureSpec); + int newHeightSpec = heightMeasureSpec; if (hasFixedHeight || isHeightLimited) { - ownMaxHeight = Math.min(ownMaxHeight, size); + newHeightSpec = MeasureSpec.makeMeasureSpec(size, MeasureSpec.AT_MOST); } - int newHeightSpec = MeasureSpec.makeMeasureSpec(ownMaxHeight, MeasureSpec.AT_MOST); int width = MeasureSpec.getSize(widthMeasureSpec); if (mOverflowNumber != null) { mOverflowNumber.measure(MeasureSpec.makeMeasureSpec(width, MeasureSpec.AT_MOST), diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java b/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java index ec44f19e8bfc..e7c2507dbf18 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java @@ -768,15 +768,19 @@ public class NotificationStackScrollLayout extends ViewGroup */ private float getAppearEndPosition() { int appearPosition; - int minNotificationsForShelf = 1; - if (mTrackingHeadsUp || mHeadsUpManager.hasPinnedHeadsUp()) { - appearPosition = mHeadsUpManager.getTopHeadsUpPinnedHeight(); - minNotificationsForShelf = 2; + if (mEmptyShadeView.getVisibility() == GONE) { + int minNotificationsForShelf = 1; + if (mTrackingHeadsUp || mHeadsUpManager.hasPinnedHeadsUp()) { + appearPosition = mHeadsUpManager.getTopHeadsUpPinnedHeight(); + minNotificationsForShelf = 2; + } else { + appearPosition = 0; + } + if (getNotGoneChildCount() >= minNotificationsForShelf) { + appearPosition += mShelf.getIntrinsicHeight(); + } } else { - appearPosition = 0; - } - if (getNotGoneChildCount() >= minNotificationsForShelf) { - appearPosition += mShelf.getIntrinsicHeight(); + appearPosition = mEmptyShadeView.getHeight(); } return appearPosition + (onKeyguard() ? mTopPadding : mIntrinsicPadding); } @@ -1064,6 +1068,19 @@ public class NotificationStackScrollLayout extends ViewGroup public void setUserExpandedChild(View v, boolean userExpanded) { if (v instanceof ExpandableNotificationRow) { ExpandableNotificationRow row = (ExpandableNotificationRow) v; + if (userExpanded && onKeyguard()) { + // Due to a race when locking the screen while touching, a notification may be + // expanded even after we went back to keyguard. An example of this happens if + // you click in the empty space while expanding a group. + + // We also need to un-user lock it here, since otherwise the content height + // calculated might be wrong. We also can't invert the two calls since + // un-userlocking it will trigger a layout switch in the content view. + row.setUserLocked(false); + updateContentHeight(); + notifyHeightChangeListener(row); + return; + } row.setUserExpanded(userExpanded, true /* allowChildrenExpansion */); row.onExpandedByGesture(userExpanded); } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/stack/StackScrollAlgorithm.java b/packages/SystemUI/src/com/android/systemui/statusbar/stack/StackScrollAlgorithm.java index 50b6d70f437c..7ff100081677 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/stack/StackScrollAlgorithm.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/stack/StackScrollAlgorithm.java @@ -23,9 +23,11 @@ import android.view.ViewGroup; import com.android.systemui.R; import com.android.systemui.statusbar.DismissView; +import com.android.systemui.statusbar.EmptyShadeView; import com.android.systemui.statusbar.ExpandableNotificationRow; import com.android.systemui.statusbar.ExpandableView; import com.android.systemui.statusbar.NotificationShelf; +import com.android.systemui.statusbar.StackScrollerDecorView; import com.android.systemui.statusbar.notification.NotificationUtils; import java.util.ArrayList; @@ -324,11 +326,15 @@ public class StackScrollAlgorithm { int childHeight = getMaxAllowedChildHeight(child); childViewState.yTranslation = currentYPosition; boolean isDismissView = child instanceof DismissView; + boolean isEmptyShadeView = child instanceof EmptyShadeView; childViewState.location = ExpandableViewState.LOCATION_MAIN_AREA; if (isDismissView) { childViewState.yTranslation = Math.min(childViewState.yTranslation, ambientState.getInnerHeight() - childHeight); + } else if (isEmptyShadeView) { + childViewState.yTranslation = ambientState.getInnerHeight() - childHeight + + ambientState.getStackTranslation() * 0.25f; } else { clampPositionToShelf(childViewState, ambientState); } diff --git a/packages/SystemUI/tests/AndroidManifest.xml b/packages/SystemUI/tests/AndroidManifest.xml index b03189cb77ce..dec8ba6c05db 100644 --- a/packages/SystemUI/tests/AndroidManifest.xml +++ b/packages/SystemUI/tests/AndroidManifest.xml @@ -27,6 +27,7 @@ <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" /> <uses-permission android:name="android.permission.BIND_QUICK_SETTINGS_TILE" /> <uses-permission android:name="android.permission.ACCESS_KEYGUARD_SECURE_STORAGE" /> + <uses-permission android:name="android.permission.STATUS_BAR_SERVICE" /> <application> <uses-library android:name="android.test.runner" /> diff --git a/packages/SystemUI/tests/src/com/android/systemui/power/PowerNotificationWarningsTest.java b/packages/SystemUI/tests/src/com/android/systemui/power/PowerNotificationWarningsTest.java index 5c87fb01e23c..7070961e39b0 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/power/PowerNotificationWarningsTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/power/PowerNotificationWarningsTest.java @@ -117,4 +117,18 @@ public class PowerNotificationWarningsTest extends SysuiTestCase { .notifyAsUser(anyString(), anyInt(), captor.capture(), any()); assertNotEqual(null, captor.getValue().sound); } + + @Test + public void testShowTemperatureWarning_NotifyAsUser() { + mPowerNotificationWarnings.showTemperatureWarning(); + verify(mMockNotificationManager, times(1)) + .notifyAsUser(anyString(), anyInt(), any(), any()); + } + + @Test + public void testDismissTemperatureWarning_CancelAsUser() { + mPowerNotificationWarnings.showTemperatureWarning(); + mPowerNotificationWarnings.dismissTemperatureWarning(); + verify(mMockNotificationManager, times(1)).cancelAsUser(anyString(), anyInt(), any()); + } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/external/TileColorPickerTest.java b/packages/SystemUI/tests/src/com/android/systemui/qs/external/TileColorPickerTest.java new file mode 100644 index 000000000000..ba451e1e10dc --- /dev/null +++ b/packages/SystemUI/tests/src/com/android/systemui/qs/external/TileColorPickerTest.java @@ -0,0 +1,71 @@ +/* + * 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. + */ +package com.android.systemui.qs.external; + +import android.content.res.ColorStateList; +import android.service.quicksettings.Tile; +import android.support.test.runner.AndroidJUnit4; +import android.test.suitebuilder.annotation.SmallTest; +import com.android.systemui.SysuiTestCase; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import com.android.systemui.R; + +import static junit.framework.Assert.assertEquals; + +@SmallTest +@RunWith(AndroidJUnit4.class) +public class TileColorPickerTest extends SysuiTestCase { + private static final int DEFAULT_COLOR = 0; + + private TileColorPicker mTileColorPicker; + private ColorStateList mTintColorStateList; + + @Before + public void setUp() { + mTileColorPicker = TileColorPicker.getInstance(mContext); + mTintColorStateList = mContext.getResources(). + getColorStateList(R.color.tint_color_selector, mContext.getTheme()); + } + + @Test + public void testGetColor_StateUnavailable_ReturnUnavailableColor() { + final int color = mTileColorPicker.getColor(Tile.STATE_UNAVAILABLE); + final int expectedColor = mTintColorStateList.getColorForState( + TileColorPicker.DISABLE_STATE_SET, DEFAULT_COLOR); + + assertEquals(expectedColor, color); + } + + @Test + public void testGetColor_StateInactive_ReturnInactiveColor() { + final int color = mTileColorPicker.getColor(Tile.STATE_INACTIVE); + final int expectedColor = mTintColorStateList.getColorForState( + TileColorPicker.INACTIVE_STATE_SET, DEFAULT_COLOR); + + assertEquals(expectedColor, color); + } + + @Test + public void testGetColor_StateActive_ReturnActiveColor() { + final int color = mTileColorPicker.getColor(Tile.STATE_ACTIVE); + final int expectedColor = mTintColorStateList.getColorForState( + TileColorPicker.ENABLE_STATE_SET, DEFAULT_COLOR); + + assertEquals(expectedColor, color); + } +} diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationGutsTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationGutsTest.java new file mode 100644 index 000000000000..2cd6dbd17a7c --- /dev/null +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationGutsTest.java @@ -0,0 +1,301 @@ +/* + * 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. + */ + +package com.android.systemui.statusbar; + +import static junit.framework.Assert.assertEquals; +import static junit.framework.Assert.assertFalse; +import static junit.framework.Assert.assertTrue; +import static org.mockito.Mockito.any; +import static org.mockito.Mockito.anyInt; +import static org.mockito.Mockito.anyString; +import static org.mockito.Mockito.eq; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +import android.app.INotificationManager; +import android.app.Notification; +import android.app.NotificationChannel; +import android.app.NotificationManager; +import android.content.pm.ApplicationInfo; +import android.content.pm.PackageInfo; +import android.content.pm.PackageManager; +import android.graphics.drawable.Drawable; +import android.service.notification.StatusBarNotification; +import android.support.test.InstrumentationRegistry; +import android.support.test.annotation.UiThreadTest; +import android.support.test.runner.AndroidJUnit4; +import android.test.suitebuilder.annotation.SmallTest; +import android.view.LayoutInflater; +import android.view.View; +import android.widget.ImageView; +import android.widget.RadioButton; +import android.widget.Switch; +import android.widget.TextView; +import com.android.systemui.R; +import org.junit.Before; +import org.junit.runner.RunWith; +import org.junit.Test; +import org.mockito.Mockito; +import java.util.Collections; +import java.util.concurrent.CountDownLatch; + +@SmallTest +@RunWith(AndroidJUnit4.class) +public class NotificationGutsTest { + private static final String TEST_PACKAGE_NAME = "test_package"; + private static final String TEST_CHANNEL = "test_channel"; + private static final String TEST_CHANNEL_NAME = "TEST CHANNEL NAME"; + + private NotificationGuts mNotificationGuts; + private final INotificationManager mMockINotificationManager = mock(INotificationManager.class); + private final PackageManager mMockPackageManager = mock(PackageManager.class); + private NotificationChannel mNotificationChannel; + private final StatusBarNotification mMockStatusBarNotification = + mock(StatusBarNotification.class); + + @Before + @UiThreadTest + public void setUp() throws Exception { + // Inflate the layout + final LayoutInflater layoutInflater = + LayoutInflater.from(InstrumentationRegistry.getTargetContext()); + mNotificationGuts = (NotificationGuts) layoutInflater.inflate(R.layout.notification_guts, + null); + + // PackageManager must return a packageInfo and applicationInfo. + final PackageInfo packageInfo = new PackageInfo(); + packageInfo.packageName = TEST_PACKAGE_NAME; + when(mMockPackageManager.getPackageInfo(anyString(), anyInt())).thenReturn(packageInfo); + final ApplicationInfo applicationInfo = new ApplicationInfo(); + applicationInfo.uid = 1; // non-zero + when(mMockPackageManager.getApplicationInfo(anyString(), anyInt())).thenReturn( + applicationInfo); + + // mMockStatusBarNotification with a test channel. + mNotificationChannel = new NotificationChannel( + TEST_CHANNEL, TEST_CHANNEL_NAME, NotificationManager.IMPORTANCE_LOW); + when(mMockStatusBarNotification.getNotificationChannel()).thenReturn(mNotificationChannel); + when(mMockStatusBarNotification.getPackageName()).thenReturn(TEST_PACKAGE_NAME); + } + + @Test + @UiThreadTest + public void testBindNotification_SetsTextApplicationName() throws Exception { + when(mMockPackageManager.getApplicationLabel(any())).thenReturn("App Name"); + mNotificationGuts.bindNotification(mMockPackageManager, mMockINotificationManager, + mMockStatusBarNotification, null, null, null); + final TextView textView = (TextView) mNotificationGuts.findViewById(R.id.pkgname); + assertTrue(textView.getText().toString().contains("App Name")); + } + + @Test + @UiThreadTest + public void testBindNotification_SetsTextChannelName() throws Exception { + mNotificationGuts.bindNotification(mMockPackageManager, mMockINotificationManager, + mMockStatusBarNotification, null, null, null); + final TextView textView = (TextView) mNotificationGuts.findViewById(R.id.channel_name); + assertEquals(TEST_CHANNEL_NAME, textView.getText()); + } + + @Test + @UiThreadTest + public void testBindNotification_SetsOnClickListenerForSettings() throws Exception { + final CountDownLatch latch = new CountDownLatch(1); + mNotificationGuts.bindNotification(mMockPackageManager, mMockINotificationManager, + mMockStatusBarNotification, (View v, int appUid) -> { latch.countDown(); }, + null, null); + + final TextView settingsButton = + (TextView) mNotificationGuts.findViewById(R.id.more_settings); + settingsButton.performClick(); + // Verify that listener was triggered. + assertEquals(0, latch.getCount()); + } + + @Test + @UiThreadTest + public void testBindNotification_SetsOnClickListenerForDone() throws Exception { + final CountDownLatch latch = new CountDownLatch(1); + mNotificationGuts.bindNotification(mMockPackageManager, mMockINotificationManager, + mMockStatusBarNotification, null, + (View v) -> { latch.countDown(); }, + null); + + final TextView doneButton = (TextView) mNotificationGuts.findViewById(R.id.done); + doneButton.performClick(); + // Verify that listener was triggered. + assertEquals(0, latch.getCount()); + } + + @Test + @UiThreadTest + public void testHasImportanceChanged_DefaultsToFalse() throws Exception { + mNotificationGuts.bindNotification(mMockPackageManager, mMockINotificationManager, + mMockStatusBarNotification, null, null, null); + assertFalse(mNotificationGuts.hasImportanceChanged()); + } + + @Test + @UiThreadTest + public void testHasImportanceChanged_ReturnsTrueAfterButtonChecked() throws Exception { + mNotificationChannel.setImportance(NotificationManager.IMPORTANCE_LOW); + mNotificationGuts.bindNotification(mMockPackageManager, mMockINotificationManager, + mMockStatusBarNotification, null, null, null); + // Find the high button and check it. + RadioButton highButton = (RadioButton) mNotificationGuts.findViewById(R.id.high_importance); + highButton.setChecked(true); + assertTrue(mNotificationGuts.hasImportanceChanged()); + } + + @Test + @UiThreadTest + public void testImportanceButtonCheckedBasedOnInitialImportance() throws Exception { + mNotificationChannel.setImportance(NotificationManager.IMPORTANCE_HIGH); + mNotificationGuts.bindNotification(mMockPackageManager, mMockINotificationManager, + mMockStatusBarNotification, null, null, null); + + RadioButton highButton = (RadioButton) mNotificationGuts.findViewById(R.id.high_importance); + assertTrue(highButton.isChecked()); + } + + @Test + @UiThreadTest + public void testBindNotification_DoesNotUpdateNotificationChannel() throws Exception { + mNotificationGuts.bindNotification(mMockPackageManager, mMockINotificationManager, + mMockStatusBarNotification, null, null, null); + verify(mMockINotificationManager, never()).updateNotificationChannelForPackage( + anyString(), anyInt(), any()); + } + + @Test + @UiThreadTest + public void testDoesNotUpdateNotificationChannelAfterImportanceChanged() throws Exception { + mNotificationChannel.setImportance(NotificationManager.IMPORTANCE_LOW); + mNotificationGuts.bindNotification(mMockPackageManager, mMockINotificationManager, + mMockStatusBarNotification, null, null, null); + + RadioButton highButton = (RadioButton) mNotificationGuts.findViewById(R.id.high_importance); + highButton.setChecked(true); + verify(mMockINotificationManager, never()).updateNotificationChannelForPackage( + anyString(), anyInt(), any()); + } + + @Test + @UiThreadTest + public void testCloseControls_DoesNotUpdateNotificationChannelIfUnchanged() throws Exception { + mNotificationGuts.bindNotification(mMockPackageManager, mMockINotificationManager, + mMockStatusBarNotification, null, null, null); + + mNotificationGuts.closeControls(-1, -1, true); + verify(mMockINotificationManager, never()).updateNotificationChannelForPackage( + anyString(), anyInt(), any()); + } + + @Test + @UiThreadTest + public void testCloseControls_CallsUpdateNotificationChannelIfChanged() throws Exception { + mNotificationChannel.setImportance(NotificationManager.IMPORTANCE_LOW); + mNotificationGuts.bindNotification(mMockPackageManager, mMockINotificationManager, + mMockStatusBarNotification, null, null, null); + + RadioButton highButton = (RadioButton) mNotificationGuts.findViewById(R.id.high_importance); + highButton.setChecked(true); + mNotificationGuts.closeControls(-1, -1, true); + verify(mMockINotificationManager, times(1)).updateNotificationChannelForPackage( + eq(TEST_PACKAGE_NAME), anyInt(), eq(mNotificationChannel)); + assertEquals(NotificationManager.IMPORTANCE_HIGH, mNotificationChannel.getImportance()); + } + + @Test + @UiThreadTest + public void testCloseControls_DoesNotUpdateNotificationChannelIfSaveFalse() throws Exception { + mNotificationChannel.setImportance(NotificationManager.IMPORTANCE_LOW); + mNotificationGuts.bindNotification(mMockPackageManager, mMockINotificationManager, + mMockStatusBarNotification, null, null, null); + + RadioButton highButton = (RadioButton) mNotificationGuts.findViewById(R.id.high_importance); + highButton.setChecked(true); + mNotificationGuts.closeControls(-1, -1, false); + verify(mMockINotificationManager, never()).updateNotificationChannelForPackage( + anyString(), anyInt(), any()); + } + + @Test + @UiThreadTest + public void testEnabledSwitchOnByDefault() throws Exception { + mNotificationChannel.setImportance(NotificationManager.IMPORTANCE_LOW); + mNotificationGuts.bindNotification(mMockPackageManager, mMockINotificationManager, + mMockStatusBarNotification, null, null, null); + + Switch enabledSwitch = (Switch) mNotificationGuts.findViewById(R.id.channel_enabled_switch); + assertTrue(enabledSwitch.isChecked()); + } + + @Test + @UiThreadTest + public void testEnabledSwitchVisibleByDefault() throws Exception { + mNotificationChannel.setImportance(NotificationManager.IMPORTANCE_LOW); + mNotificationGuts.bindNotification(mMockPackageManager, mMockINotificationManager, + mMockStatusBarNotification, null, null, null); + + Switch enabledSwitch = (Switch) mNotificationGuts.findViewById(R.id.channel_enabled_switch); + assertEquals(View.VISIBLE, enabledSwitch.getVisibility()); + } + + @Test + @UiThreadTest + public void testEnabledSwitchInvisibleIfNonBlockable() throws Exception { + mNotificationChannel.setImportance(NotificationManager.IMPORTANCE_LOW); + mNotificationGuts.bindNotification(mMockPackageManager, mMockINotificationManager, + mMockStatusBarNotification, null, null, Collections.singleton(TEST_PACKAGE_NAME)); + + Switch enabledSwitch = (Switch) mNotificationGuts.findViewById(R.id.channel_enabled_switch); + assertEquals(View.INVISIBLE, enabledSwitch.getVisibility()); + } + + @Test + @UiThreadTest + public void testEnabledSwitchChangedCallsUpdateNotificationChannel() throws Exception { + mNotificationChannel.setImportance(NotificationManager.IMPORTANCE_LOW); + mNotificationGuts.bindNotification(mMockPackageManager, mMockINotificationManager, + mMockStatusBarNotification, null, null, Collections.singleton(TEST_PACKAGE_NAME)); + + Switch enabledSwitch = (Switch) mNotificationGuts.findViewById(R.id.channel_enabled_switch); + enabledSwitch.setChecked(false); + mNotificationGuts.closeControls(-1, -1, true); + verify(mMockINotificationManager, times(1)).updateNotificationChannelForPackage( + eq(TEST_PACKAGE_NAME), anyInt(), eq(mNotificationChannel)); + } + + @Test + @UiThreadTest + public void testEnabledSwitchOverridesOtherButtons() throws Exception { + mNotificationChannel.setImportance(NotificationManager.IMPORTANCE_LOW); + mNotificationGuts.bindNotification(mMockPackageManager, mMockINotificationManager, + mMockStatusBarNotification, null, null, null); + + Switch enabledSwitch = (Switch) mNotificationGuts.findViewById(R.id.channel_enabled_switch); + RadioButton lowButton = (RadioButton) mNotificationGuts.findViewById(R.id.low_importance); + lowButton.setChecked(true); + enabledSwitch.setChecked(false); + mNotificationGuts.closeControls(-1, -1, true); + assertEquals(NotificationManager.IMPORTANCE_NONE, mNotificationChannel.getImportance()); + } +} diff --git a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java index 386fbc92ef0d..dafa3f61d1eb 100644 --- a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java +++ b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java @@ -78,10 +78,10 @@ import android.view.InputDevice; import android.view.KeyCharacterMap; import android.view.KeyEvent; import android.view.MagnificationSpec; -import android.view.MotionEvent; import android.view.WindowInfo; import android.view.WindowManager; import android.view.WindowManagerInternal; +import android.view.accessibility.AccessibilityCache; import android.view.accessibility.AccessibilityEvent; import android.view.accessibility.AccessibilityInteractionClient; import android.view.accessibility.AccessibilityManager; @@ -1151,8 +1151,11 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub { Service service = state.mBoundServices.get(i); if (service.mIsDefault == isDefault) { - if (canDispatchEventToServiceLocked(service, event)) { - service.notifyAccessibilityEvent(event); + if (doesServiceWantEventLocked(service, event)) { + service.notifyAccessibilityEvent(event, true); + } else if ((AccessibilityCache.CACHE_CRITICAL_EVENTS_MASK + & event.getEventType()) != 0) { + service.notifyAccessibilityEvent(event, false); } } } @@ -1201,7 +1204,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub { * @param event The event. * @return True if the listener should be notified, false otherwise. */ - private boolean canDispatchEventToServiceLocked(Service service, AccessibilityEvent event) { + private boolean doesServiceWantEventLocked(Service service, AccessibilityEvent event) { if (!service.canReceiveEventsLocked()) { return false; @@ -2285,7 +2288,8 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub { public void handleMessage(Message message) { final int eventType = message.what; AccessibilityEvent event = (AccessibilityEvent) message.obj; - notifyAccessibilityEventInternal(eventType, event); + boolean serviceWantsEvent = message.arg1 != 0; + notifyAccessibilityEventInternal(eventType, event, serviceWantsEvent); } }; @@ -3200,8 +3204,11 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub { * Performs a notification for an {@link AccessibilityEvent}. * * @param event The event. + * @param serviceWantsEvent whether the event should be received by + * {@link AccessibilityService#onAccessibilityEvent} (true), + * as opposed to just {@link AccessibilityInteractionClient#onAccessibilityEvent} (false) */ - public void notifyAccessibilityEvent(AccessibilityEvent event) { + public void notifyAccessibilityEvent(AccessibilityEvent event, boolean serviceWantsEvent) { synchronized (mLock) { final int eventType = event.getEventType(); // Make a copy since during dispatch it is possible the event to @@ -3223,6 +3230,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub { // Send all messages, bypassing mPendingEvents message = mEventDispatchHandler.obtainMessage(eventType, newEvent); } + message.arg1 = serviceWantsEvent ? 1 : 0; mEventDispatchHandler.sendMessageDelayed(message, mNotificationTimeout); } @@ -3233,7 +3241,10 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub { * * @param eventType The type of the event to dispatch. */ - private void notifyAccessibilityEventInternal(int eventType, AccessibilityEvent event) { + private void notifyAccessibilityEventInternal( + int eventType, + AccessibilityEvent event, + boolean serviceWantsEvent) { IAccessibilityServiceClient listener; synchronized (mLock) { @@ -3280,7 +3291,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub { } try { - listener.onAccessibilityEvent(event); + listener.onAccessibilityEvent(event, serviceWantsEvent); if (DEBUG) { Slog.i(LOG_TAG, "Event " + event + " sent to " + listener); } diff --git a/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java b/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java index 6404604ca097..87eb380de15e 100644 --- a/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java +++ b/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java @@ -48,6 +48,7 @@ import android.content.pm.PackageManager.NameNotFoundException; import android.content.pm.ParceledListSlice; import android.content.pm.ResolveInfo; import android.content.pm.ServiceInfo; +import android.content.pm.ShortcutServiceInternal; import android.content.pm.UserInfo; import android.content.res.Resources; import android.content.res.TypedArray; @@ -1542,6 +1543,36 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku } @Override + public boolean requestPinAppWidget(String callingPackage, ComponentName componentName, + IntentSender resultSender) { + final int callingUid = Binder.getCallingUid(); + final int userId = UserHandle.getUserId(callingUid); + + if (DEBUG) { + Slog.i(TAG, "requestPinAppWidget() " + userId); + } + + final AppWidgetProviderInfo info; + + synchronized (mLock) { + ensureGroupStateLoadedLocked(userId); + + // Look for the widget associated with the caller. + Provider provider = lookupProviderLocked(new ProviderId(callingUid, componentName)); + if (provider == null || provider.zombie) { + return false; + } + info = provider.info; + if ((info.widgetCategory & AppWidgetProviderInfo.WIDGET_CATEGORY_HOME_SCREEN) == 0) { + return false; + } + } + + return LocalServices.getService(ShortcutServiceInternal.class) + .requestPinAppWidget(callingPackage, info, resultSender, userId); + } + + @Override public ParceledListSlice<AppWidgetProviderInfo> getInstalledProvidersForProfile(int categoryFilter, int profileId) { final int userId = UserHandle.getCallingUserId(); diff --git a/services/core/java/com/android/server/BluetoothManagerService.java b/services/core/java/com/android/server/BluetoothManagerService.java index 1af400e03463..e7f1d16fcc61 100644 --- a/services/core/java/com/android/server/BluetoothManagerService.java +++ b/services/core/java/com/android/server/BluetoothManagerService.java @@ -58,14 +58,16 @@ import android.os.UserManagerInternal.UserRestrictionsListener; import android.provider.Settings; import android.provider.Settings.SettingNotFoundException; import android.util.Slog; -import java.util.concurrent.locks.ReentrantReadWriteLock; import java.io.FileDescriptor; import java.io.PrintWriter; import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.locks.ReentrantReadWriteLock; import java.util.HashMap; +import java.util.LinkedList; import java.util.Map; + class BluetoothManagerService extends IBluetoothManager.Stub { private static final String TAG = "BluetoothManagerService"; private static final boolean DBG = true; @@ -138,16 +140,46 @@ class BluetoothManagerService extends IBluetoothManager.Stub { new ReentrantReadWriteLock(); private boolean mBinding; private boolean mUnbinding; + // used inside handler thread private boolean mQuietEnable = false; - // configuarion from external IBinder call which is used to + private boolean mEnable; + + /** + * Used for tracking apps that enabled / disabled Bluetooth. + */ + private class ActiveLog { + private String mPackageName; + private boolean mEnable; + private long mTimestamp; + + public ActiveLog(String packageName, boolean enable, long timestamp) { + mPackageName = packageName; + mEnable = enable; + mTimestamp = timestamp; + } + + public long getTime() { + return mTimestamp; + } + + public String toString() { + return android.text.format.DateFormat.format("MM-dd hh:mm:ss ", mTimestamp) + + (mEnable ? " Enabled " : " Disabled ") + " by " + mPackageName; + } + + } + + private LinkedList<ActiveLog> mActiveLogs; + + // configuration from external IBinder call which is used to // synchronize with broadcast receiver. private boolean mQuietEnableExternal; - // configuarion from external IBinder call which is used to - // synchronize with broadcast receiver. private boolean mEnableExternal; - // used inside handler thread - private boolean mEnable; + + // Map of apps registered to keep BLE scanning on. + private Map<IBinder, ClientDeathRecipient> mBleApps = new ConcurrentHashMap<IBinder, ClientDeathRecipient>(); + private int mState; private final BluetoothHandler mHandler; private int mErrorRecoveryRetryCounter; @@ -173,7 +205,7 @@ class BluetoothManagerService extends IBluetoothManager.Stub { } } - private final IBluetoothCallback mBluetoothCallback = new IBluetoothCallback.Stub() { + private final IBluetoothCallback mBluetoothCallback = new IBluetoothCallback.Stub() { @Override public void onBluetoothStateChange(int prevState, int newState) throws RemoteException { Message msg = mHandler.obtainMessage(MESSAGE_BLUETOOTH_STATE_CHANGE,prevState,newState); @@ -253,12 +285,12 @@ class BluetoothManagerService extends IBluetoothManager.Stub { } else if (st == BluetoothAdapter.STATE_ON){ // disable without persisting the setting Slog.d(TAG, "Calling disable"); - sendDisableMsg(); + sendDisableMsg("airplane mode"); } } else if (mEnableExternal) { // enable without persisting the setting Slog.d(TAG, "Calling enable"); - sendEnableMsg(mQuietEnableExternal); + sendEnableMsg(mQuietEnableExternal, "airplane mode"); } } } @@ -273,6 +305,7 @@ class BluetoothManagerService extends IBluetoothManager.Stub { mPermissionReviewRequired = context.getResources().getBoolean( com.android.internal.R.bool.config_permissionReviewRequired); + mActiveLogs = new LinkedList<ActiveLog>(); mBluetooth = null; mBluetoothBinder = null; mBluetoothGatt = null; @@ -300,15 +333,15 @@ class BluetoothManagerService extends IBluetoothManager.Stub { mEnableExternal = true; } - int sysUiUid = -1; + int systemUiUid = -1; try { - sysUiUid = mContext.getPackageManager().getPackageUidAsUser("com.android.systemui", + systemUiUid = mContext.getPackageManager().getPackageUidAsUser("com.android.systemui", PackageManager.MATCH_SYSTEM_ONLY, UserHandle.USER_SYSTEM); } catch (PackageManager.NameNotFoundException e) { // Some platforms, such as wearables do not have a system ui. Slog.w(TAG, "Unable to resolve SystemUI's UID.", e); } - mSystemUiUid = sysUiUid; + mSystemUiUid = systemUiUid; } /** @@ -488,8 +521,14 @@ class BluetoothManagerService extends IBluetoothManager.Stub { } class ClientDeathRecipient implements IBinder.DeathRecipient { + private String mPackageName; + + public ClientDeathRecipient(String packageName) { + mPackageName = packageName; + } + public void binderDied() { - if (DBG) Slog.d(TAG, "Binder is dead - unregister Ble App"); + if (DBG) Slog.d(TAG, "Binder is dead - unregister " + mPackageName); if (isBleAppPresent()) { // Nothing to do, another app is here. return; @@ -508,10 +547,11 @@ class BluetoothManagerService extends IBluetoothManager.Stub { mBluetoothLock.readLock().unlock(); } } - } - /** Internal death rec list */ - Map<IBinder, ClientDeathRecipient> mBleApps = new ConcurrentHashMap<IBinder, ClientDeathRecipient>(); + public String getPackageName() { + return mPackageName; + } + } @Override public boolean isBleScanAlwaysAvailable() { @@ -569,28 +609,22 @@ class BluetoothManagerService extends IBluetoothManager.Stub { } } - public int updateBleAppCount(IBinder token, boolean enable) { - if (enable) { - ClientDeathRecipient r = mBleApps.get(token); - if (r == null) { - ClientDeathRecipient deathRec = new ClientDeathRecipient(); - try { - token.linkToDeath(deathRec, 0); - } catch (RemoteException ex) { - throw new IllegalArgumentException("Wake lock is already dead."); - } - mBleApps.put(token, deathRec); - if (DBG) Slog.d(TAG, "Registered for death Notification"); - } - - } else { - ClientDeathRecipient r = mBleApps.get(token); - if (r != null) { - // Unregister death recipient as the app goes away. - token.unlinkToDeath(r, 0); - mBleApps.remove(token); - if (DBG) Slog.d(TAG, "Unregistered for death Notification"); + public int updateBleAppCount(IBinder token, boolean enable, String packageName) { + ClientDeathRecipient r = mBleApps.get(token); + if (r == null && enable) { + ClientDeathRecipient deathRec = new ClientDeathRecipient(packageName); + try { + token.linkToDeath(deathRec, 0); + } catch (RemoteException ex) { + throw new IllegalArgumentException("BLE app (" + packageName + ") already dead!"); } + mBleApps.put(token, deathRec); + if (DBG) Slog.d(TAG, "Registered for death of " + packageName); + } else if (!enable && r != null) { + // Unregister death recipient as the app goes away. + token.unlinkToDeath(r, 0); + mBleApps.remove(token); + if (DBG) Slog.d(TAG, "Unregistered for death of " + packageName); } int appCount = mBleApps.size(); if (DBG) Slog.d(TAG, appCount + " registered Ble Apps"); @@ -605,7 +639,7 @@ class BluetoothManagerService extends IBluetoothManager.Stub { mBleApps.clear(); } - /** @hide*/ + /** @hide */ public boolean isBleAppPresent() { if (DBG) Slog.d(TAG, "isBleAppPresent() count: " + mBleApps.size()); return mBleApps.size() > 0; @@ -671,7 +705,7 @@ class BluetoothManagerService extends IBluetoothManager.Stub { } } - public boolean enableNoAutoConnect() + public boolean enableNoAutoConnect(String packageName) { if (isBluetoothDisallowed()) { if (DBG) { @@ -696,7 +730,7 @@ class BluetoothManagerService extends IBluetoothManager.Stub { synchronized(mReceiver) { mQuietEnableExternal = true; mEnableExternal = true; - sendEnableMsg(true); + sendEnableMsg(true, packageName); } return true; } @@ -729,7 +763,7 @@ class BluetoothManagerService extends IBluetoothManager.Stub { } if (DBG) { - Slog.d(TAG,"enable(): mBluetooth =" + mBluetooth + + Slog.d(TAG,"enable(" + packageName + "): mBluetooth =" + mBluetooth + " mBinding = " + mBinding + " mState = " + BluetoothAdapter.nameForState(mState)); } @@ -738,7 +772,7 @@ class BluetoothManagerService extends IBluetoothManager.Stub { mQuietEnableExternal = false; mEnableExternal = true; // waive WRITE_SECURE_SETTINGS permission check - sendEnableMsg(false); + sendEnableMsg(false, packageName); } if (DBG) Slog.d(TAG, "enable returning"); return true; @@ -774,7 +808,7 @@ class BluetoothManagerService extends IBluetoothManager.Stub { persistBluetoothSetting(BLUETOOTH_OFF); } mEnableExternal = false; - sendDisableMsg(); + sendDisableMsg(packageName); } return true; } @@ -792,25 +826,21 @@ class BluetoothManagerService extends IBluetoothManager.Stub { + " not in uid " + callingUid); } - // Legacy apps in permission review mode trigger a user prompt - if (applicationInfo.targetSdkVersion < Build.VERSION_CODES.M) { - Intent intent = new Intent(intentAction); - intent.putExtra(Intent.EXTRA_PACKAGE_NAME, packageName); - intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK - | Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS); - try { - mContext.startActivity(intent); - } catch (ActivityNotFoundException e) { - // Shouldn't happen - Slog.e(TAG, "Intent to handle action " + intentAction + " missing"); - return false; - } - return true; + Intent intent = new Intent(intentAction); + intent.putExtra(Intent.EXTRA_PACKAGE_NAME, packageName); + intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK + | Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS); + try { + mContext.startActivity(intent); + } catch (ActivityNotFoundException e) { + // Shouldn't happen + Slog.e(TAG, "Intent to handle action " + intentAction + " missing"); + return false; } + return true; } catch (PackageManager.NameNotFoundException e) { throw new RemoteException(e.getMessage()); } - return false; } public void unbindAndFinish() { @@ -928,7 +958,7 @@ class BluetoothManagerService extends IBluetoothManager.Stub { } if (mEnableExternal && isBluetoothPersistedStateOnBluetooth()) { if (DBG) Slog.d(TAG, "Auto-enabling Bluetooth."); - sendEnableMsg(mQuietEnableExternal); + sendEnableMsg(mQuietEnableExternal, "system boot"); } else if (!isNameAndAddressSet()) { if (DBG) Slog.d(TAG, "Getting adapter name and address"); Message getMsg = mHandler.obtainMessage(MESSAGE_GET_NAME_AND_ADDRESS); @@ -1897,13 +1927,24 @@ class BluetoothManagerService extends IBluetoothManager.Stub { return false; } - private void sendDisableMsg() { + private void sendDisableMsg(String packageName) { mHandler.sendMessage(mHandler.obtainMessage(MESSAGE_DISABLE)); + addActiveLog(packageName, false); } - private void sendEnableMsg(boolean quietMode) { + private void sendEnableMsg(boolean quietMode, String packageName) { mHandler.sendMessage(mHandler.obtainMessage(MESSAGE_ENABLE, quietMode ? 1 : 0, 0)); + addActiveLog(packageName, true); + } + + private void addActiveLog(String packageName, boolean enable) { + synchronized (mActiveLogs) { + if (mActiveLogs.size() > 10) { + mActiveLogs.remove(); + } + mActiveLogs.add(new ActiveLog(packageName, enable, System.currentTimeMillis())); + } } private void recoverBluetoothServiceFromError(boolean clearBle) { @@ -1974,19 +2015,55 @@ class BluetoothManagerService extends IBluetoothManager.Stub { public void dump(FileDescriptor fd, PrintWriter writer, String[] args) { mContext.enforceCallingOrSelfPermission(android.Manifest.permission.DUMP, TAG); String errorMsg = null; + + boolean protoOut = (args.length > 0) && args[0].startsWith("--proto"); + + if (!protoOut) { + writer.println("Bluetooth Status"); + writer.println(" enabled: " + isEnabled()); + writer.println(" state: " + BluetoothAdapter.nameForState(mState)); + writer.println(" address: " + mAddress); + writer.println(" name: " + mName); + if (mEnable) { + long onDuration = System.currentTimeMillis() - mActiveLogs.getLast().getTime(); + String onDurationString = String.format("%02d:%02d:%02d.%03d", + (int)(onDuration / (1000 * 60 * 60)), + (int)((onDuration / (1000 * 60)) % 60), + (int)((onDuration / 1000) % 60), + (int)(onDuration % 1000)); + writer.println(" time since enabled: " + onDurationString + "\n"); + } + + writer.println("Enable log:"); + for (ActiveLog log : mActiveLogs) { + writer.println(log); + } + + writer.println("\n" + mBleApps.size() + " BLE Apps registered:"); + for (ClientDeathRecipient app : mBleApps.values()) { + writer.println(app.getPackageName()); + } + + writer.flush(); + if (args.length == 0) { + // Add arg to produce output + args = new String[1]; + args[0] = "--print"; + } + } + if (mBluetoothBinder == null) { errorMsg = "Bluetooth Service not connected"; } else { try { mBluetoothBinder.dump(fd, args); } catch (RemoteException re) { - errorMsg = "RemoteException while calling Bluetooth Service"; + errorMsg = "RemoteException while dumping Bluetooth Service"; } } if (errorMsg != null) { // Silently return if we are extracting metrics in Protobuf format - if ((args.length > 0) && args[0].startsWith("--proto")) - return; + if (protoOut) return; writer.println(errorMsg); } } diff --git a/services/core/java/com/android/server/EventLogTags.logtags b/services/core/java/com/android/server/EventLogTags.logtags index eb2cd0b3ae4b..d42fe11b22ef 100644 --- a/services/core/java/com/android/server/EventLogTags.logtags +++ b/services/core/java/com/android/server/EventLogTags.logtags @@ -154,7 +154,8 @@ option java_package com.android.server 3110 unknown_sources_enabled (value|1) # Package Manager critical info 3120 pm_critical_info (msg|3) - +# Disk usage stats for verifying quota correctness +3121 pm_package_stats (manual_time|2|3),(quota_time|2|3),(manual_data|2|2),(quota_data|2|2),(manual_cache|2|2),(quota_cache|2|2) # --------------------------- # WindowManagerService.java diff --git a/services/core/java/com/android/server/HardwarePropertiesManagerService.java b/services/core/java/com/android/server/HardwarePropertiesManagerService.java index 23cf64a031af..36a16cd0a18b 100644 --- a/services/core/java/com/android/server/HardwarePropertiesManagerService.java +++ b/services/core/java/com/android/server/HardwarePropertiesManagerService.java @@ -16,6 +16,8 @@ package com.android.server; +import android.Manifest; +import android.app.ActivityManager; import android.app.admin.DevicePolicyManager; import android.content.Context; import android.content.pm.PackageManager; @@ -80,8 +82,9 @@ public class HardwarePropertiesManagerService extends IHardwarePropertiesManager * * @param callingPackage The calling package name. * - * @throws SecurityException if something other than the profile or device owner, or the - * current VR service tries to retrieve information provided by this service. + * @throws SecurityException if something other than the profile or device owner, the + * current VR service, or a caller holding the {@link Manifest.permission#DEVICE_POWER} + * permission tries to retrieve information provided by this service. */ private void enforceHardwarePropertiesRetrievalAllowed(String callingPackage) throws SecurityException { @@ -100,9 +103,11 @@ public class HardwarePropertiesManagerService extends IHardwarePropertiesManager final VrManagerInternal vrService = LocalServices.getService(VrManagerInternal.class); final DevicePolicyManager dpm = mContext.getSystemService(DevicePolicyManager.class); if (!dpm.isDeviceOwnerApp(callingPackage) && !dpm.isProfileOwnerApp(callingPackage) - && !vrService.isCurrentVrListener(callingPackage, userId)) { - throw new SecurityException("The caller is not a device or profile owner or bound " - + "VrListenerService."); + && !vrService.isCurrentVrListener(callingPackage, userId) + && mContext.checkCallingOrSelfPermission(Manifest.permission.DEVICE_POWER) + != PackageManager.PERMISSION_GRANTED) { + throw new SecurityException("The caller is not a device or profile owner, bound " + + "VrListenerService, or holding the DEVICE_POWER permission."); } } } diff --git a/services/core/java/com/android/server/NetworkScoreService.java b/services/core/java/com/android/server/NetworkScoreService.java index fe815368b756..983d0392f0bc 100644 --- a/services/core/java/com/android/server/NetworkScoreService.java +++ b/services/core/java/com/android/server/NetworkScoreService.java @@ -36,6 +36,7 @@ import android.net.INetworkScoreService; import android.net.NetworkKey; import android.net.NetworkScorerAppManager; import android.net.NetworkScorerAppManager.NetworkScorerAppData; +import android.net.NetworkScoreManager; import android.net.RecommendationRequest; import android.net.RecommendationResult; import android.net.ScoredNetwork; @@ -633,7 +634,7 @@ public class NetworkScoreService extends INetworkScoreService.Stub { void connect(Context context) { if (!mBound) { - Intent service = new Intent(); + Intent service = new Intent(NetworkScoreManager.ACTION_RECOMMEND_NETWORKS); service.setComponent(mComponentName); mBound = context.bindServiceAsUser(service, this, Context.BIND_AUTO_CREATE | Context.BIND_FOREGROUND_SERVICE, diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index 19dcf41f542c..66258461fe3a 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -215,6 +215,7 @@ import android.text.style.SuggestionSpan; import android.util.ArrayMap; import android.util.ArraySet; import android.util.AtomicFile; +import android.util.BootTimingsTraceLog; import android.util.DebugUtils; import android.util.DisplayMetrics; import android.util.EventLog; @@ -3629,13 +3630,14 @@ public class ActivityManagerService extends IActivityManager.Stub * resources like shared libraries and access user-wide resources */ if (ArrayUtils.isEmpty(permGids)) { - gids = new int[2]; + gids = new int[3]; } else { - gids = new int[permGids.length + 2]; - System.arraycopy(permGids, 0, gids, 2, permGids.length); + gids = new int[permGids.length + 3]; + System.arraycopy(permGids, 0, gids, 3, permGids.length); } gids[0] = UserHandle.getSharedAppGid(UserHandle.getAppId(uid)); - gids[1] = UserHandle.getUserGid(UserHandle.getUserId(uid)); + gids[1] = UserHandle.getCacheAppGid(UserHandle.getAppId(uid)); + gids[2] = UserHandle.getUserGid(UserHandle.getUserId(uid)); } checkTime(startTime, "startProcess: building args"); if (mFactoryTest != FactoryTest.FACTORY_TEST_OFF) { @@ -6710,6 +6712,13 @@ public class ActivityManagerService extends IActivityManager.Stub } } + /** + * @return whther the keyguard is currently locked. + */ + boolean isKeyguardLocked() { + return mKeyguardController.isKeyguardLocked(); + } + final void finishBooting() { synchronized (this) { if (!mBootAnimationComplete) { @@ -7557,10 +7566,40 @@ public class ActivityManagerService extends IActivityManager.Stub final ActivityRecord r = ensureValidPictureInPictureActivityLocked( "enterPictureInPictureMode", token, aspectRatio, checkAspectRatio, true /* checkActivityVisibility */); + final Runnable enterPipRunnable = () -> { + r.pictureInPictureArgs.aspectRatio = aspectRatio; + enterPictureInPictureModeLocked(r, displayId, r.pictureInPictureArgs, + true /* moveHomeStackToFront */, "enterPictureInPictureMode"); + }; - r.pictureInPictureArgs.aspectRatio = aspectRatio; - enterPictureInPictureModeLocked(r, displayId, r.pictureInPictureArgs, - true /* moveHomeStackToFront */, "enterPictureInPictureMode"); + if (isKeyguardLocked()) { + // If the keyguard is showing or occluded, then try and dismiss it before + // entering picture-in-picture (this will prompt the user to authenticate if the + // device is currently locked). + try { + dismissKeyguard(token, new IKeyguardDismissCallback.Stub() { + @Override + public void onDismissError() throws RemoteException { + // Do nothing + } + + @Override + public void onDismissSucceeded() throws RemoteException { + mHandler.post(enterPipRunnable); + } + + @Override + public void onDismissCancelled() throws RemoteException { + // Do nothing + } + }); + } catch (RemoteException e) { + // Local call + } + } else { + // Enter picture in picture immediately otherwise + enterPipRunnable.run(); + } } } finally { Binder.restoreCallingIdentity(origId); @@ -10044,6 +10083,11 @@ public class ActivityManagerService extends IActivityManager.Stub } } + /** + * Try to place task to provided position. The final position might be different depending on + * current user and stacks state. The task will be moved to target stack if it's currently in + * different stack. + */ @Override public void positionTaskInStack(int taskId, int stackId, int position) { enforceCallingPermission(MANAGE_ACTIVITY_STACKS, "positionTaskInStack()"); @@ -12014,6 +12058,12 @@ public class ActivityManagerService extends IActivityManager.Stub } } + /** + * @deprecated This method is only used by a few internal components and it will soon be + * replaced by a proper bug report API (which will be restricted to a few, pre-defined apps). + * No new code should be calling it. + */ + @Deprecated public void requestBugReport(int bugreportType) { String extraOptions = null; switch (bugreportType) { @@ -13163,7 +13213,8 @@ public class ActivityManagerService extends IActivityManager.Stub } } - public void systemReady(final Runnable goingCallback) { + public void systemReady(final Runnable goingCallback, BootTimingsTraceLog traceLog) { + traceLog.traceBegin("PhaseActivityManagerReady"); synchronized(this) { if (mSystemReady) { // If we're done calling all the receivers, run the next "boot phase" passed in @@ -13260,7 +13311,7 @@ public class ActivityManagerService extends IActivityManager.Stub } if (goingCallback != null) goingCallback.run(); - + traceLog.traceBegin("ActivityManagerStartApps"); mBatteryStatsService.noteEvent(BatteryStats.HistoryItem.EVENT_USER_RUNNING_START, Integer.toString(currentUserId), currentUserId); mBatteryStatsService.noteEvent(BatteryStats.HistoryItem.EVENT_USER_FOREGROUND_START, @@ -13335,6 +13386,8 @@ public class ActivityManagerService extends IActivityManager.Stub } mStackSupervisor.resumeFocusedStackTopActivityLocked(); mUserController.sendUserSwitchBroadcastsLocked(-1, currentUserId); + traceLog.traceEnd(); // ActivityManagerStartApps + traceLog.traceEnd(); // PhaseActivityManagerReady } } diff --git a/services/core/java/com/android/server/am/ActivityStack.java b/services/core/java/com/android/server/am/ActivityStack.java index 5bdae574421b..beeadac5d50a 100644 --- a/services/core/java/com/android/server/am/ActivityStack.java +++ b/services/core/java/com/android/server/am/ActivityStack.java @@ -1810,9 +1810,10 @@ final class ActivityStack extends ConfigurationContainer { */ private boolean checkKeyguardVisibility(ActivityRecord r, boolean shouldBeVisible, boolean isTop) { + final boolean isInPinnedStack = r.getStack().getStackId() == PINNED_STACK_ID; final boolean keyguardShowing = mStackSupervisor.mKeyguardController.isKeyguardShowing(); final boolean keyguardLocked = mStackSupervisor.mKeyguardController.isKeyguardLocked(); - final boolean showWhenLocked = r.hasShowWhenLockedWindows(); + final boolean showWhenLocked = r.hasShowWhenLockedWindows() && !isInPinnedStack; final boolean dismissKeyguard = r.hasDismissKeyguardWindows(); if (shouldBeVisible) { if (dismissKeyguard && mTopDismissingKeyguardActivity == null) { @@ -1885,10 +1886,13 @@ final class ActivityStack extends ConfigurationContainer { private boolean enterPictureInPictureOnActivityInvisible(ActivityRecord r) { final boolean hasPinnedStack = mStackSupervisor.getStack(PINNED_STACK_ID) != null; + final boolean isKeyguardLocked = mService.isKeyguardLocked(); if (DEBUG_VISIBILITY) Slog.v(TAG_VISIBILITY, " enterPictureInPictureOnInvisible=" + r.shouldEnterPictureInPictureOnInvisible() - + " hasPinnedStack=" + hasPinnedStack); - if (!hasPinnedStack && r.visible && r.shouldEnterPictureInPictureOnInvisible()) { + + " hasPinnedStack=" + hasPinnedStack + + " isKeyguardLocked=" + isKeyguardLocked); + if (!hasPinnedStack && !isKeyguardLocked && r.visible && + r.shouldEnterPictureInPictureOnInvisible()) { r.setEnterPipOnMoveToBackground(false); // Enter picture in picture, but don't move the home stack to the front @@ -2547,6 +2551,10 @@ final class ActivityStack extends ConfigurationContainer { return null; } + /** + * Used from {@link ActivityStack#positionTask(TaskRecord, int)}. + * @see ActivityManagerService#positionTaskInStack(int, int, int). + */ private void insertTaskAtPosition(TaskRecord task, int position) { if (position >= mTaskHistory.size()) { insertTaskAtTop(task, null); @@ -4935,6 +4943,7 @@ final class ActivityStack extends ConfigurationContainer { postAddTask(task, prevStack); } + /** @see ActivityManagerService#positionTaskInStack(int, int, int). */ void positionTask(final TaskRecord task, int position) { final ActivityRecord topRunningActivity = task.topRunningActivityLocked(); final boolean wasResumed = topRunningActivity == task.getStack().mResumedActivity; diff --git a/services/core/java/com/android/server/am/ActivityStackSupervisor.java b/services/core/java/com/android/server/am/ActivityStackSupervisor.java index b4b346576507..235325b8b259 100644 --- a/services/core/java/com/android/server/am/ActivityStackSupervisor.java +++ b/services/core/java/com/android/server/am/ActivityStackSupervisor.java @@ -2200,7 +2200,7 @@ public class ActivityStackSupervisor extends ConfigurationContainer } else { for (int i = size - 1; i >= 0; i--) { positionTaskInStackLocked(tasks.get(i).taskId, - FULLSCREEN_WORKSPACE_STACK_ID, 0); + FULLSCREEN_WORKSPACE_STACK_ID, 0 /* position */); } } } finally { @@ -2872,6 +2872,7 @@ public class ActivityStackSupervisor extends ConfigurationContainer return true; } + /** @see ActivityManagerService#positionTaskInStack(int, int, int). */ void positionTaskInStackLocked(int taskId, int stackId, int position) { final TaskRecord task = anyTaskForIdLocked(taskId); if (task == null) { @@ -2882,6 +2883,8 @@ public class ActivityStackSupervisor extends ConfigurationContainer task.updateOverrideConfigurationForStack(stack); + // TODO: Return final position from WM for AM to use instead of duplicating computations in + // ActivityStack#insertTaskAtPosition. mWindowManager.positionTaskInStack( taskId, stackId, position, task.mBounds, task.getOverrideConfiguration()); stack.positionTask(task, position); @@ -4322,7 +4325,7 @@ public class ActivityStackSupervisor extends ConfigurationContainer if (activityDisplay == null) { return; } - addToDisplayLocked(activityDisplay, true); + addToDisplayLocked(activityDisplay, true /* onTop */); } } @@ -4538,7 +4541,7 @@ public class ActivityStackSupervisor extends ConfigurationContainer new VirtualActivityDisplay(width, height, density); mActivityDisplay = virtualActivityDisplay; mActivityDisplays.put(virtualActivityDisplay.mDisplayId, virtualActivityDisplay); - addToDisplayLocked(virtualActivityDisplay, true); + addToDisplayLocked(virtualActivityDisplay, true /* onTop */); } if (mSurface != null) { diff --git a/services/core/java/com/android/server/audio/AudioService.java b/services/core/java/com/android/server/audio/AudioService.java index 788a28cfac25..a50f722b41d8 100644 --- a/services/core/java/com/android/server/audio/AudioService.java +++ b/services/core/java/com/android/server/audio/AudioService.java @@ -232,6 +232,7 @@ public class AudioService extends IAudioService.Stub private static final int MSG_SET_WIRED_DEVICE_CONNECTION_STATE = 100; private static final int MSG_SET_A2DP_SRC_CONNECTION_STATE = 101; private static final int MSG_SET_A2DP_SINK_CONNECTION_STATE = 102; + private static final int MSG_A2DP_DEVICE_CONFIG_CHANGE = 103; // end of messages handled under wakelock private static final int BTA2DP_DOCK_TIMEOUT_MILLIS = 8000; @@ -3183,7 +3184,7 @@ public class AudioService extends IAudioService.Stub queueMsgUnderWakeLock(mAudioHandler, MSG_SET_A2DP_SINK_CONNECTION_STATE, state, - 0, + 0 /* arg2 unused */, btDevice, delay); } @@ -3200,7 +3201,7 @@ public class AudioService extends IAudioService.Stub queueMsgUnderWakeLock(mAudioHandler, MSG_SET_A2DP_SRC_CONNECTION_STATE, state, - 0, + 0 /* arg2 unused */, btDevice, 0 /* delay */); } @@ -3848,8 +3849,8 @@ public class AudioService extends IAudioService.Stub int delay = checkSendBecomingNoisyIntent(type, state); queueMsgUnderWakeLock(mAudioHandler, MSG_SET_WIRED_DEVICE_CONNECTION_STATE, - 0, - 0, + 0 /* arg1 unused */, + 0 /* arg2 unused */, new WiredDeviceConnectionState(type, state, address, name, caller), delay); } @@ -3872,13 +3873,25 @@ public class AudioService extends IAudioService.Stub (profile == BluetoothProfile.A2DP ? MSG_SET_A2DP_SINK_CONNECTION_STATE : MSG_SET_A2DP_SRC_CONNECTION_STATE), state, - 0, + 0 /* arg2 unused */, device, delay); } return delay; } + public void handleBluetoothA2dpDeviceConfigChange(BluetoothDevice device) + { + synchronized (mConnectedDevices) { + queueMsgUnderWakeLock(mAudioHandler, + MSG_A2DP_DEVICE_CONFIG_CHANGE, + 0 /* arg1 unused */, + 0 /* arg1 unused */, + device, + 0 /* delay */); + } + } + /////////////////////////////////////////////////////////////////////////// // Inner classes /////////////////////////////////////////////////////////////////////////// @@ -4691,6 +4704,11 @@ public class AudioService extends IAudioService.Stub mAudioEventWakeLock.release(); break; + case MSG_A2DP_DEVICE_CONFIG_CHANGE: + onBluetoothA2dpDeviceConfigChange((BluetoothDevice)msg.obj); + mAudioEventWakeLock.release(); + break; + case MSG_REPORT_NEW_ROUTES: { int N = mRoutesObservers.beginBroadcast(); if (N > 0) { @@ -4913,7 +4931,7 @@ public class AudioService extends IAudioService.Stub private void onSetA2dpSinkConnectionState(BluetoothDevice btDevice, int state) { if (DEBUG_VOL) { - Log.d(TAG, "onSetA2dpSinkConnectionState btDevice="+btDevice+"state="+state); + Log.d(TAG, "onSetA2dpSinkConnectionState btDevice=" + btDevice+"state=" + state); } if (btDevice == null) { return; @@ -4924,9 +4942,9 @@ public class AudioService extends IAudioService.Stub } synchronized (mConnectedDevices) { - String key = makeDeviceListKey(AudioSystem.DEVICE_OUT_BLUETOOTH_A2DP, - btDevice.getAddress()); - DeviceListSpec deviceSpec = mConnectedDevices.get(key); + final String key = makeDeviceListKey(AudioSystem.DEVICE_OUT_BLUETOOTH_A2DP, + btDevice.getAddress()); + final DeviceListSpec deviceSpec = mConnectedDevices.get(key); boolean isConnected = deviceSpec != null; if (isConnected && state != BluetoothProfile.STATE_CONNECTED) { @@ -4977,7 +4995,7 @@ public class AudioService extends IAudioService.Stub private void onSetA2dpSourceConnectionState(BluetoothDevice btDevice, int state) { if (DEBUG_VOL) { - Log.d(TAG, "onSetA2dpSourceConnectionState btDevice="+btDevice+" state="+state); + Log.d(TAG, "onSetA2dpSourceConnectionState btDevice=" + btDevice + " state=" + state); } if (btDevice == null) { return; @@ -4988,8 +5006,8 @@ public class AudioService extends IAudioService.Stub } synchronized (mConnectedDevices) { - String key = makeDeviceListKey(AudioSystem.DEVICE_IN_BLUETOOTH_A2DP, address); - DeviceListSpec deviceSpec = mConnectedDevices.get(key); + final String key = makeDeviceListKey(AudioSystem.DEVICE_IN_BLUETOOTH_A2DP, address); + final DeviceListSpec deviceSpec = mConnectedDevices.get(key); boolean isConnected = deviceSpec != null; if (isConnected && state != BluetoothProfile.STATE_CONNECTED) { @@ -5000,6 +5018,31 @@ public class AudioService extends IAudioService.Stub } } + private void onBluetoothA2dpDeviceConfigChange(BluetoothDevice btDevice) + { + if (DEBUG_VOL) { + Log.d(TAG, "onBluetoothA2dpDeviceConfigChange btDevice=" + btDevice); + } + if (btDevice == null) { + return; + } + String address = btDevice.getAddress(); + if (!BluetoothAdapter.checkBluetoothAddress(address)) { + address = ""; + } + + int device = AudioSystem.DEVICE_OUT_BLUETOOTH_A2DP; + synchronized (mConnectedDevices) { + final String key = makeDeviceListKey(device, address); + final DeviceListSpec deviceSpec = mConnectedDevices.get(key); + if (deviceSpec != null) { + // Device is connected + AudioSystem.handleDeviceConfigChange(device, address, + btDevice.getName()); + } + } + } + public void avrcpSupportsAbsoluteVolume(String address, boolean support) { // address is not used for now, but may be used when multiple a2dp devices are supported synchronized (mA2dpAvrcpLock) { @@ -6453,7 +6496,7 @@ public class AudioService extends IAudioService.Stub private final PlaybackActivityMonitor mPlaybackMonitor = new PlaybackActivityMonitor(); public void registerPlaybackCallback(IPlaybackConfigDispatcher pcdb) { - final boolean isPrivileged = + final boolean isPrivileged = (PackageManager.PERMISSION_GRANTED == mContext.checkCallingPermission( android.Manifest.permission.MODIFY_AUDIO_ROUTING)); mPlaybackMonitor.registerPlaybackCallback(pcdb, isPrivileged); @@ -6464,11 +6507,14 @@ public class AudioService extends IAudioService.Stub } public List<AudioPlaybackConfiguration> getActivePlaybackConfigurations() { - return mPlaybackMonitor.getActivePlaybackConfigurations(); + final boolean isPrivileged = + (PackageManager.PERMISSION_GRANTED == mContext.checkCallingPermission( + android.Manifest.permission.MODIFY_AUDIO_ROUTING)); + return mPlaybackMonitor.getActivePlaybackConfigurations(isPrivileged); } - public void trackPlayer(PlayerBase.PlayerIdCard pic) { - mPlaybackMonitor.trackPlayer(pic); + public int trackPlayer(PlayerBase.PlayerIdCard pic) { + return mPlaybackMonitor.trackPlayer(pic); } public void playerAttributes(int piid, AudioAttributes attr) { diff --git a/services/core/java/com/android/server/audio/PlaybackActivityMonitor.java b/services/core/java/com/android/server/audio/PlaybackActivityMonitor.java index b99e4e93a95a..dfa856da0d17 100644 --- a/services/core/java/com/android/server/audio/PlaybackActivityMonitor.java +++ b/services/core/java/com/android/server/audio/PlaybackActivityMonitor.java @@ -25,6 +25,7 @@ import android.media.AudioSystem; import android.media.IPlaybackConfigDispatcher; import android.media.MediaRecorder; import android.media.PlayerBase; +import android.os.Binder; import android.os.IBinder; import android.os.RemoteException; import android.util.Log; @@ -61,16 +62,20 @@ public final class PlaybackActivityMonitor { //================================================================= // Track players and their states - // methods trackPlayer, playerAttributes, playerEvent, releasePlayer are all oneway calls + // methods playerAttributes, playerEvent, releasePlayer are all oneway calls // into AudioService. They trigger synchronous dispatchPlaybackChange() which updates // all listeners as oneway calls. - public void trackPlayer(PlayerBase.PlayerIdCard pic) { - if (DEBUG) { Log.v(TAG, "trackPlayer() for piid=" + pic.mPIId); } - final AudioPlaybackConfiguration apc = new AudioPlaybackConfiguration(pic); + public int trackPlayer(PlayerBase.PlayerIdCard pic) { + final int newPiid = AudioSystem.newAudioPlayerId(); + if (DEBUG) { Log.v(TAG, "trackPlayer() new piid=" + newPiid); } + final AudioPlaybackConfiguration apc = + new AudioPlaybackConfiguration(pic, newPiid, + Binder.getCallingUid(), Binder.getCallingPid()); synchronized(mPlayerLock) { - mPlayers.put(pic.mPIId, apc); + mPlayers.put(newPiid, apc); } + return newPiid; } public void playerAttributes(int piid, @NonNull AudioAttributes attr) { @@ -90,7 +95,7 @@ public final class PlaybackActivityMonitor { } public void playerEvent(int piid, int event) { - if (DEBUG) { Log.v(TAG, String.format("trackPlayer(piid=%d, event=%d)", piid, event)); } + if (DEBUG) { Log.v(TAG, String.format("playerEvent(piid=%d, event=%d)", piid, event)); } final boolean change; synchronized(mPlayerLock) { final AudioPlaybackConfiguration apc = mPlayers.get(new Integer(piid)); @@ -228,9 +233,18 @@ public final class PlaybackActivityMonitor { } } - List<AudioPlaybackConfiguration> getActivePlaybackConfigurations() { + List<AudioPlaybackConfiguration> getActivePlaybackConfigurations(boolean isPrivileged) { synchronized(mPlayers) { - return new ArrayList<AudioPlaybackConfiguration>(mPlayers.values()); + if (isPrivileged) { + return new ArrayList<AudioPlaybackConfiguration>(mPlayers.values()); + } else { + final List<AudioPlaybackConfiguration> configsPublic; + synchronized (mPlayerLock) { + configsPublic = anonymizeForPublicConsumption( + new ArrayList<AudioPlaybackConfiguration>(mPlayers.values())); + } + return configsPublic; + } } } diff --git a/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java b/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java index 4526ab74387b..7c5550a678e2 100644 --- a/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java +++ b/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java @@ -250,7 +250,8 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice { @ServiceThreadOnly boolean dispatchMessage(HdmiCecMessage message) { assertRunOnServiceThread(); - if (mService.isPowerStandby() && mStandbyHandler.handleCommand(message)) { + if (mService.isPowerStandby() && !mService.isWakeUpMessageReceived() + && mStandbyHandler.handleCommand(message)) { return true; } return super.onMessage(message); diff --git a/services/core/java/com/android/server/hdmi/HdmiControlService.java b/services/core/java/com/android/server/hdmi/HdmiControlService.java index 18f1b6c0513c..4c6b8328e213 100644 --- a/services/core/java/com/android/server/hdmi/HdmiControlService.java +++ b/services/core/java/com/android/server/hdmi/HdmiControlService.java @@ -967,6 +967,9 @@ public final class HdmiControlService extends SystemService { } void setAudioStatus(boolean mute, int volume) { + if (!isTvDeviceEnabled() || !tv().isSystemAudioActivated()) { + return; + } AudioManager audioManager = getAudioManager(); boolean muted = audioManager.isStreamMute(AudioManager.STREAM_MUSIC); if (mute) { @@ -2014,6 +2017,10 @@ public final class HdmiControlService extends SystemService { // the intent, the sequence will continue at onStandby(). } + boolean isWakeUpMessageReceived() { + return mWakeUpMessageReceived; + } + @ServiceThreadOnly private void onWakeUp() { assertRunOnServiceThread(); @@ -2116,7 +2123,6 @@ public final class HdmiControlService extends SystemService { device.onStandby(mStandbyMessageReceived, standbyAction); } mStandbyMessageReceived = false; - mAddressAllocated = false; mCecController.setOption(OptionKey.SYSTEM_CEC_CONTROL, false); mMhlController.setOption(OPTION_MHL_SERVICE_CONTROL, DISABLED); } diff --git a/services/core/java/com/android/server/notification/NotificationManagerService.java b/services/core/java/com/android/server/notification/NotificationManagerService.java index a3181e4146bb..aaba00ac2680 100644 --- a/services/core/java/com/android/server/notification/NotificationManagerService.java +++ b/services/core/java/com/android/server/notification/NotificationManagerService.java @@ -270,6 +270,7 @@ public class NotificationManagerService extends SystemService { new ArrayList<NotificationRecord>(); final ArrayMap<String, NotificationRecord> mNotificationsByKey = new ArrayMap<String, NotificationRecord>(); + final ArrayList<NotificationRecord> mEnqueuedNotifications = new ArrayList<>(); final ArrayMap<Integer, ArrayMap<String, String>> mAutobundledSummaries = new ArrayMap<>(); final ArrayList<ToastRecord> mToastQueue = new ArrayList<ToastRecord>(); final ArrayMap<String, NotificationRecord> mSummaryByGroupKey = new ArrayMap<>(); @@ -1547,8 +1548,9 @@ public class NotificationManagerService extends SystemService { @Override public void updateNotificationChannelForPackage(String pkg, int uid, NotificationChannel channel) { - checkCallerIsSystem(); + enforceSystemOrSystemUI("Caller not system or systemui"); if (!channel.isAllowed()) { + // cancel cancelAllNotificationsInt(MY_UID, MY_PID, pkg, channel.getId(), 0, 0, true, UserHandle.getUserId(Binder.getCallingUid()), REASON_CHANNEL_BANNED, null); @@ -1613,35 +1615,60 @@ public class NotificationManagerService extends SystemService { int userId = ActivityManager.handleIncomingUser(Binder.getCallingPid(), Binder.getCallingUid(), incomingUserId, true, false, "getAppActiveNotifications", pkg); - - final ArrayList<StatusBarNotification> list - = new ArrayList<StatusBarNotification>(mNotificationList.size()); + final ArrayMap<String, StatusBarNotification> map + = new ArrayMap<>(mNotificationList.size() + mEnqueuedNotifications.size()); synchronized (mNotificationList) { final int N = mNotificationList.size(); for (int i = 0; i < N; i++) { - final StatusBarNotification sbn = mNotificationList.get(i).sbn; - if (sbn.getPackageName().equals(pkg) && sbn.getUserId() == userId - && (sbn.getNotification().flags - & Notification.FLAG_AUTOGROUP_SUMMARY) == 0) { - // We could pass back a cloneLight() but clients might get confused and - // try to send this thing back to notify() again, which would not work - // very well. - final StatusBarNotification sbnOut = new StatusBarNotification( - sbn.getPackageName(), - sbn.getOpPkg(), - sbn.getNotificationChannel(), - sbn.getId(), sbn.getTag(), sbn.getUid(), sbn.getInitialPid(), - sbn.getNotification().clone(), - sbn.getUser(), sbn.getOverrideGroupKey(), sbn.getPostTime()); - list.add(sbnOut); + StatusBarNotification sbn = sanitizeSbn(pkg, userId, + mNotificationList.get(i).sbn); + if (sbn != null) { + map.put(sbn.getKey(), sbn); + } + } + for(NotificationRecord snoozed: mSnoozeHelper.getSnoozed(userId, pkg)) { + StatusBarNotification sbn = sanitizeSbn(pkg, userId, snoozed.sbn); + if (sbn != null) { + map.put(sbn.getKey(), sbn); + } + } + } + synchronized (mEnqueuedNotifications) { + final int N = mEnqueuedNotifications.size(); + for (int i = 0; i < N; i++) { + StatusBarNotification sbn = sanitizeSbn(pkg, userId, + mEnqueuedNotifications.get(i).sbn); + if (sbn != null) { + map.put(sbn.getKey(), sbn); // pending update overwrites existing post here } } } + final ArrayList<StatusBarNotification> list = new ArrayList<>(map.size()); + list.addAll(map.values()); return new ParceledListSlice<StatusBarNotification>(list); } + private StatusBarNotification sanitizeSbn(String pkg, int userId, + StatusBarNotification sbn) { + if (sbn.getPackageName().equals(pkg) && sbn.getUserId() == userId + && (sbn.getNotification().flags + & Notification.FLAG_AUTOGROUP_SUMMARY) == 0) { + // We could pass back a cloneLight() but clients might get confused and + // try to send this thing back to notify() again, which would not work + // very well. + return new StatusBarNotification( + sbn.getPackageName(), + sbn.getOpPkg(), + sbn.getNotificationChannel(), + sbn.getId(), sbn.getTag(), sbn.getUid(), sbn.getInitialPid(), + sbn.getNotification().clone(), + sbn.getUser(), sbn.getOverrideGroupKey(), sbn.getPostTime()); + } + return null; + } + /** * System-only API for getting a list of recent (cleared, no longer shown) notifications. * @@ -2834,6 +2861,9 @@ public class NotificationManagerService extends SystemService { // setup local book-keeping final NotificationRecord r = new NotificationRecord(getContext(), n); + synchronized (mEnqueuedNotifications) { + mEnqueuedNotifications.add(r); + } mHandler.post(new EnqueueNotificationRunnable(userId, r)); idOut[0] = id; @@ -2850,121 +2880,126 @@ public class NotificationManagerService extends SystemService { @Override public void run() { - - synchronized (mNotificationList) { - if (mSnoozeHelper.isSnoozed(userId, r.sbn.getPackageName(), r.getKey())) { - // TODO: log to event log - if (DBG) { - Slog.d(TAG, "Ignored enqueue for snoozed notification " + r.getKey()); + try { + synchronized (mNotificationList) { + if (mSnoozeHelper.isSnoozed(userId, r.sbn.getPackageName(), r.getKey())) { + // TODO: log to event log + if (DBG) { + Slog.d(TAG, "Ignored enqueue for snoozed notification " + r.getKey()); + } + mSnoozeHelper.update(userId, r); + savePolicyFile(); + return; } - mSnoozeHelper.update(userId, r); - savePolicyFile(); - return; - } - - final StatusBarNotification n = r.sbn; - if (DBG) Slog.d(TAG, "EnqueueNotificationRunnable.run for: " + n.getKey()); - NotificationRecord old = mNotificationsByKey.get(n.getKey()); - if (old != null) { - // Retain ranking information from previous record - r.copyRankingInformation(old); - } - final int callingUid = n.getUid(); - final int callingPid = n.getInitialPid(); - final Notification notification = n.getNotification(); - final String pkg = n.getPackageName(); - final int id = n.getId(); - final String tag = n.getTag(); - final boolean isSystemNotification = isUidSystem(callingUid) || - ("android".equals(pkg)); - - // Handle grouped notifications and bail out early if we - // can to avoid extracting signals. - handleGroupedNotificationLocked(r, old, callingUid, callingPid); - - // This conditional is a dirty hack to limit the logging done on - // behalf of the download manager without affecting other apps. - if (!pkg.equals("com.android.providers.downloads") - || Log.isLoggable("DownloadManager", Log.VERBOSE)) { - int enqueueStatus = EVENTLOG_ENQUEUE_STATUS_NEW; + final StatusBarNotification n = r.sbn; + if (DBG) Slog.d(TAG, "EnqueueNotificationRunnable.run for: " + n.getKey()); + NotificationRecord old = mNotificationsByKey.get(n.getKey()); if (old != null) { - enqueueStatus = EVENTLOG_ENQUEUE_STATUS_UPDATE; + // Retain ranking information from previous record + r.copyRankingInformation(old); } - EventLogTags.writeNotificationEnqueue(callingUid, callingPid, - pkg, id, tag, userId, notification.toString(), - enqueueStatus); - } - mRankingHelper.extractSignals(r); + final int callingUid = n.getUid(); + final int callingPid = n.getInitialPid(); + final Notification notification = n.getNotification(); + final String pkg = n.getPackageName(); + final int id = n.getId(); + final String tag = n.getTag(); + final boolean isSystemNotification = isUidSystem(callingUid) || + ("android".equals(pkg)); + + // Handle grouped notifications and bail out early if we + // can to avoid extracting signals. + handleGroupedNotificationLocked(r, old, callingUid, callingPid); + + // This conditional is a dirty hack to limit the logging done on + // behalf of the download manager without affecting other apps. + if (!pkg.equals("com.android.providers.downloads") + || Log.isLoggable("DownloadManager", Log.VERBOSE)) { + int enqueueStatus = EVENTLOG_ENQUEUE_STATUS_NEW; + if (old != null) { + enqueueStatus = EVENTLOG_ENQUEUE_STATUS_UPDATE; + } + EventLogTags.writeNotificationEnqueue(callingUid, callingPid, + pkg, id, tag, userId, notification.toString(), + enqueueStatus); + } - // blocked apps - if (isBlocked(r, mUsageStats)) { - return; - } + mRankingHelper.extractSignals(r); - // tell the assistant service about the notification - if (mNotificationAssistants.isEnabled()) { - mNotificationAssistants.onNotificationEnqueued(r); - // TODO delay the code below here for 100ms or until there is an answer - } + // blocked apps + if (isBlocked(r, mUsageStats)) { + return; + } + // tell the assistant service about the notification + if (mNotificationAssistants.isEnabled()) { + mNotificationAssistants.onNotificationEnqueued(r); + // TODO delay the code below here for 100ms or until there is an answer + } - int index = indexOfNotificationLocked(n.getKey()); - if (index < 0) { - mNotificationList.add(r); - mUsageStats.registerPostedByApp(r); - } else { - old = mNotificationList.get(index); - mNotificationList.set(index, r); - mUsageStats.registerUpdatedByApp(r, old); - // Make sure we don't lose the foreground service state. - notification.flags |= - old.getNotification().flags & Notification.FLAG_FOREGROUND_SERVICE; - r.isUpdate = true; - } - mNotificationsByKey.put(n.getKey(), r); + int index = indexOfNotificationLocked(n.getKey()); + if (index < 0) { + mNotificationList.add(r); + mUsageStats.registerPostedByApp(r); + } else { + old = mNotificationList.get(index); + mNotificationList.set(index, r); + mUsageStats.registerUpdatedByApp(r, old); + // Make sure we don't lose the foreground service state. + notification.flags |= + old.getNotification().flags & Notification.FLAG_FOREGROUND_SERVICE; + r.isUpdate = true; + } - // Ensure if this is a foreground service that the proper additional - // flags are set. - if ((notification.flags & Notification.FLAG_FOREGROUND_SERVICE) != 0) { - notification.flags |= Notification.FLAG_ONGOING_EVENT - | Notification.FLAG_NO_CLEAR; - } + mNotificationsByKey.put(n.getKey(), r); - applyZenModeLocked(r); - mRankingHelper.sort(mNotificationList); + // Ensure if this is a foreground service that the proper additional + // flags are set. + if ((notification.flags & Notification.FLAG_FOREGROUND_SERVICE) != 0) { + notification.flags |= Notification.FLAG_ONGOING_EVENT + | Notification.FLAG_NO_CLEAR; + } - if (notification.getSmallIcon() != null) { - StatusBarNotification oldSbn = (old != null) ? old.sbn : null; - mListeners.notifyPostedLocked(n, oldSbn); - mHandler.post(new Runnable() { - @Override - public void run() { - mGroupHelper.onNotificationPosted(n); - } - }); - } else { - Slog.e(TAG, "Not posting notification without small icon: " + notification); - if (old != null && !old.isCanceled) { - mListeners.notifyRemovedLocked(n, - NotificationListenerService.REASON_DELEGATE_ERROR); + applyZenModeLocked(r); + mRankingHelper.sort(mNotificationList); + + if (notification.getSmallIcon() != null) { + StatusBarNotification oldSbn = (old != null) ? old.sbn : null; + mListeners.notifyPostedLocked(n, oldSbn); mHandler.post(new Runnable() { @Override public void run() { - mGroupHelper.onNotificationRemoved(n); + mGroupHelper.onNotificationPosted(n); } }); + } else { + Slog.e(TAG, "Not posting notification without small icon: " + notification); + if (old != null && !old.isCanceled) { + mListeners.notifyRemovedLocked(n, + NotificationListenerService.REASON_DELEGATE_ERROR); + mHandler.post(new Runnable() { + @Override + public void run() { + mGroupHelper.onNotificationRemoved(n); + } + }); + } + // ATTENTION: in a future release we will bail out here + // so that we do not play sounds, show lights, etc. for invalid + // notifications + Slog.e(TAG, "WARNING: In a future release this will crash the app: " + + n.getPackageName()); } - // ATTENTION: in a future release we will bail out here - // so that we do not play sounds, show lights, etc. for invalid - // notifications - Slog.e(TAG, "WARNING: In a future release this will crash the app: " - + n.getPackageName()); - } - buzzBeepBlinkLocked(r); + buzzBeepBlinkLocked(r); + } + } finally { + synchronized (mEnqueuedNotifications) { + mEnqueuedNotifications.remove(r); + } } } diff --git a/services/core/java/com/android/server/notification/SnoozeHelper.java b/services/core/java/com/android/server/notification/SnoozeHelper.java index 409eef45b557..733ff67135c5 100644 --- a/services/core/java/com/android/server/notification/SnoozeHelper.java +++ b/services/core/java/com/android/server/notification/SnoozeHelper.java @@ -36,6 +36,9 @@ import android.util.Slog; import java.io.IOException; import java.io.PrintWriter; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; import java.util.Date; import java.util.Map; import java.util.Objects; @@ -84,6 +87,14 @@ public class SnoozeHelper { && mSnoozedNotifications.get(userId).get(pkg).containsKey(key); } + protected Collection<NotificationRecord> getSnoozed(int userId, String pkg) { + if (mSnoozedNotifications.containsKey(userId) + && mSnoozedNotifications.get(userId).containsKey(pkg)) { + mSnoozedNotifications.get(userId).get(pkg).values(); + } + return Collections.EMPTY_LIST; + } + /** * Snoozes a notification and schedules an alarm to repost at that time. */ diff --git a/services/core/java/com/android/server/pm/Installer.java b/services/core/java/com/android/server/pm/Installer.java index 1f83d9e9230d..605fa5d8d0c3 100644 --- a/services/core/java/com/android/server/pm/Installer.java +++ b/services/core/java/com/android/server/pm/Installer.java @@ -54,6 +54,7 @@ public class Installer extends SystemService { // NOTE: keep in sync with installd public static final int FLAG_CLEAR_CACHE_ONLY = 1 << 8; public static final int FLAG_CLEAR_CODE_CACHE_ONLY = 1 << 9; + public static final int FLAG_USE_QUOTA = 1 << 12; private final boolean mIsolated; @@ -198,12 +199,13 @@ public class Installer extends SystemService { } } - public void getAppSize(String uuid, String packageName, int userId, int flags, long ceDataInode, - String codePath, PackageStats stats) throws InstallerException { + public void getAppSize(String uuid, String packageName, int userId, int flags, int appId, + long ceDataInode, String codePath, String externalUuid, PackageStats stats) + throws InstallerException { if (!checkBeforeRemote()) return; try { - final long[] res = mInstalld.getAppSize(uuid, packageName, userId, flags, ceDataInode, - codePath); + final long[] res = mInstalld.getAppSize(uuid, packageName, userId, flags, appId, + ceDataInode, codePath, externalUuid); stats.codeSize += res[0]; stats.dataSize += res[1]; stats.cacheSize += res[2]; diff --git a/services/core/java/com/android/server/pm/PackageInstallerSession.java b/services/core/java/com/android/server/pm/PackageInstallerSession.java index c85e1d8a074f..d1aed3e3018a 100644 --- a/services/core/java/com/android/server/pm/PackageInstallerSession.java +++ b/services/core/java/com/android/server/pm/PackageInstallerSession.java @@ -703,8 +703,11 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { for (File addedFile : addedFiles) { final ApkLite apk; try { - apk = PackageParser.parseApkLite( - addedFile, PackageParser.PARSE_COLLECT_CERTIFICATES); + int flags = PackageParser.PARSE_COLLECT_CERTIFICATES; + if ((params.installFlags & PackageManager.INSTALL_EPHEMERAL) != 0) { + flags |= PackageParser.PARSE_IS_EPHEMERAL; + } + apk = PackageParser.parseApkLite(addedFile, flags); } catch (PackageParserException e) { throw PackageManagerException.from(e); } diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index ec4b7ebf8a9b..2dd95038e458 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -381,6 +381,9 @@ public class PackageManagerService extends IPackageManager.Stub { private static final boolean DISABLE_EPHEMERAL_APPS = false; private static final boolean HIDE_EPHEMERAL_APIS = true; + private static final boolean ENABLE_QUOTA = + SystemProperties.getBoolean("persist.fw.quota", false); + private static final int RADIO_UID = Process.PHONE_UID; private static final int LOG_UID = Process.LOG_UID; private static final int NFC_UID = Process.NFC_UID; @@ -15689,6 +15692,20 @@ public class PackageManagerService extends IPackageManager.Stub { + perm.info.name + "; ignoring new declaration"); pkg.permissions.remove(i); } + } else if (!PLATFORM_PACKAGE_NAME.equals(pkg.packageName)) { + // Prevent apps to change protection level to dangerous from any other + // type as this would allow a privilege escalation where an app adds a + // normal/signature permission in other app's group and later redefines + // it as dangerous leading to the group auto-grant. + if ((perm.info.protectionLevel & PermissionInfo.PROTECTION_MASK_BASE) + == PermissionInfo.PROTECTION_DANGEROUS) { + if (bp != null && !bp.isRuntime()) { + Slog.w(TAG, "Package " + pkg.packageName + " trying to change a " + + "non-runtime permission " + perm.info.name + + " to runtime; keeping old protection level"); + perm.info.protectionLevel = bp.protectionLevel; + } + } } } } @@ -17378,6 +17395,11 @@ public class PackageManagerService extends IPackageManager.Stub { mHandler.sendMessage(msg); } + private boolean equals(PackageStats a, PackageStats b) { + return (a.codeSize == b.codeSize) && (a.dataSize == b.dataSize) + && (a.cacheSize == b.cacheSize); + } + private boolean getPackageSizeInfoLI(String packageName, int userId, PackageStats stats) { final PackageSetting ps; synchronized (mPackages) { @@ -17387,20 +17409,51 @@ public class PackageManagerService extends IPackageManager.Stub { return false; } } + + final long ceDataInode = ps.getCeDataInode(userId); + final PackageStats quotaStats = new PackageStats(stats.packageName, stats.userHandle); + + final StorageManager storage = mContext.getSystemService(StorageManager.class); + final String externalUuid = storage.getPrimaryStorageUuid(); try { - mInstaller.getAppSize(ps.volumeUuid, packageName, userId, - StorageManager.FLAG_STORAGE_DE | StorageManager.FLAG_STORAGE_CE, - ps.getCeDataInode(userId), ps.codePathString, stats); + final long start = SystemClock.elapsedRealtimeNanos(); + mInstaller.getAppSize(ps.volumeUuid, packageName, userId, 0, + ps.appId, ceDataInode, ps.codePathString, externalUuid, stats); + final long stopManual = SystemClock.elapsedRealtimeNanos(); + if (ENABLE_QUOTA) { + mInstaller.getAppSize(ps.volumeUuid, packageName, userId, Installer.FLAG_USE_QUOTA, + ps.appId, ceDataInode, ps.codePathString, externalUuid, quotaStats); + } + final long stopQuota = SystemClock.elapsedRealtimeNanos(); + + // For now, ignore code size of packages on system partition + if (isSystemApp(ps) && !isUpdatedSystemApp(ps)) { + stats.codeSize = 0; + quotaStats.codeSize = 0; + } + + if (ENABLE_QUOTA && Build.IS_ENG && !ps.isSharedUser()) { + if (!equals(stats, quotaStats)) { + Log.w(TAG, "Found discrepancy between statistics:"); + Log.w(TAG, "Manual: " + stats); + Log.w(TAG, "Quota: " + quotaStats); + } + final long manualTime = stopManual - start; + final long quotaTime = stopQuota - stopManual; + EventLogTags.writePmPackageStats(manualTime, quotaTime, + stats.dataSize, quotaStats.dataSize, + stats.cacheSize, quotaStats.cacheSize); + } + + // External clients expect these to be tracked separately + stats.dataSize -= stats.cacheSize; + quotaStats.dataSize -= quotaStats.cacheSize; + } catch (InstallerException e) { Slog.w(TAG, String.valueOf(e)); return false; } - // For now, ignore code size of packages on system partition - if (isSystemApp(ps) && !isUpdatedSystemApp(ps)) { - stats.codeSize = 0; - } - return true; } diff --git a/services/core/java/com/android/server/pm/ShortcutRequestPinProcessor.java b/services/core/java/com/android/server/pm/ShortcutRequestPinProcessor.java index cdb69ce813a7..e815f0ae18fd 100644 --- a/services/core/java/com/android/server/pm/ShortcutRequestPinProcessor.java +++ b/services/core/java/com/android/server/pm/ShortcutRequestPinProcessor.java @@ -16,6 +16,8 @@ package com.android.server.pm; import android.annotation.Nullable; +import android.app.PendingIntent; +import android.appwidget.AppWidgetProviderInfo; import android.content.ComponentName; import android.content.Intent; import android.content.IntentSender; @@ -46,37 +48,17 @@ class ShortcutRequestPinProcessor { /** * Internal for {@link android.content.pm.LauncherApps.PinItemRequest} which receives callbacks. */ - private static class PinShortcutRequestInner extends IPinItemRequest.Stub { - private final ShortcutRequestPinProcessor mProcessor; - /** Original shortcut passed by the app. */ - public final ShortcutInfo shortcutOriginal; - - /** - * Cloned shortcut that's passed to the launcher. The notable difference from - * {@link #shortcutOriginal} is it must not have the intent. - */ - public final ShortcutInfo shortcutForLauncher; - + private static class PinItemRequestInner extends IPinItemRequest.Stub { + protected final ShortcutRequestPinProcessor mProcessor; private final IntentSender mResultIntent; - public final String launcherPackage; - public final int launcherUserId; - public final boolean preExisting; - @GuardedBy("this") private boolean mAccepted; - private PinShortcutRequestInner(ShortcutRequestPinProcessor processor, - ShortcutInfo shortcutOriginal, ShortcutInfo shortcutForLauncher, - IntentSender resultIntent, - String launcherPackage, int launcherUserId, boolean preExisting) { + private PinItemRequestInner(ShortcutRequestPinProcessor processor, + IntentSender resultIntent) { mProcessor = processor; - this.shortcutOriginal = shortcutOriginal; - this.shortcutForLauncher = shortcutForLauncher; mResultIntent = resultIntent; - this.launcherPackage = launcherPackage; - this.launcherUserId = launcherUserId; - this.preExisting = preExisting; } @Override @@ -95,9 +77,11 @@ class ShortcutRequestPinProcessor { public boolean accept(Bundle options) { // Make sure the options are unparcellable by the FW. (e.g. not containing unknown // classes.) + Intent extras = null; if (options != null) { try { options.size(); + extras = new Intent().putExtras(options); } catch (RuntimeException e) { throw new IllegalArgumentException("options cannot be unparceled", e); } @@ -108,20 +92,58 @@ class ShortcutRequestPinProcessor { } mAccepted = true; } - if (DEBUG) { - Slog.d(TAG, "Launcher accepted shortcut. ID=" + shortcutOriginal.getId() - + " package=" + shortcutOriginal.getPackage() - + " options=" + options); - } // Pin it and send the result intent. - if (mProcessor.directPinShortcut(this)) { - mProcessor.sendResultIntent(mResultIntent); + if (tryAccept()) { + mProcessor.sendResultIntent(mResultIntent, extras); return true; } else { return false; } } + + protected boolean tryAccept() { + return true; + } + } + + /** + * Internal for {@link android.content.pm.LauncherApps.PinItemRequest} which receives callbacks. + */ + private static class PinShortcutRequestInner extends PinItemRequestInner { + /** Original shortcut passed by the app. */ + public final ShortcutInfo shortcutOriginal; + + /** + * Cloned shortcut that's passed to the launcher. The notable difference from + * {@link #shortcutOriginal} is it must not have the intent. + */ + public final ShortcutInfo shortcutForLauncher; + + public final String launcherPackage; + public final int launcherUserId; + public final boolean preExisting; + + private PinShortcutRequestInner(ShortcutRequestPinProcessor processor, + ShortcutInfo shortcutOriginal, ShortcutInfo shortcutForLauncher, + IntentSender resultIntent, + String launcherPackage, int launcherUserId, boolean preExisting) { + super(processor, resultIntent); + this.shortcutOriginal = shortcutOriginal; + this.shortcutForLauncher = shortcutForLauncher; + this.launcherPackage = launcherPackage; + this.launcherUserId = launcherUserId; + this.preExisting = preExisting; + } + + @Override + protected boolean tryAccept() { + if (DEBUG) { + Slog.d(TAG, "Launcher accepted shortcut. ID=" + shortcutOriginal.getId() + + " package=" + shortcutOriginal.getPackage()); + } + return mProcessor.directPinShortcut(this); + } } public ShortcutRequestPinProcessor(ShortcutService service, Object lock) { @@ -134,15 +156,19 @@ class ShortcutRequestPinProcessor { } /** - * Handle {@link android.content.pm.ShortcutManager#requestPinShortcut)}. + * Handle {@link android.content.pm.ShortcutManager#requestPinShortcut)} and + * {@link android.appwidget.AppWidgetManager#requestPinAppWidget}. + * One of {@param inShortcut} and {@param inAppWidget} is always non-null and the other is + * always null. */ - public boolean requestPinShortcutLocked(ShortcutInfo inShortcut, IntentSender resultIntent) { + public boolean requestPinItemLocked(ShortcutInfo inShortcut, AppWidgetProviderInfo inAppWidget, + int userId, IntentSender resultIntent) { // First, make sure the launcher supports it. // Find the confirmation activity in the default launcher. final Pair<ComponentName, Integer> confirmActivity = - getRequestPinShortcutConfirmationActivity(inShortcut.getUserId()); + getRequestPinShortcutConfirmationActivity(userId); // If the launcher doesn't support it, just return a rejected result and finish. if (confirmActivity == null) { @@ -150,8 +176,6 @@ class ShortcutRequestPinProcessor { return false; } - final ComponentName launcherComponent = confirmActivity.first; - final String launcherPackage = confirmActivity.first.getPackageName(); final int launcherUserId = confirmActivity.second; // Make sure the launcher user is unlocked. (it's always the parent profile, so should @@ -159,7 +183,25 @@ class ShortcutRequestPinProcessor { mService.throwIfUserLockedL(launcherUserId); // Next, validate the incoming shortcut, etc. + final PinItemRequest request; + if (inShortcut != null) { + request = requestPinShortcutLocked(inShortcut, resultIntent, confirmActivity); + } else { + request = new PinItemRequest(inAppWidget, new PinItemRequestInner(this, resultIntent)); + } + + if (request == null) { + sendResultIntent(resultIntent, null); + return true; + } + return startRequestConfirmActivity(confirmActivity.first, launcherUserId, request); + } + /** + * Handle {@link android.content.pm.ShortcutManager#requestPinShortcut)}. + */ + private PinItemRequest requestPinShortcutLocked(ShortcutInfo inShortcut, + IntentSender resultIntent, Pair<ComponentName, Integer> confirmActivity) { final ShortcutPackage ps = mService.getPackageShortcutsForPublisherLocked( inShortcut.getPackage(), inShortcut.getUserId()); @@ -174,6 +216,8 @@ class ShortcutRequestPinProcessor { // This is the shortcut that'll be sent to the launcher. final ShortcutInfo shortcutForLauncher; + final String launcherPackage = confirmActivity.first.getPackageName(); + final int launcherUserId = confirmActivity.second; if (existsAlready) { validateExistingShortcut(existing); @@ -183,8 +227,7 @@ class ShortcutRequestPinProcessor { launcherPackage, existing.getUserId(), launcherUserId).hasPinned(existing)) { Log.i(TAG, "Launcher's already pinning shortcut " + existing.getId() + " for package " + existing.getPackage()); - sendResultIntent(resultIntent); - return true; + return null; } // Pass a clone, not the original. @@ -213,10 +256,7 @@ class ShortcutRequestPinProcessor { new PinShortcutRequestInner(this, inShortcut, shortcutForLauncher, resultIntent, launcherPackage, launcherUserId, existsAlready); - final PinItemRequest outer = new PinItemRequest(PinItemRequest.REQUEST_TYPE_SHORTCUT, - shortcutForLauncher, inner); - - return startRequestConfirmActivity(launcherComponent, launcherUserId, outer); + return new PinItemRequest(shortcutForLauncher, inner); } private void validateExistingShortcut(ShortcutInfo shortcutInfo) { @@ -270,11 +310,11 @@ class ShortcutRequestPinProcessor { return (activity == null) ? null : Pair.create(activity, launcherUserId); } - public void sendResultIntent(@Nullable IntentSender intent) { + public void sendResultIntent(@Nullable IntentSender intent, @Nullable Intent extras) { if (DEBUG) { Slog.d(TAG, "Sending result intent."); } - mService.injectSendIntentSender(intent); + mService.injectSendIntentSender(intent, extras); } /** diff --git a/services/core/java/com/android/server/pm/ShortcutService.java b/services/core/java/com/android/server/pm/ShortcutService.java index 436a53c77580..86f755694f43 100644 --- a/services/core/java/com/android/server/pm/ShortcutService.java +++ b/services/core/java/com/android/server/pm/ShortcutService.java @@ -24,6 +24,7 @@ import android.app.ActivityManagerInternal; import android.app.AppGlobals; import android.app.IUidObserver; import android.app.usage.UsageStatsManagerInternal; +import android.appwidget.AppWidgetProviderInfo; import android.content.BroadcastReceiver; import android.content.ComponentName; import android.content.Context; @@ -1857,21 +1858,32 @@ public class ShortcutService extends IShortcutService.Stub { @Override public boolean requestPinShortcut(String packageName, ShortcutInfo shortcut, IntentSender resultIntent, int userId) { - verifyCaller(packageName, userId); Preconditions.checkNotNull(shortcut); Preconditions.checkArgument(shortcut.isEnabled(), "Shortcut must be enabled"); + return requestPinItem(packageName, userId, shortcut, null, resultIntent); + } + + /** + * Handles {@link #requestPinShortcut} and {@link ShortcutServiceInternal#requestPinAppWidget}. + * After validating the caller, it passes the request to {@link #mShortcutRequestPinProcessor}. + * Either {@param shortcut} or {@param appWidget} should be non-null. + */ + private boolean requestPinItem(String packageName, int userId, + ShortcutInfo shortcut, AppWidgetProviderInfo appWidget, IntentSender resultIntent) { + verifyCaller(packageName, userId); final boolean ret; synchronized (mLock) { throwIfUserLockedL(userId); Preconditions.checkState(isUidForegroundLocked(injectBinderCallingUid()), - "Calling application must have a foreground activity or a foreground service"); + "Calling application must have a foreground activity or a foreground service"); // TODO Cancel all pending requests from the caller. // Send request to the launcher, if supported. - ret = mShortcutRequestPinProcessor.requestPinShortcutLocked(shortcut, resultIntent); + ret = mShortcutRequestPinProcessor.requestPinItemLocked(shortcut, appWidget, userId, + resultIntent); } verifyStates(); @@ -2591,6 +2603,14 @@ public class ShortcutService extends IShortcutService.Stub { @NonNull String callingPackage) { return ShortcutService.this.hasShortcutHostPermission(callingPackage, launcherUserId); } + + @Override + public boolean requestPinAppWidget(@NonNull String callingPackage, + @NonNull AppWidgetProviderInfo appWidget, @Nullable IntentSender resultIntent, + int userId) { + Preconditions.checkNotNull(appWidget); + return requestPinItem(callingPackage, userId, null, appWidget, resultIntent); + } } final BroadcastReceiver mReceiver = new BroadcastReceiver() { @@ -3253,12 +3273,12 @@ public class ShortcutService extends IShortcutService.Stub { } } - void injectSendIntentSender(IntentSender intentSender) { + void injectSendIntentSender(IntentSender intentSender, Intent extras) { if (intentSender == null) { return; } try { - intentSender.sendIntent(mContext, /* code= */ 0, /* intent= */ null, + intentSender.sendIntent(mContext, /* code= */ 0, extras, /* onFinished=*/ null, /* handler= */ null); } catch (SendIntentException e) { Slog.w(TAG, "sendIntent failed().", e); diff --git a/services/core/java/com/android/server/wm/DisplayContent.java b/services/core/java/com/android/server/wm/DisplayContent.java index 203137d4d481..ff841b147d9c 100644 --- a/services/core/java/com/android/server/wm/DisplayContent.java +++ b/services/core/java/com/android/server/wm/DisplayContent.java @@ -712,19 +712,11 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo if (prevDc == this) { return; } - if (prevDc != null && prevDc.mTokenMap.remove(token.token) != null) { - switch (token.windowType) { - case TYPE_WALLPAPER: - prevDc.mBelowAppWindowsContainers.removeChild(token); - break; - case TYPE_INPUT_METHOD: - case TYPE_INPUT_METHOD_DIALOG: - prevDc.mImeWindowsContainers.removeChild(token); - break; - default: - prevDc.mAboveAppWindowsContainers.removeChild(token); - break; - } + if (prevDc != null && prevDc.mTokenMap.remove(token.token) != null + && token.asAppWindowToken() == null) { + // Removed the token from the map, but made sure it's not an app token before removing + // from parent. + token.getParent().removeChild(token); } addWindowToken(token.token, token); @@ -979,7 +971,10 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo // It's already attached to the display...clear mDeferRemoval and move stack to // appropriate z-order on display as needed. stack.mDeferRemoval = false; - moveStack(stack, onTop); + // We're not moving the display to front when we're adding stacks, only when + // requested to change the position of stack explicitly. + mTaskStackContainers.positionChildAt(onTop ? POSITION_TOP : POSITION_BOTTOM, stack, + false /* includingParents */); attachedToDisplay = true; } else { stack = new TaskStack(mService, stackId); @@ -1031,10 +1026,6 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo return addStackToDisplay(stack.mStackId, true /* onTop */); } - void moveStack(TaskStack stack, boolean toTop) { - mTaskStackContainers.moveStack(stack, toTop); - } - @Override protected void addChild(DisplayChildWindowContainer child, Comparator<DisplayChildWindowContainer> comparator) { @@ -1057,6 +1048,13 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo throw new UnsupportedOperationException("See DisplayChildWindowContainer"); } + @Override + void positionChildAt(int position, DisplayChildWindowContainer child, boolean includingParents) { + // Children of the display are statically ordered, so the real intention here is to perform + // the operation on the display and not the static direct children. + getParent().positionChildAt(position, this, includingParents); + } + int taskIdFromPoint(int x, int y) { for (int stackNdx = mTaskStackContainers.size() - 1; stackNdx >= 0; --stackNdx) { final TaskStack stack = mTaskStackContainers.get(stackNdx); @@ -2499,20 +2497,6 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo stack.onRemovedFromDisplay(); } - void moveStack(TaskStack stack, boolean toTop) { - if (StackId.isAlwaysOnTop(stack.mStackId) && !toTop) { - // This stack is always-on-top silly... - Slog.w(TAG_WM, "Ignoring move of always-on-top stack=" + stack + " to bottom"); - return; - } - - if (!mChildren.contains(stack)) { - Slog.wtf(TAG_WM, "moving stack that was not added: " + stack, new Throwable()); - } - removeChild(stack); - addChild(stack, toTop); - } - private void addChild(TaskStack stack, boolean toTop) { int addIndex = toTop ? mChildren.size() : 0; @@ -2532,6 +2516,22 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo } @Override + void positionChildAt(int position, TaskStack child, boolean includingParents) { + if (StackId.isAlwaysOnTop(child.mStackId) && position != POSITION_TOP) { + // This stack is always-on-top, override the default behavior. + Slog.w(TAG_WM, "Ignoring move of always-on-top stack=" + this + " to bottom"); + + // Moving to its current position, as we must call super but we don't want to + // perform any meaningful action. + final int currentPosition = mChildren.indexOf(child); + super.positionChildAt(currentPosition, child, false /* includingParents */); + return; + } + + super.positionChildAt(position, child, includingParents); + } + + @Override boolean forAllWindows(ToBooleanFunction<WindowState> callback, boolean traverseTopToBottom) { if (traverseTopToBottom) { diff --git a/services/core/java/com/android/server/wm/Task.java b/services/core/java/com/android/server/wm/Task.java index aa6e3c7c3e45..6005a991e474 100644 --- a/services/core/java/com/android/server/wm/Task.java +++ b/services/core/java/com/android/server/wm/Task.java @@ -23,6 +23,7 @@ import static android.content.pm.ActivityInfo.RESIZE_MODE_FORCE_RESIZABLE_LANDSC 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 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; import static com.android.server.wm.WindowManagerService.H.RESIZE_TASK; @@ -154,7 +155,7 @@ class Task extends WindowContainer<AppWindowToken> implements DimLayer.DimLayerU mService.mTaskIdToTask.delete(mTaskId); } - // Change to use re-parenting in WC when TaskStack is switched to use WC. + // TODO: Change to use re-parenting in WC. void moveTaskToStack(TaskStack stack, boolean toTop) { if (stack == mStack) { return; @@ -166,15 +167,20 @@ class Task extends WindowContainer<AppWindowToken> implements DimLayer.DimLayerU stack.addTask(this, toTop); } + /** @see com.android.server.am.ActivityManagerService#positionTaskInStack(int, int, int). */ void positionTaskInStack(TaskStack stack, int position, Rect bounds, Configuration overrideConfig) { if (mStack != null && stack != mStack) { + // Task is already attached to a different stack. First we need to remove it from there + // and add to top of the target stack. We will move it proper position afterwards. if (DEBUG_STACK) Slog.i(TAG, "positionTaskInStack: removing taskId=" + mTaskId + " from stack=" + mStack); EventLog.writeEvent(EventLogTags.WM_TASK_REMOVED, mTaskId, "moveTask"); mStack.removeChild(this); + stack.addTask(this, true /* toTop */); } - stack.positionTask(this, position, showForAllUsers()); + + stack.positionChildAt(position, this, true /* includingParents */); resizeLocked(bounds, overrideConfig, false /* force */); for (int activityNdx = mChildren.size() - 1; activityNdx >= 0; --activityNdx) { @@ -183,6 +189,20 @@ class Task extends WindowContainer<AppWindowToken> implements DimLayer.DimLayerU } @Override + void onParentSet() { + // Update task bounds if needed. + updateDisplayInfo(getDisplayContent()); + + if (StackId.windowsAreScaleable(mStack.mStackId)) { + // We force windows out of SCALING_MODE_FREEZE so that we can continue to animate them + // while a resize is pending. + forceWindowsScaleable(true /* force */); + } else { + forceWindowsScaleable(false /* force */); + } + } + + @Override void removeChild(AppWindowToken token) { if (!mChildren.contains(token)) { Slog.e(TAG, "removeChild: token=" + this + " not found."); diff --git a/services/core/java/com/android/server/wm/TaskStack.java b/services/core/java/com/android/server/wm/TaskStack.java index 74c0919699fc..d7c7cfa319e1 100644 --- a/services/core/java/com/android/server/wm/TaskStack.java +++ b/services/core/java/com/android/server/wm/TaskStack.java @@ -512,27 +512,67 @@ public class TaskStack extends WindowContainer<Task> implements DimLayer.DimLaye } /** - * Put a Task in this stack. Used for adding and moving. + * Put a Task in this stack. Used for adding only. + * When task is added to top of the stack, the entire branch of the hierarchy (including stack + * and display) will be brought to top. * @param task The task to add. * @param toTop Whether to add it to the top or bottom. * @param showForAllUsers Whether to show the task regardless of the current user. */ void addTask(Task task, boolean toTop, boolean showForAllUsers) { - positionTask(task, toTop ? mChildren.size() : 0, showForAllUsers); + final TaskStack currentStack = task.mStack; + // TODO: We pass stack to task's constructor, but we still need to call this method. + // This doesn't make sense, mStack will already be set equal to "this" at this point. + if (currentStack != null && currentStack.mStackId != mStackId) { + throw new IllegalStateException("Trying to add taskId=" + task.mTaskId + + " to stackId=" + mStackId + + ", but it is already attached to stackId=" + task.mStack.mStackId); + } + + final int targetPosition = toTop ? mChildren.size() : 0; + + // Add child task. + task.mStack = this; + addChild(task, targetPosition); + + // Move child to a proper position, as some restriction for position might apply. + positionChildAt(targetPosition, task, true /* includingParents */, showForAllUsers); + } + + @Override + void positionChildAt(int position, Task child, boolean includingParents) { + positionChildAt(position, child, includingParents, child.showForAllUsers()); + } + + /** + * Overridden version of {@link TaskStack#positionChildAt(int, Task, boolean)}. Used in + * {@link TaskStack#addTask(Task, boolean, boolean showForAllUsers)}, as it can receive + * showForAllUsers param from {@link AppWindowToken} instead of {@link Task#showForAllUsers()}. + */ + private void positionChildAt(int position, Task child, boolean includingParents, + boolean showForAllUsers) { + final int targetPosition = findPositionForTask(child, position, showForAllUsers, + false /* addingNew */); + super.positionChildAt(targetPosition, child, includingParents); + + // Log positioning. + if (DEBUG_TASK_MOVEMENT) + Slog.d(TAG_WM, "positionTask: task=" + this + " position=" + position); + + final int toTop = targetPosition == mChildren.size() - 1 ? 1 : 0; + EventLog.writeEvent(EventLogTags.WM_TASK_MOVED, child.mTaskId, toTop, targetPosition); } // TODO: We should really have users as a window container in the hierarchy so that we don't - // have to do complicated things like we are doing in this method and also also the method to - // just be WindowContainer#addChild - void positionTask(Task task, int position, boolean showForAllUsers) { + // have to do complicated things like we are doing in this method. + private int findPositionForTask(Task task, int targetPosition, boolean showForAllUsers, + boolean addingNew) { final boolean canShowTask = showForAllUsers || mService.isCurrentProfileLocked(task.mUserId); - if (mChildren.contains(task)) { - super.removeChild(task); - } - int stackSize = mChildren.size(); + + final int stackSize = mChildren.size(); int minPosition = 0; - int maxPosition = stackSize; + int maxPosition = addingNew ? stackSize : stackSize - 1; if (canShowTask) { minPosition = computeMinPosition(minPosition, stackSize); @@ -540,28 +580,7 @@ public class TaskStack extends WindowContainer<Task> implements DimLayer.DimLaye maxPosition = computeMaxPosition(maxPosition); } // Reset position based on minimum/maximum possible positions. - position = Math.min(Math.max(position, minPosition), maxPosition); - - if (DEBUG_TASK_MOVEMENT) Slog.d(TAG_WM, - "positionTask: task=" + task + " position=" + position); - addChild(task, position); - task.mStack = this; - task.updateDisplayInfo(mDisplayContent); - boolean toTop = position == mChildren.size() - 1; - if (toTop) { - // TODO: Have a WidnowContainer method that moves all parents of a container to the - // front for cases like this. - mDisplayContent.moveStack(this, true); - } - - if (StackId.windowsAreScaleable(mStackId)) { - // We force windows out of SCALING_MODE_FREEZE so that we can continue to animate them - // while a resize is pending. - task.forceWindowsScaleable(true); - } else { - task.forceWindowsScaleable(false); - } - EventLog.writeEvent(EventLogTags.WM_TASK_MOVED, task.mTaskId, toTop ? 1 : 0, position); + return Math.min(Math.max(targetPosition, minPosition), maxPosition); } /** Calculate the minimum possible position for a task that can be shown to the user. @@ -591,7 +610,7 @@ public class TaskStack extends WindowContainer<Task> implements DimLayer.DimLaye */ private int computeMaxPosition(int maxPosition) { while (maxPosition > 0) { - final Task tmpTask = mChildren.get(maxPosition - 1); + final Task tmpTask = mChildren.get(maxPosition); final boolean canShowTmpTask = tmpTask.showForAllUsers() || mService.isCurrentProfileLocked(tmpTask.mUserId); @@ -603,20 +622,6 @@ public class TaskStack extends WindowContainer<Task> implements DimLayer.DimLaye return maxPosition; } - // TODO: Have functionality in WC to move things to the bottom or top. Also, look at the call - // points for this methods to see if we need functionality to move something to the front/bottom - // with its parents. - void moveTaskToTop(Task task) { - if (DEBUG_TASK_MOVEMENT) Slog.d(TAG_WM, "moveTaskToTop: task=" + task + " Callers=" - + Debug.getCallers(6)); - addTask(task, true); - } - - void moveTaskToBottom(Task task) { - if (DEBUG_TASK_MOVEMENT) Slog.d(TAG_WM, "moveTaskToBottom: task=" + task); - addTask(task, false); - } - /** * Delete a Task from this stack. If it is the last Task in the stack, move this stack to the * back. @@ -627,10 +632,11 @@ public class TaskStack extends WindowContainer<Task> implements DimLayer.DimLaye if (DEBUG_TASK_MOVEMENT) Slog.d(TAG_WM, "removeChild: task=" + task); super.removeChild(task); + task.mStack = null; if (mDisplayContent != null) { if (mChildren.isEmpty()) { - mDisplayContent.moveStack(this, false); + getParent().positionChildAt(POSITION_BOTTOM, this, false /* includingParents */); } mDisplayContent.setLayoutNeeded(); } diff --git a/services/core/java/com/android/server/wm/WindowContainer.java b/services/core/java/com/android/server/wm/WindowContainer.java index 4a1c0678a661..984cf55de0e7 100644 --- a/services/core/java/com/android/server/wm/WindowContainer.java +++ b/services/core/java/com/android/server/wm/WindowContainer.java @@ -39,6 +39,9 @@ import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED; */ class WindowContainer<E extends WindowContainer> implements Comparable<WindowContainer> { + static final int POSITION_TOP = Integer.MAX_VALUE; + static final int POSITION_BOTTOM = Integer.MIN_VALUE; + /** * The parent of this window container. * For removing or setting new parent {@link #setParent} should be used, because it also @@ -86,6 +89,16 @@ class WindowContainer<E extends WindowContainer> implements Comparable<WindowCon // Update merged override configuration of this container and all its children. onMergedOverrideConfigurationChanged(); } + + onParentSet(); + } + + /** + * Callback that is triggered when @link WindowContainer#setParent(WindowContainer)} was called. + * Supposed to be overridden and contain actions that should be executed after parent was set. + */ + void onParentSet() { + // Do nothing by default. } // Temp. holders for a chain of containers we are currently processing. @@ -203,6 +216,57 @@ class WindowContainer<E extends WindowContainer> implements Comparable<WindowCon } /** + * Move a child from it's current place in siblings list to the specified position, + * with an option to move all its parents to top. + * @param position Target position to move the child to. + * @param child Child to move to selected position. + * @param includingParents Flag indicating whether we need to move the entire branch of the + * hierarchy when we're moving a child to {@link #POSITION_TOP} or + * {@link #POSITION_BOTTOM}. When moving to other intermediate positions + * this flag will do nothing. + */ + @CallSuper + void positionChildAt(int position, E child, boolean includingParents) { + if ((position < 0 && position != POSITION_BOTTOM) + || (position >= mChildren.size() && position != POSITION_TOP)) { + throw new IllegalArgumentException("positionAt: invalid position=" + position + + ", children number=" + mChildren.size()); + } + + if (position == mChildren.size() - 1) { + position = POSITION_TOP; + } else if (position == 0) { + position = POSITION_BOTTOM; + } + + switch (position) { + case POSITION_TOP: + if (mChildren.getLast() != child) { + mChildren.remove(child); + mChildren.addLast(child); + } + if (includingParents && getParent() != null) { + getParent().positionChildAt(POSITION_TOP, this /* child */, + true /* includingParents */); + } + break; + case POSITION_BOTTOM: + if (mChildren.getFirst() != child) { + mChildren.remove(child); + mChildren.addFirst(child); + } + if (includingParents && getParent() != null) { + getParent().positionChildAt(POSITION_BOTTOM, this /* child */, + true /* includingParents */); + } + break; + default: + mChildren.remove(child); + mChildren.add(position, child); + } + } + + /** * Returns full configuration applied to this window container. * This method should be used for getting settings applied in each particular level of the * hierarchy. diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java index 577e5a0c2e20..2ade924bf77d 100644 --- a/services/core/java/com/android/server/wm/WindowManagerService.java +++ b/services/core/java/com/android/server/wm/WindowManagerService.java @@ -209,6 +209,8 @@ import static com.android.server.wm.AppWindowAnimator.PROLONG_ANIMATION_AT_END; import static com.android.server.wm.AppWindowAnimator.PROLONG_ANIMATION_AT_START; import static com.android.server.wm.DragResizeMode.DRAG_RESIZE_MODE_DOCKED_DIVIDER; import static com.android.server.wm.DragResizeMode.DRAG_RESIZE_MODE_FREEFORM; +import static com.android.server.wm.WindowContainer.POSITION_BOTTOM; +import static com.android.server.wm.WindowContainer.POSITION_TOP; import static com.android.server.wm.WindowManagerDebugConfig.DEBUG; import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_ADD_REMOVE; import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_ANIM; @@ -3311,26 +3313,17 @@ public class WindowManagerService extends IWindowManager.Stub final long origId = Binder.clearCallingIdentity(); try { synchronized(mWindowMap) { - Task task = mTaskIdToTask.get(taskId); + final Task task = mTaskIdToTask.get(taskId); if (task == null) { // Normal behavior, addAppToken will be called next and task will be created. return; } - final TaskStack stack = task.mStack; - final DisplayContent displayContent = task.getDisplayContent(); - displayContent.moveStack(stack, true); - if (displayContent.isDefaultDisplay) { - final TaskStack homeStack = displayContent.getHomeStack(); - if (homeStack != stack) { - // When a non-home stack moves to the top, the home stack moves to the - // bottom. - displayContent.moveStack(homeStack, false); - } - } - stack.moveTaskToTop(task); + task.mStack.positionChildAt(POSITION_TOP, task, true /* includingParents */); + if (mAppTransition.isTransitionSet()) { task.setSendingToBottom(false); } + final DisplayContent displayContent = task.getDisplayContent(); displayContent.layoutAndAssignWindowLayersIfNeeded(); } } finally { @@ -3342,14 +3335,14 @@ public class WindowManagerService extends IWindowManager.Stub final long origId = Binder.clearCallingIdentity(); try { synchronized(mWindowMap) { - Task task = mTaskIdToTask.get(taskId); + final Task task = mTaskIdToTask.get(taskId); if (task == null) { Slog.e(TAG_WM, "moveTaskToBottom: taskId=" + taskId + " not found in mTaskIdToTask"); return; } final TaskStack stack = task.mStack; - stack.moveTaskToBottom(task); + stack.positionChildAt(POSITION_BOTTOM, task, false /* includingParents */); if (mAppTransition.isTransitionSet()) { task.setSendingToBottom(true); } @@ -3656,6 +3649,7 @@ public class WindowManagerService extends IWindowManager.Stub } } + /** @see com.android.server.am.ActivityManagerService#positionTaskInStack(int, int, int). */ public void positionTaskInStack(int taskId, int stackId, int position, Rect bounds, Configuration overrideConfig) { synchronized (mWindowMap) { @@ -4837,6 +4831,10 @@ public class WindowManagerService extends IWindowManager.Stub + (altOrientation ? " (alt)" : "") + " from " + mRotation + (mAltOrientation ? " (alt)" : "") + ", lastOrientation=" + mLastOrientation); + if (DisplayContent.deltaRotation(rotation, mRotation) != 2) { + mWaitingForConfig = true; + } + mRotation = rotation; mAltOrientation = altOrientation; mPolicy.setRotationLw(mRotation); @@ -4844,7 +4842,7 @@ public class WindowManagerService extends IWindowManager.Stub mWindowsFreezingScreen = WINDOWS_FREEZING_SCREENS_ACTIVE; mH.removeMessages(H.WINDOW_FREEZE_TIMEOUT); mH.sendEmptyMessageDelayed(H.WINDOW_FREEZE_TIMEOUT, WINDOW_FREEZE_TIMEOUT_DURATION); - mWaitingForConfig = true; + dc.setLayoutNeeded(); final int[] anim = new int[2]; if (dc.isDimming()) { diff --git a/services/core/java/com/android/server/wm/WindowStateAnimator.java b/services/core/java/com/android/server/wm/WindowStateAnimator.java index 37bd402902b6..e5ed18d118ad 100644 --- a/services/core/java/com/android/server/wm/WindowStateAnimator.java +++ b/services/core/java/com/android/server/wm/WindowStateAnimator.java @@ -924,15 +924,10 @@ class WindowStateAnimator { if (attachedTransformation != null) { tmpMatrix.postConcat(attachedTransformation.getMatrix()); } + tmpMatrix.postTranslate(frame.left + mWin.mXOffset, frame.top + mWin.mYOffset); if (appTransformation != null) { tmpMatrix.postConcat(appTransformation.getMatrix()); } - - // The translation that applies the position of the window needs to be applied at the - // end in case that other translations include scaling. Otherwise the scaling will - // affect this translation. But it needs to be set before the screen rotation animation - // so the pivot point is at the center of the screen for all windows. - tmpMatrix.postTranslate(frame.left + mWin.mXOffset, frame.top + mWin.mYOffset); if (screenAnimation) { tmpMatrix.postConcat(screenRotationAnimation.getEnterTransformation().getMatrix()); } diff --git a/services/core/jni/com_android_server_location_GnssLocationProvider.cpp b/services/core/jni/com_android_server_location_GnssLocationProvider.cpp index 7db6d42132af..b7032dbb0ab0 100644 --- a/services/core/jni/com_android_server_location_GnssLocationProvider.cpp +++ b/services/core/jni/com_android_server_location_GnssLocationProvider.cpp @@ -20,9 +20,6 @@ #include <android/hardware/gnss/1.0/IGnss.h> -#include <hwbinder/IPCThreadState.h> -#include <hwbinder/ProcessState.h> - #include "JNIHelp.h" #include "jni.h" #include "hardware_legacy/power.h" @@ -67,8 +64,6 @@ using android::sp; using android::status_t; using android::String16; -using android::hardware::IPCThreadState; -using android::hardware::ProcessState; using android::hardware::Return; using android::hardware::Void; using android::hardware::hidl_vec; @@ -965,8 +960,6 @@ static void android_location_GnssLocationProvider_class_init_native(JNIEnv* env, } else { ALOGE("Unable to get GPS service\n"); } - ProcessState::self()->setThreadPoolMaxThreadCount(0); - ProcessState::self()->startThreadPool(); } static jboolean android_location_GnssLocationProvider_is_supported( diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index 9737b36b168e..22f9f3a05563 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java @@ -544,8 +544,10 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { if (Intent.ACTION_USER_UNLOCKED.equals(action) || Intent.ACTION_USER_STARTED.equals(action) || KeyChain.ACTION_TRUST_STORE_CHANGED.equals(action)) { - int userId = intent.getIntExtra(Intent.EXTRA_USER_HANDLE, UserHandle.USER_ALL); - new MonitoringCertNotificationTask().execute(userId); + if (!StorageManager.inCryptKeeperBounce()) { + new MonitoringCertNotificationTask().execute( + intent.getIntExtra(Intent.EXTRA_USER_HANDLE, UserHandle.USER_ALL)); + } } if (Intent.ACTION_USER_ADDED.equals(action)) { sendUserAddedOrRemovedCommand(DeviceAdminReceiver.ACTION_USER_ADDED, userHandle); @@ -5978,8 +5980,9 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { throw new IllegalArgumentException("Invalid component " + admin + " for device owner"); } + final boolean hasIncompatibleAccounts = hasIncompatibleAccountsNoLock(userId, admin); synchronized (this) { - enforceCanSetDeviceOwnerLocked(admin, userId); + enforceCanSetDeviceOwnerLocked(admin, userId, hasIncompatibleAccounts); final ActiveAdmin activeAdmin = getActiveAdminUncheckedLocked(admin, userId); if (activeAdmin == null || getUserData(userId).mRemovingAdmins.contains(admin)) { @@ -6215,8 +6218,9 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { throw new IllegalArgumentException("Component " + who + " not installed for userId:" + userHandle); } + final boolean hasIncompatibleAccounts = hasIncompatibleAccountsNoLock(userHandle, who); synchronized (this) { - enforceCanSetProfileOwnerLocked(who, userHandle); + enforceCanSetProfileOwnerLocked(who, userHandle, hasIncompatibleAccounts); if (getActiveAdminUncheckedLocked(who, userHandle) == null || getUserData(userHandle).mRemovingAdmins.contains(who)) { @@ -6549,9 +6553,10 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { * The profile owner can only be set before the user setup phase has completed, * except for: * - SYSTEM_UID - * - adb if there are no accounts. (But see {@link #hasIncompatibleAccountsLocked}) + * - adb unless hasIncompatibleAccounts is true. */ - private void enforceCanSetProfileOwnerLocked(@Nullable ComponentName owner, int userHandle) { + private void enforceCanSetProfileOwnerLocked(@Nullable ComponentName owner, int userHandle, + boolean hasIncompatibleAccounts) { UserInfo info = getUserInfo(userHandle); if (info == null) { // User doesn't exist. @@ -6571,7 +6576,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { } if (isAdb()) { if ((mIsWatch || hasUserSetupCompleted(userHandle)) - && hasIncompatibleAccountsLocked(userHandle, owner)) { + && hasIncompatibleAccounts) { throw new IllegalStateException("Not allowed to set the profile owner because " + "there are already some accounts on the profile"); } @@ -6588,12 +6593,14 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { * The Device owner can only be set by adb or an app with the MANAGE_PROFILE_AND_DEVICE_OWNERS * permission. */ - private void enforceCanSetDeviceOwnerLocked(@Nullable ComponentName owner, int userId) { + private void enforceCanSetDeviceOwnerLocked(@Nullable ComponentName owner, int userId, + boolean hasIncompatibleAccounts) { if (!isAdb()) { enforceCanManageProfileAndDeviceOwners(); } - final int code = checkDeviceOwnerProvisioningPreConditionLocked(owner, userId, isAdb()); + final int code = checkDeviceOwnerProvisioningPreConditionLocked( + owner, userId, isAdb(), hasIncompatibleAccounts); switch (code) { case CODE_OK: return; @@ -8902,7 +8909,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { * except for adb command if no accounts or additional users are present on the device. */ private int checkDeviceOwnerProvisioningPreConditionLocked(@Nullable ComponentName owner, - int deviceOwnerUserId, boolean isAdb) { + int deviceOwnerUserId, boolean isAdb, boolean hasIncompatibleAccounts) { if (mOwners.hasDeviceOwner()) { return CODE_HAS_DEVICE_OWNER; } @@ -8922,7 +8929,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { if (mUserManager.getUserCount() > 1) { return CODE_NONSYSTEM_USER_EXISTS; } - if (hasIncompatibleAccountsLocked(UserHandle.USER_SYSTEM, owner)) { + if (hasIncompatibleAccounts) { return CODE_ACCOUNTS_NOT_EMPTY; } } else { @@ -8949,8 +8956,9 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { private int checkDeviceOwnerProvisioningPreCondition(int deviceOwnerUserId) { synchronized (this) { + // hasIncompatibleAccounts doesn't matter since the caller is not adb. return checkDeviceOwnerProvisioningPreConditionLocked(/* owner unknown */ null, - deviceOwnerUserId, /* isAdb= */ false); + deviceOwnerUserId, /* isAdb= */ false, /* hasIncompatibleAccounts=*/ true); } } @@ -9848,8 +9856,15 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { * - Otherwise, if there's any account that does not have ..._ALLOWED, or does have * ..._DISALLOWED, return true. * - Otherwise return false. + * + * DO NOT CALL IT WITH THE DPMS LOCK HELD. */ - private boolean hasIncompatibleAccountsLocked(int userId, @Nullable ComponentName owner) { + private boolean hasIncompatibleAccountsNoLock(int userId, @Nullable ComponentName owner) { + if (Thread.holdsLock(this)) { + Slog.wtf(LOG_TAG, "hasIncompatibleAccountsNoLock() called with the DPMS lock held."); + return true; + } + final long token = mInjector.binderClearCallingIdentity(); try { final AccountManager am = AccountManager.get(mContext); @@ -9857,22 +9872,30 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { if (accounts.length == 0) { return false; } + synchronized (this) { + if (owner == null || !isAdminTestOnlyLocked(owner, userId)) { + Log.w(LOG_TAG, + "Non test-only owner can't be installed with existing accounts."); + return true; + } + } + final String[] feature_allow = { DevicePolicyManager.ACCOUNT_FEATURE_DEVICE_OR_PROFILE_OWNER_ALLOWED }; final String[] feature_disallow = { DevicePolicyManager.ACCOUNT_FEATURE_DEVICE_OR_PROFILE_OWNER_DISALLOWED }; - // Even if we find incompatible accounts along the way, we still check all accounts - // for logging. boolean compatible = true; for (Account account : accounts) { if (hasAccountFeatures(am, account, feature_disallow)) { Log.e(LOG_TAG, account + " has " + feature_disallow[0]); compatible = false; + break; } if (!hasAccountFeatures(am, account, feature_allow)) { Log.e(LOG_TAG, account + " doesn't have " + feature_allow[0]); compatible = false; + break; } } if (compatible) { @@ -9880,28 +9903,6 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { } else { Log.e(LOG_TAG, "Found incompatible accounts"); } - - // Then check if the owner is test-only. - String log; - if (owner == null) { - // Owner is unknown. Suppose it's not test-only - compatible = false; - log = "Only test-only device/profile owner can be installed with accounts"; - } else if (isAdminTestOnlyLocked(owner, userId)) { - if (compatible) { - log = "Installing test-only owner " + owner; - } else { - log = "Can't install test-only owner " + owner + " with incompatible accounts"; - } - } else { - compatible = false; - log = "Can't install non test-only owner " + owner + " with accounts"; - } - if (compatible) { - Log.w(LOG_TAG, log); - } else { - Log.e(LOG_TAG, log); - } return !compatible; } finally { mInjector.binderRestoreCallingIdentity(token); diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index be13499e2c18..7ccae2c323e4 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -710,10 +710,12 @@ public final class SystemServer { traceEnd(); } + traceBeginAndSlog("SetWindowManagerService"); mActivityManagerService.setWindowManager(wm); + traceEnd(); - inputManager.setWindowManagerCallbacks(wm.getInputMonitor()); traceBeginAndSlog("StartInputManager"); + inputManager.setWindowManagerCallbacks(wm.getInputMonitor()); inputManager.start(); traceEnd(); @@ -1238,8 +1240,10 @@ public final class SystemServer { } if (!disableNetwork && !disableNonCoreServices && EmergencyAffordanceManager.ENABLED) { - // EmergencyMode sevice + // EmergencyMode service + traceBeginAndSlog("StartEmergencyAffordanceService"); mSystemServiceManager.startService(EmergencyAffordanceService.class); + traceEnd(); } if (!disableNonCoreServices) { @@ -1482,176 +1486,167 @@ public final class SystemServer { // where third party code can really run (but before it has actually // started launching the initial applications), for us to complete our // initialization. - mActivityManagerService.systemReady(new Runnable() { - @Override - public void run() { - Slog.i(TAG, "Making services ready"); - traceBeginAndSlog("StartActivityManagerReadyPhase"); - mSystemServiceManager.startBootPhase( - SystemService.PHASE_ACTIVITY_MANAGER_READY); - traceEnd(); - traceBeginAndSlog("PhaseActivityManagerReady"); + mActivityManagerService.systemReady(() -> { + Slog.i(TAG, "Making services ready"); + traceBeginAndSlog("StartActivityManagerReadyPhase"); + mSystemServiceManager.startBootPhase( + SystemService.PHASE_ACTIVITY_MANAGER_READY); + traceEnd(); + traceBeginAndSlog("StartObservingNativeCrashes"); + try { + mActivityManagerService.startObservingNativeCrashes(); + } catch (Throwable e) { + reportWtf("observing native crashes", e); + } + traceEnd(); - traceBeginAndSlog("StartObservingNativeCrashes"); - try { - mActivityManagerService.startObservingNativeCrashes(); - } catch (Throwable e) { - reportWtf("observing native crashes", e); - } + if (!mOnlyCore) { + Slog.i(TAG, "WebViewFactory preparation"); + traceBeginAndSlog("WebViewFactoryPreparation"); + mWebViewUpdateService.prepareWebViewInSystemServer(); traceEnd(); + } - if (!mOnlyCore) { - Slog.i(TAG, "WebViewFactory preparation"); - traceBeginAndSlog("WebViewFactoryPreparation"); - mWebViewUpdateService.prepareWebViewInSystemServer(); - traceEnd(); - } - - traceBeginAndSlog("StartSystemUI"); - try { - startSystemUi(context); - } catch (Throwable e) { - reportWtf("starting System UI", e); - } - traceEnd(); - traceBeginAndSlog("MakeNetworkScoreReady"); - try { - if (networkScoreF != null) networkScoreF.systemReady(); - } catch (Throwable e) { - reportWtf("making Network Score Service ready", e); - } - traceEnd(); - traceBeginAndSlog("MakeNetworkManagementServiceReady"); - try { - if (networkManagementF != null) networkManagementF.systemReady(); - } catch (Throwable e) { - reportWtf("making Network Managment Service ready", e); - } - CountDownLatch networkPolicyInitReadySignal = null; + traceBeginAndSlog("StartSystemUI"); + try { + startSystemUi(context); + } catch (Throwable e) { + reportWtf("starting System UI", e); + } + traceEnd(); + traceBeginAndSlog("MakeNetworkScoreReady"); + try { + if (networkScoreF != null) networkScoreF.systemReady(); + } catch (Throwable e) { + reportWtf("making Network Score Service ready", e); + } + traceEnd(); + traceBeginAndSlog("MakeNetworkManagementServiceReady"); + try { + if (networkManagementF != null) networkManagementF.systemReady(); + } catch (Throwable e) { + reportWtf("making Network Managment Service ready", e); + } + CountDownLatch networkPolicyInitReadySignal = null; + if (networkPolicyF != null) { + networkPolicyInitReadySignal = networkPolicyF + .networkScoreAndNetworkManagementServiceReady(); + } + traceEnd(); + traceBeginAndSlog("MakeNetworkStatsServiceReady"); + try { + if (networkStatsF != null) networkStatsF.systemReady(); + } catch (Throwable e) { + reportWtf("making Network Stats Service ready", e); + } + traceEnd(); + traceBeginAndSlog("MakeConnectivityServiceReady"); + try { + if (connectivityF != null) connectivityF.systemReady(); + } catch (Throwable e) { + reportWtf("making Connectivity Service ready", e); + } + traceEnd(); + traceBeginAndSlog("MakeNetworkPolicyServiceReady"); + try { if (networkPolicyF != null) { - networkPolicyInitReadySignal = networkPolicyF - .networkScoreAndNetworkManagementServiceReady(); - } - traceEnd(); - traceBeginAndSlog("MakeNetworkStatsServiceReady"); - try { - if (networkStatsF != null) networkStatsF.systemReady(); - } catch (Throwable e) { - reportWtf("making Network Stats Service ready", e); - } - traceEnd(); - traceBeginAndSlog("MakeConnectivityServiceReady"); - try { - if (connectivityF != null) connectivityF.systemReady(); - } catch (Throwable e) { - reportWtf("making Connectivity Service ready", e); - } - traceEnd(); - traceBeginAndSlog("MakeNetworkPolicyServiceReady"); - try { - if (networkPolicyF != null) { - networkPolicyF.systemReady(networkPolicyInitReadySignal); - } - } catch (Throwable e) { - reportWtf("making Network Policy Service ready", e); + networkPolicyF.systemReady(networkPolicyInitReadySignal); } - traceEnd(); - - traceBeginAndSlog("StartWatchdog"); - Watchdog.getInstance().start(); - traceEnd(); - - // It is now okay to let the various system services start their - // third party code... - traceBeginAndSlog("PhaseThirdPartyAppsCanStart"); - mSystemServiceManager.startBootPhase( - SystemService.PHASE_THIRD_PARTY_APPS_CAN_START); - traceEnd(); + } catch (Throwable e) { + reportWtf("making Network Policy Service ready", e); + } + traceEnd(); - traceBeginAndSlog("MakeLocationServiceReady"); - try { - if (locationF != null) locationF.systemRunning(); - } catch (Throwable e) { - reportWtf("Notifying Location Service running", e); - } - traceEnd(); - traceBeginAndSlog("MakeCountryDetectionServiceReady"); - try { - if (countryDetectorF != null) countryDetectorF.systemRunning(); - } catch (Throwable e) { - reportWtf("Notifying CountryDetectorService running", e); - } - traceEnd(); - traceBeginAndSlog("MakeNetworkTimeUpdateReady"); - try { - if (networkTimeUpdaterF != null) networkTimeUpdaterF.systemRunning(); - } catch (Throwable e) { - reportWtf("Notifying NetworkTimeService running", e); - } - traceEnd(); - traceBeginAndSlog("MakeCommonTimeManagementServiceReady"); - try { - if (commonTimeMgmtServiceF != null) { - commonTimeMgmtServiceF.systemRunning(); - } - } catch (Throwable e) { - reportWtf("Notifying CommonTimeManagementService running", e); - } - traceEnd(); - traceBeginAndSlog("MakeInputManagerServiceReady"); - try { - // TODO(BT) Pass parameter to input manager - if (inputManagerF != null) inputManagerF.systemRunning(); - } catch (Throwable e) { - reportWtf("Notifying InputManagerService running", e); - } - traceEnd(); - traceBeginAndSlog("MakeTelephonyRegistryReady"); - try { - if (telephonyRegistryF != null) telephonyRegistryF.systemRunning(); - } catch (Throwable e) { - reportWtf("Notifying TelephonyRegistry running", e); - } - traceEnd(); - traceBeginAndSlog("MakeMediaRouterServiceReady"); - try { - if (mediaRouterF != null) mediaRouterF.systemRunning(); - } catch (Throwable e) { - reportWtf("Notifying MediaRouterService running", e); - } - traceEnd(); - traceBeginAndSlog("MakeMmsServiceReady"); - try { - if (mmsServiceF != null) mmsServiceF.systemRunning(); - } catch (Throwable e) { - reportWtf("Notifying MmsService running", e); - } - traceEnd(); + traceBeginAndSlog("StartWatchdog"); + Watchdog.getInstance().start(); + traceEnd(); - traceBeginAndSlog("MakeNetworkScoreServiceReady"); - try { - if (networkScoreF != null) networkScoreF.systemRunning(); - } catch (Throwable e) { - reportWtf("Notifying NetworkScoreService running", e); - } - traceEnd(); + // It is now okay to let the various system services start their + // third party code... + traceBeginAndSlog("PhaseThirdPartyAppsCanStart"); + mSystemServiceManager.startBootPhase( + SystemService.PHASE_THIRD_PARTY_APPS_CAN_START); + traceEnd(); - traceBeginAndSlog("IncidentDaemonReady"); - try { - // TODO: Switch from checkService to getService once it's always - // in the build and should reliably be there. - final IIncidentManager incident = IIncidentManager.Stub.asInterface( - ServiceManager.checkService("incident")); - if (incident != null) incident.systemRunning(); - } catch (Throwable e) { - reportWtf("Notifying incident daemon running", e); + traceBeginAndSlog("MakeLocationServiceReady"); + try { + if (locationF != null) locationF.systemRunning(); + } catch (Throwable e) { + reportWtf("Notifying Location Service running", e); + } + traceEnd(); + traceBeginAndSlog("MakeCountryDetectionServiceReady"); + try { + if (countryDetectorF != null) countryDetectorF.systemRunning(); + } catch (Throwable e) { + reportWtf("Notifying CountryDetectorService running", e); + } + traceEnd(); + traceBeginAndSlog("MakeNetworkTimeUpdateReady"); + try { + if (networkTimeUpdaterF != null) networkTimeUpdaterF.systemRunning(); + } catch (Throwable e) { + reportWtf("Notifying NetworkTimeService running", e); + } + traceEnd(); + traceBeginAndSlog("MakeCommonTimeManagementServiceReady"); + try { + if (commonTimeMgmtServiceF != null) { + commonTimeMgmtServiceF.systemRunning(); } - traceEnd(); - + } catch (Throwable e) { + reportWtf("Notifying CommonTimeManagementService running", e); + } + traceEnd(); + traceBeginAndSlog("MakeInputManagerServiceReady"); + try { + // TODO(BT) Pass parameter to input manager + if (inputManagerF != null) inputManagerF.systemRunning(); + } catch (Throwable e) { + reportWtf("Notifying InputManagerService running", e); + } + traceEnd(); + traceBeginAndSlog("MakeTelephonyRegistryReady"); + try { + if (telephonyRegistryF != null) telephonyRegistryF.systemRunning(); + } catch (Throwable e) { + reportWtf("Notifying TelephonyRegistry running", e); + } + traceEnd(); + traceBeginAndSlog("MakeMediaRouterServiceReady"); + try { + if (mediaRouterF != null) mediaRouterF.systemRunning(); + } catch (Throwable e) { + reportWtf("Notifying MediaRouterService running", e); + } + traceEnd(); + traceBeginAndSlog("MakeMmsServiceReady"); + try { + if (mmsServiceF != null) mmsServiceF.systemRunning(); + } catch (Throwable e) { + reportWtf("Notifying MmsService running", e); + } + traceEnd(); - traceEnd(); // PhaseActivityManagerReady + traceBeginAndSlog("MakeNetworkScoreServiceReady"); + try { + if (networkScoreF != null) networkScoreF.systemRunning(); + } catch (Throwable e) { + reportWtf("Notifying NetworkScoreService running", e); } - }); + traceEnd(); + traceBeginAndSlog("IncidentDaemonReady"); + try { + // TODO: Switch from checkService to getService once it's always + // in the build and should reliably be there. + final IIncidentManager incident = IIncidentManager.Stub.asInterface( + ServiceManager.checkService("incident")); + if (incident != null) incident.systemRunning(); + } catch (Throwable e) { + reportWtf("Notifying incident daemon running", e); + } + traceEnd(); + }, BOOT_TIMINGS_TRACE_LOG); } static final void startSystemUi(Context context) { diff --git a/services/net/java/android/net/util/ConnectivityPacketSummary.java b/services/net/java/android/net/util/ConnectivityPacketSummary.java index 699ba5b6c4ad..5b068c0b2468 100644 --- a/services/net/java/android/net/util/ConnectivityPacketSummary.java +++ b/services/net/java/android/net/util/ConnectivityPacketSummary.java @@ -285,7 +285,10 @@ public class ConnectivityPacketSummary { final int ndType = asUint(mPacket.get()); final int ndLength = asUint(mPacket.get()); final int ndBytes = ndLength * ICMPV6_ND_OPTION_LENGTH_SCALING_FACTOR - 2; - if (mPacket.remaining() < ndBytes) break; + if (ndBytes < 0 || ndBytes > mPacket.remaining()) { + sj.add("<malformed>"); + break; + } final int position = mPacket.position(); switch (ndType) { diff --git a/services/tests/servicestests/Android.mk b/services/tests/servicestests/Android.mk index 86983eb8b6ee..ae5da78bbab5 100644 --- a/services/tests/servicestests/Android.mk +++ b/services/tests/servicestests/Android.mk @@ -14,6 +14,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_STATIC_JAVA_LIBRARIES := \ frameworks-base-testutils \ services.accessibility \ + services.appwidget \ services.core \ services.devicepolicy \ services.net \ diff --git a/services/tests/servicestests/AndroidManifest.xml b/services/tests/servicestests/AndroidManifest.xml index 41654676aadd..1c92e452d03c 100644 --- a/services/tests/servicestests/AndroidManifest.xml +++ b/services/tests/servicestests/AndroidManifest.xml @@ -164,6 +164,13 @@ <activity android:name="com.android.server.am.TaskStackChangedListenerTest$ActivityTaskChangeCallbacks" /> <activity android:name="com.android.server.am.TaskStackChangedListenerTest$ActivityTaskDescriptionChange" /> + <receiver android:name="com.android.server.appwidget.DummyAppWidget"> + <intent-filter> + <action android:name="android.appwidget.action.APPWIDGET_UPDATE" /> + </intent-filter> + <meta-data android:name="android.appwidget.provider" + android:resource="@xml/dummy_appwidget_info" /> + </receiver> </application> <instrumentation diff --git a/services/tests/servicestests/res/xml/dummy_appwidget_info.xml b/services/tests/servicestests/res/xml/dummy_appwidget_info.xml new file mode 100644 index 000000000000..c7144da18dde --- /dev/null +++ b/services/tests/servicestests/res/xml/dummy_appwidget_info.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 + --> + +<appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android" + android:minWidth="40dp" + android:minHeight="40dp" + android:updatePeriodMillis="86400000" + android:previewImage="@drawable/icon1" + android:resizeMode="horizontal|vertical" + android:widgetCategory="home_screen"> +</appwidget-provider>
\ No newline at end of file diff --git a/services/tests/servicestests/src/android/net/util/ConnectivityPacketSummaryTest.java b/services/tests/servicestests/src/android/net/util/ConnectivityPacketSummaryTest.java index 766e5c048f1b..dd679bc20090 100644 --- a/services/tests/servicestests/src/android/net/util/ConnectivityPacketSummaryTest.java +++ b/services/tests/servicestests/src/android/net/util/ConnectivityPacketSummaryTest.java @@ -135,6 +135,30 @@ public class ConnectivityPacketSummaryTest extends TestCase { assertEquals(expected, getSummary(packet)); } + public void testInvalidICMPv6NDLength() { + final String packet = + // Ethernet + "807ABF6F48F3 100E7E263FC1 86DD" + + // IPv6 + "600000000068 3A FF" + + "FE80000000000000FA000004FD000001" + + "FE80000000000000827ABFFFFE6F48F3" + + // ICMPv6 RA + "86 00 8141" + + "40 00 0E10" + + "00000000" + + "00000000" + + "01 01 00005E000265" + + "00 00 0102030405D6"; + + final String expected = + "RX 10:0e:7e:26:3f:c1 > 80:7a:bf:6f:48:f3 ipv6" + + " fe80::fa00:4:fd00:1 > fe80::827a:bfff:fe6f:48f3 icmp6" + + " ra slla 00:00:5e:00:02:65 <malformed>"; + + assertEquals(expected, getSummary(packet)); + } + public void testParseICMPv6NA() { final String packet = // Ethernet diff --git a/services/tests/servicestests/src/com/android/server/NetworkScoreServiceTest.java b/services/tests/servicestests/src/com/android/server/NetworkScoreServiceTest.java index 69d27f292072..9a9f81e03dfd 100644 --- a/services/tests/servicestests/src/com/android/server/NetworkScoreServiceTest.java +++ b/services/tests/servicestests/src/com/android/server/NetworkScoreServiceTest.java @@ -53,6 +53,7 @@ import android.content.res.Resources; import android.net.INetworkRecommendationProvider; import android.net.INetworkScoreCache; import android.net.NetworkKey; +import android.net.NetworkScoreManager; import android.net.NetworkScorerAppManager; import android.net.NetworkScorerAppManager.NetworkScorerAppData; import android.net.RecommendationRequest; @@ -134,9 +135,10 @@ public class NetworkScoreServiceTest { mNetworkScoreService.systemRunning(); - verify(mContext).bindServiceAsUser(MockUtils.checkIntent(new Intent().setComponent( - new ComponentName(NEW_SCORER.packageName, - NEW_SCORER.recommendationServiceClassName))), + verify(mContext).bindServiceAsUser(MockUtils.checkIntent( + new Intent(NetworkScoreManager.ACTION_RECOMMEND_NETWORKS) + .setComponent(new ComponentName(NEW_SCORER.packageName, + NEW_SCORER.recommendationServiceClassName))), any(ServiceConnection.class), eq(Context.BIND_AUTO_CREATE | Context.BIND_FOREGROUND_SERVICE), eq(UserHandle.SYSTEM)); diff --git a/services/tests/servicestests/src/com/android/server/appwidget/AppWidgetServiceImplTest.java b/services/tests/servicestests/src/com/android/server/appwidget/AppWidgetServiceImplTest.java new file mode 100644 index 000000000000..4886a5f573aa --- /dev/null +++ b/services/tests/servicestests/src/com/android/server/appwidget/AppWidgetServiceImplTest.java @@ -0,0 +1,129 @@ +/* + * 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.server.appwidget; + +import static org.mockito.Matchers.any; +import static org.mockito.Matchers.anyInt; +import static org.mockito.Matchers.anyString; +import static org.mockito.Matchers.eq; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +import android.app.admin.DevicePolicyManagerInternal; +import android.appwidget.AppWidgetManager; +import android.appwidget.AppWidgetProviderInfo; +import android.content.BroadcastReceiver; +import android.content.ComponentName; +import android.content.ContextWrapper; +import android.content.Intent; +import android.content.IntentFilter; +import android.content.IntentSender; +import android.content.pm.ShortcutServiceInternal; +import android.os.Handler; +import android.os.UserHandle; +import android.test.InstrumentationTestCase; +import android.test.suitebuilder.annotation.SmallTest; + +import com.android.server.LocalServices; + +import org.mockito.ArgumentCaptor; + + +/** + * Tests for {@link AppWidgetManager} and {@link AppWidgetServiceImpl}. + * + m FrameworksServicesTests && + adb install \ + -r -g ${ANDROID_PRODUCT_OUT}/data/app/FrameworksServicesTests/FrameworksServicesTests.apk && + adb shell am instrument -e class com.android.server.appwidget.AppWidgetServiceImplTest \ + -w com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner + */ +@SmallTest +public class AppWidgetServiceImplTest extends InstrumentationTestCase { + + private TestContext mTestContext; + private AppWidgetServiceImpl mService; + private AppWidgetManager mManager; + + private ShortcutServiceInternal mMockShortcutService; + + @Override + protected void setUp() throws Exception { + super.setUp(); + LocalServices.removeServiceForTest(DevicePolicyManagerInternal.class); + LocalServices.removeServiceForTest(ShortcutServiceInternal.class); + + mTestContext = new TestContext(); + mService = new AppWidgetServiceImpl(mTestContext); + mManager = new AppWidgetManager(mTestContext, mService); + + mMockShortcutService = mock(ShortcutServiceInternal.class); + LocalServices.addService(ShortcutServiceInternal.class, mMockShortcutService); + + mService.onStart(); + } + + public void testRequestPinAppWidget_otherProvider() { + ComponentName otherProvider = null; + for (AppWidgetProviderInfo provider : mManager.getInstalledProviders()) { + if (!provider.provider.getPackageName().equals(mTestContext.getPackageName())) { + otherProvider = provider.provider; + break; + } + } + if (otherProvider == null) { + // No other provider found. Ignore this test. + } + assertFalse(mManager.requestPinAppWidget(otherProvider, null)); + } + + public void testRequestPinAppWidget() { + ComponentName provider = new ComponentName(mTestContext, DummyAppWidget.class); + // Set up users. + when(mMockShortcutService.requestPinAppWidget(anyString(), + any(AppWidgetProviderInfo.class), any(IntentSender.class), anyInt())) + .thenReturn(true); + assertTrue(mManager.requestPinAppWidget(provider, null)); + + final ArgumentCaptor<AppWidgetProviderInfo> providerCaptor = + ArgumentCaptor.forClass(AppWidgetProviderInfo.class); + verify(mMockShortcutService, times(1)).requestPinAppWidget(anyString(), + providerCaptor.capture(), eq(null), anyInt()); + assertEquals(provider, providerCaptor.getValue().provider); + } + + private class TestContext extends ContextWrapper { + + public TestContext() { + super(getInstrumentation().getContext()); + } + + @Override + public Intent registerReceiverAsUser(BroadcastReceiver receiver, UserHandle user, + IntentFilter filter, String broadcastPermission, Handler scheduler) { + // ignore. + return null; + } + + @Override + public void unregisterReceiver(BroadcastReceiver receiver) { + // ignore. + } + } +} diff --git a/services/tests/servicestests/src/com/android/server/appwidget/DummyAppWidget.java b/services/tests/servicestests/src/com/android/server/appwidget/DummyAppWidget.java new file mode 100644 index 000000000000..803119f4c5fa --- /dev/null +++ b/services/tests/servicestests/src/com/android/server/appwidget/DummyAppWidget.java @@ -0,0 +1,31 @@ +/* + * 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.server.appwidget; + +import android.content.BroadcastReceiver; +import android.content.Context; +import android.content.Intent; + +/** + * Dummy widget for testing + */ +public class DummyAppWidget extends BroadcastReceiver { + + @Override + public void onReceive(Context context, Intent intent) { + } +} diff --git a/services/tests/servicestests/src/com/android/server/devicepolicy/DpmMockContext.java b/services/tests/servicestests/src/com/android/server/devicepolicy/DpmMockContext.java index 1247b2d7005b..65255d9ef7ad 100644 --- a/services/tests/servicestests/src/com/android/server/devicepolicy/DpmMockContext.java +++ b/services/tests/servicestests/src/com/android/server/devicepolicy/DpmMockContext.java @@ -16,6 +16,8 @@ package com.android.server.devicepolicy; +import android.accounts.Account; +import android.accounts.AccountManager; import android.app.IActivityManager; import android.app.NotificationManager; import android.app.backup.IBackupManager; @@ -273,6 +275,7 @@ public class DpmMockContext extends MockContext { public final SettingsForMock settings; public final MockContentResolver contentResolver; public final TelephonyManager telephonyManager; + public final AccountManager accountManager; /** Note this is a partial mock, not a real mock. */ public final PackageManager packageManager; @@ -315,6 +318,7 @@ public class DpmMockContext extends MockContext { wifiManager = mock(WifiManager.class); settings = mock(SettingsForMock.class); telephonyManager = mock(TelephonyManager.class); + accountManager = mock(AccountManager.class); // Package manager is huge, so we use a partial mock instead. packageManager = spy(context.getPackageManager()); @@ -375,6 +379,7 @@ public class DpmMockContext extends MockContext { } } ); + when(accountManager.getAccountsAsUser(anyInt())).thenReturn(new Account[0]); // Create a data directory. final File dir = new File(dataDir, "user" + userId); @@ -464,6 +469,8 @@ public class DpmMockContext extends MockContext { return powerManager; case Context.WIFI_SERVICE: return wifiManager; + case Context.ACCOUNT_SERVICE: + return accountManager; } throw new UnsupportedOperationException(); } diff --git a/services/tests/servicestests/src/com/android/server/pm/BaseShortcutManagerTest.java b/services/tests/servicestests/src/com/android/server/pm/BaseShortcutManagerTest.java index 6bc4c19f6c89..dcaab76b1f53 100644 --- a/services/tests/servicestests/src/com/android/server/pm/BaseShortcutManagerTest.java +++ b/services/tests/servicestests/src/com/android/server/pm/BaseShortcutManagerTest.java @@ -441,7 +441,7 @@ public abstract class BaseShortcutManagerTest extends InstrumentationTestCase { } @Override - void injectSendIntentSender(IntentSender intent) { + void injectSendIntentSender(IntentSender intent, Intent extras) { mContext.sendIntentSender(intent); } diff --git a/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest9.java b/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest9.java new file mode 100644 index 000000000000..84a7c198cede --- /dev/null +++ b/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest9.java @@ -0,0 +1,153 @@ +/* + * 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.server.pm; + +import static com.android.server.pm.shortcutmanagertest.ShortcutManagerTestUtils.assertExpectException; + +import static org.mockito.Matchers.any; +import static org.mockito.Matchers.eq; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; + +import android.annotation.Nullable; +import android.app.PendingIntent; +import android.appwidget.AppWidgetProviderInfo; +import android.content.ComponentName; +import android.content.Intent; +import android.content.IntentSender; +import android.content.pm.LauncherApps; +import android.content.pm.LauncherApps.PinItemRequest; +import android.os.UserHandle; +import android.test.suitebuilder.annotation.SmallTest; + +import org.mockito.ArgumentCaptor; + +/** + * Tests for {@link android.content.pm.ShortcutServiceInternal#requestPinAppWidget} + * and relevant APIs. + * + m FrameworksServicesTests && + adb install \ + -r -g ${ANDROID_PRODUCT_OUT}/data/app/FrameworksServicesTests/FrameworksServicesTests.apk && + adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest9 \ + -w com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner + */ +@SmallTest +public class ShortcutManagerTest9 extends BaseShortcutManagerTest { + + private ShortcutRequestPinProcessor mProcessor; + + @Override + protected void initService() { + super.initService(); + mProcessor = mService.getShortcutRequestPinProcessorForTest(); + } + + @Override + protected void setCaller(String packageName, int userId) { + super.setCaller(packageName, userId); + + // Note during this test, assume all callers are in the foreground by default. + makeCallerForeground(); + } + + private AppWidgetProviderInfo makeProviderInfo(String className) { + AppWidgetProviderInfo info = new AppWidgetProviderInfo(); + info.provider = new ComponentName(CALLING_PACKAGE_3, className); + return info; + } + + private void assertPinItemRequestIntent(Intent actualIntent, String expectedPackage) { + assertEquals(LauncherApps.ACTION_CONFIRM_PIN_ITEM, actualIntent.getAction()); + assertEquals(expectedPackage, actualIntent.getComponent().getPackageName()); + assertEquals(PIN_CONFIRM_ACTIVITY_CLASS, + actualIntent.getComponent().getClassName()); + assertEquals(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK, + actualIntent.getFlags()); + } + + private void assertPinItemRequest(PinItemRequest actualRequest, String className) { + assertNotNull(actualRequest); + assertEquals(PinItemRequest.REQUEST_TYPE_APPWIDGET, actualRequest.getRequestType()); + assertEquals(className, actualRequest.getAppWidgetProviderInfo().provider.getClassName()); + } + + public void testNotForeground() { + setDefaultLauncher(USER_0, mMainActivityFetcher.apply(LAUNCHER_1, USER_0)); + + runWithCaller(CALLING_PACKAGE_1, USER_P0, () -> { + makeCallerBackground(); + + assertExpectException(IllegalStateException.class, "foreground activity", () -> { + mInternal.requestPinAppWidget(CALLING_PACKAGE_1, makeProviderInfo("dummy"), + /* resultIntent= */ null, USER_P0); + }); + + verify(mServiceContext, times(0)).sendIntentSender(any(IntentSender.class)); + verify(mServiceContext, times(0)).startActivityAsUser( + any(Intent.class), any(UserHandle.class)); + }); + } + + private void checkRequestPinAppWidget(@Nullable PendingIntent resultIntent) { + setDefaultLauncher(USER_0, mMainActivityFetcher.apply(LAUNCHER_1, USER_0)); + setDefaultLauncher(USER_10, mMainActivityFetcher.apply(LAUNCHER_2, USER_10)); + + runWithCaller(CALLING_PACKAGE_1, USER_P0, () -> { + AppWidgetProviderInfo info = makeProviderInfo("c1"); + + assertTrue(mInternal.requestPinAppWidget(CALLING_PACKAGE_1, info, + resultIntent == null ? null : resultIntent.getIntentSender(), USER_P0)); + + verify(mServiceContext, times(0)).sendIntentSender(any(IntentSender.class)); + }); + + runWithCaller(LAUNCHER_1, USER_0, () -> { + // Check the intent passed to startActivityAsUser(). + final ArgumentCaptor<Intent> intent = ArgumentCaptor.forClass(Intent.class); + + verify(mServiceContext).startActivityAsUser(intent.capture(), eq(HANDLE_USER_0)); + + assertPinItemRequestIntent(intent.getValue(), mInjectedClientPackage); + + // Check the request object. + final PinItemRequest request = mLauncherApps.getPinItemRequest(intent.getValue()); + assertPinItemRequest(request, "c1"); + + // Accept the request. + assertTrue(request.accept()); + }); + + // This method is always called, even with PI == null. + if (resultIntent == null) { + verify(mServiceContext, times(1)).sendIntentSender(eq(null)); + } else { + verify(mServiceContext, times(1)).sendIntentSender(any(IntentSender.class)); + } + } + + public void testRequestPinAppWidget() { + checkRequestPinAppWidget(/* resultIntent=*/ null); + } + + public void testRequestPinAppWidget_withCallback() { + final PendingIntent resultIntent = + PendingIntent.getActivity(getTestContext(), 0, new Intent(), 0); + + checkRequestPinAppWidget(resultIntent); + } +} 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 01808cb7462d..786c2bb06d96 100644 --- a/services/tests/servicestests/src/com/android/server/wm/DisplayContentTests.java +++ b/services/tests/servicestests/src/com/android/server/wm/DisplayContentTests.java @@ -19,12 +19,16 @@ package com.android.server.wm; import org.junit.Test; import org.junit.runner.RunWith; +import android.hardware.display.DisplayManagerGlobal; import android.platform.test.annotations.Presubmit; import android.support.test.filters.SmallTest; import android.support.test.runner.AndroidJUnit4; +import android.view.Display; +import android.view.DisplayInfo; import java.util.ArrayList; +import static android.view.DisplayAdjustments.DEFAULT_DISPLAY_ADJUSTMENTS; import static android.view.WindowManager.LayoutParams.TYPE_BASE_APPLICATION; import static android.view.WindowManager.LayoutParams.TYPE_VOICE_INTERACTION; import static org.junit.Assert.assertEquals; @@ -203,4 +207,35 @@ public class DisplayContentTests extends WindowTestsBase { voiceInteractionWindow.removeImmediately(); } + + @Test + public void testMoveStackBetweenDisplays() throws Exception { + // Create second display. + final Display display = new Display(DisplayManagerGlobal.getInstance(), + sDisplayContent.getDisplayId() + 1, new DisplayInfo(), + DEFAULT_DISPLAY_ADJUSTMENTS); + final DisplayContent dc = new DisplayContent(display, sWm, sLayersController, + new WallpaperController(sWm)); + sWm.mRoot.addChild(dc, 1); + + // Add stack with activity. + final TaskStack stack = createTaskStackOnDisplay(dc); + assertEquals(dc.getDisplayId(), stack.getDisplayContent().getDisplayId()); + assertEquals(dc, stack.getParent().getParent()); + assertEquals(dc, stack.getDisplayContent()); + + final Task task = createTaskInStack(stack, 0 /* userId */); + final TestAppWindowToken token = new TestAppWindowToken(dc); + task.addChild(token, 0); + assertEquals(dc, task.getDisplayContent()); + assertEquals(dc, token.getDisplayContent()); + + // Move stack to first display. + sWm.moveStackToDisplay(stack.mStackId, sDisplayContent.getDisplayId()); + assertEquals(sDisplayContent.getDisplayId(), stack.getDisplayContent().getDisplayId()); + assertEquals(sDisplayContent, stack.getParent().getParent()); + assertEquals(sDisplayContent, stack.getDisplayContent()); + assertEquals(sDisplayContent, task.getDisplayContent()); + assertEquals(sDisplayContent, token.getDisplayContent()); + } } diff --git a/services/tests/servicestests/src/com/android/server/wm/TaskStackContainersTests.java b/services/tests/servicestests/src/com/android/server/wm/TaskStackContainersTests.java new file mode 100644 index 000000000000..746310217c38 --- /dev/null +++ b/services/tests/servicestests/src/com/android/server/wm/TaskStackContainersTests.java @@ -0,0 +1,69 @@ +/* + * 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 + */ + +package com.android.server.wm; + +import static android.app.ActivityManager.StackId.PINNED_STACK_ID; + +import org.junit.Test; +import org.junit.runner.RunWith; + +import android.platform.test.annotations.Presubmit; +import android.support.test.filters.SmallTest; +import android.support.test.runner.AndroidJUnit4; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; + +/** + * Tests for the {@link DisplayContent.TaskStackContainers} container in {@link DisplayContent}. + * + * Build/Install/Run: + * bit FrameworksServicesTests:com.android.server.wm.TaskStackContainersTests + */ +@SmallTest +@Presubmit +@RunWith(AndroidJUnit4.class) +public class TaskStackContainersTests extends WindowTestsBase { + + @Test + public void testStackPositionChildAt() throws Exception { + // Test that always-on-top stack can't be moved to position other than top. + final TaskStack stack1 = createTaskStackOnDisplay(sDisplayContent); + final TaskStack stack2 = createTaskStackOnDisplay(sDisplayContent); + sDisplayContent.addStackToDisplay(PINNED_STACK_ID, true); + final TaskStack pinnedStack = sWm.mStackIdToStack.get(PINNED_STACK_ID); + + final WindowContainer taskStackContainer = stack1.getParent(); + + final int stack1Pos = taskStackContainer.mChildren.indexOf(stack1); + final int stack2Pos = taskStackContainer.mChildren.indexOf(stack2); + final int pinnedStackPos = taskStackContainer.mChildren.indexOf(pinnedStack); + + taskStackContainer.positionChildAt(WindowContainer.POSITION_BOTTOM, pinnedStack, false); + assertEquals(taskStackContainer.mChildren.get(stack1Pos), stack1); + assertEquals(taskStackContainer.mChildren.get(stack2Pos), stack2); + assertEquals(taskStackContainer.mChildren.get(pinnedStackPos), pinnedStack); + + taskStackContainer.positionChildAt(1, pinnedStack, false); + assertEquals(taskStackContainer.mChildren.get(stack1Pos), stack1); + assertEquals(taskStackContainer.mChildren.get(stack2Pos), stack2); + assertEquals(taskStackContainer.mChildren.get(pinnedStackPos), pinnedStack); + } +} diff --git a/services/tests/servicestests/src/com/android/server/wm/TaskStackTests.java b/services/tests/servicestests/src/com/android/server/wm/TaskStackTests.java new file mode 100644 index 000000000000..eca2500642fe --- /dev/null +++ b/services/tests/servicestests/src/com/android/server/wm/TaskStackTests.java @@ -0,0 +1,59 @@ +/* + * 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 + */ + +package com.android.server.wm; + +import org.junit.Test; +import org.junit.runner.RunWith; + +import android.platform.test.annotations.Presubmit; +import android.support.test.filters.SmallTest; +import android.support.test.runner.AndroidJUnit4; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; + +/** + * Tests for the {@link TaskStack} class. + * + * Build/Install/Run: + * bit FrameworksServicesTests:com.android.server.wm.TaskStackTests + */ +@SmallTest +@Presubmit +@RunWith(AndroidJUnit4.class) +public class TaskStackTests extends WindowTestsBase { + + @Test + public void testStackPositionChildAt() throws Exception { + final TaskStack stack = createTaskStackOnDisplay(sDisplayContent); + final Task task1 = createTaskInStack(stack, 0 /* userId */); + final Task task2 = createTaskInStack(stack, 1 /* userId */); + + // Current user task should be moved to top. + stack.positionChildAt(WindowContainer.POSITION_TOP, task1, false /* includingParents */); + assertEquals(stack.mChildren.get(0), task2); + assertEquals(stack.mChildren.get(1), task1); + + // Non-current user won't be moved to top. + stack.positionChildAt(WindowContainer.POSITION_TOP, task2, false /* includingParents */); + assertEquals(stack.mChildren.get(0), task2); + assertEquals(stack.mChildren.get(1), task1); + } +} diff --git a/services/tests/servicestests/src/com/android/server/wm/UnknownAppVisibilityControllerTest.java b/services/tests/servicestests/src/com/android/server/wm/UnknownAppVisibilityControllerTest.java index a820eb1171d5..07f65bd90021 100644 --- a/services/tests/servicestests/src/com/android/server/wm/UnknownAppVisibilityControllerTest.java +++ b/services/tests/servicestests/src/com/android/server/wm/UnknownAppVisibilityControllerTest.java @@ -42,9 +42,10 @@ import org.mockito.invocation.InvocationOnMock; /** * Test class for {@link AppTransition}. * - * runtest frameworks-services -c com.android.server.wm.UnknownVisibilityControllerTest + * runtest frameworks-services -c com.android.server.wm.UnknownAppVisibilityControllerTest */ @SmallTest +@Presubmit @RunWith(AndroidJUnit4.class) public class UnknownAppVisibilityControllerTest { diff --git a/services/tests/servicestests/src/com/android/server/wm/WindowContainerTests.java b/services/tests/servicestests/src/com/android/server/wm/WindowContainerTests.java index 0ccd0ada8ac8..7277ba42c2da 100644 --- a/services/tests/servicestests/src/com/android/server/wm/WindowContainerTests.java +++ b/services/tests/servicestests/src/com/android/server/wm/WindowContainerTests.java @@ -33,6 +33,10 @@ import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_REVERSE_LANDSCA import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_REVERSE_PORTRAIT; import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_UNSET; import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED; + +import static com.android.server.wm.WindowContainer.POSITION_BOTTOM; +import static com.android.server.wm.WindowContainer.POSITION_TOP; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; @@ -87,6 +91,14 @@ public class WindowContainerTests { assertEquals(layer1, root.getChildAt(4)); assertEquals(secondLayer1, root.getChildAt(5)); assertEquals(layer2, root.getChildAt(6)); + + assertTrue(layer1.mOnParentSetCalled); + assertTrue(secondLayer1.mOnParentSetCalled); + assertTrue(layer2.mOnParentSetCalled); + assertTrue(layerNeg1.mOnParentSetCalled); + assertTrue(layerNeg2.mOnParentSetCalled); + assertTrue(secondLayerNeg1.mOnParentSetCalled); + assertTrue(layer0.mOnParentSetCalled); } @Test @@ -180,6 +192,99 @@ public class WindowContainerTests { } @Test + public void testPositionChildAt() throws Exception { + final TestWindowContainerBuilder builder = new TestWindowContainerBuilder(); + final TestWindowContainer root = builder.setLayer(0).build(); + + final TestWindowContainer child1 = root.addChildWindow(); + final TestWindowContainer child2 = root.addChildWindow(); + final TestWindowContainer child3 = root.addChildWindow(); + + // Test position at top. + root.positionChildAt(POSITION_TOP, child1, false /* includingParents */); + assertEquals(child1, root.getChildAt(root.getChildrenCount() - 1)); + + // Test position at bottom. + root.positionChildAt(POSITION_BOTTOM, child1, false /* includingParents */); + assertEquals(child1, root.getChildAt(0)); + + // Test position in the middle. + root.positionChildAt(1, child3, false /* includingParents */); + assertEquals(child1, root.getChildAt(0)); + assertEquals(child3, root.getChildAt(1)); + assertEquals(child2, root.getChildAt(2)); + } + + @Test + public void testPositionChildAtIncludeParents() throws Exception { + final TestWindowContainerBuilder builder = new TestWindowContainerBuilder(); + final TestWindowContainer root = builder.setLayer(0).build(); + + final TestWindowContainer child1 = root.addChildWindow(); + final TestWindowContainer child2 = root.addChildWindow(); + final TestWindowContainer child11 = child1.addChildWindow(); + final TestWindowContainer child12 = child1.addChildWindow(); + final TestWindowContainer child13 = child1.addChildWindow(); + final TestWindowContainer child21 = child2.addChildWindow(); + final TestWindowContainer child22 = child2.addChildWindow(); + final TestWindowContainer child23 = child2.addChildWindow(); + + // Test moving to top. + child1.positionChildAt(POSITION_TOP, child11, true /* includingParents */); + assertEquals(child12, child1.getChildAt(0)); + assertEquals(child13, child1.getChildAt(1)); + assertEquals(child11, child1.getChildAt(2)); + assertEquals(child2, root.getChildAt(0)); + assertEquals(child1, root.getChildAt(1)); + + // Test moving to bottom. + child1.positionChildAt(POSITION_BOTTOM, child11, true /* includingParents */); + assertEquals(child11, child1.getChildAt(0)); + assertEquals(child12, child1.getChildAt(1)); + assertEquals(child13, child1.getChildAt(2)); + assertEquals(child1, root.getChildAt(0)); + assertEquals(child2, root.getChildAt(1)); + + // Test moving to middle, includeParents shouldn't do anything. + child2.positionChildAt(1, child21, true /* includingParents */); + assertEquals(child11, child1.getChildAt(0)); + assertEquals(child12, child1.getChildAt(1)); + assertEquals(child13, child1.getChildAt(2)); + assertEquals(child22, child2.getChildAt(0)); + assertEquals(child21, child2.getChildAt(1)); + assertEquals(child23, child2.getChildAt(2)); + assertEquals(child1, root.getChildAt(0)); + assertEquals(child2, root.getChildAt(1)); + } + + @Test + public void testPositionChildAtInvalid() throws Exception { + final TestWindowContainerBuilder builder = new TestWindowContainerBuilder(); + final TestWindowContainer root = builder.setLayer(0).build(); + + final TestWindowContainer child1 = root.addChildWindow(); + final TestWindowContainer child2 = root.addChildWindow(); + + boolean gotException = false; + try { + // Check response to negative position. + root.positionChildAt(-1, child1, false /* includingParents */); + } catch (IllegalArgumentException e) { + gotException = true; + } + assertTrue(gotException); + + gotException = false; + try { + // Check response to position that's bigger than child number. + root.positionChildAt(2, child1, false /* includingParents */); + } catch (IllegalArgumentException e) { + gotException = true; + } + assertTrue(gotException); + } + + @Test public void testIsAnimating() throws Exception { final TestWindowContainerBuilder builder = new TestWindowContainerBuilder(); final TestWindowContainer root = builder.setLayer(0).build(); @@ -548,6 +653,8 @@ public class WindowContainerTests { private boolean mIsVisible; private boolean mFillsParent; + private boolean mOnParentSetCalled; + /** * Compares 2 window layers and returns -1 if the first is lesser than the second in terms * of z-order and 1 otherwise. @@ -598,6 +705,11 @@ public class WindowContainerTests { } @Override + void onParentSet() { + mOnParentSetCalled = true; + } + + @Override boolean isAnimating() { return mIsAnimating || super.isAnimating(); } diff --git a/services/tests/servicestests/src/com/android/server/wm/WindowTestsBase.java b/services/tests/servicestests/src/com/android/server/wm/WindowTestsBase.java index 41bf646a6a1d..398568771cd7 100644 --- a/services/tests/servicestests/src/com/android/server/wm/WindowTestsBase.java +++ b/services/tests/servicestests/src/com/android/server/wm/WindowTestsBase.java @@ -75,6 +75,7 @@ public class WindowTestsBase { sLayersController = new WindowLayersController(sWm); sDisplayContent = new DisplayContent(context.getDisplay(), sWm, sLayersController, new WallpaperController(sWm)); + sWm.mRoot.addChild(sDisplayContent, 0); // Set-up some common windows. sWallpaperWindow = createWindow(null, TYPE_WALLPAPER, sDisplayContent, "wallpaperWindow"); @@ -103,11 +104,8 @@ public class WindowTestsBase { return new TestWindowToken(type, dc); } - final int stackId = sNextStackId++; - dc.addStackToDisplay(stackId, true); - final TaskStack stack = sWm.mStackIdToStack.get(stackId); - final Task task = new Task(sNextTaskId++, stack, 0, sWm, null, EMPTY, false, 0, false); - stack.addTask(task, true); + final TaskStack stack = createTaskStackOnDisplay(dc); + final Task task = createTaskInStack(stack, 0 /* userId */); final TestAppWindowToken token = new TestAppWindowToken(dc); task.addChild(token, 0); return token; @@ -136,6 +134,21 @@ public class WindowTestsBase { return w; } + /** Creates a {@link TaskStack} and adds it to the specified {@link DisplayContent}. */ + TaskStack createTaskStackOnDisplay(DisplayContent dc) { + final int stackId = sNextStackId++; + dc.addStackToDisplay(stackId, true); + return sWm.mStackIdToStack.get(stackId); + } + + /**Creates a {@link Task} and adds it to the specified {@link TaskStack}. */ + Task createTaskInStack(TaskStack stack, int userId) { + final Task newTask = new Task(sNextTaskId++, stack, userId, sWm, null, EMPTY, false, 0, + false); + stack.addTask(newTask, true); + return newTask; + } + /* Used so we can gain access to some protected members of the {@link WindowToken} class */ class TestWindowToken extends WindowToken { diff --git a/telephony/java/android/telephony/DisconnectCause.java b/telephony/java/android/telephony/DisconnectCause.java index 989f72c86dae..10cb7c95e85b 100644 --- a/telephony/java/android/telephony/DisconnectCause.java +++ b/telephony/java/android/telephony/DisconnectCause.java @@ -239,6 +239,13 @@ public class DisconnectCause { */ public static final int DIALED_CALL_FORWARDING_WHILE_ROAMING = 57; + /** + * The network does not accept the emergency call request because IMEI was used as + * identification and this cability is not supported by the network. + * {@hide} + */ + public static final int IMEI_NOT_ACCEPTED = 58; + //********************************************************************************************* // When adding a disconnect type: // 1) Please assign the new type the next id value below. @@ -247,14 +254,14 @@ public class DisconnectCause { // 4) Update toString() with the newly added disconnect type. // 5) Update android.telecom.DisconnectCauseUtil with any mappings to a telecom.DisconnectCause. // - // NextId: 58 + // NextId: 59 //********************************************************************************************* /** Smallest valid value for call disconnect codes. */ public static final int MINIMUM_VALID_VALUE = NOT_DISCONNECTED; /** Largest valid value for call disconnect codes. */ - public static final int MAXIMUM_VALID_VALUE = DIALED_CALL_FORWARDING_WHILE_ROAMING; + public static final int MAXIMUM_VALID_VALUE = IMEI_NOT_ACCEPTED; /** Private constructor to avoid class instantiation. */ private DisconnectCause() { @@ -378,6 +385,8 @@ public class DisconnectCause { return "DIALED_ON_WRONG_SLOT"; case DIALED_CALL_FORWARDING_WHILE_ROAMING: return "DIALED_CALL_FORWARDING_WHILE_ROAMING"; + case IMEI_NOT_ACCEPTED: + return "IMEI_NOT_ACCEPTED"; default: return "INVALID: " + cause; } diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index 77972715e9c8..9d9a8104fdda 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -24,12 +24,14 @@ import android.annotation.SystemApi; import android.annotation.SdkConstant; import android.annotation.SdkConstant.SdkConstantType; import android.app.ActivityThread; +import android.app.PendingIntent; import android.content.ContentResolver; import android.content.Context; import android.content.Intent; import android.net.ConnectivityManager; import android.net.Uri; import android.os.BatteryStats; +import android.os.Binder; import android.provider.Settings; import android.provider.Settings.SettingNotFoundException; import android.os.Bundle; @@ -57,6 +59,7 @@ import com.android.internal.telephony.TelephonyProperties; import java.io.FileInputStream; import java.io.IOException; +import java.io.UnsupportedEncodingException; import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -2697,18 +2700,17 @@ public class TelephonyManager { /** * @returns the settings of the visual voicemail SMS filter for a phone account set by the - * package, or {@code null} if the filter is disabled. + * current active visual voicemail client, or {@code null} if the filter is disabled. * * <p>Requires the calling app to have READ_PRIVILEGED_PHONE_STATE permission. */ /** @hide */ @Nullable - public VisualVoicemailSmsFilterSettings getVisualVoicemailSmsFilterSettings(String packageName, - int subId) { + public VisualVoicemailSmsFilterSettings getActiveVisualVoicemailSmsFilterSettings(int subId) { try { ITelephony telephony = getITelephony(); if (telephony != null) { - return telephony.getSystemVisualVoicemailSmsFilterSettings(packageName, subId); + return telephony.getActiveVisualVoicemailSmsFilterSettings(subId); } } catch (RemoteException ex) { } catch (NullPointerException ex) { @@ -2718,6 +2720,35 @@ public class TelephonyManager { } /** + * Send a visual voicemail SMS. The IPC caller must be the current default dialer. + * + * <p>Requires Permission: + * {@link android.Manifest.permission#SEND_SMS SEND_SMS} + * + * @param phoneAccountHandle The account to send the SMS with. + * @param number The destination number. + * @param port The destination port for data SMS, or 0 for text SMS. + * @param text The message content. For data sms, it will be encoded as a UTF-8 byte stream. + * @param sentIntent The sent intent passed to the {@link SmsManager} + * + * @see SmsManager#sendDataMessage(String, String, short, byte[], PendingIntent, PendingIntent) + * @see SmsManager#sendTextMessage(String, String, String, PendingIntent, PendingIntent) + * + * @hide + */ + public void sendVisualVoicemailSmsForSubscriber(int subId, String number, int port, + String text, PendingIntent sentIntent) { + try { + ITelephony telephony = getITelephony(); + if (telephony != null) { + telephony.sendVisualVoicemailSmsForSubscriber( + mContext.getOpPackageName(), subId, number, port, text, sentIntent); + } + } catch (RemoteException ex) { + } + } + + /** * Returns the voice mail count. Return 0 if unavailable, -1 if there are unread voice messages * but the count is unknown. * <p> diff --git a/telephony/java/android/telephony/VisualVoicemailService.java b/telephony/java/android/telephony/VisualVoicemailService.java new file mode 100644 index 000000000000..84833e38232f --- /dev/null +++ b/telephony/java/android/telephony/VisualVoicemailService.java @@ -0,0 +1,281 @@ +/* + * 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. + */ + +package android.telephony; + +import android.annotation.MainThread; +import android.annotation.SdkConstant; +import android.app.PendingIntent; +import android.app.Service; +import android.content.Context; +import android.content.Intent; +import android.os.Bundle; +import android.os.Handler; +import android.os.IBinder; +import android.os.Message; +import android.os.Messenger; +import android.os.RemoteException; +import android.telecom.PhoneAccountHandle; +import android.telecom.TelecomManager; +import android.util.Log; + +/** + * This service is implemented by dialer apps that wishes to handle OMTP or similar visual + * voicemails. Telephony binds to this service when the cell service is first connected, a visual + * voicemail SMS has been received, or when a SIM has been removed. Telephony will only bind to the + * default dialer for such events (See {@link TelecomManager#getDefaultDialerPackage()}). The + * {@link android.service.carrier.CarrierMessagingService} precedes the VisualVoicemailService in + * the SMS filtering chain and may intercept the visual voicemail SMS before it reaches this + * service. + * <p> + * Below is an example manifest registration for a {@code VisualVoicemailService}. + * <pre> + * {@code + * <service android:name="your.package.YourVisualVoicemailServiceImplementation" + * android:permission="android.permission.BIND_VISUAL_VOICEMAIL_SERVICE"> + * <intent-filter> + * <action android:name="android.telephony.VisualVoicemailService"/> + * </intent-filter> + * </service> + * } + * </pre> + */ +public abstract class VisualVoicemailService extends Service { + + private static final String TAG = "VvmService"; + + /** + * The {@link Intent} that must be declared as handled by the service. + */ + @SdkConstant(SdkConstant.SdkConstantType.SERVICE_ACTION) + public static final String SERVICE_INTERFACE = "android.telephony.VisualVoicemailService"; + + /** + * @hide + */ + public static final int MSG_ON_CELL_SERVICE_CONNECTED = 1; + /** + * @hide + */ + public static final int MSG_ON_SMS_RECEIVED = 2; + /** + * @hide + */ + public static final int MSG_ON_SIM_REMOVED = 3; + /** + * @hide + */ + public static final int MSG_TASK_ENDED = 4; + /** + * @hide + */ + public static final int MSG_TASK_STOPPED = 5; + + /** + * @hide + */ + public static final String DATA_PHONE_ACCOUNT_HANDLE = "data_phone_account_handle"; + /** + * @hide + */ + public static final String DATA_SMS = "data_sms"; + + /** + * Represents a visual voicemail event which needs to be handled. While the task is being + * processed telephony will hold a wakelock for the VisualVoicemailService. The service can + * unblock the main thread and pass the task to a worker thread. Once the task is finished, + * {@link VisualVoicemailTask#finish()} should be called to signal telephony to release the + * resources. Telephony will call {@link VisualVoicemailService#onStopped(VisualVoicemailTask)} + * when the task is going to be terminated before completion. + * + * @see #onCellServiceConnected(VisualVoicemailTask, PhoneAccountHandle) + * @see #onSmsReceived(VisualVoicemailTask, VisualVoicemailSms) + * @see #onSimRemoved(VisualVoicemailTask, PhoneAccountHandle) + * @see #onStopped(VisualVoicemailTask) + */ + public static class VisualVoicemailTask { + + private final int mTaskId; + private final Messenger mReplyTo; + + private VisualVoicemailTask(Messenger replyTo, int taskId) { + mTaskId = taskId; + mReplyTo = replyTo; + } + + /** + * Call to signal telephony the task has completed. Must be called for every task. + */ + public final void finish() { + Message message = Message.obtain(); + try { + message.what = MSG_TASK_ENDED; + message.arg1 = mTaskId; + mReplyTo.send(message); + } catch (RemoteException e) { + Log.e(TAG, + "Cannot send MSG_TASK_ENDED, remote handler no longer exist"); + } + } + + @Override + public boolean equals(Object obj) { + if (!(obj instanceof VisualVoicemailTask)) { + return false; + } + return mTaskId == ((VisualVoicemailTask) obj).mTaskId; + } + + @Override + public int hashCode() { + return mTaskId; + } + } + + /** + * Handles messages sent by telephony. + */ + private final Messenger mMessenger = new Messenger(new Handler() { + @Override + public void handleMessage(final Message msg) { + final PhoneAccountHandle handle = msg.getData() + .getParcelable(DATA_PHONE_ACCOUNT_HANDLE); + VisualVoicemailTask task = new VisualVoicemailTask(msg.replyTo, msg.arg1); + switch (msg.what) { + case MSG_ON_CELL_SERVICE_CONNECTED: + onCellServiceConnected(task, handle); + break; + case MSG_ON_SMS_RECEIVED: + VisualVoicemailSms sms = msg.getData().getParcelable(DATA_SMS); + onSmsReceived(task, sms); + break; + case MSG_ON_SIM_REMOVED: + onSimRemoved(task, handle); + break; + case MSG_TASK_STOPPED: + onStopped(task); + break; + default: + super.handleMessage(msg); + break; + } + } + }); + + @Override + public IBinder onBind(Intent intent) { + return mMessenger.getBinder(); + } + + /** + * Called when the cellular service is connected on a {@link PhoneAccountHandle} for the first + * time, or when the carrier config has changed. It will not be called when the signal is lost + * then restored. + * + * @param task The task representing this event. {@link VisualVoicemailTask#finish()} must be + * called when the task is completed. + * @param phoneAccountHandle The {@link PhoneAccountHandle} triggering this event. + */ + @MainThread + public abstract void onCellServiceConnected(VisualVoicemailTask task, + PhoneAccountHandle phoneAccountHandle); + + /** + * Called when a SMS matching the {@link VisualVoicemailSmsFilterSettings} set by + * {@link #setSmsFilterSettings(Context, PhoneAccountHandle, VisualVoicemailSmsFilterSettings)} + * is received. + * + * @param task The task representing this event. {@link VisualVoicemailTask#finish()} must be + * called when the task is completed. + * @param sms The content of the received SMS. + */ + @MainThread + public abstract void onSmsReceived(VisualVoicemailTask task, + VisualVoicemailSms sms); + + /** + * Called when a SIM is removed. + * + * @param task The task representing this event. {@link VisualVoicemailTask#finish()} must be + * called when the task is completed. + * @param phoneAccountHandle The {@link PhoneAccountHandle} triggering this event. + */ + @MainThread + public abstract void onSimRemoved(VisualVoicemailTask task, + PhoneAccountHandle phoneAccountHandle); + + /** + * Called before the system is about to terminate a task. The service should persist any + * necessary data and call finish on the task immediately. + */ + @MainThread + public abstract void onStopped(VisualVoicemailTask task); + + /** + * Set the visual voicemail SMS filter settings for the VisualVoicemailService. + * {@link #onSmsReceived(VisualVoicemailTask, VisualVoicemailSms)} will be called when + * a SMS matching the settings is received. The caller should have + * {@link android.Manifest.permission#READ_PHONE_STATE READ_PHONE_STATE} and implements a + * VisualVoicemailService. + * <p> + * <p>Requires Permission: + * {@link android.Manifest.permission#READ_PHONE_STATE READ_PHONE_STATE} + * + * @param phoneAccountHandle The account to apply the settings to. + * @param settings The settings for the filter, or {@code null} to disable the filter. + */ + public final static void setSmsFilterSettings(Context context, + PhoneAccountHandle phoneAccountHandle, + VisualVoicemailSmsFilterSettings settings) { + TelephonyManager telephonyManager = context.getSystemService(TelephonyManager.class); + int subId = getSubId(context, phoneAccountHandle); + if (settings == null) { + telephonyManager.disableVisualVoicemailSmsFilter(subId); + } else { + telephonyManager.enableVisualVoicemailSmsFilter(subId, settings); + } + } + + /** + * Send a visual voicemail SMS. The caller must be the current default dialer. + * <p> + * <p>Requires Permission: + * {@link android.Manifest.permission#SEND_SMS SEND_SMS} + * + * @param phoneAccountHandle The account to send the SMS with. + * @param number The destination number. + * @param port The destination port for data SMS, or 0 for text SMS. + * @param text The message content. For data sms, it will be encoded as a UTF-8 byte stream. + * @param sentIntent The sent intent passed to the {@link SmsManager} + * @see SmsManager#sendDataMessage(String, String, short, byte[], PendingIntent, PendingIntent) + * @see SmsManager#sendTextMessage(String, String, String, PendingIntent, PendingIntent) + */ + public final static void sendVisualVoicemailSms(Context context, + PhoneAccountHandle phoneAccountHandle, String number, + short port, String text, PendingIntent sentIntent) { + TelephonyManager telephonyManager = context.getSystemService(TelephonyManager.class); + telephonyManager.sendVisualVoicemailSmsForSubscriber(getSubId(context, phoneAccountHandle), + number, port, text, sentIntent); + } + + private static int getSubId(Context context, PhoneAccountHandle phoneAccountHandle) { + TelephonyManager telephonyManager = context.getSystemService(TelephonyManager.class); + TelecomManager telecomManager = context.getSystemService(TelecomManager.class); + return telephonyManager + .getSubIdForPhoneAccount(telecomManager.getPhoneAccount(phoneAccountHandle)); + } + +} diff --git a/telephony/java/android/telephony/VisualVoicemailSms.java b/telephony/java/android/telephony/VisualVoicemailSms.java new file mode 100644 index 000000000000..6235c10ab12a --- /dev/null +++ b/telephony/java/android/telephony/VisualVoicemailSms.java @@ -0,0 +1,148 @@ +/* + * 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. + */ + +package android.telephony; + +import android.annotation.Nullable; +import android.os.Bundle; +import android.os.Parcel; +import android.os.Parcelable; +import android.telecom.PhoneAccountHandle; +import android.telephony.VisualVoicemailService.VisualVoicemailTask; + +/** + * Represents the content of a visual voicemail SMS. If a incoming SMS matches the {@link + * VisualVoicemailSmsFilterSettings} set by the default dialer, {@link + * VisualVoicemailService#onSmsReceived(VisualVoicemailTask, VisualVoicemailSms)} will be called. + */ +public final class VisualVoicemailSms implements Parcelable { + + private final PhoneAccountHandle mPhoneAccountHandle; + @Nullable + private final String mPrefix; + + @Nullable + private final Bundle mFields; + + private final String mMessageBody; + + VisualVoicemailSms(Builder builder) { + mPhoneAccountHandle = builder.mPhoneAccountHandle; + mPrefix = builder.mPrefix; + mFields = builder.mFields; + mMessageBody = builder.mMessageBody; + } + + /** + * The {@link PhoneAccountHandle} that received the SMS. + */ + public PhoneAccountHandle getPhoneAccountHandle() { + return mPhoneAccountHandle; + } + + /** + * The event type of the SMS or {@code null} if the framework cannot parse the SMS as voicemail + * but the carrier pattern indicates it is. Common values are "SYNC" or "STATUS". + */ + public String getPrefix() { + return mPrefix; + } + + /** + * The key-value pairs sent by the SMS, or {@code null} if the framework cannot parse the SMS as + * voicemail but the carrier pattern indicates it is. + */ + public Bundle getFields() { + return mFields; + } + + /** + * Raw message body of the received SMS. + */ + public String getMessageBody() { + return mMessageBody; + } + + /** + * Builder for the {@link VisualVoicemailSms}. Internal use only. + * + * @hide + */ + public static class Builder { + + private PhoneAccountHandle mPhoneAccountHandle; + private String mPrefix; + private Bundle mFields; + private String mMessageBody; + + public VisualVoicemailSms build() { + return new VisualVoicemailSms(this); + } + + public Builder setPhoneAccountHandle(PhoneAccountHandle phoneAccountHandle) { + this.mPhoneAccountHandle = phoneAccountHandle; + return this; + } + + public Builder setPrefix(String prefix) { + this.mPrefix = prefix; + return this; + } + + public Builder setFields(Bundle fields) { + this.mFields = fields; + return this; + } + + public Builder setMessageBody(String messageBody) { + this.mMessageBody = messageBody; + return this; + } + + } + + + public static final Creator<VisualVoicemailSms> CREATOR = + new Creator<VisualVoicemailSms>() { + @Override + public VisualVoicemailSms createFromParcel(Parcel in) { + return new Builder() + .setPhoneAccountHandle((PhoneAccountHandle) in.readParcelable(null)) + .setPrefix(in.readString()) + .setFields(in.readBundle()) + .setMessageBody(in.readString()) + .build(); + } + + @Override + public VisualVoicemailSms[] newArray(int size) { + return new VisualVoicemailSms[size]; + } + }; + + @Override + public int describeContents() { + return 0; + } + + @Override + public void writeToParcel(Parcel dest, int flags) { + dest.writeParcelable(getPhoneAccountHandle(), flags); + dest.writeString(getPrefix()); + dest.writeBundle(getFields()); + dest.writeString(getMessageBody()); + } +} diff --git a/telephony/java/android/telephony/VisualVoicemailSmsFilterSettings.java b/telephony/java/android/telephony/VisualVoicemailSmsFilterSettings.java index 5b81027655f0..9d19d0860407 100644 --- a/telephony/java/android/telephony/VisualVoicemailSmsFilterSettings.java +++ b/telephony/java/android/telephony/VisualVoicemailSmsFilterSettings.java @@ -15,9 +15,13 @@ */ package android.telephony; +import android.content.Context; +import android.os.Bundle; import android.os.Parcel; import android.os.Parcelable; +import android.telecom.PhoneAccountHandle; +import android.telephony.VisualVoicemailService.VisualVoicemailTask; import java.util.Collections; import java.util.List; @@ -28,31 +32,26 @@ import java.util.List; * <p>[clientPrefix]:[prefix]:([key]=[value];)* * * <p>will be regarded as a visual voicemail SMS, and removed before reaching the SMS provider. The - * intent {@link android.provider.VoicemailContract#ACTION_VOICEMAIL_SMS_RECEIVED} will then be sent - * to the default dialer with the information extracted from the SMS. + * {@link VisualVoicemailService} in the current default dialer will be bound and + * {@link VisualVoicemailService#onSmsReceived(VisualVoicemailTask, VisualVoicemailSms)} + * will called with the information extracted from the SMS. * * <p>Use {@link android.telephony.VisualVoicemailSmsFilterSettings.Builder} to construct this * class. * - * @see android.telephony.TelephonyManager#enableVisualVoicemailSmsFilter - * - * @hide + * @see VisualVoicemailService#setSmsFilterSettings(Context, PhoneAccountHandle, VisualVoicemailSmsFilterSettings) */ -public class VisualVoicemailSmsFilterSettings implements Parcelable { +public final class VisualVoicemailSmsFilterSettings implements Parcelable { /** * The visual voicemail SMS message does not have to be a data SMS, and can be directed to any * port. - * - * @hide */ public static final int DESTINATION_PORT_ANY = -1; /** * The visual voicemail SMS message can be directed to any port, but must be a data SMS. - * - * @hide */ public static final int DESTINATION_PORT_DATA_SMS = -2; @@ -62,8 +61,6 @@ public class VisualVoicemailSmsFilterSettings implements Parcelable { /** * Builder class for {@link VisualVoicemailSmsFilterSettings} objects. - * - * @hide */ public static class Builder { @@ -171,4 +168,13 @@ public class VisualVoicemailSmsFilterSettings implements Parcelable { dest.writeInt(destinationPort); } + @Override + public String toString(){ + return "[VisualVoicemailSmsFilterSettings " + + "clientPrefix=" + clientPrefix + + ", originatingNumbers=" + originatingNumbers + + ", destinationPort=" + destinationPort + + "]"; + } + } diff --git a/telephony/java/com/android/internal/telephony/ITelephony.aidl b/telephony/java/com/android/internal/telephony/ITelephony.aidl index 9c62988c0e25..c0d6768aece0 100644 --- a/telephony/java/com/android/internal/telephony/ITelephony.aidl +++ b/telephony/java/com/android/internal/telephony/ITelephony.aidl @@ -16,6 +16,7 @@ package com.android.internal.telephony; +import android.app.PendingIntent; import android.content.Intent; import android.os.Bundle; import android.os.ResultReceiver; @@ -481,9 +482,18 @@ interface ITelephony { VisualVoicemailSmsFilterSettings getVisualVoicemailSmsFilterSettings(String callingPackage, int subId); - // Get settings set by the package, requires READ_PRIVILEGED_PHONE_STATE permission - VisualVoicemailSmsFilterSettings getSystemVisualVoicemailSmsFilterSettings(String packageName, - int subId); + /** + * Get settings set by the current default dialer, Internal use only. + * Requires READ_PRIVILEGED_PHONE_STATE permission. + */ + VisualVoicemailSmsFilterSettings getActiveVisualVoicemailSmsFilterSettings(int subId); + + /** + * Send a visual voicemail SMS. Internal use only. + * Requires caller to be the default dialer and have SEND_SMS permission + */ + oneway void sendVisualVoicemailSmsForSubscriber(in String callingPackage, in int subId, + in String number, in int port, in String text, in PendingIntent sentIntent); /** * Returns the network type for data transmission diff --git a/test-runner/src/android/test/mock/MockContext.java b/test-runner/src/android/test/mock/MockContext.java index 190fc35e4873..bcc68b38dd2b 100644 --- a/test-runner/src/android/test/mock/MockContext.java +++ b/test-runner/src/android/test/mock/MockContext.java @@ -780,4 +780,10 @@ public class MockContext extends Context { public IApplicationThread getIApplicationThread() { throw new UnsupportedOperationException(); } + + /** {@hide} */ + @Override + public Handler getMainThreadHandler() { + throw new UnsupportedOperationException(); + } } diff --git a/tools/aapt2/link/XmlReferenceLinker.cpp b/tools/aapt2/link/XmlReferenceLinker.cpp index a8198318b69e..1dbe53c02ecf 100644 --- a/tools/aapt2/link/XmlReferenceLinker.cpp +++ b/tools/aapt2/link/XmlReferenceLinker.cpp @@ -16,6 +16,8 @@ #include "link/Linkers.h" +#include "androidfw/ResourceTypes.h" + #include "Diagnostics.h" #include "ResourceUtils.h" #include "SdkConstants.h" @@ -40,17 +42,12 @@ class ReferenceVisitor : public ValueVisitor { public: using ValueVisitor::Visit; - ReferenceVisitor(IAaptContext* context, SymbolTable* symbols, - xml::IPackageDeclStack* decls, CallSite* callsite) - : context_(context), - symbols_(symbols), - decls_(decls), - callsite_(callsite), - error_(false) {} + ReferenceVisitor(IAaptContext* context, SymbolTable* symbols, xml::IPackageDeclStack* decls, + CallSite* callsite) + : context_(context), symbols_(symbols), decls_(decls), callsite_(callsite), error_(false) {} void Visit(Reference* ref) override { - if (!ReferenceLinker::LinkReference(ref, context_, symbols_, decls_, - callsite_)) { + if (!ReferenceLinker::LinkReference(ref, context_, symbols_, decls_, callsite_)) { error_ = true; } } @@ -84,73 +81,72 @@ class XmlVisitor : public xml::PackageAwareVisitor { reference_visitor_(context, symbols, this, callsite) {} void Visit(xml::Element* el) override { + // The default Attribute allows everything except enums or flags. + constexpr const static uint32_t kDefaultTypeMask = + 0xffffffffu & ~(android::ResTable_map::TYPE_ENUM | android::ResTable_map::TYPE_FLAGS); + const static Attribute kDefaultAttribute(true /* weak */, kDefaultTypeMask); + const Source source = source_.WithLine(el->line_number); for (xml::Attribute& attr : el->attributes) { - Maybe<xml::ExtractedPackage> maybe_package = - xml::ExtractPackageFromNamespace(attr.namespace_uri); - if (maybe_package) { - // There is a valid package name for this attribute. We will look this - // up. - StringPiece package = maybe_package.value().package; - if (package.empty()) { + // If the attribute has no namespace, interpret values as if + // they were assigned to the default Attribute. + + const Attribute* attribute = &kDefaultAttribute; + std::string attribute_package; + + if (Maybe<xml::ExtractedPackage> maybe_package = + xml::ExtractPackageFromNamespace(attr.namespace_uri)) { + // There is a valid package name for this attribute. We will look this up. + attribute_package = maybe_package.value().package; + if (attribute_package.empty()) { // Empty package means the 'current' or 'local' package. - package = context_->GetCompilationPackage(); + attribute_package = context_->GetCompilationPackage(); } - Reference attr_ref( - ResourceNameRef(package, ResourceType::kAttr, attr.name)); + Reference attr_ref(ResourceNameRef(attribute_package, ResourceType::kAttr, attr.name)); attr_ref.private_reference = maybe_package.value().private_namespace; std::string err_str; attr.compiled_attribute = ReferenceLinker::CompileXmlAttribute( - attr_ref, context_->GetNameMangler(), symbols_, callsite_, - &err_str); - - // Convert the string value into a compiled Value if this is a valid - // attribute. - if (attr.compiled_attribute) { - if (attr.compiled_attribute.value().id) { - // Record all SDK levels from which the attributes were defined. - const size_t sdk_level = FindAttributeSdkLevel( - attr.compiled_attribute.value().id.value()); - if (sdk_level > 1) { - sdk_levels_found_->insert(sdk_level); - } - } - - const Attribute* attribute = - &attr.compiled_attribute.value().attribute; - attr.compiled_value = - ResourceUtils::TryParseItemForAttribute(attr.value, attribute); - if (!attr.compiled_value && - !(attribute->type_mask & android::ResTable_map::TYPE_STRING)) { - // We won't be able to encode this as a string. - context_->GetDiagnostics()->Error( - DiagMessage(source) << "'" << attr.value << "' " - << "is incompatible with attribute " - << package << ":" << attr.name << " " - << *attribute); - error_ = true; - } + attr_ref, context_->GetNameMangler(), symbols_, callsite_, &err_str); - } else { - context_->GetDiagnostics()->Error(DiagMessage(source) - << "attribute '" << package << ":" - << attr.name << "' " << err_str); + if (!attr.compiled_attribute) { + context_->GetDiagnostics()->Error(DiagMessage(source) << "attribute '" + << attribute_package << ":" + << attr.name << "' " << err_str); error_ = true; + continue; } - } else if (!attr.compiled_value) { - // We still encode references, but only if we haven't manually set this - // to - // another compiled value. - attr.compiled_value = ResourceUtils::TryParseReference(attr.value); + + // Find this compiled attribute's SDK level. + const xml::AaptAttribute& aapt_attr = attr.compiled_attribute.value(); + if (aapt_attr.id) { + // Record all SDK levels from which the attributes were defined. + const size_t sdk_level = FindAttributeSdkLevel(aapt_attr.id.value()); + if (sdk_level > 1) { + sdk_levels_found_->insert(sdk_level); + } + } + attribute = &aapt_attr.attribute; } + attr.compiled_value = ResourceUtils::TryParseItemForAttribute(attr.value, attribute); if (attr.compiled_value) { // With a compiledValue, we must resolve the reference and assign it an // ID. attr.compiled_value->SetSource(source); attr.compiled_value->Accept(&reference_visitor_); + } else if ((attribute->type_mask & android::ResTable_map::TYPE_STRING) == 0) { + // We won't be able to encode this as a string. + DiagMessage msg(source); + msg << "'" << attr.value << "' " + << "is incompatible with attribute "; + if (!attribute_package.empty()) { + msg << attribute_package << ":"; + } + msg << attr.name << " " << *attribute; + context_->GetDiagnostics()->Error(msg); + error_ = true; } } @@ -174,12 +170,11 @@ class XmlVisitor : public xml::PackageAwareVisitor { } // namespace -bool XmlReferenceLinker::Consume(IAaptContext* context, - xml::XmlResource* resource) { +bool XmlReferenceLinker::Consume(IAaptContext* context, xml::XmlResource* resource) { sdk_levels_found_.clear(); CallSite callsite = {resource->file.name}; - XmlVisitor visitor(context, context->GetExternalSymbols(), - resource->file.source, &sdk_levels_found_, &callsite); + XmlVisitor visitor(context, context->GetExternalSymbols(), resource->file.source, + &sdk_levels_found_, &callsite); if (resource->root) { resource->root->Accept(&visitor); return !visitor.HasError(); diff --git a/tools/aapt2/link/XmlReferenceLinker_test.cpp b/tools/aapt2/link/XmlReferenceLinker_test.cpp index 810f63c0410e..cc59416cb2b9 100644 --- a/tools/aapt2/link/XmlReferenceLinker_test.cpp +++ b/tools/aapt2/link/XmlReferenceLinker_test.cpp @@ -23,63 +23,52 @@ namespace aapt { class XmlReferenceLinkerTest : public ::testing::Test { public: void SetUp() override { - context_ = - test::ContextBuilder() - .SetCompilationPackage("com.app.test") - .SetNameManglerPolicy( - NameManglerPolicy{"com.app.test", {"com.android.support"}}) - .AddSymbolSource( - test::StaticSymbolSourceBuilder() - .AddPublicSymbol( - "android:attr/layout_width", ResourceId(0x01010000), - test::AttributeBuilder() - .SetTypeMask(android::ResTable_map::TYPE_ENUM | - android::ResTable_map::TYPE_DIMENSION) - .AddItem("match_parent", 0xffffffff) - .Build()) - .AddPublicSymbol( - "android:attr/background", ResourceId(0x01010001), - test::AttributeBuilder() - .SetTypeMask(android::ResTable_map::TYPE_COLOR) - .Build()) - .AddPublicSymbol("android:attr/attr", - ResourceId(0x01010002), - test::AttributeBuilder().Build()) - .AddPublicSymbol( - "android:attr/text", ResourceId(0x01010003), - test::AttributeBuilder() - .SetTypeMask(android::ResTable_map::TYPE_STRING) - .Build()) - - // Add one real symbol that was introduces in v21 - .AddPublicSymbol("android:attr/colorAccent", - ResourceId(0x01010435), - test::AttributeBuilder().Build()) - - // Private symbol. - .AddSymbol("android:color/hidden", ResourceId(0x01020001)) - - .AddPublicSymbol("android:id/id", ResourceId(0x01030000)) - .AddSymbol("com.app.test:id/id", ResourceId(0x7f030000)) - .AddSymbol("com.app.test:color/green", - ResourceId(0x7f020000)) - .AddSymbol("com.app.test:color/red", ResourceId(0x7f020001)) - .AddSymbol( - "com.app.test:attr/colorAccent", ResourceId(0x7f010000), - test::AttributeBuilder() - .SetTypeMask(android::ResTable_map::TYPE_COLOR) - .Build()) - .AddPublicSymbol( - "com.app.test:attr/com.android.support$colorAccent", - ResourceId(0x7f010001), - test::AttributeBuilder() - .SetTypeMask(android::ResTable_map::TYPE_COLOR) - .Build()) - .AddPublicSymbol("com.app.test:attr/attr", - ResourceId(0x7f010002), - test::AttributeBuilder().Build()) - .Build()) - .Build(); + context_ = test::ContextBuilder() + .SetCompilationPackage("com.app.test") + .SetNameManglerPolicy(NameManglerPolicy{"com.app.test", {"com.android.support"}}) + .AddSymbolSource( + test::StaticSymbolSourceBuilder() + .AddPublicSymbol("android:attr/layout_width", ResourceId(0x01010000), + test::AttributeBuilder() + .SetTypeMask(android::ResTable_map::TYPE_ENUM | + android::ResTable_map::TYPE_DIMENSION) + .AddItem("match_parent", 0xffffffff) + .Build()) + .AddPublicSymbol("android:attr/background", ResourceId(0x01010001), + test::AttributeBuilder() + .SetTypeMask(android::ResTable_map::TYPE_COLOR) + .Build()) + .AddPublicSymbol("android:attr/attr", ResourceId(0x01010002), + test::AttributeBuilder().Build()) + .AddPublicSymbol("android:attr/text", ResourceId(0x01010003), + test::AttributeBuilder() + .SetTypeMask(android::ResTable_map::TYPE_STRING) + .Build()) + + // Add one real symbol that was introduces in v21 + .AddPublicSymbol("android:attr/colorAccent", ResourceId(0x01010435), + test::AttributeBuilder().Build()) + + // Private symbol. + .AddSymbol("android:color/hidden", ResourceId(0x01020001)) + + .AddPublicSymbol("android:id/id", ResourceId(0x01030000)) + .AddSymbol("com.app.test:id/id", ResourceId(0x7f030000)) + .AddSymbol("com.app.test:color/green", ResourceId(0x7f020000)) + .AddSymbol("com.app.test:color/red", ResourceId(0x7f020001)) + .AddSymbol("com.app.test:attr/colorAccent", ResourceId(0x7f010000), + test::AttributeBuilder() + .SetTypeMask(android::ResTable_map::TYPE_COLOR) + .Build()) + .AddPublicSymbol("com.app.test:attr/com.android.support$colorAccent", + ResourceId(0x7f010001), + test::AttributeBuilder() + .SetTypeMask(android::ResTable_map::TYPE_COLOR) + .Build()) + .AddPublicSymbol("com.app.test:attr/attr", ResourceId(0x7f010002), + test::AttributeBuilder().Build()) + .Build()) + .Build(); } protected: @@ -87,12 +76,13 @@ class XmlReferenceLinkerTest : public ::testing::Test { }; TEST_F(XmlReferenceLinkerTest, LinkBasicAttributes) { - std::unique_ptr<xml::XmlResource> doc = - test::BuildXmlDomForPackageName(context_.get(), R"EOF( + std::unique_ptr<xml::XmlResource> doc = test::BuildXmlDomForPackageName(context_.get(), R"EOF( <View xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:background="@color/green" android:text="hello" + nonAaptAttr="1" + nonAaptAttrRef="@id/id" class="hello" />)EOF"); XmlReferenceLinker linker; @@ -101,38 +91,44 @@ TEST_F(XmlReferenceLinkerTest, LinkBasicAttributes) { xml::Element* view_el = xml::FindRootElement(doc.get()); ASSERT_NE(view_el, nullptr); - xml::Attribute* xml_attr = - view_el->FindAttribute(xml::kSchemaAndroid, "layout_width"); + xml::Attribute* xml_attr = view_el->FindAttribute(xml::kSchemaAndroid, "layout_width"); ASSERT_NE(xml_attr, nullptr); AAPT_ASSERT_TRUE(xml_attr->compiled_attribute); AAPT_ASSERT_TRUE(xml_attr->compiled_attribute.value().id); - EXPECT_EQ(xml_attr->compiled_attribute.value().id.value(), - ResourceId(0x01010000)); + EXPECT_EQ(xml_attr->compiled_attribute.value().id.value(), ResourceId(0x01010000)); ASSERT_NE(xml_attr->compiled_value, nullptr); - ASSERT_NE(ValueCast<BinaryPrimitive>(xml_attr->compiled_value.get()), - nullptr); + ASSERT_NE(ValueCast<BinaryPrimitive>(xml_attr->compiled_value.get()), nullptr); xml_attr = view_el->FindAttribute(xml::kSchemaAndroid, "background"); ASSERT_NE(xml_attr, nullptr); AAPT_ASSERT_TRUE(xml_attr->compiled_attribute); AAPT_ASSERT_TRUE(xml_attr->compiled_attribute.value().id); - EXPECT_EQ(xml_attr->compiled_attribute.value().id.value(), - ResourceId(0x01010001)); + EXPECT_EQ(xml_attr->compiled_attribute.value().id.value(), ResourceId(0x01010001)); ASSERT_NE(xml_attr->compiled_value, nullptr); Reference* ref = ValueCast<Reference>(xml_attr->compiled_value.get()); ASSERT_NE(ref, nullptr); AAPT_ASSERT_TRUE(ref->name); - EXPECT_EQ(ref->name.value(), - test::ParseNameOrDie("color/green")); // Make sure the name - // didn't change. + EXPECT_EQ(ref->name.value(), test::ParseNameOrDie("color/green")); // Make sure the name + // didn't change. AAPT_ASSERT_TRUE(ref->id); EXPECT_EQ(ref->id.value(), ResourceId(0x7f020000)); xml_attr = view_el->FindAttribute(xml::kSchemaAndroid, "text"); ASSERT_NE(xml_attr, nullptr); AAPT_ASSERT_TRUE(xml_attr->compiled_attribute); - ASSERT_FALSE( - xml_attr->compiled_value); // Strings don't get compiled for memory sake. + ASSERT_FALSE(xml_attr->compiled_value); // Strings don't get compiled for memory sake. + + xml_attr = view_el->FindAttribute("", "nonAaptAttr"); + ASSERT_NE(nullptr, xml_attr); + AAPT_ASSERT_FALSE(xml_attr->compiled_attribute); + ASSERT_NE(nullptr, xml_attr->compiled_value); + ASSERT_NE(nullptr, ValueCast<BinaryPrimitive>(xml_attr->compiled_value.get())); + + xml_attr = view_el->FindAttribute("", "nonAaptAttrRef"); + ASSERT_NE(nullptr, xml_attr); + AAPT_ASSERT_FALSE(xml_attr->compiled_attribute); + ASSERT_NE(nullptr, xml_attr->compiled_value); + ASSERT_NE(nullptr, ValueCast<Reference>(xml_attr->compiled_value.get())); xml_attr = view_el->FindAttribute("", "class"); ASSERT_NE(xml_attr, nullptr); @@ -141,8 +137,7 @@ TEST_F(XmlReferenceLinkerTest, LinkBasicAttributes) { } TEST_F(XmlReferenceLinkerTest, PrivateSymbolsAreNotLinked) { - std::unique_ptr<xml::XmlResource> doc = - test::BuildXmlDomForPackageName(context_.get(), R"EOF( + std::unique_ptr<xml::XmlResource> doc = test::BuildXmlDomForPackageName(context_.get(), R"EOF( <View xmlns:android="http://schemas.android.com/apk/res/android" android:colorAccent="@android:color/hidden" />)EOF"); @@ -150,10 +145,8 @@ TEST_F(XmlReferenceLinkerTest, PrivateSymbolsAreNotLinked) { ASSERT_FALSE(linker.Consume(context_.get(), doc.get())); } -TEST_F(XmlReferenceLinkerTest, - PrivateSymbolsAreLinkedWhenReferenceHasStarPrefix) { - std::unique_ptr<xml::XmlResource> doc = - test::BuildXmlDomForPackageName(context_.get(), R"EOF( +TEST_F(XmlReferenceLinkerTest, PrivateSymbolsAreLinkedWhenReferenceHasStarPrefix) { + std::unique_ptr<xml::XmlResource> doc = test::BuildXmlDomForPackageName(context_.get(), R"EOF( <View xmlns:android="http://schemas.android.com/apk/res/android" android:colorAccent="@*android:color/hidden" />)EOF"); @@ -162,8 +155,7 @@ TEST_F(XmlReferenceLinkerTest, } TEST_F(XmlReferenceLinkerTest, SdkLevelsAreRecorded) { - std::unique_ptr<xml::XmlResource> doc = - test::BuildXmlDomForPackageName(context_.get(), R"EOF( + std::unique_ptr<xml::XmlResource> doc = test::BuildXmlDomForPackageName(context_.get(), R"EOF( <View xmlns:android="http://schemas.android.com/apk/res/android" android:colorAccent="#ffffff" />)EOF"); @@ -173,8 +165,7 @@ TEST_F(XmlReferenceLinkerTest, SdkLevelsAreRecorded) { } TEST_F(XmlReferenceLinkerTest, LinkMangledAttributes) { - std::unique_ptr<xml::XmlResource> doc = - test::BuildXmlDomForPackageName(context_.get(), R"EOF( + std::unique_ptr<xml::XmlResource> doc = test::BuildXmlDomForPackageName(context_.get(), R"EOF( <View xmlns:support="http://schemas.android.com/apk/res/com.android.support" support:colorAccent="#ff0000" />)EOF"); @@ -184,20 +175,17 @@ TEST_F(XmlReferenceLinkerTest, LinkMangledAttributes) { xml::Element* view_el = xml::FindRootElement(doc.get()); ASSERT_NE(view_el, nullptr); - xml::Attribute* xml_attr = view_el->FindAttribute( - xml::BuildPackageNamespace("com.android.support"), "colorAccent"); + xml::Attribute* xml_attr = + view_el->FindAttribute(xml::BuildPackageNamespace("com.android.support"), "colorAccent"); ASSERT_NE(xml_attr, nullptr); AAPT_ASSERT_TRUE(xml_attr->compiled_attribute); AAPT_ASSERT_TRUE(xml_attr->compiled_attribute.value().id); - EXPECT_EQ(xml_attr->compiled_attribute.value().id.value(), - ResourceId(0x7f010001)); - ASSERT_NE(ValueCast<BinaryPrimitive>(xml_attr->compiled_value.get()), - nullptr); + EXPECT_EQ(xml_attr->compiled_attribute.value().id.value(), ResourceId(0x7f010001)); + ASSERT_NE(ValueCast<BinaryPrimitive>(xml_attr->compiled_value.get()), nullptr); } TEST_F(XmlReferenceLinkerTest, LinkAutoResReference) { - std::unique_ptr<xml::XmlResource> doc = - test::BuildXmlDomForPackageName(context_.get(), R"EOF( + std::unique_ptr<xml::XmlResource> doc = test::BuildXmlDomForPackageName(context_.get(), R"EOF( <View xmlns:app="http://schemas.android.com/apk/res-auto" app:colorAccent="@app:color/red" />)EOF"); @@ -207,13 +195,11 @@ TEST_F(XmlReferenceLinkerTest, LinkAutoResReference) { xml::Element* view_el = xml::FindRootElement(doc.get()); ASSERT_NE(view_el, nullptr); - xml::Attribute* xml_attr = - view_el->FindAttribute(xml::kSchemaAuto, "colorAccent"); + xml::Attribute* xml_attr = view_el->FindAttribute(xml::kSchemaAuto, "colorAccent"); ASSERT_NE(xml_attr, nullptr); AAPT_ASSERT_TRUE(xml_attr->compiled_attribute); AAPT_ASSERT_TRUE(xml_attr->compiled_attribute.value().id); - EXPECT_EQ(xml_attr->compiled_attribute.value().id.value(), - ResourceId(0x7f010000)); + EXPECT_EQ(xml_attr->compiled_attribute.value().id.value(), ResourceId(0x7f010000)); Reference* ref = ValueCast<Reference>(xml_attr->compiled_value.get()); ASSERT_NE(ref, nullptr); AAPT_ASSERT_TRUE(ref->name); @@ -222,8 +208,7 @@ TEST_F(XmlReferenceLinkerTest, LinkAutoResReference) { } TEST_F(XmlReferenceLinkerTest, LinkViewWithShadowedPackageAlias) { - std::unique_ptr<xml::XmlResource> doc = - test::BuildXmlDomForPackageName(context_.get(), R"EOF( + std::unique_ptr<xml::XmlResource> doc = test::BuildXmlDomForPackageName(context_.get(), R"EOF( <View xmlns:app="http://schemas.android.com/apk/res/android" app:attr="@app:id/id"> <View xmlns:app="http://schemas.android.com/apk/res/com.app.test" @@ -238,13 +223,11 @@ TEST_F(XmlReferenceLinkerTest, LinkViewWithShadowedPackageAlias) { // All attributes and references in this element should be referring to // "android" (0x01). - xml::Attribute* xml_attr = - view_el->FindAttribute(xml::kSchemaAndroid, "attr"); + xml::Attribute* xml_attr = view_el->FindAttribute(xml::kSchemaAndroid, "attr"); ASSERT_NE(xml_attr, nullptr); AAPT_ASSERT_TRUE(xml_attr->compiled_attribute); AAPT_ASSERT_TRUE(xml_attr->compiled_attribute.value().id); - EXPECT_EQ(xml_attr->compiled_attribute.value().id.value(), - ResourceId(0x01010002)); + EXPECT_EQ(xml_attr->compiled_attribute.value().id.value(), ResourceId(0x01010002)); Reference* ref = ValueCast<Reference>(xml_attr->compiled_value.get()); ASSERT_NE(ref, nullptr); AAPT_ASSERT_TRUE(ref->id); @@ -256,13 +239,11 @@ TEST_F(XmlReferenceLinkerTest, LinkViewWithShadowedPackageAlias) { // All attributes and references in this element should be referring to // "com.app.test" (0x7f). - xml_attr = view_el->FindAttribute(xml::BuildPackageNamespace("com.app.test"), - "attr"); + xml_attr = view_el->FindAttribute(xml::BuildPackageNamespace("com.app.test"), "attr"); ASSERT_NE(xml_attr, nullptr); AAPT_ASSERT_TRUE(xml_attr->compiled_attribute); AAPT_ASSERT_TRUE(xml_attr->compiled_attribute.value().id); - EXPECT_EQ(xml_attr->compiled_attribute.value().id.value(), - ResourceId(0x7f010002)); + EXPECT_EQ(xml_attr->compiled_attribute.value().id.value(), ResourceId(0x7f010002)); ref = ValueCast<Reference>(xml_attr->compiled_value.get()); ASSERT_NE(ref, nullptr); AAPT_ASSERT_TRUE(ref->id); @@ -270,8 +251,7 @@ TEST_F(XmlReferenceLinkerTest, LinkViewWithShadowedPackageAlias) { } TEST_F(XmlReferenceLinkerTest, LinkViewWithLocalPackageAndAliasOfTheSameName) { - std::unique_ptr<xml::XmlResource> doc = - test::BuildXmlDomForPackageName(context_.get(), R"EOF( + std::unique_ptr<xml::XmlResource> doc = test::BuildXmlDomForPackageName(context_.get(), R"EOF( <View xmlns:android="http://schemas.android.com/apk/res/com.app.test" android:attr="@id/id"/>)EOF"); @@ -283,13 +263,12 @@ TEST_F(XmlReferenceLinkerTest, LinkViewWithLocalPackageAndAliasOfTheSameName) { // All attributes and references in this element should be referring to // "com.app.test" (0x7f). - xml::Attribute* xml_attr = view_el->FindAttribute( - xml::BuildPackageNamespace("com.app.test"), "attr"); + xml::Attribute* xml_attr = + view_el->FindAttribute(xml::BuildPackageNamespace("com.app.test"), "attr"); ASSERT_NE(xml_attr, nullptr); AAPT_ASSERT_TRUE(xml_attr->compiled_attribute); AAPT_ASSERT_TRUE(xml_attr->compiled_attribute.value().id); - EXPECT_EQ(xml_attr->compiled_attribute.value().id.value(), - ResourceId(0x7f010002)); + EXPECT_EQ(xml_attr->compiled_attribute.value().id.value(), ResourceId(0x7f010002)); Reference* ref = ValueCast<Reference>(xml_attr->compiled_value.get()); ASSERT_NE(ref, nullptr); AAPT_ASSERT_TRUE(ref->id); |