diff options
551 files changed, 9535 insertions, 4487 deletions
diff --git a/Android.mk b/Android.mk index ed85df0ffef7..a596ee782a3b 100644 --- a/Android.mk +++ b/Android.mk @@ -202,6 +202,8 @@ LOCAL_SRC_FILES += \ core/java/android/os/IUpdateLock.aidl \ core/java/android/os/IUserManager.aidl \ core/java/android/os/IVibratorService.aidl \ + core/java/android/service/carriermessaging/ICarrierMessagingCallback.aidl \ + core/java/android/service/carriermessaging/ICarrierMessagingService.aidl \ core/java/android/service/notification/INotificationListener.aidl \ core/java/android/service/notification/IStatusBarNotificationHolder.aidl \ core/java/android/service/notification/IConditionListener.aidl \ @@ -400,9 +402,6 @@ LOCAL_DX_FLAGS := --core-library --multi-dex LOCAL_RMTYPEDEFS := true -# List of classes and interfaces which should be loaded by the Zygote. -LOCAL_JAVA_RESOURCE_FILES += $(LOCAL_PATH)/preloaded-classes - include $(BUILD_JAVA_LIBRARY) framework_module := $(LOCAL_INSTALLED_MODULE) @@ -522,6 +521,8 @@ aidl_files := \ frameworks/base/core/java/android/view/textservice/SpellCheckerInfo.aidl \ frameworks/base/core/java/android/view/textservice/SentenceSuggestionsInfo.aidl \ frameworks/base/core/java/android/view/textservice/SuggestionsInfo.aidl \ + frameworks/base/core/java/android/service/carriermessaging/MessagePdu.aidl \ + frameworks/base/core/java/android/service/carriermessaging/CarrierMessagingService.aidl \ frameworks/base/core/java/android/service/notification/StatusBarNotification.aidl \ frameworks/base/core/java/android/speech/tts/Voice.aidl \ frameworks/base/core/java/android/app/usage/UsageEvents.aidl \ @@ -733,6 +734,7 @@ sample_groups := -samplegroup Background \ -samplegroup Content \ -samplegroup Input \ -samplegroup Media \ + -samplegroup Notification \ -samplegroup RenderScript \ -samplegroup Security \ -samplegroup Sensors \ diff --git a/api/current.txt b/api/current.txt index 1a882ac5a6e2..c480a1bbd196 100644 --- a/api/current.txt +++ b/api/current.txt @@ -20,6 +20,7 @@ package android { field public static final java.lang.String BATTERY_STATS = "android.permission.BATTERY_STATS"; field public static final java.lang.String BIND_ACCESSIBILITY_SERVICE = "android.permission.BIND_ACCESSIBILITY_SERVICE"; field public static final java.lang.String BIND_APPWIDGET = "android.permission.BIND_APPWIDGET"; + field public static final java.lang.String BIND_CARRIER_MESSAGING_SERVICE = "android.permission.BIND_CARRIER_MESSAGING_SERVICE"; field public static final java.lang.String BIND_DEVICE_ADMIN = "android.permission.BIND_DEVICE_ADMIN"; field public static final java.lang.String BIND_DREAM_SERVICE = "android.permission.BIND_DREAM_SERVICE"; field public static final java.lang.String BIND_INPUT_METHOD = "android.permission.BIND_INPUT_METHOD"; @@ -2708,7 +2709,9 @@ package android.accounts { method public void invalidateAuthToken(java.lang.String, java.lang.String); method public static android.content.Intent newChooseAccountIntent(android.accounts.Account, java.util.ArrayList<android.accounts.Account>, java.lang.String[], boolean, java.lang.String, java.lang.String, java.lang.String[], android.os.Bundle); method public java.lang.String peekAuthToken(android.accounts.Account, java.lang.String); - method public android.accounts.AccountManagerFuture<java.lang.Boolean> removeAccount(android.accounts.Account, android.accounts.AccountManagerCallback<java.lang.Boolean>, android.os.Handler); + method public deprecated android.accounts.AccountManagerFuture<java.lang.Boolean> removeAccount(android.accounts.Account, android.accounts.AccountManagerCallback<java.lang.Boolean>, android.os.Handler); + method public android.accounts.AccountManagerFuture<android.os.Bundle> removeAccount(android.accounts.Account, android.app.Activity, android.accounts.AccountManagerCallback<android.os.Bundle>, android.os.Handler); + method public boolean removeAccountExplicitly(android.accounts.Account); method public void removeOnAccountsUpdatedListener(android.accounts.OnAccountsUpdateListener); method public android.accounts.AccountManagerFuture<android.accounts.Account> renameAccount(android.accounts.Account, java.lang.String, android.accounts.AccountManagerCallback<android.accounts.Account>, android.os.Handler); method public void setAuthToken(android.accounts.Account, java.lang.String, java.lang.String); @@ -5393,11 +5396,13 @@ package android.app.admin { field public static final int ENCRYPTION_STATUS_UNSUPPORTED = 0; // 0x0 field public static final java.lang.String EXTRA_ADD_EXPLANATION = "android.app.extra.ADD_EXPLANATION"; field public static final java.lang.String EXTRA_DEVICE_ADMIN = "android.app.extra.DEVICE_ADMIN"; + field public static final java.lang.String EXTRA_PROVISIONING_ACCOUNT_TO_MIGRATE = "android.app.extra.PROVISIONING_ACCOUNT_TO_MIGRATE"; field public static final java.lang.String EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE = "android.app.extra.PROVISIONING_ADMIN_EXTRAS_BUNDLE"; field public static final java.lang.String EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_CHECKSUM = "android.app.extra.PROVISIONING_DEVICE_ADMIN_PACKAGE_CHECKSUM"; field public static final java.lang.String EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_DOWNLOAD_COOKIE_HEADER = "android.app.extra.PROVISIONING_DEVICE_ADMIN_PACKAGE_DOWNLOAD_COOKIE_HEADER"; field public static final java.lang.String EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_DOWNLOAD_LOCATION = "android.app.extra.PROVISIONING_DEVICE_ADMIN_PACKAGE_DOWNLOAD_LOCATION"; field public static final java.lang.String EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_NAME = "android.app.extra.PROVISIONING_DEVICE_ADMIN_PACKAGE_NAME"; + field public static final java.lang.String EXTRA_PROVISIONING_DONT_DISABLE_SYSTEM_APPS = "android.app.extra.PROVISIONING_DONT_DISABLE_SYSTEM_APPS"; field public static final java.lang.String EXTRA_PROVISIONING_EMAIL_ADDRESS = "android.app.extra.PROVISIONING_EMAIL_ADDRESS"; field public static final java.lang.String EXTRA_PROVISIONING_LOCALE = "android.app.extra.PROVISIONING_LOCALE"; field public static final java.lang.String EXTRA_PROVISIONING_LOCAL_TIME = "android.app.extra.PROVISIONING_LOCAL_TIME"; @@ -10929,6 +10934,7 @@ package android.graphics { method public boolean canClip(); method public float getAlpha(); method public boolean isEmpty(); + method public void offset(int, int); method public void set(android.graphics.Outline); method public void setAlpha(float); method public void setConvexPath(android.graphics.Path); @@ -12815,9 +12821,11 @@ package android.hardware.camera2 { field public static final int NOISE_REDUCTION_MODE_HIGH_QUALITY = 2; // 0x2 field public static final int NOISE_REDUCTION_MODE_OFF = 0; // 0x0 field public static final int REQUEST_AVAILABLE_CAPABILITIES_BACKWARD_COMPATIBLE = 0; // 0x0 + field public static final int REQUEST_AVAILABLE_CAPABILITIES_BURST_CAPTURE = 6; // 0x6 field public static final int REQUEST_AVAILABLE_CAPABILITIES_MANUAL_POST_PROCESSING = 2; // 0x2 field public static final int REQUEST_AVAILABLE_CAPABILITIES_MANUAL_SENSOR = 1; // 0x1 field public static final int REQUEST_AVAILABLE_CAPABILITIES_RAW = 3; // 0x3 + field public static final int REQUEST_AVAILABLE_CAPABILITIES_READ_SENSOR_SETTINGS = 5; // 0x5 field public static final int SCALER_CROPPING_TYPE_CENTER_ONLY = 0; // 0x0 field public static final int SCALER_CROPPING_TYPE_FREEFORM = 1; // 0x1 field public static final int SENSOR_INFO_COLOR_FILTER_ARRANGEMENT_BGGR = 3; // 0x3 @@ -21854,6 +21862,7 @@ package android.os { method public android.os.Bundle getData(); method public android.os.Handler getTarget(); method public long getWhen(); + method public boolean isAsynchronous(); method public static android.os.Message obtain(); method public static android.os.Message obtain(android.os.Message); method public static android.os.Message obtain(android.os.Handler); @@ -21865,6 +21874,7 @@ package android.os { method public android.os.Bundle peekData(); method public void recycle(); method public void sendToTarget(); + method public void setAsynchronous(boolean); method public void setData(android.os.Bundle); method public void setTarget(android.os.Handler); method public void writeToParcel(android.os.Parcel, int); @@ -26888,6 +26898,83 @@ package android.security { } +package android.service.carriermessaging { + + public abstract class CarrierMessagingService extends android.app.Service { + ctor public CarrierMessagingService(); + method public android.os.IBinder onBind(android.content.Intent); + method public int onDownloadMms(android.net.Uri, java.lang.String); + method public boolean onFilterSms(android.service.carriermessaging.MessagePdu, java.lang.String, int); + method public android.service.carriermessaging.CarrierMessagingService.SendSmsResponse onSendDataSms(byte[], java.lang.String, java.lang.String, int); + method public android.service.carriermessaging.CarrierMessagingService.SendMmsResult onSendMms(android.net.Uri, java.lang.String); + method public java.util.List<android.service.carriermessaging.CarrierMessagingService.SendSmsResponse> onSendMultipartTextSms(java.util.List<java.lang.String>, java.lang.String, java.lang.String); + method public android.service.carriermessaging.CarrierMessagingService.SendSmsResponse onSendTextSms(java.lang.String, java.lang.String, java.lang.String); + field public static final int DOWNLOAD_STATUS_ERROR = 2; // 0x2 + field public static final int DOWNLOAD_STATUS_OK = 0; // 0x0 + field public static final int DOWNLOAD_STATUS_RETRY_ON_CARRIER_NETWORK = 1; // 0x1 + field public static final int SEND_STATUS_ERROR = 2; // 0x2 + field public static final int SEND_STATUS_OK = 0; // 0x0 + field public static final int SEND_STATUS_RETRY_ON_CARRIER_NETWORK = 1; // 0x1 + field public static final java.lang.String SERVICE_INTERFACE = "android.service.carriermessaging.CarrierMessagingService"; + } + + public static final class CarrierMessagingService.SendMmsResult { + ctor public CarrierMessagingService.SendMmsResult(int, byte[]); + method public int getResult(); + method public byte[] getSendConfPdu(); + } + + public static final class CarrierMessagingService.SendSmsResponse implements android.os.Parcelable { + ctor public CarrierMessagingService.SendSmsResponse(int, byte[], int); + method public int describeContents(); + method public byte[] getAckPdu(); + method public int getErrorCode(); + method public int getMessageRef(); + method public void writeToParcel(android.os.Parcel, int); + field public static final android.os.Parcelable.Creator<android.service.carriermessaging.CarrierMessagingService.SendSmsResponse> CREATOR; + } + + public abstract interface ICarrierMessagingCallback implements android.os.IInterface { + method public abstract void onDownloadMmsComplete(int) throws android.os.RemoteException; + method public abstract void onFilterComplete(boolean) throws android.os.RemoteException; + method public abstract void onSendMmsComplete(int, byte[]) throws android.os.RemoteException; + method public abstract void onSendMultipartSmsComplete(int, java.util.List<android.service.carriermessaging.CarrierMessagingService.SendSmsResponse>) throws android.os.RemoteException; + method public abstract void onSendSmsComplete(int, android.service.carriermessaging.CarrierMessagingService.SendSmsResponse) throws android.os.RemoteException; + } + + public static abstract class ICarrierMessagingCallback.Stub extends android.os.Binder implements android.service.carriermessaging.ICarrierMessagingCallback { + ctor public ICarrierMessagingCallback.Stub(); + method public android.os.IBinder asBinder(); + method public static android.service.carriermessaging.ICarrierMessagingCallback asInterface(android.os.IBinder); + method public boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) throws android.os.RemoteException; + } + + public abstract interface ICarrierMessagingService implements android.os.IInterface { + method public abstract void downloadMms(android.net.Uri, java.lang.String, android.service.carriermessaging.ICarrierMessagingCallback) throws android.os.RemoteException; + method public abstract void filterSms(android.service.carriermessaging.MessagePdu, java.lang.String, int, android.service.carriermessaging.ICarrierMessagingCallback) throws android.os.RemoteException; + method public abstract void sendDataSms(byte[], java.lang.String, java.lang.String, int, android.service.carriermessaging.ICarrierMessagingCallback) throws android.os.RemoteException; + method public abstract void sendMms(android.net.Uri, java.lang.String, android.service.carriermessaging.ICarrierMessagingCallback) throws android.os.RemoteException; + method public abstract void sendMultipartTextSms(java.util.List<java.lang.String>, java.lang.String, java.lang.String, android.service.carriermessaging.ICarrierMessagingCallback) throws android.os.RemoteException; + method public abstract void sendTextSms(java.lang.String, java.lang.String, java.lang.String, android.service.carriermessaging.ICarrierMessagingCallback) throws android.os.RemoteException; + } + + public static abstract class ICarrierMessagingService.Stub extends android.os.Binder implements android.service.carriermessaging.ICarrierMessagingService { + ctor public ICarrierMessagingService.Stub(); + method public android.os.IBinder asBinder(); + method public static android.service.carriermessaging.ICarrierMessagingService asInterface(android.os.IBinder); + method public boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) throws android.os.RemoteException; + } + + public final class MessagePdu implements android.os.Parcelable { + ctor public MessagePdu(java.util.List<byte[]>); + method public int describeContents(); + method public java.util.List<byte[]> getPdus(); + method public void writeToParcel(android.os.Parcel, int); + field public static final android.os.Parcelable.Creator<android.service.carriermessaging.MessagePdu> CREATOR; + } + +} + package android.service.dreams { public class DreamService extends android.app.Service implements android.view.Window.Callback { @@ -28616,6 +28703,7 @@ package android.telephony { method public boolean setGlobalPreferredNetworkType(); method public void setLine1NumberForDisplay(java.lang.String, java.lang.String); method public boolean setOperatorBrandOverride(java.lang.String); + method public boolean setVoiceMailNumber(java.lang.String, java.lang.String); field public static final java.lang.String ACTION_PHONE_STATE_CHANGED = "android.intent.action.PHONE_STATE"; field public static final java.lang.String ACTION_RESPOND_VIA_MESSAGE = "android.intent.action.RESPOND_VIA_MESSAGE"; field public static final int CALL_STATE_IDLE = 0; // 0x0 @@ -35921,24 +36009,25 @@ package android.webkit { enum_constant public static final android.webkit.ConsoleMessage.MessageLevel WARNING; } - public class CookieManager { - method public synchronized boolean acceptCookie(); - method public boolean acceptThirdPartyCookies(android.webkit.WebView); + public abstract class CookieManager { + ctor public CookieManager(); + method public abstract boolean acceptCookie(); + method public abstract boolean acceptThirdPartyCookies(android.webkit.WebView); method public static boolean allowFileSchemeCookies(); - method public void flush(); - method public java.lang.String getCookie(java.lang.String); + method public abstract void flush(); + method public abstract java.lang.String getCookie(java.lang.String); method public static synchronized android.webkit.CookieManager getInstance(); - method public synchronized boolean hasCookies(); - method public deprecated void removeAllCookie(); - method public void removeAllCookies(android.webkit.ValueCallback<java.lang.Boolean>); - method public deprecated void removeExpiredCookie(); - method public deprecated void removeSessionCookie(); - method public void removeSessionCookies(android.webkit.ValueCallback<java.lang.Boolean>); - method public synchronized void setAcceptCookie(boolean); + method public abstract boolean hasCookies(); + method public abstract deprecated void removeAllCookie(); + method public abstract void removeAllCookies(android.webkit.ValueCallback<java.lang.Boolean>); + method public abstract deprecated void removeExpiredCookie(); + method public abstract deprecated void removeSessionCookie(); + method public abstract void removeSessionCookies(android.webkit.ValueCallback<java.lang.Boolean>); + method public abstract void setAcceptCookie(boolean); method public static void setAcceptFileSchemeCookies(boolean); - method public void setAcceptThirdPartyCookies(android.webkit.WebView, boolean); - method public void setCookie(java.lang.String, java.lang.String); - method public void setCookie(java.lang.String, java.lang.String, android.webkit.ValueCallback<java.lang.Boolean>); + method public abstract void setAcceptThirdPartyCookies(android.webkit.WebView, boolean); + method public abstract void setCookie(java.lang.String, java.lang.String); + method public abstract void setCookie(java.lang.String, java.lang.String, android.webkit.ValueCallback<java.lang.Boolean>); } public final deprecated class CookieSyncManager extends android.webkit.WebSyncManager { @@ -36047,11 +36136,13 @@ package android.webkit { method public abstract void onReceiveValue(T); } - public class WebBackForwardList implements java.lang.Cloneable java.io.Serializable { - method public synchronized int getCurrentIndex(); - method public synchronized android.webkit.WebHistoryItem getCurrentItem(); - method public synchronized android.webkit.WebHistoryItem getItemAtIndex(int); - method public synchronized int getSize(); + public abstract class WebBackForwardList implements java.lang.Cloneable java.io.Serializable { + ctor public WebBackForwardList(); + method protected abstract android.webkit.WebBackForwardList clone(); + method public abstract int getCurrentIndex(); + method public abstract android.webkit.WebHistoryItem getCurrentItem(); + method public abstract android.webkit.WebHistoryItem getItemAtIndex(int); + method public abstract int getSize(); } public class WebChromeClient { @@ -36103,21 +36194,24 @@ package android.webkit { field public static final int MODE_SAVE = 3; // 0x3 } - public class WebHistoryItem implements java.lang.Cloneable { - method public android.graphics.Bitmap getFavicon(); - method public java.lang.String getOriginalUrl(); - method public java.lang.String getTitle(); - method public java.lang.String getUrl(); + public abstract class WebHistoryItem implements java.lang.Cloneable { + ctor public WebHistoryItem(); + method protected abstract android.webkit.WebHistoryItem clone(); + method public abstract android.graphics.Bitmap getFavicon(); + method public abstract java.lang.String getOriginalUrl(); + method public abstract java.lang.String getTitle(); + method public abstract java.lang.String getUrl(); } - public deprecated class WebIconDatabase { - method public void close(); + public abstract deprecated class WebIconDatabase { + ctor public WebIconDatabase(); + method public abstract void close(); method public static android.webkit.WebIconDatabase getInstance(); - method public void open(java.lang.String); - method public void releaseIconForPageUrl(java.lang.String); - method public void removeAllIcons(); - method public void requestIconForPageUrl(java.lang.String, android.webkit.WebIconDatabase.IconListener); - method public void retainIconForPageUrl(java.lang.String); + method public abstract void open(java.lang.String); + method public abstract void releaseIconForPageUrl(java.lang.String); + method public abstract void removeAllIcons(); + method public abstract void requestIconForPageUrl(java.lang.String, android.webkit.WebIconDatabase.IconListener); + method public abstract void retainIconForPageUrl(java.lang.String); } public static abstract deprecated interface WebIconDatabase.IconListener { @@ -36149,98 +36243,99 @@ package android.webkit { } public abstract class WebSettings { - method public deprecated boolean enableSmoothTransition(); - method public boolean getAllowContentAccess(); - method public boolean getAllowFileAccess(); + ctor public WebSettings(); + method public abstract deprecated boolean enableSmoothTransition(); + method public abstract boolean getAllowContentAccess(); + method public abstract boolean getAllowFileAccess(); method public abstract boolean getAllowFileAccessFromFileURLs(); method public abstract boolean getAllowUniversalAccessFromFileURLs(); - method public synchronized boolean getBlockNetworkImage(); - method public synchronized boolean getBlockNetworkLoads(); - method public boolean getBuiltInZoomControls(); - method public int getCacheMode(); - method public synchronized java.lang.String getCursiveFontFamily(); - method public synchronized boolean getDatabaseEnabled(); - method public deprecated synchronized java.lang.String getDatabasePath(); - method public synchronized int getDefaultFixedFontSize(); - method public synchronized int getDefaultFontSize(); - method public synchronized java.lang.String getDefaultTextEncodingName(); + method public abstract boolean getBlockNetworkImage(); + method public abstract boolean getBlockNetworkLoads(); + method public abstract boolean getBuiltInZoomControls(); + method public abstract int getCacheMode(); + method public abstract java.lang.String getCursiveFontFamily(); + method public abstract boolean getDatabaseEnabled(); + method public abstract deprecated java.lang.String getDatabasePath(); + method public abstract int getDefaultFixedFontSize(); + method public abstract int getDefaultFontSize(); + method public abstract java.lang.String getDefaultTextEncodingName(); method public static java.lang.String getDefaultUserAgent(android.content.Context); - method public deprecated android.webkit.WebSettings.ZoomDensity getDefaultZoom(); - method public boolean getDisplayZoomControls(); - method public synchronized boolean getDomStorageEnabled(); - method public synchronized java.lang.String getFantasyFontFamily(); - method public synchronized java.lang.String getFixedFontFamily(); - method public synchronized boolean getJavaScriptCanOpenWindowsAutomatically(); - method public synchronized boolean getJavaScriptEnabled(); - method public synchronized android.webkit.WebSettings.LayoutAlgorithm getLayoutAlgorithm(); - method public deprecated boolean getLightTouchEnabled(); - method public boolean getLoadWithOverviewMode(); - method public synchronized boolean getLoadsImagesAutomatically(); - method public boolean getMediaPlaybackRequiresUserGesture(); - method public synchronized int getMinimumFontSize(); - method public synchronized int getMinimumLogicalFontSize(); + method public abstract deprecated android.webkit.WebSettings.ZoomDensity getDefaultZoom(); + method public abstract boolean getDisplayZoomControls(); + method public abstract boolean getDomStorageEnabled(); + method public abstract java.lang.String getFantasyFontFamily(); + method public abstract java.lang.String getFixedFontFamily(); + method public abstract boolean getJavaScriptCanOpenWindowsAutomatically(); + method public abstract boolean getJavaScriptEnabled(); + method public abstract android.webkit.WebSettings.LayoutAlgorithm getLayoutAlgorithm(); + method public abstract deprecated boolean getLightTouchEnabled(); + method public abstract boolean getLoadWithOverviewMode(); + method public abstract boolean getLoadsImagesAutomatically(); + method public abstract boolean getMediaPlaybackRequiresUserGesture(); + method public abstract int getMinimumFontSize(); + method public abstract int getMinimumLogicalFontSize(); method public abstract int getMixedContentMode(); - method public deprecated synchronized android.webkit.WebSettings.PluginState getPluginState(); - method public synchronized java.lang.String getSansSerifFontFamily(); - method public boolean getSaveFormData(); - method public deprecated boolean getSavePassword(); - method public synchronized java.lang.String getSerifFontFamily(); - method public synchronized java.lang.String getStandardFontFamily(); + method public abstract deprecated android.webkit.WebSettings.PluginState getPluginState(); + method public abstract java.lang.String getSansSerifFontFamily(); + method public abstract boolean getSaveFormData(); + method public abstract deprecated boolean getSavePassword(); + method public abstract java.lang.String getSerifFontFamily(); + method public abstract java.lang.String getStandardFontFamily(); method public deprecated synchronized android.webkit.WebSettings.TextSize getTextSize(); - method public synchronized int getTextZoom(); - method public synchronized boolean getUseWideViewPort(); - method public synchronized java.lang.String getUserAgentString(); - method public void setAllowContentAccess(boolean); - method public void setAllowFileAccess(boolean); + method public abstract int getTextZoom(); + method public abstract boolean getUseWideViewPort(); + method public abstract java.lang.String getUserAgentString(); + method public abstract void setAllowContentAccess(boolean); + method public abstract void setAllowFileAccess(boolean); method public abstract void setAllowFileAccessFromFileURLs(boolean); method public abstract void setAllowUniversalAccessFromFileURLs(boolean); - method public synchronized void setAppCacheEnabled(boolean); - method public deprecated synchronized void setAppCacheMaxSize(long); - method public synchronized void setAppCachePath(java.lang.String); - method public synchronized void setBlockNetworkImage(boolean); - method public synchronized void setBlockNetworkLoads(boolean); - method public void setBuiltInZoomControls(boolean); - method public void setCacheMode(int); - method public synchronized void setCursiveFontFamily(java.lang.String); - method public synchronized void setDatabaseEnabled(boolean); - method public deprecated synchronized void setDatabasePath(java.lang.String); - method public synchronized void setDefaultFixedFontSize(int); - method public synchronized void setDefaultFontSize(int); - method public synchronized void setDefaultTextEncodingName(java.lang.String); - method public deprecated void setDefaultZoom(android.webkit.WebSettings.ZoomDensity); - method public void setDisplayZoomControls(boolean); - method public synchronized void setDomStorageEnabled(boolean); - method public deprecated void setEnableSmoothTransition(boolean); - method public synchronized void setFantasyFontFamily(java.lang.String); - method public synchronized void setFixedFontFamily(java.lang.String); - method public synchronized void setGeolocationDatabasePath(java.lang.String); - method public synchronized void setGeolocationEnabled(boolean); - method public synchronized void setJavaScriptCanOpenWindowsAutomatically(boolean); - method public synchronized void setJavaScriptEnabled(boolean); - method public synchronized void setLayoutAlgorithm(android.webkit.WebSettings.LayoutAlgorithm); - method public deprecated void setLightTouchEnabled(boolean); - method public void setLoadWithOverviewMode(boolean); - method public synchronized void setLoadsImagesAutomatically(boolean); - method public void setMediaPlaybackRequiresUserGesture(boolean); - method public synchronized void setMinimumFontSize(int); - method public synchronized void setMinimumLogicalFontSize(int); + method public abstract void setAppCacheEnabled(boolean); + method public abstract deprecated void setAppCacheMaxSize(long); + method public abstract void setAppCachePath(java.lang.String); + method public abstract void setBlockNetworkImage(boolean); + method public abstract void setBlockNetworkLoads(boolean); + method public abstract void setBuiltInZoomControls(boolean); + method public abstract void setCacheMode(int); + method public abstract void setCursiveFontFamily(java.lang.String); + method public abstract void setDatabaseEnabled(boolean); + method public abstract deprecated void setDatabasePath(java.lang.String); + method public abstract void setDefaultFixedFontSize(int); + method public abstract void setDefaultFontSize(int); + method public abstract void setDefaultTextEncodingName(java.lang.String); + method public abstract deprecated void setDefaultZoom(android.webkit.WebSettings.ZoomDensity); + method public abstract void setDisplayZoomControls(boolean); + method public abstract void setDomStorageEnabled(boolean); + method public abstract deprecated void setEnableSmoothTransition(boolean); + method public abstract void setFantasyFontFamily(java.lang.String); + method public abstract void setFixedFontFamily(java.lang.String); + method public abstract void setGeolocationDatabasePath(java.lang.String); + method public abstract void setGeolocationEnabled(boolean); + method public abstract void setJavaScriptCanOpenWindowsAutomatically(boolean); + method public abstract void setJavaScriptEnabled(boolean); + method public abstract void setLayoutAlgorithm(android.webkit.WebSettings.LayoutAlgorithm); + method public abstract deprecated void setLightTouchEnabled(boolean); + method public abstract void setLoadWithOverviewMode(boolean); + method public abstract void setLoadsImagesAutomatically(boolean); + method public abstract void setMediaPlaybackRequiresUserGesture(boolean); + method public abstract void setMinimumFontSize(int); + method public abstract void setMinimumLogicalFontSize(int); method public abstract void setMixedContentMode(int); - method public void setNeedInitialFocus(boolean); - method public deprecated synchronized void setPluginState(android.webkit.WebSettings.PluginState); - method public deprecated synchronized void setRenderPriority(android.webkit.WebSettings.RenderPriority); - method public synchronized void setSansSerifFontFamily(java.lang.String); - method public void setSaveFormData(boolean); - method public deprecated void setSavePassword(boolean); - method public synchronized void setSerifFontFamily(java.lang.String); - method public synchronized void setStandardFontFamily(java.lang.String); - method public synchronized void setSupportMultipleWindows(boolean); - method public void setSupportZoom(boolean); + method public abstract void setNeedInitialFocus(boolean); + method public abstract deprecated void setPluginState(android.webkit.WebSettings.PluginState); + method public abstract deprecated void setRenderPriority(android.webkit.WebSettings.RenderPriority); + method public abstract void setSansSerifFontFamily(java.lang.String); + method public abstract void setSaveFormData(boolean); + method public abstract deprecated void setSavePassword(boolean); + method public abstract void setSerifFontFamily(java.lang.String); + method public abstract void setStandardFontFamily(java.lang.String); + method public abstract void setSupportMultipleWindows(boolean); + method public abstract void setSupportZoom(boolean); method public deprecated synchronized void setTextSize(android.webkit.WebSettings.TextSize); - method public synchronized void setTextZoom(int); - method public synchronized void setUseWideViewPort(boolean); - method public synchronized void setUserAgentString(java.lang.String); - method public synchronized boolean supportMultipleWindows(); - method public boolean supportZoom(); + method public abstract void setTextZoom(int); + method public abstract void setUseWideViewPort(boolean); + method public abstract void setUserAgentString(java.lang.String); + method public abstract boolean supportMultipleWindows(); + method public abstract boolean supportZoom(); field public static final int LOAD_CACHE_ELSE_NETWORK = 1; // 0x1 field public static final int LOAD_CACHE_ONLY = 3; // 0x3 field public static final int LOAD_DEFAULT = -1; // 0xffffffff @@ -36490,14 +36585,15 @@ package android.webkit { field public static final int ERROR_UNSUPPORTED_SCHEME = -10; // 0xfffffff6 } - public class WebViewDatabase { - method public void clearFormData(); - method public void clearHttpAuthUsernamePassword(); - method public deprecated void clearUsernamePassword(); + public abstract class WebViewDatabase { + ctor public WebViewDatabase(); + method public abstract void clearFormData(); + method public abstract void clearHttpAuthUsernamePassword(); + method public abstract deprecated void clearUsernamePassword(); method public static android.webkit.WebViewDatabase getInstance(android.content.Context); - method public boolean hasFormData(); - method public boolean hasHttpAuthUsernamePassword(); - method public deprecated boolean hasUsernamePassword(); + method public abstract boolean hasFormData(); + method public abstract boolean hasHttpAuthUsernamePassword(); + method public abstract deprecated boolean hasUsernamePassword(); } public class WebViewFragment extends android.app.Fragment { diff --git a/cmds/bmgr/src/com/android/commands/bmgr/Bmgr.java b/cmds/bmgr/src/com/android/commands/bmgr/Bmgr.java index d6838512b8c3..9728e384d9a2 100644 --- a/cmds/bmgr/src/com/android/commands/bmgr/Bmgr.java +++ b/cmds/bmgr/src/com/android/commands/bmgr/Bmgr.java @@ -354,7 +354,7 @@ public final class Bmgr { return; } - if (arg.indexOf('.') >= 0) { + if (arg.indexOf('.') >= 0 || arg.equals("android")) { // it's a package name doRestorePackage(arg); } else { diff --git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index 09b484bab2ca..6957435c92b8 100644 --- a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java @@ -17,37 +17,37 @@ package android.accounts; import android.app.Activity; -import android.content.Intent; +import android.content.BroadcastReceiver; import android.content.ComponentName; import android.content.Context; +import android.content.Intent; import android.content.IntentFilter; -import android.content.BroadcastReceiver; import android.content.res.Resources; import android.database.SQLException; +import android.os.Build; import android.os.Bundle; import android.os.Handler; import android.os.Looper; -import android.os.RemoteException; import android.os.Parcelable; -import android.os.Build; import android.os.Process; +import android.os.RemoteException; import android.os.UserHandle; -import android.util.Log; import android.text.TextUtils; +import android.util.Log; + +import com.android.internal.R; +import com.google.android.collect.Maps; import java.io.IOException; import java.util.ArrayList; +import java.util.HashMap; +import java.util.Map; import java.util.concurrent.Callable; import java.util.concurrent.CancellationException; import java.util.concurrent.ExecutionException; import java.util.concurrent.FutureTask; -import java.util.concurrent.TimeoutException; import java.util.concurrent.TimeUnit; -import java.util.HashMap; -import java.util.Map; - -import com.android.internal.R; -import com.google.android.collect.Maps; +import java.util.concurrent.TimeoutException; /** * This class provides access to a centralized registry of the user's @@ -747,13 +747,17 @@ public class AccountManager { * null for the main thread * @return An {@link AccountManagerFuture} which resolves to a Boolean, * true if the account has been successfully removed + * @deprecated use + * {@link #removeAccount(Account, Activity, AccountManagerCallback, Handler)} + * instead */ + @Deprecated public AccountManagerFuture<Boolean> removeAccount(final Account account, AccountManagerCallback<Boolean> callback, Handler handler) { if (account == null) throw new IllegalArgumentException("account is null"); return new Future2Task<Boolean>(handler, callback) { public void doWork() throws RemoteException { - mService.removeAccount(mResponse, account); + mService.removeAccount(mResponse, account, false); } public Boolean bundleToResult(Bundle bundle) throws AuthenticatorException { if (!bundle.containsKey(KEY_BOOLEAN_RESULT)) { @@ -765,9 +769,60 @@ public class AccountManager { } /** + * Removes an account from the AccountManager. Does nothing if the account + * does not exist. Does not delete the account from the server. + * The authenticator may have its own policies preventing account + * deletion, in which case the account will not be deleted. + * + * <p>This method may be called from any thread, but the returned + * {@link AccountManagerFuture} must not be used on the main thread. + * + * <p>This method requires the caller to hold the permission + * {@link android.Manifest.permission#MANAGE_ACCOUNTS}. + * + * @param account The {@link Account} to remove + * @param activity The {@link Activity} context to use for launching a new + * authenticator-defined sub-Activity to prompt the user to delete an + * account; used only to call startActivity(); if null, the prompt + * will not be launched directly, but the {@link Intent} may be + * returned to the caller instead + * @param callback Callback to invoke when the request completes, + * null for no callback + * @param handler {@link Handler} identifying the callback thread, + * null for the main thread + * @return An {@link AccountManagerFuture} which resolves to a Bundle with + * {@link #KEY_BOOLEAN_RESULT} if activity was specified and an account + * was removed or if active. If no activity was specified, the returned + * Bundle contains only {@link #KEY_INTENT} with the {@link Intent} + * needed to launch the actual account removal process, if authenticator + * needs the activity launch. If an error occurred, + * {@link AccountManagerFuture#getResult()} throws: + * <ul> + * <li> {@link AuthenticatorException} if no authenticator was registered for + * this account type or the authenticator failed to respond + * <li> {@link OperationCanceledException} if the operation was canceled for + * any reason, including the user canceling the creation process or + * adding accounts (of this type) has been disabled by policy + * </ul> + */ + public AccountManagerFuture<Bundle> removeAccount(final Account account, + final Activity activity, AccountManagerCallback<Bundle> callback, Handler handler) { + if (account == null) throw new IllegalArgumentException("account is null"); + return new AmsTask(activity, handler, callback) { + public void doWork() throws RemoteException { + mService.removeAccount(mResponse, account, activity != null); + } + }.start(); + } + + /** * @see #removeAccount(Account, AccountManagerCallback, Handler) * @hide + * @deprecated use + * {@link #removeAccountAsUser(Account, Activity, AccountManagerCallback, Handler)} + * instead */ + @Deprecated public AccountManagerFuture<Boolean> removeAccountAsUser(final Account account, AccountManagerCallback<Boolean> callback, Handler handler, final UserHandle userHandle) { @@ -775,7 +830,7 @@ public class AccountManager { if (userHandle == null) throw new IllegalArgumentException("userHandle is null"); return new Future2Task<Boolean>(handler, callback) { public void doWork() throws RemoteException { - mService.removeAccountAsUser(mResponse, account, userHandle.getIdentifier()); + mService.removeAccountAsUser(mResponse, account, false, userHandle.getIdentifier()); } public Boolean bundleToResult(Bundle bundle) throws AuthenticatorException { if (!bundle.containsKey(KEY_BOOLEAN_RESULT)) { @@ -787,6 +842,52 @@ public class AccountManager { } /** + * @see #removeAccount(Account, Activity, AccountManagerCallback, Handler) + * @hide + */ + public AccountManagerFuture<Bundle> removeAccountAsUser(final Account account, + final Activity activity, AccountManagerCallback<Bundle> callback, Handler handler, + final UserHandle userHandle) { + if (account == null) + throw new IllegalArgumentException("account is null"); + if (userHandle == null) + throw new IllegalArgumentException("userHandle is null"); + return new AmsTask(activity, handler, callback) { + public void doWork() throws RemoteException { + mService.removeAccountAsUser(mResponse, account, activity != null, + userHandle.getIdentifier()); + } + }.start(); + } + + /** + * Removes an account directly. Normally used by authenticators, not + * directly by applications. Does not delete the account from the server. + * The authenticator may have its own policies preventing account deletion, + * in which case the account will not be deleted. + * <p> + * It is safe to call this method from the main thread. + * <p> + * This method requires the caller to hold the permission + * {@link android.Manifest.permission#AUTHENTICATE_ACCOUNTS} and to have the + * same UID or signature as the account's authenticator. + * + * @param account The {@link Account} to delete. + * @return True if the account was successfully deleted, false if the + * account did not exist, the account is null, or another error + * occurs. + */ + public boolean removeAccountExplicitly(Account account) { + if (account == null) throw new IllegalArgumentException("account is null"); + try { + return mService.removeAccountExplicitly(account); + } catch (RemoteException e) { + // won't ever happen + throw new RuntimeException(e); + } + } + + /** * Removes an auth token from the AccountManager's cache. Does nothing if * the auth token is not currently in the cache. Applications must call this * method when the auth token is found to have expired or otherwise become @@ -1342,6 +1443,40 @@ public class AccountManager { } /** + * Copies an account from the primary user to another user. + * @param account the account to copy + * @param user the target user + * @param callback Callback to invoke when the request completes, + * null for no callback + * @param handler {@link Handler} identifying the callback thread, + * null for the main thread + * @return An {@link AccountManagerFuture} which resolves to a Boolean indicated wether it + * succeeded. + * @hide + */ + public AccountManagerFuture<Boolean> copyAccountToUser( + final Account account, final UserHandle user, + AccountManagerCallback<Boolean> callback, Handler handler) { + if (account == null) throw new IllegalArgumentException("account is null"); + if (user == null) throw new IllegalArgumentException("user is null"); + + return new Future2Task<Boolean>(handler, callback) { + @Override + public void doWork() throws RemoteException { + mService.copyAccountToUser( + mResponse, account, UserHandle.USER_OWNER, user.getIdentifier()); + } + @Override + public Boolean bundleToResult(Bundle bundle) throws AuthenticatorException { + if (!bundle.containsKey(KEY_BOOLEAN_RESULT)) { + throw new AuthenticatorException("no result in response"); + } + return bundle.getBoolean(KEY_BOOLEAN_RESULT); + } + }.start(); + } + + /** * @hide * Removes the shared account. * @param account the account to remove diff --git a/core/java/android/accounts/IAccountManager.aidl b/core/java/android/accounts/IAccountManager.aidl index a13378800047..aa41161b8853 100644 --- a/core/java/android/accounts/IAccountManager.aidl +++ b/core/java/android/accounts/IAccountManager.aidl @@ -37,8 +37,13 @@ interface IAccountManager { void hasFeatures(in IAccountManagerResponse response, in Account account, in String[] features); void getAccountsByFeatures(in IAccountManagerResponse response, String accountType, in String[] features); boolean addAccountExplicitly(in Account account, String password, in Bundle extras); - void removeAccount(in IAccountManagerResponse response, in Account account); - void removeAccountAsUser(in IAccountManagerResponse response, in Account account, int userId); + void removeAccount(in IAccountManagerResponse response, in Account account, + boolean expectActivityLaunch); + void removeAccountAsUser(in IAccountManagerResponse response, in Account account, + boolean expectActivityLaunch, int userId); + boolean removeAccountExplicitly(in Account account); + void copyAccountToUser(in IAccountManagerResponse response, in Account account, + int userFrom, int userTo); void invalidateAuthToken(String accountType, String authToken); String peekAuthToken(in Account account, String authTokenType); void setAuthToken(in Account account, String authTokenType, String authToken); diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java index 5f21d754558b..e3de44e45d89 100644 --- a/core/java/android/app/ActivityThread.java +++ b/core/java/android/app/ActivityThread.java @@ -60,6 +60,7 @@ import android.os.IBinder; import android.os.Looper; import android.os.Message; import android.os.MessageQueue; +import android.os.Parcel; import android.os.ParcelFileDescriptor; import android.os.PersistableBundle; import android.os.Process; @@ -965,6 +966,8 @@ public final class ActivityThread { int binderLocalObjectCount = Debug.getBinderLocalObjectCount(); int binderProxyObjectCount = Debug.getBinderProxyObjectCount(); int binderDeathObjectCount = Debug.getBinderDeathObjectCount(); + long parcelSize = Parcel.getGlobalAllocSize(); + long parcelCount = Parcel.getGlobalAllocCount(); long openSslSocketCount = Debug.countInstancesOfClass(OpenSSLSocketImpl.class); SQLiteDebug.PagerStats stats = SQLiteDebug.getDatabaseInfo(); @@ -1023,9 +1026,10 @@ public final class ActivityThread { printRow(pw, TWO_COUNT_COLUMNS, "Local Binders:", binderLocalObjectCount, "Proxy Binders:", binderProxyObjectCount); - printRow(pw, ONE_COUNT_COLUMN, "Death Recipients:", binderDeathObjectCount); - - printRow(pw, ONE_COUNT_COLUMN, "OpenSSL Sockets:", openSslSocketCount); + printRow(pw, TWO_COUNT_COLUMNS, "Parcel memory:", parcelSize/1024, + "Parcel count:", parcelCount); + printRow(pw, TWO_COUNT_COLUMNS, "Death Recipients:", binderDeathObjectCount, + "OpenSSL Sockets:", openSslSocketCount); // SQLite mem info pw.println(" "); @@ -1948,7 +1952,7 @@ public final class ActivityThread { if (dumpFullInfo) { printRow(pw, HEAP_FULL_COLUMN, "", "Pss", "Pss", "Shared", "Private", "Shared", "Private", "Swapped", "Heap", "Heap", "Heap"); - printRow(pw, HEAP_FULL_COLUMN, "", "Total", "Clean", "Dirty", "", + printRow(pw, HEAP_FULL_COLUMN, "", "Total", "Clean", "Dirty", "Dirty", "Clean", "Clean", "Dirty", "Size", "Alloc", "Free"); printRow(pw, HEAP_FULL_COLUMN, "", "------", "------", "------", "------", "------", "------", "------", "------", "------", "------"); @@ -5219,8 +5223,6 @@ public final class ActivityThread { sMainThreadHandler = thread.getHandler(); } - AsyncTask.init(); - if (false) { Looper.myLooper().setMessageLogging(new LogPrinter(Log.DEBUG, "ActivityThread")); diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java index dfe5cf5f8809..07e8dc55cfd9 100644 --- a/core/java/android/app/Notification.java +++ b/core/java/android/app/Notification.java @@ -4986,7 +4986,9 @@ public class Notification implements Parcelable } /** - * Set a hint that this notification's background should not be clipped if possible. + * Set a hint that this notification's background should not be clipped if possible, + * and should instead be resized to fully display on the screen, retaining the aspect + * ratio of the image. This can be useful for images like barcodes or qr codes. * @param hintAvoidBackgroundClipping {@code true} to avoid clipping if possible. * @return this object for method chaining */ @@ -4997,7 +4999,9 @@ public class Notification implements Parcelable } /** - * Get a hint that this notification's background should not be clipped if possible. + * Get a hint that this notification's background should not be clipped if possible, + * and should instead be resized to fully display on the screen, retaining the aspect + * ratio of the image. This can be useful for images like barcodes or qr codes. * @return {@code true} if it's ok if the background is clipped on the screen, false * otherwise. The default value is {@code false} if this was never set. */ diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index 33cac75027e8..ad1cf44efa38 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -142,13 +142,24 @@ public class DevicePolicyManager { * {@link #ACTION_PROVISION_MANAGED_PROFILE} this package has to match the package name of the * application that started provisioning. The package will be set as profile owner in that case. * - * <p>This package is set as device owner when device owner provisioning is started by an Nfc - * message containing an Nfc record with MIME type {@link #MIME_TYPE_PROVISIONING_NFC}. + * <p>This package is set as device owner when device owner provisioning is started by an NFC + * message containing an NFC record with MIME type {@link #MIME_TYPE_PROVISIONING_NFC}. */ public static final String EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_NAME = "android.app.extra.PROVISIONING_DEVICE_ADMIN_PACKAGE_NAME"; /** + * An {@link android.accounts.Account} extra holding the account to migrate during managed + * profile provisioning. If the account supplied is present in the primary user, it will be + * copied, along with its credentials to the managed profile and removed from the primary user. + * + * Use with {@link #ACTION_PROVISION_MANAGED_PROFILE}. + */ + + public static final String EXTRA_PROVISIONING_ACCOUNT_TO_MIGRATE + = "android.app.extra.PROVISIONING_ACCOUNT_TO_MIGRATE"; + + /** * A String extra that, holds the email address of the account which a managed profile is * created for. Used with {@link #ACTION_PROVISION_MANAGED_PROFILE} and * {@link DeviceAdminReceiver#ACTION_PROFILE_PROVISIONING_COMPLETE}. @@ -165,11 +176,21 @@ public class DevicePolicyManager { = "android.app.extra.PROVISIONING_EMAIL_ADDRESS"; /** + * A Boolean extra that can be used by the mobile device management application to skip the + * disabling of system apps during provisioning when set to <code>true</code>. + * + * <p>Use in an NFC record with {@link #MIME_TYPE_PROVISIONING_NFC} that starts device owner + * provisioning via an NFC bump. + */ + public static final String EXTRA_PROVISIONING_DONT_DISABLE_SYSTEM_APPS = + "android.app.extra.PROVISIONING_DONT_DISABLE_SYSTEM_APPS"; + + /** * A String extra holding the time zone {@link android.app.AlarmManager} that the device * will be set to. * - * <p>Use in an Nfc record with {@link #MIME_TYPE_PROVISIONING_NFC} that starts device owner - * provisioning via an Nfc bump. + * <p>Use in an NFC record with {@link #MIME_TYPE_PROVISIONING_NFC} that starts device owner + * provisioning via an NFC bump. */ public static final String EXTRA_PROVISIONING_TIME_ZONE = "android.app.extra.PROVISIONING_TIME_ZONE"; @@ -178,8 +199,8 @@ public class DevicePolicyManager { * A Long extra holding the wall clock time (in milliseconds) to be set on the device's * {@link android.app.AlarmManager}. * - * <p>Use in an Nfc record with {@link #MIME_TYPE_PROVISIONING_NFC} that starts device owner - * provisioning via an Nfc bump. + * <p>Use in an NFC record with {@link #MIME_TYPE_PROVISIONING_NFC} that starts device owner + * provisioning via an NFC bump. */ public static final String EXTRA_PROVISIONING_LOCAL_TIME = "android.app.extra.PROVISIONING_LOCAL_TIME"; @@ -188,8 +209,8 @@ public class DevicePolicyManager { * A String extra holding the {@link java.util.Locale} that the device will be set to. * Format: xx_yy, where xx is the language code, and yy the country code. * - * <p>Use in an Nfc record with {@link #MIME_TYPE_PROVISIONING_NFC} that starts device owner - * provisioning via an Nfc bump. + * <p>Use in an NFC record with {@link #MIME_TYPE_PROVISIONING_NFC} that starts device owner + * provisioning via an NFC bump. */ public static final String EXTRA_PROVISIONING_LOCALE = "android.app.extra.PROVISIONING_LOCALE"; @@ -198,8 +219,8 @@ public class DevicePolicyManager { * A String extra holding the ssid of the wifi network that should be used during nfc device * owner provisioning for downloading the mobile device management application. * - * <p>Use in an Nfc record with {@link #MIME_TYPE_PROVISIONING_NFC} that starts device owner - * provisioning via an Nfc bump. + * <p>Use in an NFC record with {@link #MIME_TYPE_PROVISIONING_NFC} that starts device owner + * provisioning via an NFC bump. */ public static final String EXTRA_PROVISIONING_WIFI_SSID = "android.app.extra.PROVISIONING_WIFI_SSID"; @@ -208,8 +229,8 @@ public class DevicePolicyManager { * A boolean extra indicating whether the wifi network in {@link #EXTRA_PROVISIONING_WIFI_SSID} * is hidden or not. * - * <p>Use in an Nfc record with {@link #MIME_TYPE_PROVISIONING_NFC} that starts device owner - * provisioning via an Nfc bump. + * <p>Use in an NFC record with {@link #MIME_TYPE_PROVISIONING_NFC} that starts device owner + * provisioning via an NFC bump. */ public static final String EXTRA_PROVISIONING_WIFI_HIDDEN = "android.app.extra.PROVISIONING_WIFI_HIDDEN"; @@ -218,8 +239,8 @@ public class DevicePolicyManager { * A String extra indicating the security type of the wifi network in * {@link #EXTRA_PROVISIONING_WIFI_SSID}. * - * <p>Use in an Nfc record with {@link #MIME_TYPE_PROVISIONING_NFC} that starts device owner - * provisioning via an Nfc bump. + * <p>Use in an NFC record with {@link #MIME_TYPE_PROVISIONING_NFC} that starts device owner + * provisioning via an NFC bump. */ public static final String EXTRA_PROVISIONING_WIFI_SECURITY_TYPE = "android.app.extra.PROVISIONING_WIFI_SECURITY_TYPE"; @@ -228,8 +249,8 @@ public class DevicePolicyManager { * A String extra holding the password of the wifi network in * {@link #EXTRA_PROVISIONING_WIFI_SSID}. * - * <p>Use in an Nfc record with {@link #MIME_TYPE_PROVISIONING_NFC} that starts device owner - * provisioning via an Nfc bump. + * <p>Use in an NFC record with {@link #MIME_TYPE_PROVISIONING_NFC} that starts device owner + * provisioning via an NFC bump. */ public static final String EXTRA_PROVISIONING_WIFI_PASSWORD = "android.app.extra.PROVISIONING_WIFI_PASSWORD"; @@ -238,8 +259,8 @@ public class DevicePolicyManager { * A String extra holding the proxy host for the wifi network in * {@link #EXTRA_PROVISIONING_WIFI_SSID}. * - * <p>Use in an Nfc record with {@link #MIME_TYPE_PROVISIONING_NFC} that starts device owner - * provisioning via an Nfc bump. + * <p>Use in an NFC record with {@link #MIME_TYPE_PROVISIONING_NFC} that starts device owner + * provisioning via an NFC bump. */ public static final String EXTRA_PROVISIONING_WIFI_PROXY_HOST = "android.app.extra.PROVISIONING_WIFI_PROXY_HOST"; @@ -248,8 +269,8 @@ public class DevicePolicyManager { * An int extra holding the proxy port for the wifi network in * {@link #EXTRA_PROVISIONING_WIFI_SSID}. * - * <p>Use in an Nfc record with {@link #MIME_TYPE_PROVISIONING_NFC} that starts device owner - * provisioning via an Nfc bump. + * <p>Use in an NFC record with {@link #MIME_TYPE_PROVISIONING_NFC} that starts device owner + * provisioning via an NFC bump. */ public static final String EXTRA_PROVISIONING_WIFI_PROXY_PORT = "android.app.extra.PROVISIONING_WIFI_PROXY_PORT"; @@ -258,8 +279,8 @@ public class DevicePolicyManager { * A String extra holding the proxy bypass for the wifi network in * {@link #EXTRA_PROVISIONING_WIFI_SSID}. * - * <p>Use in an Nfc record with {@link #MIME_TYPE_PROVISIONING_NFC} that starts device owner - * provisioning via an Nfc bump. + * <p>Use in an NFC record with {@link #MIME_TYPE_PROVISIONING_NFC} that starts device owner + * provisioning via an NFC bump. */ public static final String EXTRA_PROVISIONING_WIFI_PROXY_BYPASS = "android.app.extra.PROVISIONING_WIFI_PROXY_BYPASS"; @@ -268,8 +289,8 @@ public class DevicePolicyManager { * A String extra holding the proxy auto-config (PAC) URL for the wifi network in * {@link #EXTRA_PROVISIONING_WIFI_SSID}. * - * <p>Use in an Nfc record with {@link #MIME_TYPE_PROVISIONING_NFC} that starts device owner - * provisioning via an Nfc bump. + * <p>Use in an NFC record with {@link #MIME_TYPE_PROVISIONING_NFC} that starts device owner + * provisioning via an NFC bump. */ public static final String EXTRA_PROVISIONING_WIFI_PAC_URL = "android.app.extra.PROVISIONING_WIFI_PAC_URL"; @@ -278,8 +299,8 @@ public class DevicePolicyManager { * A String extra holding a url that specifies the download location of the device admin * package. When not provided it is assumed that the device admin package is already installed. * - * <p>Use in an Nfc record with {@link #MIME_TYPE_PROVISIONING_NFC} that starts device owner - * provisioning via an Nfc bump. + * <p>Use in an NFC record with {@link #MIME_TYPE_PROVISIONING_NFC} that starts device owner + * provisioning via an NFC bump. */ public static final String EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_DOWNLOAD_LOCATION = "android.app.extra.PROVISIONING_DEVICE_ADMIN_PACKAGE_DOWNLOAD_LOCATION"; @@ -288,8 +309,8 @@ public class DevicePolicyManager { * A String extra holding a http cookie header which should be used in the http request to the * url specified in {@link #EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_DOWNLOAD_LOCATION}. * - * <p>Use in an Nfc record with {@link #MIME_TYPE_PROVISIONING_NFC} that starts device owner - * provisioning via an Nfc bump. + * <p>Use in an NFC record with {@link #MIME_TYPE_PROVISIONING_NFC} that starts device owner + * provisioning via an NFC bump. */ public static final String EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_DOWNLOAD_COOKIE_HEADER = "android.app.extra.PROVISIONING_DEVICE_ADMIN_PACKAGE_DOWNLOAD_COOKIE_HEADER"; @@ -300,8 +321,8 @@ public class DevicePolicyManager { * the file at the download location an error will be shown to the user and the user will be * asked to factory reset the device. * - * <p>Use in an Nfc record with {@link #MIME_TYPE_PROVISIONING_NFC} that starts device owner - * provisioning via an Nfc bump. + * <p>Use in an NFC record with {@link #MIME_TYPE_PROVISIONING_NFC} that starts device owner + * provisioning via an NFC bump. */ public static final String EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_CHECKSUM = "android.app.extra.PROVISIONING_DEVICE_ADMIN_PACKAGE_CHECKSUM"; @@ -317,9 +338,9 @@ public class DevicePolicyManager { * <p> A typical use case would be a device that is owned by a company, but used by either an * employee or client. * - * <p> The Nfc message should be send to an unprovisioned device. + * <p> The NFC message should be send to an unprovisioned device. * - * <p>The Nfc record must contain a serialized {@link java.util.Properties} object which + * <p>The NFC record must contain a serialized {@link java.util.Properties} object which * contains the following properties: * <ul> * <li>{@link #EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_NAME}</li> diff --git a/core/java/android/bluetooth/le/BluetoothLeAdvertiser.java b/core/java/android/bluetooth/le/BluetoothLeAdvertiser.java index a019d5cff2a1..e76c23b97a7c 100644 --- a/core/java/android/bluetooth/le/BluetoothLeAdvertiser.java +++ b/core/java/android/bluetooth/le/BluetoothLeAdvertiser.java @@ -117,8 +117,9 @@ public final class BluetoothLeAdvertiser { AdvertiseCallback.ADVERTISE_FAILED_FEATURE_UNSUPPORTED); return; } - if (totalBytes(advertiseData) > MAX_ADVERTISING_DATA_BYTES || - totalBytes(scanResponse) > MAX_ADVERTISING_DATA_BYTES) { + boolean isConnectable = settings.isConnectable(); + if (totalBytes(advertiseData, isConnectable) > MAX_ADVERTISING_DATA_BYTES || + totalBytes(scanResponse, isConnectable) > MAX_ADVERTISING_DATA_BYTES) { postStartFailure(callback, AdvertiseCallback.ADVERTISE_FAILED_DATA_TOO_LARGE); return; } @@ -171,9 +172,10 @@ public final class BluetoothLeAdvertiser { } // Compute the size of the advertise data. - private int totalBytes(AdvertiseData data) { + private int totalBytes(AdvertiseData data, boolean isConnectable) { if (data == null) return 0; - int size = FLAGS_FIELD_BYTES; // flags field is always set. + // Flags field is omitted if the advertising is not connectable. + int size = isConnectable ? FLAGS_FIELD_BYTES : 0; if (data.getServiceUuids() != null) { int num16BitUuids = 0; int num32BitUuids = 0; diff --git a/core/java/android/content/ContentProvider.java b/core/java/android/content/ContentProvider.java index c8f9b7dd80e2..4c82efda7298 100644 --- a/core/java/android/content/ContentProvider.java +++ b/core/java/android/content/ContentProvider.java @@ -1659,12 +1659,6 @@ public abstract class ContentProvider implements ComponentCallbacks2 { } private void attachInfo(Context context, ProviderInfo info, boolean testing) { - /* - * We may be using AsyncTask from binder threads. Make it init here - * so its static handler is on the main thread. - */ - AsyncTask.init(); - mNoPerms = testing; /* diff --git a/core/java/android/content/pm/ParceledListSlice.java b/core/java/android/content/pm/ParceledListSlice.java index 8a43472a430b..335a45e40777 100644 --- a/core/java/android/content/pm/ParceledListSlice.java +++ b/core/java/android/content/pm/ParceledListSlice.java @@ -30,6 +30,12 @@ import java.util.List; * Transfer a large list of Parcelable objects across an IPC. Splits into * multiple transactions if needed. * + * Caveat: for efficiency and security, all elements must be the same concrete type. + * In order to avoid writing the class name of each object, we must ensure that + * each object is the same type, or else unparceling then reparceling the data may yield + * a different result if the class name encoded in the Parcelable is a Base type. + * See b/17671747. + * * @hide */ public class ParceledListSlice<T extends Parcelable> implements Parcelable { @@ -56,13 +62,25 @@ public class ParceledListSlice<T extends Parcelable> implements Parcelable { if (N <= 0) { return; } + Parcelable.Creator<T> creator = p.readParcelableCreator(loader); + Class<?> listElementClass = null; + int i = 0; while (i < N) { if (p.readInt() == 0) { break; } - mList.add(p.readCreator(creator, loader)); + + final T parcelable = p.readCreator(creator, loader); + if (listElementClass == null) { + listElementClass = parcelable.getClass(); + } else { + verifySameType(listElementClass, parcelable.getClass()); + } + + mList.add(parcelable); + if (DEBUG) Log.d(TAG, "Read inline #" + i + ": " + mList.get(mList.size()-1)); i++; } @@ -82,7 +100,11 @@ public class ParceledListSlice<T extends Parcelable> implements Parcelable { return; } while (i < N && reply.readInt() != 0) { - mList.add(reply.readCreator(creator, loader)); + final T parcelable = reply.readCreator(creator, loader); + verifySameType(listElementClass, parcelable.getClass()); + + mList.add(parcelable); + if (DEBUG) Log.d(TAG, "Read extra #" + i + ": " + mList.get(mList.size()-1)); i++; } @@ -91,6 +113,14 @@ public class ParceledListSlice<T extends Parcelable> implements Parcelable { } } + private static void verifySameType(final Class<?> expected, final Class<?> actual) { + if (!actual.equals(expected)) { + throw new IllegalArgumentException("Can't unparcel type " + + actual.getName() + " in list of type " + + expected.getName()); + } + } + public List<T> getList() { return mList; } @@ -116,11 +146,16 @@ public class ParceledListSlice<T extends Parcelable> implements Parcelable { dest.writeInt(N); if (DEBUG) Log.d(TAG, "Writing " + N + " items"); if (N > 0) { + final Class<?> listElementClass = mList.get(0).getClass(); dest.writeParcelableCreator(mList.get(0)); int i = 0; while (i < N && dest.dataSize() < MAX_FIRST_IPC_SIZE) { dest.writeInt(1); - mList.get(i).writeToParcel(dest, callFlags); + + final T parcelable = mList.get(i); + verifySameType(listElementClass, parcelable.getClass()); + parcelable.writeToParcel(dest, callFlags); + if (DEBUG) Log.d(TAG, "Wrote inline #" + i + ": " + mList.get(i)); i++; } @@ -137,7 +172,11 @@ public class ParceledListSlice<T extends Parcelable> implements Parcelable { if (DEBUG) Log.d(TAG, "Writing more @" + i + " of " + N); while (i < N && reply.dataSize() < MAX_IPC_SIZE) { reply.writeInt(1); - mList.get(i).writeToParcel(reply, callFlags); + + final T parcelable = mList.get(i); + verifySameType(listElementClass, parcelable.getClass()); + parcelable.writeToParcel(reply, callFlags); + if (DEBUG) Log.d(TAG, "Wrote extra #" + i + ": " + mList.get(i)); i++; } diff --git a/core/java/android/content/pm/Signature.java b/core/java/android/content/pm/Signature.java index 7edf4b984f9e..fdc54aedac96 100644 --- a/core/java/android/content/pm/Signature.java +++ b/core/java/android/content/pm/Signature.java @@ -22,12 +22,14 @@ import android.os.Parcelable; import com.android.internal.util.ArrayUtils; import java.io.ByteArrayInputStream; +import java.io.InputStream; import java.lang.ref.SoftReference; import java.security.PublicKey; import java.security.cert.Certificate; import java.security.cert.CertificateEncodingException; import java.security.cert.CertificateException; import java.security.cert.CertificateFactory; +import java.security.cert.X509Certificate; import java.util.Arrays; /** @@ -252,4 +254,53 @@ public class Signature implements Parcelable { return (a.length == b.length) && ArrayUtils.containsAll(a, b) && ArrayUtils.containsAll(b, a); } + + /** + * Test if given {@link Signature} sets are effectively equal. In rare + * cases, certificates can have slightly malformed encoding which causes + * exact-byte checks to fail. + * <p> + * To identify effective equality, we bounce the certificates through an + * decode/encode pass before doing the exact-byte check. To reduce attack + * surface area, we only allow a byte size delta of a few bytes. + * + * @throws CertificateException if the before/after length differs + * substantially, usually a signal of something fishy going on. + * @hide + */ + public static boolean areEffectiveMatch(Signature[] a, Signature[] b) + throws CertificateException { + final CertificateFactory cf = CertificateFactory.getInstance("X.509"); + + final Signature[] aPrime = new Signature[a.length]; + for (int i = 0; i < a.length; i++) { + aPrime[i] = bounce(cf, a[i]); + } + final Signature[] bPrime = new Signature[b.length]; + for (int i = 0; i < b.length; i++) { + bPrime[i] = bounce(cf, b[i]); + } + + return areExactMatch(aPrime, bPrime); + } + + /** + * Bounce the given {@link Signature} through a decode/encode cycle. + * + * @throws CertificateException if the before/after length differs + * substantially, usually a signal of something fishy going on. + * @hide + */ + public static Signature bounce(CertificateFactory cf, Signature s) throws CertificateException { + final InputStream is = new ByteArrayInputStream(s.mSignature); + final X509Certificate cert = (X509Certificate) cf.generateCertificate(is); + final Signature sPrime = new Signature(cert.getEncoded()); + + if (Math.abs(sPrime.mSignature.length - s.mSignature.length) > 2) { + throw new CertificateException("Bounced cert length looks fishy; before " + + s.mSignature.length + ", after " + sPrime.mSignature.length); + } + + return sPrime; + } } diff --git a/core/java/android/content/res/AssetManager.java b/core/java/android/content/res/AssetManager.java index e57882240e56..ecae52c3cd67 100644 --- a/core/java/android/content/res/AssetManager.java +++ b/core/java/android/content/res/AssetManager.java @@ -666,6 +666,14 @@ public final class AssetManager implements AutoCloseable { /** * Get the locales that this asset manager contains data for. + * + * <p>On SDK 21 (Android 5.0: Lollipop) and above, Locale strings are valid + * <a href="https://tools.ietf.org/html/bcp47">BCP-47</a> language tags and can be + * parsed using {@link java.util.Locale#forLanguageTag(String)}. + * + * <p>On SDK 20 (Android 4.4W: Kitkat for watches) and below, locale strings + * are of the form {@code ll_CC} where {@code ll} is a two letter language code, + * and {@code CC} is a two letter country code. */ public native final String[] getLocales(); diff --git a/core/java/android/hardware/camera2/CameraCharacteristics.java b/core/java/android/hardware/camera2/CameraCharacteristics.java index fb3eaffe339b..754f27095d0f 100644 --- a/core/java/android/hardware/camera2/CameraCharacteristics.java +++ b/core/java/android/hardware/camera2/CameraCharacteristics.java @@ -1155,6 +1155,8 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri * <li>{@link #REQUEST_AVAILABLE_CAPABILITIES_MANUAL_SENSOR MANUAL_SENSOR}</li> * <li>{@link #REQUEST_AVAILABLE_CAPABILITIES_MANUAL_POST_PROCESSING MANUAL_POST_PROCESSING}</li> * <li>{@link #REQUEST_AVAILABLE_CAPABILITIES_RAW RAW}</li> + * <li>{@link #REQUEST_AVAILABLE_CAPABILITIES_READ_SENSOR_SETTINGS READ_SENSOR_SETTINGS}</li> + * <li>{@link #REQUEST_AVAILABLE_CAPABILITIES_BURST_CAPTURE BURST_CAPTURE}</li> * </ul></p> * <p>This key is available on all devices.</p> * @@ -1163,6 +1165,8 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri * @see #REQUEST_AVAILABLE_CAPABILITIES_MANUAL_SENSOR * @see #REQUEST_AVAILABLE_CAPABILITIES_MANUAL_POST_PROCESSING * @see #REQUEST_AVAILABLE_CAPABILITIES_RAW + * @see #REQUEST_AVAILABLE_CAPABILITIES_READ_SENSOR_SETTINGS + * @see #REQUEST_AVAILABLE_CAPABILITIES_BURST_CAPTURE */ @PublicKey public static final Key<int[]> REQUEST_AVAILABLE_CAPABILITIES = @@ -2283,12 +2287,16 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri * <p>Camera devices will come in three flavors: LEGACY, LIMITED and FULL.</p> * <p>A FULL device will support below capabilities:</p> * <ul> - * <li>30fps at maximum resolution (== sensor resolution) is preferred, more than 20fps is required.</li> + * <li>30fps operation at maximum resolution (== sensor resolution) is preferred, more than + * 20fps is required, for at least uncompressed YUV + * output. ({@link CameraCharacteristics#REQUEST_AVAILABLE_CAPABILITIES android.request.availableCapabilities} contains BURST_CAPTURE)</li> * <li>Per frame control ({@link CameraCharacteristics#SYNC_MAX_LATENCY android.sync.maxLatency} <code>==</code> PER_FRAME_CONTROL)</li> * <li>Manual sensor control ({@link CameraCharacteristics#REQUEST_AVAILABLE_CAPABILITIES android.request.availableCapabilities} contains MANUAL_SENSOR)</li> - * <li>Manual post-processing control ({@link CameraCharacteristics#REQUEST_AVAILABLE_CAPABILITIES android.request.availableCapabilities} contains MANUAL_POST_PROCESSING)</li> + * <li>Manual post-processing control ({@link CameraCharacteristics#REQUEST_AVAILABLE_CAPABILITIES android.request.availableCapabilities} contains + * MANUAL_POST_PROCESSING)</li> * <li>Arbitrary cropping region ({@link CameraCharacteristics#SCALER_CROPPING_TYPE android.scaler.croppingType} <code>==</code> FREEFORM)</li> - * <li>At least 3 processed (but not stalling) format output streams ({@link CameraCharacteristics#REQUEST_MAX_NUM_OUTPUT_PROC android.request.maxNumOutputProc} <code>>=</code> 3)</li> + * <li>At least 3 processed (but not stalling) format output streams + * ({@link CameraCharacteristics#REQUEST_MAX_NUM_OUTPUT_PROC android.request.maxNumOutputProc} <code>>=</code> 3)</li> * <li>The required stream configuration defined in android.scaler.availableStreamConfigurations</li> * <li>The required exposure time range defined in {@link CameraCharacteristics#SENSOR_INFO_EXPOSURE_TIME_RANGE android.sensor.info.exposureTimeRange}</li> * <li>The required maxFrameDuration defined in {@link CameraCharacteristics#SENSOR_INFO_MAX_FRAME_DURATION android.sensor.info.maxFrameDuration}</li> diff --git a/core/java/android/hardware/camera2/CameraDevice.java b/core/java/android/hardware/camera2/CameraDevice.java index 0bb742c77f64..9e90d019f951 100644 --- a/core/java/android/hardware/camera2/CameraDevice.java +++ b/core/java/android/hardware/camera2/CameraDevice.java @@ -334,6 +334,24 @@ public abstract class CameraDevice implements AutoCloseable { * </table><br> * </p> * + * <p>BURST-capability ({@link CameraCharacteristics#REQUEST_AVAILABLE_CAPABILITIES} includes + * {@link CameraMetadata#REQUEST_AVAILABLE_CAPABILITIES_BURST_CAPTURE BURST_CAPTURE}) devices + * support at least the below stream combinations in addition to those for + * {@link CameraMetadata#INFO_SUPPORTED_HARDWARE_LEVEL_LIMITED LIMITED} devices. Note that all + * FULL-level devices support the BURST capability, and the below list is a strict subset of the + * list for FULL-level devices, so this table is only relevant for LIMITED-level devices that + * support the BURST_CAPTURE capability. + * + * <table> + * <tr><th colspan="5">BURST-capability additional guaranteed configurations</th></tr> + * <tr><th colspan="2" id="rb">Target 1</th><th colspan="2" id="rb">Target 2</th><th rowspan="2">Sample use case(s)</th> </tr> + * <tr><th>Type</th><th id="rb">Max size</th><th>Type</th><th id="rb">Max size</th> </tr> + * <tr> <td>{@code PRIV}</td><td id="rb">{@code PREVIEW}</td> <td>{@code PRIV}</td><td id="rb">{@code MAXIMUM}</td> <td>Maximum-resolution GPU processing with preview.</td> </tr> + * <tr> <td>{@code PRIV}</td><td id="rb">{@code PREVIEW}</td> <td>{@code YUV }</td><td id="rb">{@code MAXIMUM}</td> <td>Maximum-resolution in-app processing with preview.</td> </tr> + * <tr> <td>{@code YUV }</td><td id="rb">{@code PREVIEW}</td> <td>{@code YUV }</td><td id="rb">{@code MAXIMUM}</td> <td>Maximum-resolution two-input in-app processsing.</td> </tr> + * </table><br> + * </p> + * * <p>Since the capabilities of camera devices vary greatly, a given camera device may support * target combinations with sizes outside of these guarantees, but this can only be tested for * by attempting to create a session with such targets.</p> diff --git a/core/java/android/hardware/camera2/CameraMetadata.java b/core/java/android/hardware/camera2/CameraMetadata.java index 16df8441b171..271fc309c82a 100644 --- a/core/java/android/hardware/camera2/CameraMetadata.java +++ b/core/java/android/hardware/camera2/CameraMetadata.java @@ -450,6 +450,58 @@ public abstract class CameraMetadata<TKey> { */ public static final int REQUEST_AVAILABLE_CAPABILITIES_ZSL = 4; + /** + * <p>The camera device supports accurately reporting the sensor settings for many of + * the sensor controls while the built-in 3A algorithm is running. This allows + * reporting of sensor settings even when these settings cannot be manually changed.</p> + * <p>The values reported for the following controls are guaranteed to be available + * in the CaptureResult, including when 3A is enabled:</p> + * <ul> + * <li>Exposure control<ul> + * <li>{@link CaptureRequest#SENSOR_EXPOSURE_TIME android.sensor.exposureTime}</li> + * </ul> + * </li> + * <li>Sensitivity control<ul> + * <li>{@link CaptureRequest#SENSOR_SENSITIVITY android.sensor.sensitivity}</li> + * </ul> + * </li> + * <li>Lens controls (if the lens is adjustable)<ul> + * <li>{@link CaptureRequest#LENS_FOCUS_DISTANCE android.lens.focusDistance}</li> + * <li>{@link CaptureRequest#LENS_APERTURE android.lens.aperture}</li> + * </ul> + * </li> + * </ul> + * <p>This capability is a subset of the MANUAL_SENSOR control capability, and will + * always be included if the MANUAL_SENSOR capability is available.</p> + * + * @see CaptureRequest#LENS_APERTURE + * @see CaptureRequest#LENS_FOCUS_DISTANCE + * @see CaptureRequest#SENSOR_EXPOSURE_TIME + * @see CaptureRequest#SENSOR_SENSITIVITY + * @see CameraCharacteristics#REQUEST_AVAILABLE_CAPABILITIES + */ + public static final int REQUEST_AVAILABLE_CAPABILITIES_READ_SENSOR_SETTINGS = 5; + + /** + * <p>The camera device supports capturing maximum-resolution + * images at >= 20 frames per second, in at least the + * uncompressed YUV format, when post-processing settings + * are set to FAST.</p> + * <p>More specifically, this means that a size matching the + * camera device's active array size is listed as a + * supported size for the YUV_420_888 format in + * {@link CameraCharacteristics#SCALER_STREAM_CONFIGURATION_MAP android.scaler.streamConfigurationMap}, and the + * minimum frame duration for that format and size is <= + * 1/20 s.</p> + * <p>In addition, the {@link CameraCharacteristics#SYNC_MAX_LATENCY android.sync.maxLatency} field is + * guaranted to have a value between 0 and 4, inclusive.</p> + * + * @see CameraCharacteristics#SCALER_STREAM_CONFIGURATION_MAP + * @see CameraCharacteristics#SYNC_MAX_LATENCY + * @see CameraCharacteristics#REQUEST_AVAILABLE_CAPABILITIES + */ + public static final int REQUEST_AVAILABLE_CAPABILITIES_BURST_CAPTURE = 6; + // // Enumeration values for CameraCharacteristics#SCALER_CROPPING_TYPE // @@ -807,9 +859,21 @@ public abstract class CameraMetadata<TKey> { * {@link CaptureRequest#SENSOR_FRAME_DURATION android.sensor.frameDuration} are used by the camera * device, along with android.flash.* fields, if there's * a flash unit for this camera device.</p> + * <p>Note that auto-white balance (AWB) and auto-focus (AF) + * behavior is device dependent when AE is in OFF mode. + * To have consistent behavior across different devices, + * it is recommended to either set AWB and AF to OFF mode + * or lock AWB and AF before setting AE to OFF. + * See {@link CaptureRequest#CONTROL_AWB_MODE android.control.awbMode}, {@link CaptureRequest#CONTROL_AF_MODE android.control.afMode}, + * {@link CaptureRequest#CONTROL_AWB_LOCK android.control.awbLock}, and {@link CaptureRequest#CONTROL_AF_TRIGGER android.control.afTrigger} + * for more details.</p> * <p>LEGACY devices do not support the OFF mode and will * override attempts to use this value to ON.</p> * + * @see CaptureRequest#CONTROL_AF_MODE + * @see CaptureRequest#CONTROL_AF_TRIGGER + * @see CaptureRequest#CONTROL_AWB_LOCK + * @see CaptureRequest#CONTROL_AWB_MODE * @see CaptureRequest#SENSOR_EXPOSURE_TIME * @see CaptureRequest#SENSOR_FRAME_DURATION * @see CaptureRequest#SENSOR_SENSITIVITY diff --git a/core/java/android/hardware/camera2/CaptureRequest.java b/core/java/android/hardware/camera2/CaptureRequest.java index 6aec72a36762..48af67c8dbf4 100644 --- a/core/java/android/hardware/camera2/CaptureRequest.java +++ b/core/java/android/hardware/camera2/CaptureRequest.java @@ -906,7 +906,10 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>> * <p>Whether auto-focus (AF) is currently enabled, and what * mode it is set to.</p> * <p>Only effective if {@link CaptureRequest#CONTROL_MODE android.control.mode} = AUTO and the lens is not fixed focus - * (i.e. <code>{@link CameraCharacteristics#LENS_INFO_MINIMUM_FOCUS_DISTANCE android.lens.info.minimumFocusDistance} > 0</code>).</p> + * (i.e. <code>{@link CameraCharacteristics#LENS_INFO_MINIMUM_FOCUS_DISTANCE android.lens.info.minimumFocusDistance} > 0</code>). Also note that + * when {@link CaptureRequest#CONTROL_AE_MODE android.control.aeMode} is OFF, the behavior of AF is device + * dependent. It is recommended to lock AF by using {@link CaptureRequest#CONTROL_AF_TRIGGER android.control.afTrigger} before + * setting {@link CaptureRequest#CONTROL_AE_MODE android.control.aeMode} to OFF, or set AF mode to OFF when AE is OFF.</p> * <p>If the lens is controlled by the camera device auto-focus algorithm, * the camera device will report the current AF status in {@link CaptureResult#CONTROL_AF_STATE android.control.afState} * in result metadata.</p> @@ -923,8 +926,10 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>> * {@link CameraCharacteristics#CONTROL_AF_AVAILABLE_MODES android.control.afAvailableModes}</p> * <p>This key is available on all devices.</p> * + * @see CaptureRequest#CONTROL_AE_MODE * @see CameraCharacteristics#CONTROL_AF_AVAILABLE_MODES * @see CaptureResult#CONTROL_AF_STATE + * @see CaptureRequest#CONTROL_AF_TRIGGER * @see CaptureRequest#CONTROL_MODE * @see CameraCharacteristics#LENS_INFO_MINIMUM_FOCUS_DISTANCE * @see #CONTROL_AF_MODE_OFF @@ -1046,7 +1051,10 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>> * <p>When set to the ON mode, the camera device's auto-white balance * routine is enabled, overriding the application's selected * {@link CaptureRequest#COLOR_CORRECTION_TRANSFORM android.colorCorrection.transform}, {@link CaptureRequest#COLOR_CORRECTION_GAINS android.colorCorrection.gains} and - * {@link CaptureRequest#COLOR_CORRECTION_MODE android.colorCorrection.mode}.</p> + * {@link CaptureRequest#COLOR_CORRECTION_MODE android.colorCorrection.mode}. Note that when {@link CaptureRequest#CONTROL_AE_MODE android.control.aeMode} + * is OFF, the behavior of AWB is device dependent. It is recommened to + * also set AWB mode to OFF or lock AWB by using {@link CaptureRequest#CONTROL_AWB_LOCK android.control.awbLock} before + * setting AE mode to OFF.</p> * <p>When set to the OFF mode, the camera device's auto-white balance * routine is disabled. The application manually controls the white * balance by {@link CaptureRequest#COLOR_CORRECTION_TRANSFORM android.colorCorrection.transform}, {@link CaptureRequest#COLOR_CORRECTION_GAINS android.colorCorrection.gains} @@ -1077,7 +1085,9 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>> * @see CaptureRequest#COLOR_CORRECTION_GAINS * @see CaptureRequest#COLOR_CORRECTION_MODE * @see CaptureRequest#COLOR_CORRECTION_TRANSFORM + * @see CaptureRequest#CONTROL_AE_MODE * @see CameraCharacteristics#CONTROL_AWB_AVAILABLE_MODES + * @see CaptureRequest#CONTROL_AWB_LOCK * @see CaptureRequest#CONTROL_MODE * @see #CONTROL_AWB_MODE_OFF * @see #CONTROL_AWB_MODE_AUTO diff --git a/core/java/android/hardware/camera2/CaptureResult.java b/core/java/android/hardware/camera2/CaptureResult.java index d208649f3edd..c5c843d0bec6 100644 --- a/core/java/android/hardware/camera2/CaptureResult.java +++ b/core/java/android/hardware/camera2/CaptureResult.java @@ -970,7 +970,10 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { * <p>Whether auto-focus (AF) is currently enabled, and what * mode it is set to.</p> * <p>Only effective if {@link CaptureRequest#CONTROL_MODE android.control.mode} = AUTO and the lens is not fixed focus - * (i.e. <code>{@link CameraCharacteristics#LENS_INFO_MINIMUM_FOCUS_DISTANCE android.lens.info.minimumFocusDistance} > 0</code>).</p> + * (i.e. <code>{@link CameraCharacteristics#LENS_INFO_MINIMUM_FOCUS_DISTANCE android.lens.info.minimumFocusDistance} > 0</code>). Also note that + * when {@link CaptureRequest#CONTROL_AE_MODE android.control.aeMode} is OFF, the behavior of AF is device + * dependent. It is recommended to lock AF by using {@link CaptureRequest#CONTROL_AF_TRIGGER android.control.afTrigger} before + * setting {@link CaptureRequest#CONTROL_AE_MODE android.control.aeMode} to OFF, or set AF mode to OFF when AE is OFF.</p> * <p>If the lens is controlled by the camera device auto-focus algorithm, * the camera device will report the current AF status in {@link CaptureResult#CONTROL_AF_STATE android.control.afState} * in result metadata.</p> @@ -987,8 +990,10 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { * {@link CameraCharacteristics#CONTROL_AF_AVAILABLE_MODES android.control.afAvailableModes}</p> * <p>This key is available on all devices.</p> * + * @see CaptureRequest#CONTROL_AE_MODE * @see CameraCharacteristics#CONTROL_AF_AVAILABLE_MODES * @see CaptureResult#CONTROL_AF_STATE + * @see CaptureRequest#CONTROL_AF_TRIGGER * @see CaptureRequest#CONTROL_MODE * @see CameraCharacteristics#LENS_INFO_MINIMUM_FOCUS_DISTANCE * @see #CONTROL_AF_MODE_OFF @@ -1519,7 +1524,10 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { * <p>When set to the ON mode, the camera device's auto-white balance * routine is enabled, overriding the application's selected * {@link CaptureRequest#COLOR_CORRECTION_TRANSFORM android.colorCorrection.transform}, {@link CaptureRequest#COLOR_CORRECTION_GAINS android.colorCorrection.gains} and - * {@link CaptureRequest#COLOR_CORRECTION_MODE android.colorCorrection.mode}.</p> + * {@link CaptureRequest#COLOR_CORRECTION_MODE android.colorCorrection.mode}. Note that when {@link CaptureRequest#CONTROL_AE_MODE android.control.aeMode} + * is OFF, the behavior of AWB is device dependent. It is recommened to + * also set AWB mode to OFF or lock AWB by using {@link CaptureRequest#CONTROL_AWB_LOCK android.control.awbLock} before + * setting AE mode to OFF.</p> * <p>When set to the OFF mode, the camera device's auto-white balance * routine is disabled. The application manually controls the white * balance by {@link CaptureRequest#COLOR_CORRECTION_TRANSFORM android.colorCorrection.transform}, {@link CaptureRequest#COLOR_CORRECTION_GAINS android.colorCorrection.gains} @@ -1550,7 +1558,9 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { * @see CaptureRequest#COLOR_CORRECTION_GAINS * @see CaptureRequest#COLOR_CORRECTION_MODE * @see CaptureRequest#COLOR_CORRECTION_TRANSFORM + * @see CaptureRequest#CONTROL_AE_MODE * @see CameraCharacteristics#CONTROL_AWB_AVAILABLE_MODES + * @see CaptureRequest#CONTROL_AWB_LOCK * @see CaptureRequest#CONTROL_MODE * @see #CONTROL_AWB_MODE_OFF * @see #CONTROL_AWB_MODE_AUTO diff --git a/core/java/android/hardware/hdmi/HdmiPortInfo.java b/core/java/android/hardware/hdmi/HdmiPortInfo.java index e52baed525a1..1f0f45a91917 100644 --- a/core/java/android/hardware/hdmi/HdmiPortInfo.java +++ b/core/java/android/hardware/hdmi/HdmiPortInfo.java @@ -136,7 +136,7 @@ public final class HdmiPortInfo implements Parcelable { boolean cec = (source.readInt() == 1); boolean arc = (source.readInt() == 1); boolean mhl = (source.readInt() == 1); - return new HdmiPortInfo(id, type, address, cec, arc, mhl); + return new HdmiPortInfo(id, type, address, cec, mhl, arc); } @Override @@ -172,4 +172,15 @@ public final class HdmiPortInfo implements Parcelable { s.append("mhl: ").append(mMhlSupported); return s.toString(); } + + @Override + public boolean equals(Object o) { + if (!(o instanceof HdmiPortInfo)) { + return false; + } + final HdmiPortInfo other = (HdmiPortInfo) o; + return mId == other.mId && mType == other.mType && mAddress == other.mAddress + && mCecSupported == other.mCecSupported && mArcSupported == other.mArcSupported + && mMhlSupported == other.mMhlSupported; + } } diff --git a/core/java/android/hardware/soundtrigger/SoundTrigger.java b/core/java/android/hardware/soundtrigger/SoundTrigger.java index 746ead29bf2e..c85e97b5c27b 100644 --- a/core/java/android/hardware/soundtrigger/SoundTrigger.java +++ b/core/java/android/hardware/soundtrigger/SoundTrigger.java @@ -211,6 +211,43 @@ public class SoundTrigger { this.type = type; this.data = data; } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + Arrays.hashCode(data); + result = prime * result + type; + result = prime * result + ((uuid == null) ? 0 : uuid.hashCode()); + result = prime * result + ((vendorUuid == null) ? 0 : vendorUuid.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (!(obj instanceof SoundModel)) + return false; + SoundModel other = (SoundModel) obj; + if (!Arrays.equals(data, other.data)) + return false; + if (type != other.type) + return false; + if (uuid == null) { + if (other.uuid != null) + return false; + } else if (!uuid.equals(other.uuid)) + return false; + if (vendorUuid == null) { + if (other.vendorUuid != null) + return false; + } else if (!vendorUuid.equals(other.vendorUuid)) + return false; + return true; + } } /***************************************************************************** @@ -395,6 +432,28 @@ public class SoundTrigger { + ", uuid=" + uuid + ", vendorUuid=" + vendorUuid + ", type=" + type + ", data=" + (data == null ? 0 : data.length) + "]"; } + + @Override + public int hashCode() { + final int prime = 31; + int result = super.hashCode(); + result = prime * result + Arrays.hashCode(keyphrases); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (!super.equals(obj)) + return false; + if (!(obj instanceof KeyphraseSoundModel)) + return false; + KeyphraseSoundModel other = (KeyphraseSoundModel) obj; + if (!Arrays.equals(keyphrases, other.keyphrases)) + return false; + return true; + } } /** diff --git a/core/java/android/net/VpnService.java b/core/java/android/net/VpnService.java index c8489937f057..d469487a7a0f 100644 --- a/core/java/android/net/VpnService.java +++ b/core/java/android/net/VpnService.java @@ -19,6 +19,7 @@ package android.net; import static android.system.OsConstants.AF_INET; import static android.system.OsConstants.AF_INET6; +import android.annotation.SystemApi; import android.app.Activity; import android.app.PendingIntent; import android.app.Service; @@ -164,6 +165,32 @@ public class VpnService extends Service { } /** + * Version of {@link #prepare(Context)} which does not require user consent. + * + * <p>Requires {@link android.Manifest.permission#CONTROL_VPN} and should generally not be + * used. Only acceptable in situations where user consent has been obtained through other means. + * + * <p>Once this is run, future preparations may be done with the standard prepare method as this + * will authorize the package to prepare the VPN without consent in the future. + * + * @hide + */ + @SystemApi + public static void prepareAndAuthorize(Context context) { + IConnectivityManager cm = getService(); + String packageName = context.getPackageName(); + try { + // Only prepare if we're not already prepared. + if (!cm.prepareVpn(packageName, null)) { + cm.prepareVpn(null, packageName); + } + cm.setVpnPackageAuthorization(true); + } catch (RemoteException e) { + // ignore + } + } + + /** * Protect a socket from VPN connections. After protecting, data sent * through this socket will go directly to the underlying network, * so its traffic will not be forwarded through the VPN. diff --git a/core/java/android/net/WebAddress.java b/core/java/android/net/WebAddress.java index 8126b75a77c1..24d4eb8907fa 100644 --- a/core/java/android/net/WebAddress.java +++ b/core/java/android/net/WebAddress.java @@ -18,6 +18,8 @@ package android.net; import static android.util.Patterns.GOOD_IRI_CHAR; +import android.annotation.SystemApi; + import java.util.Locale; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -38,6 +40,9 @@ import java.util.regex.Pattern; * If given an https scheme but no port, fills in port * */ +// TODO(igsolla): remove WebAddress from the system SDK once the WebView apk does not +// longer need to be binary compatible with the API 21 version of the framework. +@SystemApi public class WebAddress { private String mScheme; @@ -136,42 +141,52 @@ public class WebAddress { return mScheme + "://" + authInfo + mHost + port + mPath; } + /** {@hide} */ public void setScheme(String scheme) { mScheme = scheme; } + /** {@hide} */ public String getScheme() { return mScheme; } + /** {@hide} */ public void setHost(String host) { mHost = host; } + /** {@hide} */ public String getHost() { return mHost; } + /** {@hide} */ public void setPort(int port) { mPort = port; } + /** {@hide} */ public int getPort() { return mPort; } + /** {@hide} */ public void setPath(String path) { mPath = path; } + /** {@hide} */ public String getPath() { return mPath; } + /** {@hide} */ public void setAuthInfo(String authInfo) { mAuthInfo = authInfo; } + /** {@hide} */ public String getAuthInfo() { return mAuthInfo; } diff --git a/core/java/android/nfc/BeamShareData.java b/core/java/android/nfc/BeamShareData.java index c30ba14778da..918ec3d5e2c4 100644 --- a/core/java/android/nfc/BeamShareData.java +++ b/core/java/android/nfc/BeamShareData.java @@ -3,6 +3,7 @@ package android.nfc; import android.net.Uri; import android.os.Parcel; import android.os.Parcelable; +import android.os.UserHandle; /** * Class to IPC data to be shared over Android Beam. @@ -14,11 +15,13 @@ import android.os.Parcelable; public final class BeamShareData implements Parcelable { public final NdefMessage ndefMessage; public final Uri[] uris; + public final UserHandle userHandle; public final int flags; - public BeamShareData(NdefMessage msg, Uri[] uris, int flags) { + public BeamShareData(NdefMessage msg, Uri[] uris, UserHandle userHandle, int flags) { this.ndefMessage = msg; this.uris = uris; + this.userHandle = userHandle; this.flags = flags; } @@ -35,6 +38,7 @@ public final class BeamShareData implements Parcelable { if (urisLength > 0) { dest.writeTypedArray(uris, 0); } + dest.writeParcelable(userHandle, 0); dest.writeInt(this.flags); } @@ -49,9 +53,10 @@ public final class BeamShareData implements Parcelable { uris = new Uri[numUris]; source.readTypedArray(uris, Uri.CREATOR); } + UserHandle userHandle = source.readParcelable(UserHandle.class.getClassLoader()); int flags = source.readInt(); - return new BeamShareData(msg, uris, flags); + return new BeamShareData(msg, uris, userHandle, flags); } @Override diff --git a/core/java/android/nfc/NfcActivityManager.java b/core/java/android/nfc/NfcActivityManager.java index 8643f2ef0802..dd9765d7b5c0 100644 --- a/core/java/android/nfc/NfcActivityManager.java +++ b/core/java/android/nfc/NfcActivityManager.java @@ -18,12 +18,14 @@ package android.nfc; import android.app.Activity; import android.app.Application; +import android.content.ContentProvider; import android.content.Intent; import android.net.Uri; import android.nfc.NfcAdapter.ReaderCallback; import android.os.Binder; import android.os.Bundle; import android.os.RemoteException; +import android.os.UserHandle; import android.util.Log; import java.util.ArrayList; @@ -350,19 +352,24 @@ public final class NfcActivityManager extends IAppCallback.Stub if (urisCallback != null) { uris = urisCallback.createBeamUris(mDefaultEvent); if (uris != null) { + ArrayList<Uri> validUris = new ArrayList<Uri>(); for (Uri uri : uris) { if (uri == null) { Log.e(TAG, "Uri not allowed to be null."); - return null; + continue; } String scheme = uri.getScheme(); if (scheme == null || (!scheme.equalsIgnoreCase("file") && !scheme.equalsIgnoreCase("content"))) { Log.e(TAG, "Uri needs to have " + "either scheme file or scheme content"); - return null; + continue; } + uri = ContentProvider.maybeAddUserId(uri, UserHandle.myUserId()); + validUris.add(uri); } + + uris = validUris.toArray(new Uri[validUris.size()]); } } if (uris != null && uris.length > 0) { @@ -372,7 +379,7 @@ public final class NfcActivityManager extends IAppCallback.Stub Intent.FLAG_GRANT_READ_URI_PERMISSION); } } - return new BeamShareData(message, uris, flags); + return new BeamShareData(message, uris, UserHandle.CURRENT, flags); } /** Callback from NFC service, usually on binder thread */ diff --git a/core/java/android/os/AsyncTask.java b/core/java/android/os/AsyncTask.java index 4f91d1993305..7785f2bb886c 100644 --- a/core/java/android/os/AsyncTask.java +++ b/core/java/android/os/AsyncTask.java @@ -209,9 +209,9 @@ public abstract class AsyncTask<Params, Progress, Result> { private static final int MESSAGE_POST_RESULT = 0x1; private static final int MESSAGE_POST_PROGRESS = 0x2; - private static final InternalHandler sHandler = new InternalHandler(); - private static volatile Executor sDefaultExecutor = SERIAL_EXECUTOR; + private static InternalHandler sHandler; + private final WorkerRunnable<Params, Result> mWorker; private final FutureTask<Result> mFuture; @@ -265,9 +265,13 @@ public abstract class AsyncTask<Params, Progress, Result> { FINISHED, } - /** @hide Used to force static handler to be created. */ - public static void init() { - sHandler.getLooper(); + private static Handler getHandler() { + synchronized (AsyncTask.class) { + if (sHandler == null) { + sHandler = new InternalHandler(); + } + return sHandler; + } } /** @hide */ @@ -315,7 +319,7 @@ public abstract class AsyncTask<Params, Progress, Result> { private Result postResult(Result result) { @SuppressWarnings("unchecked") - Message message = sHandler.obtainMessage(MESSAGE_POST_RESULT, + Message message = getHandler().obtainMessage(MESSAGE_POST_RESULT, new AsyncTaskResult<Result>(this, result)); message.sendToTarget(); return result; @@ -620,7 +624,7 @@ public abstract class AsyncTask<Params, Progress, Result> { */ protected final void publishProgress(Progress... values) { if (!isCancelled()) { - sHandler.obtainMessage(MESSAGE_POST_PROGRESS, + getHandler().obtainMessage(MESSAGE_POST_PROGRESS, new AsyncTaskResult<Progress>(this, values)).sendToTarget(); } } @@ -635,10 +639,14 @@ public abstract class AsyncTask<Params, Progress, Result> { } private static class InternalHandler extends Handler { + public InternalHandler() { + super(Looper.getMainLooper()); + } + @SuppressWarnings({"unchecked", "RawUseOfParameterizedType"}) @Override public void handleMessage(Message msg) { - AsyncTaskResult result = (AsyncTaskResult) msg.obj; + AsyncTaskResult<?> result = (AsyncTaskResult<?>) msg.obj; switch (msg.what) { case MESSAGE_POST_RESULT: // There is only one result diff --git a/core/java/android/os/Build.java b/core/java/android/os/Build.java index f361695b2fbd..4b0cef6e5a12 100644 --- a/core/java/android/os/Build.java +++ b/core/java/android/os/Build.java @@ -20,8 +20,11 @@ import android.text.TextUtils; import android.util.Slog; import com.android.internal.telephony.TelephonyProperties; + import dalvik.system.VMRuntime; +import java.util.Objects; + /** * Information about the current build, extracted from system properties. */ @@ -640,6 +643,32 @@ public class Build { } } + /** + * Check that device fingerprint is defined and that it matches across + * various partitions. + * + * @hide + */ + public static boolean isFingerprintConsistent() { + final String system = SystemProperties.get("ro.build.fingerprint"); + final String vendor = SystemProperties.get("ro.vendor.build.fingerprint"); + + if (TextUtils.isEmpty(system)) { + Slog.e(TAG, "Required ro.build.fingerprint is empty!"); + return false; + } + + if (!TextUtils.isEmpty(vendor)) { + if (!Objects.equals(system, vendor)) { + Slog.e(TAG, "Mismatched fingerprints; system reported " + system + + " but vendor reported " + vendor); + return false; + } + } + + return true; + } + // The following properties only make sense for internal engineering builds. public static final long TIME = getLong("ro.build.date.utc") * 1000; public static final String USER = getString("ro.build.user"); diff --git a/core/java/android/os/Handler.java b/core/java/android/os/Handler.java index 52db0609854e..878b7a0e8e10 100644 --- a/core/java/android/os/Handler.java +++ b/core/java/android/os/Handler.java @@ -156,7 +156,7 @@ public class Handler { * one that is strictly asynchronous. * * Asynchronous messages represent interrupts or events that do not require global ordering - * with represent to synchronous messages. Asynchronous messages are not subject to + * with respect to synchronous messages. Asynchronous messages are not subject to * the synchronization barriers introduced by {@link MessageQueue#enqueueSyncBarrier(long)}. * * @param async If true, the handler calls {@link Message#setAsynchronous(boolean)} for @@ -176,7 +176,7 @@ public class Handler { * one that is strictly asynchronous. * * Asynchronous messages represent interrupts or events that do not require global ordering - * with represent to synchronous messages. Asynchronous messages are not subject to + * with respect to synchronous messages. Asynchronous messages are not subject to * the synchronization barriers introduced by {@link MessageQueue#enqueueSyncBarrier(long)}. * * @param callback The callback interface in which to handle messages, or null. @@ -214,7 +214,7 @@ public class Handler { * one that is strictly asynchronous. * * Asynchronous messages represent interrupts or events that do not require global ordering - * with represent to synchronous messages. Asynchronous messages are not subject to + * with respect to synchronous messages. Asynchronous messages are not subject to * the synchronization barriers introduced by {@link MessageQueue#enqueueSyncBarrier(long)}. * * @param looper The looper, must not be null. diff --git a/core/java/android/os/Message.java b/core/java/android/os/Message.java index 6a0bddc5ee1b..8c758470c83a 100644 --- a/core/java/android/os/Message.java +++ b/core/java/android/os/Message.java @@ -417,38 +417,42 @@ public final class Message implements Parcelable { } /** - * Returns true if the message is asynchronous. - * - * Asynchronous messages represent interrupts or events that do not require global ordering - * with represent to synchronous messages. Asynchronous messages are not subject to - * the synchronization barriers introduced by {@link MessageQueue#enqueueSyncBarrier(long)}. + * Returns true if the message is asynchronous, meaning that it is not + * subject to {@link Looper} synchronization barriers. * * @return True if the message is asynchronous. * * @see #setAsynchronous(boolean) - * @see MessageQueue#enqueueSyncBarrier(long) - * @see MessageQueue#removeSyncBarrier(int) - * - * @hide */ public boolean isAsynchronous() { return (flags & FLAG_ASYNCHRONOUS) != 0; } /** - * Sets whether the message is asynchronous. - * - * Asynchronous messages represent interrupts or events that do not require global ordering - * with represent to synchronous messages. Asynchronous messages are not subject to - * the synchronization barriers introduced by {@link MessageQueue#enqueueSyncBarrier(long)}. + * Sets whether the message is asynchronous, meaning that it is not + * subject to {@link Looper} synchronization barriers. + * <p> + * Certain operations, such as view invalidation, may introduce synchronization + * barriers into the {@link Looper}'s message queue to prevent subsequent messages + * from being delivered until some condition is met. In the case of view invalidation, + * messages which are posted after a call to {@link android.view.View#invalidate} + * are suspended by means of a synchronization barrier until the next frame is + * ready to be drawn. The synchronization barrier ensures that the invalidation + * request is completely handled before resuming. + * </p><p> + * Asynchronous messages are exempt from synchronization barriers. They typically + * represent interrupts, input events, and other signals that must be handled independently + * even while other work has been suspended. + * </p><p> + * Note that asynchronous messages may be delivered out of order with respect to + * synchronous messages although they are always delivered in order among themselves. + * If the relative order of these messages matters then they probably should not be + * asynchronous in the first place. Use with caution. + * </p> * * @param async True if the message is asynchronous. * * @see #isAsynchronous() - * @see MessageQueue#enqueueSyncBarrier(long) - * @see MessageQueue#removeSyncBarrier(int) - * - * @hide */ public void setAsynchronous(boolean async) { if (async) { diff --git a/core/java/android/os/Parcel.java b/core/java/android/os/Parcel.java index 5230128fabbd..bedc695ffbcf 100644 --- a/core/java/android/os/Parcel.java +++ b/core/java/android/os/Parcel.java @@ -340,6 +340,12 @@ public final class Parcel { } } + /** @hide */ + public static native long getGlobalAllocSize(); + + /** @hide */ + public static native long getGlobalAllocCount(); + /** * Returns the total amount of data contained in the parcel. */ diff --git a/core/java/android/webkit/MustOverrideException.java b/core/java/android/service/carriermessaging/CarrierMessagingService.aidl index 0643bf0749a7..50c438af6641 100644 --- a/core/java/android/webkit/MustOverrideException.java +++ b/core/java/android/service/carriermessaging/CarrierMessagingService.aidl @@ -1,11 +1,11 @@ -/* - * Copyright (C) 2012 The Android Open Source Project +/** + * 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 + * 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,12 +14,6 @@ * limitations under the License. */ -package android.webkit; +package android.service.carriermessaging; -// TODO: Remove MustOverrideException and make all methods throwing it abstract instead; -// needs API file update. -class MustOverrideException extends RuntimeException { - MustOverrideException() { - super("abstract function called: must be overriden!"); - } -}
\ No newline at end of file +parcelable CarrierMessagingService.SendSmsResponse;
\ No newline at end of file diff --git a/core/java/android/service/carriermessaging/CarrierMessagingService.java b/core/java/android/service/carriermessaging/CarrierMessagingService.java new file mode 100644 index 000000000000..101f69b8001d --- /dev/null +++ b/core/java/android/service/carriermessaging/CarrierMessagingService.java @@ -0,0 +1,370 @@ +/* + * 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.service.carriermessaging; + +import android.annotation.Nullable; +import android.annotation.SdkConstant; +import android.app.Service; +import android.content.Intent; +import android.net.Uri; +import android.os.IBinder; +import android.os.Parcel; +import android.os.Parcelable; +import android.os.RemoteException; + +import java.util.List; + +/** + * A service that receives calls from the system when new SMS and MMS are + * sent or received. + * <p>To extend this class, you must declare the service in your manifest file with + * the {@link android.Manifest.permission#BIND_CARRIER_MESSAGING_SERVICE} permission + * and include an intent filter with the {@link #SERVICE_INTERFACE} action. For example:</p> + * <pre> + * <service android:name=".MyMessagingService" + * android:label="@string/service_name" + * android:permission="android.permission.BIND_CARRIER_MESSAGING_SERVICE"> + * <intent-filter> + * <action android:name="android.service.carriermessaging.CarrierMessagingService" /> + * </intent-filter> + * </service></pre> + */ +public abstract class CarrierMessagingService extends Service { + /** + * The {@link android.content.Intent} that must be declared as handled by the service. + */ + @SdkConstant(SdkConstant.SdkConstantType.SERVICE_ACTION) + public static final String SERVICE_INTERFACE + = "android.service.carriermessaging.CarrierMessagingService"; + + /** + * Indicates that an SMS or MMS message was successfully sent. + */ + public static final int SEND_STATUS_OK = 0; + + /** + * SMS/MMS sending failed. We should retry via the carrier network. + */ + public static final int SEND_STATUS_RETRY_ON_CARRIER_NETWORK = 1; + + /** + * SMS/MMS sending failed. We should not retry via the carrier network. + */ + public static final int SEND_STATUS_ERROR = 2; + + /** + * Successfully downloaded an MMS message. + */ + public static final int DOWNLOAD_STATUS_OK = 0; + + /** + * MMS downloading failed. We should retry via the carrier network. + */ + public static final int DOWNLOAD_STATUS_RETRY_ON_CARRIER_NETWORK = 1; + + /** + * MMS downloading failed. We should not retry via the carrier network. + */ + public static final int DOWNLOAD_STATUS_ERROR = 2; + + private final ICarrierMessagingWrapper mWrapper = new ICarrierMessagingWrapper(); + + /** + * Implement this method to filter SMS messages. + * + * @param pdu the PDUs of the message + * @param format the format of the PDUs, typically "3gpp" or "3gpp2" + * @param destPort the destination port of a binary SMS, this will be -1 for text SMS + * + * @return True to keep an inbound SMS message and delivered to SMS apps. False to + * drop the message. + */ + public boolean onFilterSms(MessagePdu pdu, String format, int destPort) { + // optional + return true; + } + + /** + * Implement this method to intercept text SMSs sent from the devcie. + * + * @param text the text to send + * @param format the format of the response PDU, typically "3gpp" or "3gpp2" + * @param destAddress phone number of the recipient of the message + * + * @return a {@link SendSmsResponse}. + */ + public SendSmsResponse onSendTextSms(String text, String format, String destAddress) { + // optional + return null; + } + + /** + * Implement this method to intercept binary SMSs sent from the device. + * + * @param data the binary content + * @param format format the format of the response PDU, typically "3gpp" or "3gpp2" + * @param destAddress phone number of the recipient of the message + * @param destPort the destination port + * + * @return a {@link SendSmsResponse} + */ + public SendSmsResponse onSendDataSms(byte[] data, String format, String destAddress, + int destPort) { + // optional + return null; + } + + /** + * Implement this method to intercept long SMSs sent from the device. + * + * @param parts a {@link List} of the message parts + * @param format format the format of the response PDU, typically "3gpp" or "3gpp2" + * @param destAddress phone number of the recipient of the message + * + * @return a {@link List} of {@link SendSmsResponse}, one for each message part. + */ + public List<SendSmsResponse> onSendMultipartTextSms(List<String> parts, String format, + String destAddress) { + // optional + return null; + } + + /** + * Implement this method to intercept MMSs sent from the device. + * + * @param pduUri the content provider URI of the PDU to send + * @param locationUrl the optional URL to send this MMS PDU. If this is not specified, + * the PDU should be sent to the default MMSC URL. + * + * @return a {@link SendMmsResult}. + */ + public SendMmsResult onSendMms(Uri pduUri, @Nullable String locationUrl) { + // optional + return null; + } + + /** + * Implement this method to download MMSs received. + * + * @param contentUri the content provider URI of the PDU to be downloaded. + * @param locationUrl the URL of the message to be downloaded. + * + * @return a {@link SendMmsResult}. + */ + public int onDownloadMms(Uri contentUri, String locationUrl) { + // optional + return DOWNLOAD_STATUS_RETRY_ON_CARRIER_NETWORK; + } + + @Override + public IBinder onBind(Intent intent) { + if (!SERVICE_INTERFACE.equals(intent.getAction())) { + return null; + } + return mWrapper; + } + + /** + * The result of sending an MMS. + */ + public static final class SendMmsResult { + private int mResult; + private byte[] mSendConfPdu; + + public SendMmsResult(int result, byte[] sendConfPdu) { + mResult = result; + mSendConfPdu = sendConfPdu; + } + + /** + * @return the result which is one of {@link #SEND_STATUS_OK}, + * {@link #SEND_STATUS_RETRY_ON_CARRIER_NETWORK}, and {@link #SEND_STATUS_ERROR} + */ + public int getResult() { + return mResult; + } + + /** + * @return the SendConf PDU, which confirms that the message was sent. + */ + public byte[] getSendConfPdu() { + return mSendConfPdu; + } + } + + /** + * Object passed in callbacks upon successful completion of + * {@link ICarrierMessagingService#sendTextSms}, + * {@link ICarrierMessagingService#sendDataSms}, and + * {@link ICarrierMessagingService#sendMultipartTextSms}. + * Contains message reference and ackPdu. + */ + public static final class SendSmsResponse implements Parcelable { + private int mMessageRef; + private byte[] mAckPdu; + private int mErrorCode; + + /** + * @param messageRef message reference of the just-sent SMS + * @param ackPdu ackPdu for the just-sent SMS + * @param errorCode error code. See 3GPP 27.005, 3.2.5 for GSM/UMTS, + * 3GPP2 N.S0005 (IS-41C) Table 171 for CDMA, -1 if unknown or not applicable. + */ + public SendSmsResponse(int messageRef, byte[] ackPdu, int errorCode) { + mMessageRef = messageRef; + mAckPdu = ackPdu; + mErrorCode = errorCode; + } + + /** + * Returns the message reference of the just-sent SMS. + * + * @return the message reference + */ + public int getMessageRef() { + return mMessageRef; + } + + /** + * Returns the ackPdu for the just-sent SMS. + * + * @return the ackPdu + */ + public byte[] getAckPdu() { + return mAckPdu; + } + + /** + * Returns the error code upon encountering an error while sending the SMS, -1 if unknown or + * not applicable. + * + * @return errorCode the errorCode as defined in 3GPP 27.005, 3.2.5 for GSM/UMTS, and 3GPP2 + * N.S0005 (IS-41C) Table 171 for CDMA, -1 if unknown or not applicable. + */ + public int getErrorCode() { + return mErrorCode; + } + + @Override + public int describeContents() { + return 0; + } + + @Override + public void writeToParcel(Parcel dest, int flags) { + dest.writeInt(mMessageRef); + dest.writeByteArray(mAckPdu); + dest.writeInt(mErrorCode); + } + + public static final Parcelable.Creator<SendSmsResponse> CREATOR + = new Parcelable.Creator<SendSmsResponse>() { + @Override + public SendSmsResponse createFromParcel(Parcel source) { + return new SendSmsResponse(source.readInt(), + source.createByteArray(), + source.readInt()); + } + + @Override + public SendSmsResponse[] newArray(int size) { + return new SendSmsResponse[size]; + } + }; + } + + /** + * A wrapper around ICarrierMessagingService to enable the carrier messaging APP to implement + * methods it cares about in the {@link ICarrierMessagingService} interface. + */ + private class ICarrierMessagingWrapper extends ICarrierMessagingService.Stub { + @Override + public void filterSms(MessagePdu pdu, String format, int destPort, + ICarrierMessagingCallback callback) { + try { + callback.onFilterComplete(onFilterSms(pdu, format, destPort)); + } catch (RemoteException ex) { + } + } + + @Override + public void sendTextSms(String text, String format, String destAddress, + ICarrierMessagingCallback callback) { + try { + SendSmsResponse sendSmsResponse = onSendTextSms(text, format, destAddress); + if (sendSmsResponse == null) { + callback.onSendSmsComplete(SEND_STATUS_RETRY_ON_CARRIER_NETWORK, null); + } else { + callback.onSendSmsComplete(SEND_STATUS_OK, sendSmsResponse); + } + } catch (RemoteException ex) { + } + } + + @Override + public void sendDataSms(byte[] data, String format, String destAddress, int destPort, + ICarrierMessagingCallback callback) { + try { + SendSmsResponse sendSmsResponse = onSendDataSms(data, format, destAddress, + destPort); + if (sendSmsResponse == null) { + callback.onSendSmsComplete(SEND_STATUS_RETRY_ON_CARRIER_NETWORK, null); + } else { + callback.onSendSmsComplete(SEND_STATUS_OK, sendSmsResponse); + } + } catch (RemoteException ex) { + } + } + + @Override + public void sendMultipartTextSms(List<String> parts, String format, String destAddress, + ICarrierMessagingCallback callback) { + try { + List<SendSmsResponse> sendSmsResponses = + onSendMultipartTextSms(parts, format, destAddress); + if (sendSmsResponses == null) { + callback.onSendMultipartSmsComplete(SEND_STATUS_RETRY_ON_CARRIER_NETWORK, null); + } else { + callback.onSendMultipartSmsComplete(SEND_STATUS_OK, sendSmsResponses); + } + } catch (RemoteException ex) { + } + } + + @Override + public void sendMms(Uri pduUri, String locationUrl, ICarrierMessagingCallback callback) { + try { + SendMmsResult result = onSendMms(pduUri, locationUrl); + if (result == null) { + callback.onSendMmsComplete(SEND_STATUS_RETRY_ON_CARRIER_NETWORK, null); + } else { + callback.onSendMmsComplete(SEND_STATUS_OK, result.getSendConfPdu()); + } + } catch (RemoteException ex) { + } + } + + @Override + public void downloadMms(Uri contentUri, String locationUrl, + ICarrierMessagingCallback callback) { + try { + callback.onDownloadMmsComplete(onDownloadMms(contentUri, locationUrl)); + } catch (RemoteException ex) { + } + } + } +} diff --git a/core/java/android/service/carriermessaging/CarrierMessagingServiceManager.java b/core/java/android/service/carriermessaging/CarrierMessagingServiceManager.java new file mode 100644 index 000000000000..56ee2c16c9a6 --- /dev/null +++ b/core/java/android/service/carriermessaging/CarrierMessagingServiceManager.java @@ -0,0 +1,97 @@ +/* + * 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.service.carriermessaging; + +import android.content.ComponentName; +import android.content.Context; +import android.content.Intent; +import android.content.ServiceConnection; +import android.os.IBinder; + +import com.android.internal.util.Preconditions; + +/** + * Provides basic structure for platform to connect to the carrier messaging service. + * <p> + * <code> + * CarrierMessagingServiceManager carrierMessagingServiceManager = + * new CarrierMessagingServiceManagerImpl(); + * if (carrierMessagingServiceManager.bindToCarrierMessagingService(context, carrierPackageName)) { + * // wait for onServiceReady callback + * } else { + * // Unable to bind: handle error. + * } + * </code> + * <p> Upon completion {@link #disposeConnection} should be called to unbind the + * CarrierMessagingService. + * @hide + */ +public abstract class CarrierMessagingServiceManager { + // Populated by bindToCarrierMessagingService. bindToCarrierMessagingService must complete + // prior to calling disposeConnection so that mCarrierMessagingServiceConnection is initialized. + private volatile CarrierMessagingServiceConnection mCarrierMessagingServiceConnection; + + /** + * Binds to the carrier messaging service under package {@code carrierPackageName}. This method + * should be called exactly once. + * + * @param context the context + * @param carrierPackageName the carrier package name + * @return true upon successfully binding to a carrier messaging service, false otherwise + */ + public boolean bindToCarrierMessagingService(Context context, String carrierPackageName) { + Preconditions.checkState(mCarrierMessagingServiceConnection == null); + + Intent intent = new Intent(CarrierMessagingService.SERVICE_INTERFACE); + intent.setPackage(carrierPackageName); + mCarrierMessagingServiceConnection = new CarrierMessagingServiceConnection(); + return context.bindService(intent, mCarrierMessagingServiceConnection, + Context.BIND_AUTO_CREATE); + } + + /** + * Unbinds the carrier messaging service. This method should be called exactly once. + * + * @param context the context + */ + public void disposeConnection(Context context) { + Preconditions.checkNotNull(mCarrierMessagingServiceConnection); + context.unbindService(mCarrierMessagingServiceConnection); + mCarrierMessagingServiceConnection = null; + } + + /** + * Implemented by subclasses to use the carrier messaging service once it is ready. + * + * @param carrierMessagingService the carirer messaing service interface + */ + protected abstract void onServiceReady(ICarrierMessagingService carrierMessagingService); + + /** + * A basic {@link ServiceConnection}. + */ + private final class CarrierMessagingServiceConnection implements ServiceConnection { + @Override + public void onServiceConnected(ComponentName name, IBinder service) { + onServiceReady(ICarrierMessagingService.Stub.asInterface(service)); + } + + @Override + public void onServiceDisconnected(ComponentName name) { + } + } +} diff --git a/core/java/android/service/carriermessaging/ICarrierMessagingCallback.aidl b/core/java/android/service/carriermessaging/ICarrierMessagingCallback.aidl new file mode 100644 index 000000000000..da56ad1bb526 --- /dev/null +++ b/core/java/android/service/carriermessaging/ICarrierMessagingCallback.aidl @@ -0,0 +1,33 @@ +/** + * 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.service.carriermessaging; + +import android.service.carriermessaging.CarrierMessagingService; + +/** + * Callback interface definition for the Carrier Messaging Service client to get informed of the + * result of various API invocations. + */ +oneway interface ICarrierMessagingCallback { + void onFilterComplete(boolean keepMessage); + void onSendSmsComplete( + int result, in CarrierMessagingService.SendSmsResponse sendSmsResponse); + void onSendMultipartSmsComplete( + int result, in List<CarrierMessagingService.SendSmsResponse> sendSmsResponses); + void onSendMmsComplete(int result, in byte[] sendConfPdu); + void onDownloadMmsComplete(int result); +} diff --git a/core/java/android/service/carriermessaging/ICarrierMessagingService.aidl b/core/java/android/service/carriermessaging/ICarrierMessagingService.aidl new file mode 100644 index 000000000000..6e9e3fa1bab8 --- /dev/null +++ b/core/java/android/service/carriermessaging/ICarrierMessagingService.aidl @@ -0,0 +1,103 @@ +/** + * 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.service.carriermessaging; + +import android.net.Uri; +import android.service.carriermessaging.ICarrierMessagingCallback; +import android.service.carriermessaging.MessagePdu; + +/** + * <p class="note"><strong>Note:</strong> + * This service can only be implemented by a carrier privileged app. + */ +oneway interface ICarrierMessagingService { + /** + * Request filtering an incoming SMS message. + * The service will call callback.onFilterComplete with the filtering result. + * + * @param pdu the PDUs of the message + * @param format the format of the PDUs, typically "3gpp" or "3gpp2" + * @param destPort the destination port of a data SMS. It will be -1 for text SMS + * @param callback the callback to notify upon completion + */ + void filterSms( + in MessagePdu pdu, String format, int destPort, in ICarrierMessagingCallback callback); + + /** + * Request sending a new text SMS from the device. + * The service will call {@link ICarrierMessagingCallback#onSendSmsComplete} with the send + * status. + * + * @param text the text to send + * @param format the format of the response PDU, typically "3gpp" or "3gpp2" + * @param destAddress phone number of the recipient of the message + * @param callback the callback to notify upon completion + */ + void sendTextSms(String text, String format, String destAddress, + in ICarrierMessagingCallback callback); + + /** + * Request sending a new data SMS from the device. + * The service will call {@link ICarrierMessagingCallback#onSendSmsComplete} with the send + * status. + * + * @param data the data to send + * @param format the format of the response PDU, typically "3gpp" or "3gpp2" + * @param destAddress phone number of the recipient of the message + * @param destPort port number of the recipient of the message + * @param callback the callback to notify upon completion + */ + void sendDataSms(in byte[] data, String format, String destAddress, int destPort, + in ICarrierMessagingCallback callback); + + /** + * Request sending a new multi-part text SMS from the device. + * The service will call {@link ICarrierMessagingCallback#onSendMultipartSmsComplete} + * with the send status. + * + * @param parts the parts of the multi-part text SMS to send + * @param format the format of the response PDU, typically "3gpp" or "3gpp2" + * @param destAddress phone number of the recipient of the message + * @param callback the callback to notify upon completion + */ + void sendMultipartTextSms(in List<String> parts, String format, String destAddress, + in ICarrierMessagingCallback callback); + + /** + * Request sending a new MMS PDU from the device. + * The service will call {@link ICarrierMessagingCallback#onSendMmsComplete} with the send + * status. + * + * @param pduUri the content provider URI of the PDU to send + * @param locationUrl the optional url to send this MMS PDU. + * If this is not specified, PDU should be sent to the default MMSC url. + * @param callback the callback to notify upon completion + */ + void sendMms(in Uri pduUri, String locationUrl, in ICarrierMessagingCallback callback); + + /** + * Request downloading a new MMS. + * The service will call {@link ICarrierMessagingCallback#onDownloadMmsComplete} with the + * download status. + * + * @param pduUri the content provider URI of the PDU to be downloaded. + * @param locationUrl the URL of the message to be downloaded. + * @param callback the callback to notify upon completion + */ + void downloadMms(in Uri pduUri, String locationUrl, in ICarrierMessagingCallback callback); +} + diff --git a/core/java/android/service/carriermessaging/MessagePdu.aidl b/core/java/android/service/carriermessaging/MessagePdu.aidl new file mode 100644 index 000000000000..82b3fb3b6038 --- /dev/null +++ b/core/java/android/service/carriermessaging/MessagePdu.aidl @@ -0,0 +1,19 @@ +/** + * 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.service.carriermessaging; + +parcelable MessagePdu;
\ No newline at end of file diff --git a/core/java/android/service/carriermessaging/MessagePdu.java b/core/java/android/service/carriermessaging/MessagePdu.java new file mode 100644 index 000000000000..b81719f3b115 --- /dev/null +++ b/core/java/android/service/carriermessaging/MessagePdu.java @@ -0,0 +1,94 @@ +/* + * 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.service.carriermessaging; + +import android.os.Parcel; +import android.os.Parcelable; + +import java.util.ArrayList; +import java.util.List; + +/** + * A parcelable list of PDUs representing contents of a possibly multi-part SMS. + */ +public final class MessagePdu implements Parcelable { + private static final int NULL_LENGTH = -1; + + private final List<byte[]> mPduList; + + /** + * @param pduList the list of message PDUs + */ + public MessagePdu(List<byte[]> pduList) { + mPduList = pduList; + } + + /** + * Returns the contents of a possibly multi-part SMS. + * + * @return the list of PDUs + */ + public List<byte[]> getPdus() { + return mPduList; + } + + @Override + public int describeContents() { + return 0; + } + + /** + * Writes the PDU into a {@link Parcel}. + */ + @Override + public void writeToParcel(Parcel dest, int flags) { + if (mPduList == null) { + dest.writeInt(NULL_LENGTH); + } else { + dest.writeInt(mPduList.size()); + for (byte[] messagePdu : mPduList) { + dest.writeByteArray(messagePdu); + } + } + } + + /** + * Constructs a {@link MessagePdu} from a {@link Parcel}. + */ + public static final Parcelable.Creator<MessagePdu> CREATOR + = new Parcelable.Creator<MessagePdu>() { + @Override + public MessagePdu createFromParcel(Parcel source) { + int size = source.readInt(); + List<byte[]> pduList; + if (size == NULL_LENGTH) { + pduList = null; + } else { + pduList = new ArrayList<>(size); + for (int i = 0; i < size; i++) { + pduList.add(source.createByteArray()); + } + } + return new MessagePdu(pduList); + } + + @Override + public MessagePdu[] newArray(int size) { + return new MessagePdu[size]; + } + }; +} diff --git a/core/java/android/transition/Visibility.java b/core/java/android/transition/Visibility.java index 36bac31901fc..8779229026e4 100644 --- a/core/java/android/transition/Visibility.java +++ b/core/java/android/transition/Visibility.java @@ -63,6 +63,7 @@ public abstract class Visibility extends Transition { private static final String[] sTransitionProperties = { PROPNAME_VISIBILITY, + PROPNAME_PARENT, }; private static class VisibilityInfo { diff --git a/core/java/android/util/PathParser.java b/core/java/android/util/PathParser.java index e5f3b2c3a5b1..92b19be64803 100644 --- a/core/java/android/util/PathParser.java +++ b/core/java/android/util/PathParser.java @@ -280,7 +280,7 @@ public class PathParser { * @param path The target Path object. */ public static void nodesToPath(PathDataNode[] node, Path path) { - float[] current = new float[4]; + float[] current = new float[6]; char previousCommand = 'm'; for (int i = 0; i < node.length; i++) { addCommand(path, current, previousCommand, node[i].mType, node[i].mParams); @@ -313,6 +313,8 @@ public class PathParser { float currentY = current[1]; float ctrlPointX = current[2]; float ctrlPointY = current[3]; + float currentSegmentStartX = current[4]; + float currentSegmentStartY = current[5]; float reflectiveCtrlPointX; float reflectiveCtrlPointY; @@ -320,7 +322,15 @@ public class PathParser { case 'z': case 'Z': path.close(); - return; + // Path is closed here, but we need to move the pen to the + // closed position. So we cache the segment's starting position, + // and restore it here. + currentX = currentSegmentStartX; + currentY = currentSegmentStartY; + ctrlPointX = currentSegmentStartX; + ctrlPointY = currentSegmentStartY; + path.moveTo(currentX, currentY); + break; case 'm': case 'M': case 'l': @@ -350,17 +360,22 @@ public class PathParser { incr = 7; break; } + for (int k = 0; k < val.length; k += incr) { switch (cmd) { case 'm': // moveto - Start a new sub-path (relative) path.rMoveTo(val[k + 0], val[k + 1]); currentX += val[k + 0]; currentY += val[k + 1]; + currentSegmentStartX = currentX; + currentSegmentStartY = currentY; break; case 'M': // moveto - Start a new sub-path path.moveTo(val[k + 0], val[k + 1]); currentX = val[k + 0]; currentY = val[k + 1]; + currentSegmentStartX = currentX; + currentSegmentStartY = currentY; break; case 'l': // lineto - Draw a line from the current point (relative) path.rLineTo(val[k + 0], val[k + 1]); @@ -372,10 +387,6 @@ public class PathParser { currentX = val[k + 0]; currentY = val[k + 1]; break; - case 'z': // closepath - Close the current subpath - case 'Z': // closepath - Close the current subpath - path.close(); - break; case 'h': // horizontal lineto - Draws a horizontal line (relative) path.rLineTo(val[k + 0], 0); currentX += val[k + 0]; @@ -526,6 +537,8 @@ public class PathParser { current[1] = currentY; current[2] = ctrlPointX; current[3] = ctrlPointY; + current[4] = currentSegmentStartX; + current[5] = currentSegmentStartY; } private static void drawArc(Path p, diff --git a/core/java/android/view/GLES20Canvas.java b/core/java/android/view/GLES20Canvas.java index b86455ace7b5..d120d7907b13 100644 --- a/core/java/android/view/GLES20Canvas.java +++ b/core/java/android/view/GLES20Canvas.java @@ -885,6 +885,9 @@ class GLES20Canvas extends HardwareCanvas { @Override public void drawText(CharSequence text, int start, int end, float x, float y, Paint paint) { + if ((start | end | (end - start) | (text.length() - end)) < 0) { + throw new IndexOutOfBoundsException(); + } if (text instanceof String || text instanceof SpannedString || text instanceof SpannableString) { nDrawText(mRenderer, text.toString(), start, end, x, y, paint.mBidiFlags, @@ -994,4 +997,15 @@ class GLES20Canvas extends HardwareCanvas { int indexOffset, int indexCount, Paint paint) { // TODO: Implement } + + @Override + public void setOverrideXfermode(PorterDuff.Mode xfermode) { + int xfermodeValue = -1; + if (xfermode != null) { + xfermodeValue = xfermode.nativeInt; + } + nSetOverrideXfermode(mRenderer, xfermodeValue); + } + + private static native void nSetOverrideXfermode(long renderer, int xfermode); } diff --git a/core/java/android/view/InputEvent.java b/core/java/android/view/InputEvent.java index 1ecdf3071281..e2ad3ad45c64 100644 --- a/core/java/android/view/InputEvent.java +++ b/core/java/android/view/InputEvent.java @@ -196,6 +196,13 @@ public abstract class InputEvent implements Parcelable { public abstract long getEventTimeNano(); /** + * Marks the input event as being canceled. + * + * @hide + */ + public abstract void cancel(); + + /** * Gets the unique sequence number of this event. * Every input event that is created or received by a process has a * unique sequence number. Moreover, a new sequence number is obtained diff --git a/core/java/android/view/KeyEvent.java b/core/java/android/view/KeyEvent.java index 0701b53e4147..243a0fc17e52 100644 --- a/core/java/android/view/KeyEvent.java +++ b/core/java/android/view/KeyEvent.java @@ -2304,6 +2304,16 @@ public class KeyEvent extends InputEvent implements Parcelable { } /** + * Set {@link #FLAG_CANCELED} flag for the key event. + * + * @hide + */ + @Override + public final void cancel() { + mFlags |= FLAG_CANCELED; + } + + /** * Call this during {@link Callback#onKeyDown} to have the system track * the key through its final up (possibly including a long press). Note * that only one key can be tracked at a time -- if another key down diff --git a/core/java/android/view/MotionEvent.java b/core/java/android/view/MotionEvent.java index ae39b7aeee6d..1c5c41c74905 100644 --- a/core/java/android/view/MotionEvent.java +++ b/core/java/android/view/MotionEvent.java @@ -3168,6 +3168,12 @@ public final class MotionEvent extends InputEvent implements Parcelable { return ev; } + /** @hide */ + @Override + public final void cancel() { + setAction(ACTION_CANCEL); + } + public void writeToParcel(Parcel out, int flags) { out.writeInt(PARCEL_TOKEN_MOTION_EVENT); nativeWriteToParcel(mNativePtr, out); diff --git a/core/java/android/view/Surface.java b/core/java/android/view/Surface.java index 19142b8c8cb5..33ce5171bc57 100644 --- a/core/java/android/view/Surface.java +++ b/core/java/android/view/Surface.java @@ -53,6 +53,9 @@ public class Surface implements Parcelable { private static native void nativeAllocateBuffers(long nativeObject); + private static native int nativeGetWidth(long nativeObject); + private static native int nativeGetHeight(long nativeObject); + public static final Parcelable.Creator<Surface> CREATOR = new Parcelable.Creator<Surface>() { @Override @@ -327,7 +330,9 @@ public class Surface implements Parcelable { if (mHwuiContext == null) { mHwuiContext = new HwuiContext(); } - return mHwuiContext.lockCanvas(); + return mHwuiContext.lockCanvas( + nativeGetWidth(mNativeObject), + nativeGetHeight(mNativeObject)); } } @@ -576,11 +581,11 @@ public class Surface implements Parcelable { mHwuiRenderer = nHwuiCreate(mRenderNode.mNativeRenderNode, mNativeObject); } - Canvas lockCanvas() { + Canvas lockCanvas(int width, int height) { if (mCanvas != null) { throw new IllegalStateException("Surface was already locked!"); } - mCanvas = mRenderNode.start(0, 0); + mCanvas = mRenderNode.start(width, height); return mCanvas; } diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index 1d09696c517f..77c1d7b2edd9 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -5901,6 +5901,12 @@ public class View implements Drawable.Callback, KeyEvent.Callback, region.op(interactiveRegion, Region.Op.INTERSECT); } + // Take into account the window bounds. + final View root = getRootView(); + if (root != null) { + region.op(dx, dy, root.getWidth() + dx, root.getHeight() + dy, Region.Op.INTERSECT); + } + // If the view is completely covered, done. if (region.isEmpty()) { return false; @@ -11842,7 +11848,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, void invalidateInternal(int l, int t, int r, int b, boolean invalidateCache, boolean fullInvalidate) { if (mGhostView != null) { - mGhostView.invalidate(invalidateCache); + mGhostView.invalidate(true); return; } @@ -13174,7 +13180,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, } // Should resolve Drawables before Padding because we need the layout direction of the // Drawable to correctly resolve Padding. - if (!isDrawablesResolved()) { + if (!areDrawablesResolved()) { resolveDrawables(); } if (!isPaddingResolved()) { @@ -13438,6 +13444,14 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * @hide */ public void resetResolvedPadding() { + resetResolvedPaddingInternal(); + } + + /** + * Used when we only want to reset *this* view's padding and not trigger overrides + * in ViewGroup that reset children too. + */ + void resetResolvedPaddingInternal() { mPrivateFlags2 &= ~PFLAG2_PADDING_RESOLVED; } @@ -15974,6 +15988,10 @@ public class View implements Drawable.Callback, KeyEvent.Callback, onResolveDrawables(layoutDirection); } + boolean areDrawablesResolved() { + return (mPrivateFlags2 & PFLAG2_DRAWABLE_RESOLVED) == PFLAG2_DRAWABLE_RESOLVED; + } + /** * Called when layout direction has been resolved. * @@ -15993,11 +16011,11 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * @hide */ protected void resetResolvedDrawables() { - mPrivateFlags2 &= ~PFLAG2_DRAWABLE_RESOLVED; + resetResolvedDrawablesInternal(); } - private boolean isDrawablesResolved() { - return (mPrivateFlags2 & PFLAG2_DRAWABLE_RESOLVED) == PFLAG2_DRAWABLE_RESOLVED; + void resetResolvedDrawablesInternal() { + mPrivateFlags2 &= ~PFLAG2_DRAWABLE_RESOLVED; } /** @@ -16297,10 +16315,10 @@ public class View implements Drawable.Callback, KeyEvent.Callback, padding = new Rect(); sThreadLocal.set(padding); } - resetResolvedDrawables(); + resetResolvedDrawablesInternal(); background.setLayoutDirection(getLayoutDirection()); if (background.getPadding(padding)) { - resetResolvedPadding(); + resetResolvedPaddingInternal(); switch (background.getLayoutDirection()) { case LAYOUT_DIRECTION_RTL: mUserPaddingLeftInitial = padding.right; @@ -16500,7 +16518,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * @param bottom the bottom padding in pixels */ public void setPadding(int left, int top, int right, int bottom) { - resetResolvedPadding(); + resetResolvedPaddingInternal(); mUserPaddingStart = UNDEFINED_PADDING; mUserPaddingEnd = UNDEFINED_PADDING; @@ -16592,7 +16610,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * @param bottom the bottom padding in pixels */ public void setPaddingRelative(int start, int top, int end, int bottom) { - resetResolvedPadding(); + resetResolvedPaddingInternal(); mUserPaddingStart = start; mUserPaddingEnd = end; diff --git a/core/java/android/view/ViewAnimationUtils.java b/core/java/android/view/ViewAnimationUtils.java index 001cd01646a9..d44df3133ff9 100644 --- a/core/java/android/view/ViewAnimationUtils.java +++ b/core/java/android/view/ViewAnimationUtils.java @@ -17,6 +17,7 @@ package android.view; import android.animation.Animator; +import android.animation.Animator.AnimatorListener; import android.animation.RevealAnimator; /** @@ -35,7 +36,11 @@ public final class ViewAnimationUtils { * {@link View#setClipToOutline(boolean) View Outline clipping}. * <p> * Note that the animation returned here is a one-shot animation. It cannot - * be re-used, and once started it cannot be paused or resumed. + * be re-used, and once started it cannot be paused or resumed. It is also + * an asynchronous animation that automatically runs off of the UI thread. + * As a result {@link AnimatorListener#onAnimationEnd(Animator)} + * will occur after the animation has ended, but it may be delayed depending + * on thread responsiveness. * * @param view The View will be clipped to the animating circle. * @param centerX The x coordinate of the center of the animating circle. diff --git a/core/java/android/view/ViewGroup.java b/core/java/android/view/ViewGroup.java index 5c433c147a12..bae0b1299293 100644 --- a/core/java/android/view/ViewGroup.java +++ b/core/java/android/view/ViewGroup.java @@ -5023,7 +5023,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager rect.set(r); if (!child.hasIdentityMatrix()) { - child.getMatrix().mapRect(rect); + child.getMatrix().mapRect(rect); } int dx = child.mLeft - mScrollX; @@ -5045,14 +5045,30 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager offset.y += dy; } - if (rect.intersect(0, 0, mRight - mLeft, mBottom - mTop)) { - if (mParent == null) return true; - r.set((int) (rect.left + 0.5f), (int) (rect.top + 0.5f), - (int) (rect.right + 0.5f), (int) (rect.bottom + 0.5f)); - return mParent.getChildVisibleRect(this, r, offset); + boolean rectIsVisible = true; + if (mParent instanceof ViewGroup && ((ViewGroup)mParent).getClipChildren()) { + // clipChildren clips to the child's bounds + rectIsVisible = rect.intersect(0, 0, mRight - mLeft, mBottom - mTop); } - return false; + if (rectIsVisible && (mGroupFlags & CLIP_TO_PADDING_MASK) == CLIP_TO_PADDING_MASK) { + // Clip to padding + rectIsVisible = rect.intersect(mPaddingLeft, mPaddingTop, + mRight - mLeft - mPaddingLeft - mPaddingRight, + mBottom - mTop - mPaddingTop - mPaddingBottom); + } + + if (rectIsVisible && mClipBounds != null) { + // Clip to clipBounds + rectIsVisible = rect.intersect(mClipBounds.left, mClipBounds.top, mClipBounds.right, + mClipBounds.bottom); + } + r.set((int) (rect.left + 0.5f), (int) (rect.top + 0.5f), (int) (rect.right + 0.5f), + (int) (rect.bottom + 0.5f)); + if (rectIsVisible && mParent != null) { + rectIsVisible = mParent.getChildVisibleRect(this, r, offset); + } + return rectIsVisible; } /** @@ -6134,7 +6150,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager int count = getChildCount(); for (int i = 0; i < count; i++) { final View child = getChildAt(i); - if (child.isLayoutDirectionInherited()) { + if (child.isLayoutDirectionInherited() && !child.isPaddingResolved()) { child.resolvePadding(); } } @@ -6149,7 +6165,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager int count = getChildCount(); for (int i = 0; i < count; i++) { final View child = getChildAt(i); - if (child.isLayoutDirectionInherited()) { + if (child.isLayoutDirectionInherited() && !child.areDrawablesResolved()) { child.resolveDrawables(); } } diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java index 5d2a24be51db..fe174175567b 100644 --- a/core/java/android/view/ViewRootImpl.java +++ b/core/java/android/view/ViewRootImpl.java @@ -3596,12 +3596,19 @@ public final class ViewRootImpl implements ViewParent, if (mView == null || !mAdded) { Slog.w(TAG, "Dropping event due to root view being removed: " + q.mEvent); return true; - } else if (!mAttachInfo.mHasWindowFocus && - !q.mEvent.isFromSource(InputDevice.SOURCE_CLASS_POINTER) && - !isTerminalInputEvent(q.mEvent)) { - // If this is a focused event and the window doesn't currently have input focus, - // then drop this event. This could be an event that came back from the previous - // stage but the window has lost focus in the meantime. + } else if ((!mAttachInfo.mHasWindowFocus || mStopped) + && !q.mEvent.isFromSource(InputDevice.SOURCE_CLASS_POINTER)) { + // This is a focus event and the window doesn't currently have input focus or + // has stopped. This could be an event that came back from the previous stage + // but the window has lost focus or stopped in the meantime. + if (isTerminalInputEvent(q.mEvent)) { + // Don't drop terminal input events, however mark them as canceled. + q.mEvent.cancel(); + Slog.w(TAG, "Cancelling event due to no window focus: " + q.mEvent); + return false; + } + + // Drop non-terminal input events. Slog.w(TAG, "Dropping event due to no window focus: " + q.mEvent); return true; } diff --git a/core/java/android/webkit/CookieManager.java b/core/java/android/webkit/CookieManager.java index 20ef64621258..eca96f95d09a 100644 --- a/core/java/android/webkit/CookieManager.java +++ b/core/java/android/webkit/CookieManager.java @@ -16,18 +16,14 @@ package android.webkit; +import android.annotation.SystemApi; import android.net.WebAddress; /** * Manages the cookies used by an application's {@link WebView} instances. * Cookies are manipulated according to RFC2109. */ -public class CookieManager { - /** - * @hide Only for use by WebViewProvider implementations - */ - protected CookieManager() { - } +public abstract class CookieManager { @Override protected Object clone() throws CloneNotSupportedException { @@ -59,9 +55,7 @@ public class CookieManager { * @param accept whether {@link WebView} instances should send and accept * cookies */ - public synchronized void setAcceptCookie(boolean accept) { - throw new MustOverrideException(); - } + public abstract void setAcceptCookie(boolean accept); /** * Gets whether the application's {@link WebView} instances send and accept @@ -69,9 +63,7 @@ public class CookieManager { * * @return true if {@link WebView} instances send and accept cookies */ - public synchronized boolean acceptCookie() { - throw new MustOverrideException(); - } + public abstract boolean acceptCookie(); /** * Sets whether the {@link WebView} should allow third party cookies to be set. @@ -87,9 +79,7 @@ public class CookieManager { * @param accept whether the {@link WebView} instance should accept * third party cookies */ - public void setAcceptThirdPartyCookies(WebView webview, boolean accept) { - throw new MustOverrideException(); - } + public abstract void setAcceptThirdPartyCookies(WebView webview, boolean accept); /** * Gets whether the {@link WebView} should allow third party cookies to be set. @@ -97,9 +87,7 @@ public class CookieManager { * @param webview the {@link WebView} instance to get the cookie policy for * @return true if the {@link WebView} accepts third party cookies */ - public boolean acceptThirdPartyCookies(WebView webview) { - throw new MustOverrideException(); - } + public abstract boolean acceptThirdPartyCookies(WebView webview); /** * Sets a cookie for the given URL. Any existing cookie with the same host, @@ -110,9 +98,7 @@ public class CookieManager { * @param value the cookie as a string, using the format of the 'Set-Cookie' * HTTP response header */ - public void setCookie(String url, String value) { - throw new MustOverrideException(); - } + public abstract void setCookie(String url, String value); /** * Sets a cookie for the given URL. Any existing cookie with the same host, @@ -133,9 +119,7 @@ public class CookieManager { * HTTP response header * @param callback a callback to be executed when the cookie has been set */ - public void setCookie(String url, String value, ValueCallback<Boolean> callback) { - throw new MustOverrideException(); - } + public abstract void setCookie(String url, String value, ValueCallback<Boolean> callback); /** * Gets the cookies for the given URL. @@ -144,9 +128,7 @@ public class CookieManager { * @return value the cookies as a string, using the format of the 'Cookie' * HTTP request header */ - public String getCookie(String url) { - throw new MustOverrideException(); - } + public abstract String getCookie(String url); /** * See {@link #getCookie(String)}. @@ -155,11 +137,10 @@ public class CookieManager { * @param privateBrowsing whether to use the private browsing cookie jar * @return value the cookies as a string, using the format of the 'Cookie' * HTTP request header - * @hide Used by Browser, no intention to publish. + * @hide Used by Browser and by WebViewProvider implementations. */ - public String getCookie(String url, boolean privateBrowsing) { - throw new MustOverrideException(); - } + @SystemApi + public abstract String getCookie(String url, boolean privateBrowsing); /** * Gets cookie(s) for a given uri so that it can be set to "cookie:" in http @@ -168,10 +149,11 @@ public class CookieManager { * @param uri the WebAddress for which the cookies are requested * @return value the cookies as a string, using the format of the 'Cookie' * HTTP request header - * @hide Used by RequestHandle, no intention to publish. + * @hide Used by RequestHandle and by WebViewProvider implementations. */ + @SystemApi public synchronized String getCookie(WebAddress uri) { - throw new MustOverrideException(); + return getCookie(uri.toString()); } /** @@ -179,9 +161,7 @@ public class CookieManager { * date. * @deprecated use {@link #removeSessionCookies(ValueCallback)} instead. */ - public void removeSessionCookie() { - throw new MustOverrideException(); - } + public abstract void removeSessionCookie(); /** * Removes all session cookies, which are cookies without an expiration @@ -197,18 +177,14 @@ public class CookieManager { * method from a thread without a Looper. * @param callback a callback which is executed when the session cookies have been removed */ - public void removeSessionCookies(ValueCallback<Boolean> callback) { - throw new MustOverrideException(); - } + public abstract void removeSessionCookies(ValueCallback<Boolean> callback); /** * Removes all cookies. * @deprecated Use {@link #removeAllCookies(ValueCallback)} instead. */ @Deprecated - public void removeAllCookie() { - throw new MustOverrideException(); - } + public abstract void removeAllCookie(); /** * Removes all cookies. @@ -223,54 +199,37 @@ public class CookieManager { * method from a thread without a Looper. * @param callback a callback which is executed when the cookies have been removed */ - public void removeAllCookies(ValueCallback<Boolean> callback) { - throw new MustOverrideException(); - } + public abstract void removeAllCookies(ValueCallback<Boolean> callback); /** * Gets whether there are stored cookies. * * @return true if there are stored cookies */ - public synchronized boolean hasCookies() { - throw new MustOverrideException(); - } + public abstract boolean hasCookies(); /** * See {@link #hasCookies()}. * * @param privateBrowsing whether to use the private browsing cookie jar - * @hide Used by Browser, no intention to publish. + * @hide Used by Browser and WebViewProvider implementations. */ - public synchronized boolean hasCookies(boolean privateBrowsing) { - throw new MustOverrideException(); - } + @SystemApi + public abstract boolean hasCookies(boolean privateBrowsing); /** * Removes all expired cookies. * @deprecated The WebView handles removing expired cookies automatically. */ @Deprecated - public void removeExpiredCookie() { - throw new MustOverrideException(); - } + public abstract void removeExpiredCookie(); /** * Ensures all cookies currently accessible through the getCookie API are * written to persistent storage. * This call will block the caller until it is done and may perform I/O. */ - public void flush() { - flushCookieStore(); - } - - /** - * Flushes all cookies managed by the Chrome HTTP stack to flash. - * - * @hide Package level api, called from CookieSyncManager - */ - protected void flushCookieStore() { - } + public abstract void flush(); /** * Gets whether the application's {@link WebView} instances send and accept @@ -289,9 +248,8 @@ public class CookieManager { * * @hide Only for use by WebViewProvider implementations */ - protected boolean allowFileSchemeCookiesImpl() { - throw new MustOverrideException(); - } + @SystemApi + protected abstract boolean allowFileSchemeCookiesImpl(); /** * Sets whether the application's {@link WebView} instances should send and @@ -314,7 +272,6 @@ public class CookieManager { * * @hide Only for use by WebViewProvider implementations */ - protected void setAcceptFileSchemeCookiesImpl(boolean accept) { - throw new MustOverrideException(); - } + @SystemApi + protected abstract void setAcceptFileSchemeCookiesImpl(boolean accept); } diff --git a/core/java/android/webkit/DebugFlags.java b/core/java/android/webkit/DebugFlags.java deleted file mode 100644 index 7b3cb1b55993..000000000000 --- a/core/java/android/webkit/DebugFlags.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright (C) 2009 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.webkit; - -/** - * This class is a container for all of the debug flags used in the Java - * components of webkit. These flags must be final in order to ensure that - * the compiler optimizes the code that uses them out of the final executable. - * - * The name of each flags maps directly to the name of the class in which that - * flag is used. - * - * @hide Only used by WebView implementations. - */ -public class DebugFlags { - - public static final boolean COOKIE_SYNC_MANAGER = false; - public static final boolean TRACE_API = false; - public static final boolean TRACE_CALLBACK = false; - public static final boolean URL_UTIL = false; - public static final boolean WEB_SYNC_MANAGER = false; - -} diff --git a/core/java/android/webkit/FindActionModeCallback.java b/core/java/android/webkit/FindActionModeCallback.java index c68b450417af..ab6a2f91f95e 100644 --- a/core/java/android/webkit/FindActionModeCallback.java +++ b/core/java/android/webkit/FindActionModeCallback.java @@ -16,6 +16,7 @@ package android.webkit; +import android.annotation.SystemApi; import android.content.Context; import android.content.res.Resources; import android.graphics.Point; @@ -36,6 +37,7 @@ import android.widget.TextView; /** * @hide */ +@SystemApi public class FindActionModeCallback implements ActionMode.Callback, TextWatcher, View.OnClickListener, WebView.FindListener { private View mCustomView; diff --git a/core/java/android/webkit/GeolocationPermissions.java b/core/java/android/webkit/GeolocationPermissions.java index bc3d0351727f..7187f221c77d 100644 --- a/core/java/android/webkit/GeolocationPermissions.java +++ b/core/java/android/webkit/GeolocationPermissions.java @@ -16,6 +16,8 @@ package android.webkit; +import android.annotation.SystemApi; + import java.util.Set; /** @@ -136,5 +138,6 @@ public class GeolocationPermissions { * way to call createHandler() and createUIHandler(), so it would not work). * @hide Only for use by WebViewProvider implementations */ + @SystemApi public GeolocationPermissions() {} } diff --git a/core/java/android/webkit/HttpAuthHandler.java b/core/java/android/webkit/HttpAuthHandler.java index ee3b3698c1d9..45fc1f5204fd 100644 --- a/core/java/android/webkit/HttpAuthHandler.java +++ b/core/java/android/webkit/HttpAuthHandler.java @@ -16,6 +16,7 @@ package android.webkit; +import android.annotation.SystemApi; import android.os.Handler; /** @@ -30,6 +31,7 @@ public class HttpAuthHandler extends Handler { /** * @hide Only for use by WebViewProvider implementations. */ + @SystemApi public HttpAuthHandler() { } diff --git a/core/java/android/webkit/JsDialogHelper.java b/core/java/android/webkit/JsDialogHelper.java index bb0339e3b334..cc475c3299b3 100644 --- a/core/java/android/webkit/JsDialogHelper.java +++ b/core/java/android/webkit/JsDialogHelper.java @@ -16,6 +16,7 @@ package android.webkit; +import android.annotation.SystemApi; import android.app.Activity; import android.app.AlertDialog; import android.content.Context; @@ -34,8 +35,9 @@ import java.net.URL; * Helper class to create JavaScript dialogs. It is used by * different WebView implementations. * - * @hide Helper class for internal use + * @hide */ +@SystemApi public class JsDialogHelper { private static final String TAG = "JsDialogHelper"; diff --git a/core/java/android/webkit/JsPromptResult.java b/core/java/android/webkit/JsPromptResult.java index a1bf124ffc51..771cc32d42f4 100644 --- a/core/java/android/webkit/JsPromptResult.java +++ b/core/java/android/webkit/JsPromptResult.java @@ -16,6 +16,8 @@ package android.webkit; +import android.annotation.SystemApi; + /** * Public class for handling JavaScript prompt requests. The WebChromeClient will receive a @@ -39,6 +41,7 @@ public class JsPromptResult extends JsResult { /** * @hide Only for use by WebViewProvider implementations */ + @SystemApi public JsPromptResult(ResultReceiver receiver) { super(receiver); } @@ -46,6 +49,7 @@ public class JsPromptResult extends JsResult { /** * @hide Only for use by WebViewProvider implementations */ + @SystemApi public String getStringResult() { return mStringResult; } diff --git a/core/java/android/webkit/JsResult.java b/core/java/android/webkit/JsResult.java index e4e6851d1a41..d36ab418a164 100644 --- a/core/java/android/webkit/JsResult.java +++ b/core/java/android/webkit/JsResult.java @@ -16,6 +16,8 @@ package android.webkit; +import android.annotation.SystemApi; + /** * An instance of this class is passed as a parameter in various {@link WebChromeClient} action * notifications. The object is used as a handle onto the underlying JavaScript-originated request, @@ -27,6 +29,7 @@ public class JsResult { * notifications when the JavaScript result represented by a JsResult instance has * @hide Only for use by WebViewProvider implementations */ + @SystemApi public interface ResultReceiver { public void onJsResultComplete(JsResult result); } @@ -54,6 +57,7 @@ public class JsResult { /** * @hide Only for use by WebViewProvider implementations */ + @SystemApi public JsResult(ResultReceiver receiver) { mReceiver = receiver; } @@ -61,6 +65,7 @@ public class JsResult { /** * @hide Only for use by WebViewProvider implementations */ + @SystemApi public final boolean getResult() { return mResult; } diff --git a/core/java/android/webkit/SslErrorHandler.java b/core/java/android/webkit/SslErrorHandler.java index af3154474b6b..537065d58a9d 100644 --- a/core/java/android/webkit/SslErrorHandler.java +++ b/core/java/android/webkit/SslErrorHandler.java @@ -16,6 +16,7 @@ package android.webkit; +import android.annotation.SystemApi; import android.os.Handler; /** @@ -30,6 +31,7 @@ public class SslErrorHandler extends Handler { /** * @hide Only for use by WebViewProvider implementations. */ + @SystemApi public SslErrorHandler() {} /** diff --git a/core/java/android/webkit/URLUtil.java b/core/java/android/webkit/URLUtil.java index d11598446fb2..f5233b611dce 100644 --- a/core/java/android/webkit/URLUtil.java +++ b/core/java/android/webkit/URLUtil.java @@ -29,6 +29,7 @@ import android.util.Log; public final class URLUtil { private static final String LOGTAG = "webkit"; + private static final boolean TRACE = false; // to refer to bar.png under your package's asset/foo/ directory, use // "file:///android_asset/foo/bar.png". @@ -49,7 +50,7 @@ public final class URLUtil { String retVal = inUrl; WebAddress webAddress; - if (DebugFlags.URL_UTIL) Log.v(LOGTAG, "guessURL before queueRequest: " + inUrl); + if (TRACE) Log.v(LOGTAG, "guessURL before queueRequest: " + inUrl); if (inUrl.length() == 0) return inUrl; if (inUrl.startsWith("about:")) return inUrl; @@ -69,7 +70,7 @@ public final class URLUtil { webAddress = new WebAddress(inUrl); } catch (ParseException ex) { - if (DebugFlags.URL_UTIL) { + if (TRACE) { Log.v(LOGTAG, "smartUrlFilter: failed to parse url = " + inUrl); } return retVal; @@ -286,7 +287,7 @@ public final class URLUtil { } return url; } - + /** * Guesses canonical filename that a download would have, using * the URL and contentDisposition. File extension, if not defined, @@ -294,7 +295,7 @@ public final class URLUtil { * @param url Url to the content * @param contentDisposition Content-Disposition HTTP header or null * @param mimeType Mime-type of the content or null - * + * * @return suggested filename */ public static final String guessFileName( diff --git a/core/java/android/webkit/WebBackForwardList.java b/core/java/android/webkit/WebBackForwardList.java index bfef2e7404b5..e67137650338 100644 --- a/core/java/android/webkit/WebBackForwardList.java +++ b/core/java/android/webkit/WebBackForwardList.java @@ -16,6 +16,7 @@ package android.webkit; +import android.annotation.SystemApi; import java.io.Serializable; /** @@ -23,56 +24,38 @@ import java.io.Serializable; * WebView.copyBackForwardList() will return a copy of this class used to * inspect the entries in the list. */ -public class WebBackForwardList implements Cloneable, Serializable { - - /** - * @hide - */ - public WebBackForwardList() { - } - +public abstract class WebBackForwardList implements Cloneable, Serializable { /** * Return the current history item. This method returns null if the list is * empty. * @return The current history item. */ - public synchronized WebHistoryItem getCurrentItem() { - throw new MustOverrideException(); - } + public abstract WebHistoryItem getCurrentItem(); /** * Get the index of the current history item. This index can be used to * directly index into the array list. * @return The current index from 0...n or -1 if the list is empty. */ - public synchronized int getCurrentIndex() { - throw new MustOverrideException(); - } + public abstract int getCurrentIndex(); /** * Get the history item at the given index. The index range is from 0...n * where 0 is the first item and n is the last item. * @param index The index to retrieve. */ - public synchronized WebHistoryItem getItemAtIndex(int index) { - throw new MustOverrideException(); - } + public abstract WebHistoryItem getItemAtIndex(int index); /** * Get the total size of the back/forward list. * @return The size of the list. */ - public synchronized int getSize() { - throw new MustOverrideException(); - } + public abstract int getSize(); /** * Clone the entire object to be used in the UI thread by clients of * WebView. This creates a copy that should never be modified by any of the * webkit package classes. */ - protected synchronized WebBackForwardList clone() { - throw new MustOverrideException(); - } - + protected abstract WebBackForwardList clone(); } diff --git a/core/java/android/webkit/WebChromeClient.java b/core/java/android/webkit/WebChromeClient.java index 46a7fd0f4c68..768dc9f70ff6 100644 --- a/core/java/android/webkit/WebChromeClient.java +++ b/core/java/android/webkit/WebChromeClient.java @@ -16,6 +16,7 @@ package android.webkit; +import android.annotation.SystemApi; import android.content.Intent; import android.content.pm.ActivityInfo; import android.graphics.Bitmap; @@ -509,6 +510,7 @@ public class WebChromeClient { * @deprecated Use {@link #showFileChooser} instead. * @hide This method was not published in any SDK version. */ + @SystemApi @Deprecated public void openFileChooser(ValueCallback<Uri> uploadFile, String acceptType, String capture) { uploadFile.onReceiveValue(null); diff --git a/core/java/android/webkit/WebHistoryItem.java b/core/java/android/webkit/WebHistoryItem.java index 9a588e411f3a..569fccd565cc 100644 --- a/core/java/android/webkit/WebHistoryItem.java +++ b/core/java/android/webkit/WebHistoryItem.java @@ -16,6 +16,7 @@ package android.webkit; +import android.annotation.SystemApi; import android.graphics.Bitmap; /** @@ -24,14 +25,7 @@ import android.graphics.Bitmap; * item. Each history item may be updated during the load of a page. * @see WebBackForwardList */ -public class WebHistoryItem implements Cloneable { - - /** - * @hide - */ - public WebHistoryItem() { - } - +public abstract class WebHistoryItem implements Cloneable { /** * Return an identifier for this history item. If an item is a copy of * another item, the identifiers will be the same even if they are not the @@ -40,10 +34,9 @@ public class WebHistoryItem implements Cloneable { * @deprecated This method is now obsolete. * @hide Since API level {@link android.os.Build.VERSION_CODES#JELLY_BEAN_MR1} */ + @SystemApi @Deprecated - public int getId() { - throw new MustOverrideException(); - } + public abstract int getId(); /** * Return the url of this history item. The url is the base url of this @@ -53,29 +46,23 @@ public class WebHistoryItem implements Cloneable { * Note: The VM ensures 32-bit atomic read/write operations so we don't have * to synchronize this method. */ - public String getUrl() { - throw new MustOverrideException(); - } + public abstract String getUrl(); /** * Return the original url of this history item. This was the requested - * url, the final url may be different as there might have been + * url, the final url may be different as there might have been * redirects while loading the site. * @return The original url of this history item. */ - public String getOriginalUrl() { - throw new MustOverrideException(); - } - + public abstract String getOriginalUrl(); + /** * Return the document title of this history item. * @return The document title of this history item. * Note: The VM ensures 32-bit atomic read/write operations so we don't have * to synchronize this method. */ - public String getTitle() { - throw new MustOverrideException(); - } + public abstract String getTitle(); /** * Return the favicon of this history item or null if no favicon was found. @@ -83,15 +70,10 @@ public class WebHistoryItem implements Cloneable { * Note: The VM ensures 32-bit atomic read/write operations so we don't have * to synchronize this method. */ - public Bitmap getFavicon() { - throw new MustOverrideException(); - } + public abstract Bitmap getFavicon(); /** * Clone the history item for use by clients of WebView. */ - protected synchronized WebHistoryItem clone() { - throw new MustOverrideException(); - } - + protected abstract WebHistoryItem clone(); } diff --git a/core/java/android/webkit/WebIconDatabase.java b/core/java/android/webkit/WebIconDatabase.java index e574593fa918..08956e0f1b78 100644 --- a/core/java/android/webkit/WebIconDatabase.java +++ b/core/java/android/webkit/WebIconDatabase.java @@ -16,6 +16,7 @@ package android.webkit; +import android.annotation.SystemApi; import android.content.ContentResolver; import android.graphics.Bitmap; @@ -32,7 +33,7 @@ import android.graphics.Bitmap; * up to {@link android.os.Build.VERSION_CODES#JELLY_BEAN_MR2} */ @Deprecated -public class WebIconDatabase { +public abstract class WebIconDatabase { /** * Interface for receiving icons from the database. * @deprecated This interface is obsolete. @@ -52,23 +53,17 @@ public class WebIconDatabase { * Open a the icon database and store the icons in the given path. * @param path The directory path where the icon database will be stored. */ - public void open(String path) { - throw new MustOverrideException(); - } + public abstract void open(String path); /** * Close the shared instance of the icon database. */ - public void close() { - throw new MustOverrideException(); - } + public abstract void close(); /** * Removes all the icons in the database. */ - public void removeAllIcons() { - throw new MustOverrideException(); - } + public abstract void removeAllIcons(); /** * Request the Bitmap representing the icon for the given page @@ -76,32 +71,25 @@ public class WebIconDatabase { * @param url The page's url. * @param listener An implementation on IconListener to receive the result. */ - public void requestIconForPageUrl(String url, IconListener listener) { - throw new MustOverrideException(); - } + public abstract void requestIconForPageUrl(String url, IconListener listener); /** {@hide} */ - public void bulkRequestIconForPageUrl(ContentResolver cr, String where, - IconListener listener) { - throw new MustOverrideException(); - } + @SystemApi + public abstract void bulkRequestIconForPageUrl(ContentResolver cr, String where, + IconListener listener); /** * Retain the icon for the given page url. * @param url The page's url. */ - public void retainIconForPageUrl(String url) { - throw new MustOverrideException(); - } + public abstract void retainIconForPageUrl(String url); /** * Release the icon for the given page url. * @param url The page's url. */ - public void releaseIconForPageUrl(String url) { - throw new MustOverrideException(); - } + public abstract void releaseIconForPageUrl(String url); /** * Get the global instance of WebIconDatabase. @@ -113,9 +101,4 @@ public class WebIconDatabase { // XXX: Must be created in the UI thread. return WebViewFactory.getProvider().getWebIconDatabase(); } - - /** - * @hide Only for use by WebViewProvider implementations - */ - protected WebIconDatabase() {} } diff --git a/core/java/android/webkit/WebSettings.java b/core/java/android/webkit/WebSettings.java index 7cf3cb5ad7ca..1d2c3119d81d 100644 --- a/core/java/android/webkit/WebSettings.java +++ b/core/java/android/webkit/WebSettings.java @@ -204,25 +204,15 @@ public abstract class WebSettings { public static final int MIXED_CONTENT_COMPATIBILITY_MODE = 2; /** - * Hidden constructor to prevent clients from creating a new settings - * instance or deriving the class. - * - * @hide - */ - protected WebSettings() { - } - - /** * Enables dumping the pages navigation cache to a text file. The default * is false. * * @deprecated This method is now obsolete. * @hide Since API level {@link android.os.Build.VERSION_CODES#JELLY_BEAN_MR1} */ + @SystemApi @Deprecated - public void setNavDump(boolean enabled) { - throw new MustOverrideException(); - } + public abstract void setNavDump(boolean enabled); /** * Gets whether dumping the navigation cache is enabled. @@ -232,10 +222,9 @@ public abstract class WebSettings { * @deprecated This method is now obsolete. * @hide Since API level {@link android.os.Build.VERSION_CODES#JELLY_BEAN_MR1} */ + @SystemApi @Deprecated - public boolean getNavDump() { - throw new MustOverrideException(); - } + public abstract boolean getNavDump(); /** * Sets whether the WebView should support zooming using its on-screen zoom @@ -246,9 +235,7 @@ public abstract class WebSettings { * * @param support whether the WebView should support zoom */ - public void setSupportZoom(boolean support) { - throw new MustOverrideException(); - } + public abstract void setSupportZoom(boolean support); /** * Gets whether the WebView supports zoom. @@ -256,9 +243,7 @@ public abstract class WebSettings { * @return true if the WebView supports zoom * @see #setSupportZoom */ - public boolean supportZoom() { - throw new MustOverrideException(); - } + public abstract boolean supportZoom(); /** * Sets whether the WebView requires a user gesture to play media. @@ -266,9 +251,7 @@ public abstract class WebSettings { * * @param require whether the WebView requires a user gesture to play media */ - public void setMediaPlaybackRequiresUserGesture(boolean require) { - throw new MustOverrideException(); - } + public abstract void setMediaPlaybackRequiresUserGesture(boolean require); /** * Gets whether the WebView requires a user gesture to play media. @@ -276,9 +259,7 @@ public abstract class WebSettings { * @return true if the WebView requires a user gesture to play media * @see #setMediaPlaybackRequiresUserGesture */ - public boolean getMediaPlaybackRequiresUserGesture() { - throw new MustOverrideException(); - } + public abstract boolean getMediaPlaybackRequiresUserGesture(); /** * Sets whether the WebView should use its built-in zoom mechanisms. The @@ -295,9 +276,7 @@ public abstract class WebSettings { // This method was intended to select between the built-in zoom mechanisms // and the separate zoom controls. The latter were obtained using // {@link WebView#getZoomControls}, which is now hidden. - public void setBuiltInZoomControls(boolean enabled) { - throw new MustOverrideException(); - } + public abstract void setBuiltInZoomControls(boolean enabled); /** * Gets whether the zoom mechanisms built into WebView are being used. @@ -305,9 +284,7 @@ public abstract class WebSettings { * @return true if the zoom mechanisms built into WebView are being used * @see #setBuiltInZoomControls */ - public boolean getBuiltInZoomControls() { - throw new MustOverrideException(); - } + public abstract boolean getBuiltInZoomControls(); /** * Sets whether the WebView should display on-screen zoom controls when @@ -316,9 +293,7 @@ public abstract class WebSettings { * * @param enabled whether the WebView should display on-screen zoom controls */ - public void setDisplayZoomControls(boolean enabled) { - throw new MustOverrideException(); - } + public abstract void setDisplayZoomControls(boolean enabled); /** * Gets whether the WebView displays on-screen zoom controls when using @@ -328,9 +303,7 @@ public abstract class WebSettings { * the built-in zoom mechanisms * @see #setDisplayZoomControls */ - public boolean getDisplayZoomControls() { - throw new MustOverrideException(); - } + public abstract boolean getDisplayZoomControls(); /** * Enables or disables file access within WebView. File access is enabled by @@ -338,36 +311,28 @@ public abstract class WebSettings { * Assets and resources are still accessible using file:///android_asset and * file:///android_res. */ - public void setAllowFileAccess(boolean allow) { - throw new MustOverrideException(); - } + public abstract void setAllowFileAccess(boolean allow); /** * Gets whether this WebView supports file access. * * @see #setAllowFileAccess */ - public boolean getAllowFileAccess() { - throw new MustOverrideException(); - } + public abstract boolean getAllowFileAccess(); /** * Enables or disables content URL access within WebView. Content URL * access allows WebView to load content from a content provider installed * in the system. The default is enabled. */ - public void setAllowContentAccess(boolean allow) { - throw new MustOverrideException(); - } + public abstract void setAllowContentAccess(boolean allow); /** * Gets whether this WebView supports content URL access. * * @see #setAllowContentAccess */ - public boolean getAllowContentAccess() { - throw new MustOverrideException(); - } + public abstract boolean getAllowContentAccess(); /** * Sets whether the WebView loads pages in overview mode, that is, @@ -376,9 +341,7 @@ public abstract class WebSettings { * of the WebView control, for example, when {@link #getUseWideViewPort} * is enabled. The default is false. */ - public void setLoadWithOverviewMode(boolean overview) { - throw new MustOverrideException(); - } + public abstract void setLoadWithOverviewMode(boolean overview); /** * Gets whether this WebView loads pages in overview mode. @@ -386,9 +349,7 @@ public abstract class WebSettings { * @return whether this WebView loads pages in overview mode * @see #setLoadWithOverviewMode */ - public boolean getLoadWithOverviewMode() { - throw new MustOverrideException(); - } + public abstract boolean getLoadWithOverviewMode(); /** * Sets whether the WebView will enable smooth transition while panning or @@ -400,9 +361,7 @@ public abstract class WebSettings { * @deprecated This method is now obsolete, and will become a no-op in future. */ @Deprecated - public void setEnableSmoothTransition(boolean enable) { - throw new MustOverrideException(); - } + public abstract void setEnableSmoothTransition(boolean enable); /** * Gets whether the WebView enables smooth transition while panning or @@ -413,9 +372,7 @@ public abstract class WebSettings { * @deprecated This method is now obsolete, and will become a no-op in future. */ @Deprecated - public boolean enableSmoothTransition() { - throw new MustOverrideException(); - } + public abstract boolean enableSmoothTransition(); /** * Sets whether the WebView uses its background for over scroll background. @@ -425,10 +382,9 @@ public abstract class WebSettings { * @deprecated This method is now obsolete. * @hide Since API level {@link android.os.Build.VERSION_CODES#JELLY_BEAN_MR1} */ + @SystemApi @Deprecated - public void setUseWebViewBackgroundForOverscrollBackground(boolean view) { - throw new MustOverrideException(); - } + public abstract void setUseWebViewBackgroundForOverscrollBackground(boolean view); /** * Gets whether this WebView uses WebView's background instead of @@ -438,17 +394,14 @@ public abstract class WebSettings { * @deprecated This method is now obsolete. * @hide Since API level {@link android.os.Build.VERSION_CODES#JELLY_BEAN_MR1} */ + @SystemApi @Deprecated - public boolean getUseWebViewBackgroundForOverscrollBackground() { - throw new MustOverrideException(); - } + public abstract boolean getUseWebViewBackgroundForOverscrollBackground(); /** * Sets whether the WebView should save form data. The default is true. */ - public void setSaveFormData(boolean save) { - throw new MustOverrideException(); - } + public abstract void setSaveFormData(boolean save); /** * Gets whether the WebView saves form data. @@ -456,18 +409,14 @@ public abstract class WebSettings { * @return whether the WebView saves form data * @see #setSaveFormData */ - public boolean getSaveFormData() { - throw new MustOverrideException(); - } + public abstract boolean getSaveFormData(); /** * Sets whether the WebView should save passwords. The default is true. * @deprecated Saving passwords in WebView will not be supported in future versions. */ @Deprecated - public void setSavePassword(boolean save) { - throw new MustOverrideException(); - } + public abstract void setSavePassword(boolean save); /** * Gets whether the WebView saves passwords. @@ -477,18 +426,14 @@ public abstract class WebSettings { * @deprecated Saving passwords in WebView will not be supported in future versions. */ @Deprecated - public boolean getSavePassword() { - throw new MustOverrideException(); - } + public abstract boolean getSavePassword(); /** * Sets the text zoom of the page in percent. The default is 100. * * @param textZoom the text zoom in percent */ - public synchronized void setTextZoom(int textZoom) { - throw new MustOverrideException(); - } + public abstract void setTextZoom(int textZoom); /** * Gets the text zoom of the page in percent. @@ -496,27 +441,23 @@ public abstract class WebSettings { * @return the text zoom of the page in percent * @see #setTextZoom */ - public synchronized int getTextZoom() { - throw new MustOverrideException(); - } + public abstract int getTextZoom(); /** * Sets policy for third party cookies. * Developers should access this via {@link CookieManager#setShouldAcceptThirdPartyCookies}. * @hide Internal API. */ - public void setAcceptThirdPartyCookies(boolean accept) { - throw new MustOverrideException(); - } + @SystemApi + public abstract void setAcceptThirdPartyCookies(boolean accept); /** * Gets policy for third party cookies. * Developers should access this via {@link CookieManager#getShouldAcceptThirdPartyCookies}. * @hide Internal API */ - public boolean getAcceptThirdPartyCookies() { - throw new MustOverrideException(); - } + @SystemApi + public abstract boolean getAcceptThirdPartyCookies(); /** * Sets the text size of the page. The default is {@link TextSize#NORMAL}. @@ -569,9 +510,7 @@ public abstract class WebSettings { * recommended alternatives. */ @Deprecated - public void setDefaultZoom(ZoomDensity zoom) { - throw new MustOverrideException(); - } + public abstract void setDefaultZoom(ZoomDensity zoom); /** * Gets the default zoom density of the page. This should be called from @@ -583,9 +522,7 @@ public abstract class WebSettings { * @see #setDefaultZoom * @deprecated Will only return the default value. */ - public ZoomDensity getDefaultZoom() { - throw new MustOverrideException(); - } + public abstract ZoomDensity getDefaultZoom(); /** * Enables using light touches to make a selection and activate mouseovers. @@ -593,9 +530,7 @@ public abstract class WebSettings { * setting is obsolete and has no effect. */ @Deprecated - public void setLightTouchEnabled(boolean enabled) { - throw new MustOverrideException(); - } + public abstract void setLightTouchEnabled(boolean enabled); /** * Gets whether light touches are enabled. @@ -603,9 +538,7 @@ public abstract class WebSettings { * @deprecated This setting is obsolete. */ @Deprecated - public boolean getLightTouchEnabled() { - throw new MustOverrideException(); - } + public abstract boolean getLightTouchEnabled(); /** * Controlled a rendering optimization that is no longer present. Setting @@ -615,7 +548,7 @@ public abstract class WebSettings { * @hide Since API level {@link android.os.Build.VERSION_CODES#JELLY_BEAN_MR1} */ @Deprecated - public synchronized void setUseDoubleTree(boolean use) { + public void setUseDoubleTree(boolean use) { // Specified to do nothing, so no need for derived classes to override. } @@ -627,7 +560,7 @@ public abstract class WebSettings { * @hide Since API level {@link android.os.Build.VERSION_CODES#JELLY_BEAN_MR1} */ @Deprecated - public synchronized boolean getUseDoubleTree() { + public boolean getUseDoubleTree() { // Returns false unconditionally, so no need for derived classes to override. return false; } @@ -645,10 +578,9 @@ public abstract class WebSettings { * @deprecated Please use {@link #setUserAgentString} instead. * @hide Since API level {@link android.os.Build.VERSION_CODES#JELLY_BEAN_MR1} */ + @SystemApi @Deprecated - public synchronized void setUserAgent(int ua) { - throw new MustOverrideException(); - } + public abstract void setUserAgent(int ua); /** * Gets the user-agent as an integer code. @@ -664,10 +596,9 @@ public abstract class WebSettings { * @deprecated Please use {@link #getUserAgentString} instead. * @hide Since API level {@link android.os.Build.VERSION_CODES#JELLY_BEAN_MR1} */ + @SystemApi @Deprecated - public synchronized int getUserAgent() { - throw new MustOverrideException(); - } + public abstract int getUserAgent(); /** * Sets whether the WebView should enable support for the "viewport" @@ -680,9 +611,7 @@ public abstract class WebSettings { * * @param use whether to enable support for the viewport meta tag */ - public synchronized void setUseWideViewPort(boolean use) { - throw new MustOverrideException(); - } + public abstract void setUseWideViewPort(boolean use); /** * Gets whether the WebView supports the "viewport" @@ -691,9 +620,7 @@ public abstract class WebSettings { * @return true if the WebView supports the viewport meta tag * @see #setUseWideViewPort */ - public synchronized boolean getUseWideViewPort() { - throw new MustOverrideException(); - } + public abstract boolean getUseWideViewPort(); /** * Sets whether the WebView whether supports multiple windows. If set to @@ -702,9 +629,7 @@ public abstract class WebSettings { * * @param support whether to suport multiple windows */ - public synchronized void setSupportMultipleWindows(boolean support) { - throw new MustOverrideException(); - } + public abstract void setSupportMultipleWindows(boolean support); /** * Gets whether the WebView supports multiple windows. @@ -712,9 +637,7 @@ public abstract class WebSettings { * @return true if the WebView supports multiple windows * @see #setSupportMultipleWindows */ - public synchronized boolean supportMultipleWindows() { - throw new MustOverrideException(); - } + public abstract boolean supportMultipleWindows(); /** * Sets the underlying layout algorithm. This will cause a relayout of the @@ -722,9 +645,7 @@ public abstract class WebSettings { * * @param l the layout algorithm to use, as a {@link LayoutAlgorithm} value */ - public synchronized void setLayoutAlgorithm(LayoutAlgorithm l) { - throw new MustOverrideException(); - } + public abstract void setLayoutAlgorithm(LayoutAlgorithm l); /** * Gets the current layout algorithm. @@ -732,18 +653,14 @@ public abstract class WebSettings { * @return the layout algorithm in use, as a {@link LayoutAlgorithm} value * @see #setLayoutAlgorithm */ - public synchronized LayoutAlgorithm getLayoutAlgorithm() { - throw new MustOverrideException(); - } + public abstract LayoutAlgorithm getLayoutAlgorithm(); /** * Sets the standard font family name. The default is "sans-serif". * * @param font a font family name */ - public synchronized void setStandardFontFamily(String font) { - throw new MustOverrideException(); - } + public abstract void setStandardFontFamily(String font); /** * Gets the standard font family name. @@ -751,18 +668,14 @@ public abstract class WebSettings { * @return the standard font family name as a string * @see #setStandardFontFamily */ - public synchronized String getStandardFontFamily() { - throw new MustOverrideException(); - } + public abstract String getStandardFontFamily(); /** * Sets the fixed font family name. The default is "monospace". * * @param font a font family name */ - public synchronized void setFixedFontFamily(String font) { - throw new MustOverrideException(); - } + public abstract void setFixedFontFamily(String font); /** * Gets the fixed font family name. @@ -770,18 +683,14 @@ public abstract class WebSettings { * @return the fixed font family name as a string * @see #setFixedFontFamily */ - public synchronized String getFixedFontFamily() { - throw new MustOverrideException(); - } + public abstract String getFixedFontFamily(); /** * Sets the sans-serif font family name. The default is "sans-serif". * * @param font a font family name */ - public synchronized void setSansSerifFontFamily(String font) { - throw new MustOverrideException(); - } + public abstract void setSansSerifFontFamily(String font); /** * Gets the sans-serif font family name. @@ -789,18 +698,14 @@ public abstract class WebSettings { * @return the sans-serif font family name as a string * @see #setSansSerifFontFamily */ - public synchronized String getSansSerifFontFamily() { - throw new MustOverrideException(); - } + public abstract String getSansSerifFontFamily(); /** * Sets the serif font family name. The default is "sans-serif". * * @param font a font family name */ - public synchronized void setSerifFontFamily(String font) { - throw new MustOverrideException(); - } + public abstract void setSerifFontFamily(String font); /** * Gets the serif font family name. The default is "serif". @@ -808,18 +713,14 @@ public abstract class WebSettings { * @return the serif font family name as a string * @see #setSerifFontFamily */ - public synchronized String getSerifFontFamily() { - throw new MustOverrideException(); - } + public abstract String getSerifFontFamily(); /** * Sets the cursive font family name. The default is "cursive". * * @param font a font family name */ - public synchronized void setCursiveFontFamily(String font) { - throw new MustOverrideException(); - } + public abstract void setCursiveFontFamily(String font); /** * Gets the cursive font family name. @@ -827,18 +728,14 @@ public abstract class WebSettings { * @return the cursive font family name as a string * @see #setCursiveFontFamily */ - public synchronized String getCursiveFontFamily() { - throw new MustOverrideException(); - } + public abstract String getCursiveFontFamily(); /** * Sets the fantasy font family name. The default is "fantasy". * * @param font a font family name */ - public synchronized void setFantasyFontFamily(String font) { - throw new MustOverrideException(); - } + public abstract void setFantasyFontFamily(String font); /** * Gets the fantasy font family name. @@ -846,9 +743,7 @@ public abstract class WebSettings { * @return the fantasy font family name as a string * @see #setFantasyFontFamily */ - public synchronized String getFantasyFontFamily() { - throw new MustOverrideException(); - } + public abstract String getFantasyFontFamily(); /** * Sets the minimum font size. The default is 8. @@ -856,9 +751,7 @@ public abstract class WebSettings { * @param size a non-negative integer between 1 and 72. Any number outside * the specified range will be pinned. */ - public synchronized void setMinimumFontSize(int size) { - throw new MustOverrideException(); - } + public abstract void setMinimumFontSize(int size); /** * Gets the minimum font size. @@ -866,9 +759,7 @@ public abstract class WebSettings { * @return a non-negative integer between 1 and 72 * @see #setMinimumFontSize */ - public synchronized int getMinimumFontSize() { - throw new MustOverrideException(); - } + public abstract int getMinimumFontSize(); /** * Sets the minimum logical font size. The default is 8. @@ -876,9 +767,7 @@ public abstract class WebSettings { * @param size a non-negative integer between 1 and 72. Any number outside * the specified range will be pinned. */ - public synchronized void setMinimumLogicalFontSize(int size) { - throw new MustOverrideException(); - } + public abstract void setMinimumLogicalFontSize(int size); /** * Gets the minimum logical font size. @@ -886,9 +775,7 @@ public abstract class WebSettings { * @return a non-negative integer between 1 and 72 * @see #setMinimumLogicalFontSize */ - public synchronized int getMinimumLogicalFontSize() { - throw new MustOverrideException(); - } + public abstract int getMinimumLogicalFontSize(); /** * Sets the default font size. The default is 16. @@ -896,9 +783,7 @@ public abstract class WebSettings { * @param size a non-negative integer between 1 and 72. Any number outside * the specified range will be pinned. */ - public synchronized void setDefaultFontSize(int size) { - throw new MustOverrideException(); - } + public abstract void setDefaultFontSize(int size); /** * Gets the default font size. @@ -906,9 +791,7 @@ public abstract class WebSettings { * @return a non-negative integer between 1 and 72 * @see #setDefaultFontSize */ - public synchronized int getDefaultFontSize() { - throw new MustOverrideException(); - } + public abstract int getDefaultFontSize(); /** * Sets the default fixed font size. The default is 16. @@ -916,9 +799,7 @@ public abstract class WebSettings { * @param size a non-negative integer between 1 and 72. Any number outside * the specified range will be pinned. */ - public synchronized void setDefaultFixedFontSize(int size) { - throw new MustOverrideException(); - } + public abstract void setDefaultFixedFontSize(int size); /** * Gets the default fixed font size. @@ -926,9 +807,7 @@ public abstract class WebSettings { * @return a non-negative integer between 1 and 72 * @see #setDefaultFixedFontSize */ - public synchronized int getDefaultFixedFontSize() { - throw new MustOverrideException(); - } + public abstract int getDefaultFixedFontSize(); /** * Sets whether the WebView should load image resources. Note that this method @@ -941,9 +820,7 @@ public abstract class WebSettings { * * @param flag whether the WebView should load image resources */ - public synchronized void setLoadsImagesAutomatically(boolean flag) { - throw new MustOverrideException(); - } + public abstract void setLoadsImagesAutomatically(boolean flag); /** * Gets whether the WebView loads image resources. This includes @@ -952,9 +829,7 @@ public abstract class WebSettings { * @return true if the WebView loads image resources * @see #setLoadsImagesAutomatically */ - public synchronized boolean getLoadsImagesAutomatically() { - throw new MustOverrideException(); - } + public abstract boolean getLoadsImagesAutomatically(); /** * Sets whether the WebView should not load image resources from the @@ -971,9 +846,7 @@ public abstract class WebSettings { * network * @see #setBlockNetworkLoads */ - public synchronized void setBlockNetworkImage(boolean flag) { - throw new MustOverrideException(); - } + public abstract void setBlockNetworkImage(boolean flag); /** * Gets whether the WebView does not load image resources from the network. @@ -981,9 +854,7 @@ public abstract class WebSettings { * @return true if the WebView does not load image resources from the network * @see #setBlockNetworkImage */ - public synchronized boolean getBlockNetworkImage() { - throw new MustOverrideException(); - } + public abstract boolean getBlockNetworkImage(); /** * Sets whether the WebView should not load resources from the network. @@ -1003,9 +874,7 @@ public abstract class WebSettings { * network * @see android.webkit.WebView#reload */ - public synchronized void setBlockNetworkLoads(boolean flag) { - throw new MustOverrideException(); - } + public abstract void setBlockNetworkLoads(boolean flag); /** * Gets whether the WebView does not load any resources from the network. @@ -1013,9 +882,7 @@ public abstract class WebSettings { * @return true if the WebView does not load any resources from the network * @see #setBlockNetworkLoads */ - public synchronized boolean getBlockNetworkLoads() { - throw new MustOverrideException(); - } + public abstract boolean getBlockNetworkLoads(); /** * Tells the WebView to enable JavaScript execution. @@ -1023,9 +890,7 @@ public abstract class WebSettings { * * @param flag true if the WebView should execute JavaScript */ - public synchronized void setJavaScriptEnabled(boolean flag) { - throw new MustOverrideException(); - } + public abstract void setJavaScriptEnabled(boolean flag); /** * Sets whether JavaScript running in the context of a file scheme URL @@ -1076,10 +941,9 @@ public abstract class WebSettings { * {@link #setPluginState} * @hide Since API level {@link android.os.Build.VERSION_CODES#JELLY_BEAN_MR2} */ + @SystemApi @Deprecated - public synchronized void setPluginsEnabled(boolean flag) { - throw new MustOverrideException(); - } + public abstract void setPluginsEnabled(boolean flag); /** * Tells the WebView to enable, disable, or have plugins on demand. On @@ -1092,9 +956,7 @@ public abstract class WebSettings { * @deprecated Plugins will not be supported in future, and should not be used. */ @Deprecated - public synchronized void setPluginState(PluginState state) { - throw new MustOverrideException(); - } + public abstract void setPluginState(PluginState state); /** * Sets a custom path to plugins used by the WebView. This method is @@ -1106,7 +968,7 @@ public abstract class WebSettings { * @hide Since API level {@link android.os.Build.VERSION_CODES#JELLY_BEAN_MR2} */ @Deprecated - public synchronized void setPluginsPath(String pluginsPath) { + public void setPluginsPath(String pluginsPath) { // Specified to do nothing, so no need for derived classes to override. } @@ -1125,9 +987,7 @@ public abstract class WebSettings { // Note that the WebCore Database Tracker only allows the path to be set // once. @Deprecated - public synchronized void setDatabasePath(String databasePath) { - throw new MustOverrideException(); - } + public abstract void setDatabasePath(String databasePath); /** * Sets the path where the Geolocation databases should be saved. In order @@ -1138,9 +998,7 @@ public abstract class WebSettings { * saved. */ // This will update WebCore when the Sync runs in the C++ side. - public synchronized void setGeolocationDatabasePath(String databasePath) { - throw new MustOverrideException(); - } + public abstract void setGeolocationDatabasePath(String databasePath); /** * Sets whether the Application Caches API should be enabled. The default @@ -1150,9 +1008,7 @@ public abstract class WebSettings { * * @param flag true if the WebView should enable Application Caches */ - public synchronized void setAppCacheEnabled(boolean flag) { - throw new MustOverrideException(); - } + public abstract void setAppCacheEnabled(boolean flag); /** * Sets the path to the Application Caches files. In order for the @@ -1164,9 +1020,7 @@ public abstract class WebSettings { * Application Caches files. * @see #setAppCacheEnabled */ - public synchronized void setAppCachePath(String appCachePath) { - throw new MustOverrideException(); - } + public abstract void setAppCachePath(String appCachePath); /** * Sets the maximum size for the Application Cache content. The passed size @@ -1180,9 +1034,7 @@ public abstract class WebSettings { * @deprecated In future quota will be managed automatically. */ @Deprecated - public synchronized void setAppCacheMaxSize(long appCacheMaxSize) { - throw new MustOverrideException(); - } + public abstract void setAppCacheMaxSize(long appCacheMaxSize); /** * Sets whether the database storage API is enabled. The default value is @@ -1196,18 +1048,14 @@ public abstract class WebSettings { * * @param flag true if the WebView should use the database storage API */ - public synchronized void setDatabaseEnabled(boolean flag) { - throw new MustOverrideException(); - } + public abstract void setDatabaseEnabled(boolean flag); /** * Sets whether the DOM storage API is enabled. The default value is false. * * @param flag true if the WebView should use the DOM storage API */ - public synchronized void setDomStorageEnabled(boolean flag) { - throw new MustOverrideException(); - } + public abstract void setDomStorageEnabled(boolean flag); /** * Gets whether the DOM Storage APIs are enabled. @@ -1215,9 +1063,8 @@ public abstract class WebSettings { * @return true if the DOM Storage APIs are enabled * @see #setDomStorageEnabled */ - public synchronized boolean getDomStorageEnabled() { - throw new MustOverrideException(); - } + public abstract boolean getDomStorageEnabled(); + /** * Gets the path to where database storage API databases are saved. * @@ -1226,9 +1073,7 @@ public abstract class WebSettings { * @deprecated Database paths are managed by the implementation this method is obsolete. */ @Deprecated - public synchronized String getDatabasePath() { - throw new MustOverrideException(); - } + public abstract String getDatabasePath(); /** * Gets whether the database storage API is enabled. @@ -1236,9 +1081,7 @@ public abstract class WebSettings { * @return true if the database storage API is enabled * @see #setDatabaseEnabled */ - public synchronized boolean getDatabaseEnabled() { - throw new MustOverrideException(); - } + public abstract boolean getDatabaseEnabled(); /** * Sets whether Geolocation is enabled. The default is true. @@ -1260,9 +1103,7 @@ public abstract class WebSettings { * * @param flag whether Geolocation should be enabled */ - public synchronized void setGeolocationEnabled(boolean flag) { - throw new MustOverrideException(); - } + public abstract void setGeolocationEnabled(boolean flag); /** * Gets whether JavaScript is enabled. @@ -1270,9 +1111,7 @@ public abstract class WebSettings { * @return true if JavaScript is enabled * @see #setJavaScriptEnabled */ - public synchronized boolean getJavaScriptEnabled() { - throw new MustOverrideException(); - } + public abstract boolean getJavaScriptEnabled(); /** * Gets whether JavaScript running in the context of a file scheme URL can @@ -1303,10 +1142,9 @@ public abstract class WebSettings { * @deprecated This method has been replaced by {@link #getPluginState} * @hide Since API level {@link android.os.Build.VERSION_CODES#JELLY_BEAN_MR2} */ + @SystemApi @Deprecated - public synchronized boolean getPluginsEnabled() { - throw new MustOverrideException(); - } + public abstract boolean getPluginsEnabled(); /** * Gets the current state regarding whether plugins are enabled. @@ -1316,9 +1154,7 @@ public abstract class WebSettings { * @deprecated Plugins will not be supported in future, and should not be used. */ @Deprecated - public synchronized PluginState getPluginState() { - throw new MustOverrideException(); - } + public abstract PluginState getPluginState(); /** * Gets the directory that contains the plugin libraries. This method is @@ -1330,7 +1166,7 @@ public abstract class WebSettings { * @hide Since API level {@link android.os.Build.VERSION_CODES#JELLY_BEAN_MR2} */ @Deprecated - public synchronized String getPluginsPath() { + public String getPluginsPath() { // Unconditionally returns empty string, so no need for derived classes to override. return ""; } @@ -1341,9 +1177,7 @@ public abstract class WebSettings { * * @param flag true if JavaScript can open windows automatically */ - public synchronized void setJavaScriptCanOpenWindowsAutomatically(boolean flag) { - throw new MustOverrideException(); - } + public abstract void setJavaScriptCanOpenWindowsAutomatically(boolean flag); /** * Gets whether JavaScript can open windows automatically. @@ -1352,9 +1186,7 @@ public abstract class WebSettings { * window.open() * @see #setJavaScriptCanOpenWindowsAutomatically */ - public synchronized boolean getJavaScriptCanOpenWindowsAutomatically() { - throw new MustOverrideException(); - } + public abstract boolean getJavaScriptCanOpenWindowsAutomatically(); /** * Sets the default text encoding name to use when decoding html pages. @@ -1362,9 +1194,7 @@ public abstract class WebSettings { * * @param encoding the text encoding name */ - public synchronized void setDefaultTextEncodingName(String encoding) { - throw new MustOverrideException(); - } + public abstract void setDefaultTextEncodingName(String encoding); /** * Gets the default text encoding name. @@ -1372,17 +1202,13 @@ public abstract class WebSettings { * @return the default text encoding name as a string * @see #setDefaultTextEncodingName */ - public synchronized String getDefaultTextEncodingName() { - throw new MustOverrideException(); - } + public abstract String getDefaultTextEncodingName(); /** * Sets the WebView's user-agent string. If the string is null or empty, * the system default value will be used. */ - public synchronized void setUserAgentString(String ua) { - throw new MustOverrideException(); - } + public abstract void setUserAgentString(String ua); /** * Gets the WebView's user-agent string. @@ -1390,9 +1216,7 @@ public abstract class WebSettings { * @return the WebView's user-agent string * @see #setUserAgentString */ - public synchronized String getUserAgentString() { - throw new MustOverrideException(); - } + public abstract String getUserAgentString(); /** * Returns the default User-Agent used by a WebView. @@ -1412,9 +1236,7 @@ public abstract class WebSettings { * * @param flag whether the WebView needs to set a node */ - public void setNeedInitialFocus(boolean flag) { - throw new MustOverrideException(); - } + public abstract void setNeedInitialFocus(boolean flag); /** * Sets the priority of the Render thread. Unlike the other settings, this @@ -1426,9 +1248,7 @@ public abstract class WebSettings { * not be supported in future versions. */ @Deprecated - public synchronized void setRenderPriority(RenderPriority priority) { - throw new MustOverrideException(); - } + public abstract void setRenderPriority(RenderPriority priority); /** * Overrides the way the cache is used. The way the cache is used is based @@ -1442,9 +1262,7 @@ public abstract class WebSettings { * * @param mode the mode to use */ - public void setCacheMode(int mode) { - throw new MustOverrideException(); - } + public abstract void setCacheMode(int mode); /** * Gets the current setting for overriding the cache mode. @@ -1452,9 +1270,7 @@ public abstract class WebSettings { * @return the current setting for overriding the cache mode * @see #setCacheMode */ - public int getCacheMode() { - throw new MustOverrideException(); - } + public abstract int getCacheMode(); /** * Configures the WebView's behavior when a secure origin attempts to load a resource from an diff --git a/core/java/android/webkit/WebStorage.java b/core/java/android/webkit/WebStorage.java index 3bfe9cf7a807..947d0cbd46a8 100644 --- a/core/java/android/webkit/WebStorage.java +++ b/core/java/android/webkit/WebStorage.java @@ -16,6 +16,8 @@ package android.webkit; +import android.annotation.SystemApi; + import java.util.Map; /** @@ -65,23 +67,13 @@ public class WebStorage { private long mUsage = 0; /** @hide */ + @SystemApi protected Origin(String origin, long quota, long usage) { mOrigin = origin; mQuota = quota; mUsage = usage; } - /** @hide */ - protected Origin(String origin, long quota) { - mOrigin = origin; - mQuota = quota; - } - - /** @hide */ - protected Origin(String origin) { - mOrigin = origin; - } - /** * Gets the string representation of this origin. * @@ -210,5 +202,6 @@ public class WebStorage { * way to call createHandler() and createUIHandler(), so it would not work). * @hide */ + @SystemApi public WebStorage() {} } diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java index 40aee969a063..8d2c51f00dd2 100644 --- a/core/java/android/webkit/WebView.java +++ b/core/java/android/webkit/WebView.java @@ -16,6 +16,7 @@ package android.webkit; +import android.annotation.SystemApi; import android.annotation.Widget; import android.content.Context; import android.content.res.Configuration; @@ -256,10 +257,12 @@ public class WebView extends AbsoluteLayout * always stay as a hidden API. * @hide */ + @SystemApi public static final String DATA_REDUCTION_PROXY_SETTING_CHANGED = "android.webkit.DATA_REDUCTION_PROXY_SETTING_CHANGED"; private static final String LOGTAG = "WebView"; + private static final boolean TRACE = false; // Throwing an exception for incorrect thread usage if the // build target is JB MR2 or newer. Defaults to false, and is @@ -394,6 +397,7 @@ public class WebView extends AbsoluteLayout /** * @hide Only for use by WebViewProvider implementations */ + @SystemApi public HitTestResult() { mType = UNKNOWN_TYPE; } @@ -401,6 +405,7 @@ public class WebView extends AbsoluteLayout /** * @hide Only for use by WebViewProvider implementations */ + @SystemApi public void setType(int type) { mType = type; } @@ -408,6 +413,7 @@ public class WebView extends AbsoluteLayout /** * @hide Only for use by WebViewProvider implementations */ + @SystemApi public void setExtra(String extra) { mExtra = extra; } @@ -542,7 +548,7 @@ public class WebView extends AbsoluteLayout sEnforceThreadChecking = context.getApplicationInfo().targetSdkVersion >= Build.VERSION_CODES.JELLY_BEAN_MR2; checkThread(); - if (DebugFlags.TRACE_API) Log.d(LOGTAG, "WebView<init>"); + if (TRACE) Log.d(LOGTAG, "WebView<init>"); ensureProviderCreated(); mProvider.init(javaScriptInterfaces, privateBrowsing); @@ -557,7 +563,7 @@ public class WebView extends AbsoluteLayout */ public void setHorizontalScrollbarOverlay(boolean overlay) { checkThread(); - if (DebugFlags.TRACE_API) Log.d(LOGTAG, "setHorizontalScrollbarOverlay=" + overlay); + if (TRACE) Log.d(LOGTAG, "setHorizontalScrollbarOverlay=" + overlay); mProvider.setHorizontalScrollbarOverlay(overlay); } @@ -568,7 +574,7 @@ public class WebView extends AbsoluteLayout */ public void setVerticalScrollbarOverlay(boolean overlay) { checkThread(); - if (DebugFlags.TRACE_API) Log.d(LOGTAG, "setVerticalScrollbarOverlay=" + overlay); + if (TRACE) Log.d(LOGTAG, "setVerticalScrollbarOverlay=" + overlay); mProvider.setVerticalScrollbarOverlay(overlay); } @@ -623,7 +629,7 @@ public class WebView extends AbsoluteLayout @Deprecated public void setCertificate(SslCertificate certificate) { checkThread(); - if (DebugFlags.TRACE_API) Log.d(LOGTAG, "setCertificate=" + certificate); + if (TRACE) Log.d(LOGTAG, "setCertificate=" + certificate); mProvider.setCertificate(certificate); } @@ -647,7 +653,7 @@ public class WebView extends AbsoluteLayout @Deprecated public void savePassword(String host, String username, String password) { checkThread(); - if (DebugFlags.TRACE_API) Log.d(LOGTAG, "savePassword=" + host); + if (TRACE) Log.d(LOGTAG, "savePassword=" + host); mProvider.savePassword(host, username, password); } @@ -667,7 +673,7 @@ public class WebView extends AbsoluteLayout public void setHttpAuthUsernamePassword(String host, String realm, String username, String password) { checkThread(); - if (DebugFlags.TRACE_API) Log.d(LOGTAG, "setHttpAuthUsernamePassword=" + host); + if (TRACE) Log.d(LOGTAG, "setHttpAuthUsernamePassword=" + host); mProvider.setHttpAuthUsernamePassword(host, realm, username, password); } @@ -697,7 +703,7 @@ public class WebView extends AbsoluteLayout */ public void destroy() { checkThread(); - if (DebugFlags.TRACE_API) Log.d(LOGTAG, "destroy"); + if (TRACE) Log.d(LOGTAG, "destroy"); mProvider.destroy(); } @@ -743,7 +749,7 @@ public class WebView extends AbsoluteLayout */ public void setNetworkAvailable(boolean networkUp) { checkThread(); - if (DebugFlags.TRACE_API) Log.d(LOGTAG, "setNetworkAvailable=" + networkUp); + if (TRACE) Log.d(LOGTAG, "setNetworkAvailable=" + networkUp); mProvider.setNetworkAvailable(networkUp); } @@ -760,7 +766,7 @@ public class WebView extends AbsoluteLayout */ public WebBackForwardList saveState(Bundle outState) { checkThread(); - if (DebugFlags.TRACE_API) Log.d(LOGTAG, "saveState"); + if (TRACE) Log.d(LOGTAG, "saveState"); return mProvider.saveState(outState); } @@ -777,7 +783,7 @@ public class WebView extends AbsoluteLayout @Deprecated public boolean savePicture(Bundle b, final File dest) { checkThread(); - if (DebugFlags.TRACE_API) Log.d(LOGTAG, "savePicture=" + dest.getName()); + if (TRACE) Log.d(LOGTAG, "savePicture=" + dest.getName()); return mProvider.savePicture(b, dest); } @@ -795,7 +801,7 @@ public class WebView extends AbsoluteLayout @Deprecated public boolean restorePicture(Bundle b, File src) { checkThread(); - if (DebugFlags.TRACE_API) Log.d(LOGTAG, "restorePicture=" + src.getName()); + if (TRACE) Log.d(LOGTAG, "restorePicture=" + src.getName()); return mProvider.restorePicture(b, src); } @@ -813,7 +819,7 @@ public class WebView extends AbsoluteLayout */ public WebBackForwardList restoreState(Bundle inState) { checkThread(); - if (DebugFlags.TRACE_API) Log.d(LOGTAG, "restoreState"); + if (TRACE) Log.d(LOGTAG, "restoreState"); return mProvider.restoreState(inState); } @@ -830,7 +836,7 @@ public class WebView extends AbsoluteLayout */ public void loadUrl(String url, Map<String, String> additionalHttpHeaders) { checkThread(); - if (DebugFlags.TRACE_API) { + if (TRACE) { StringBuilder headers = new StringBuilder(); if (additionalHttpHeaders != null) { for (Map.Entry<String, String> entry : additionalHttpHeaders.entrySet()) { @@ -849,7 +855,7 @@ public class WebView extends AbsoluteLayout */ public void loadUrl(String url) { checkThread(); - if (DebugFlags.TRACE_API) Log.d(LOGTAG, "loadUrl=" + url); + if (TRACE) Log.d(LOGTAG, "loadUrl=" + url); mProvider.loadUrl(url); } @@ -864,7 +870,7 @@ public class WebView extends AbsoluteLayout */ public void postUrl(String url, byte[] postData) { checkThread(); - if (DebugFlags.TRACE_API) Log.d(LOGTAG, "postUrl=" + url); + if (TRACE) Log.d(LOGTAG, "postUrl=" + url); if (URLUtil.isNetworkUrl(url)) { mProvider.postUrl(url, postData); } else { @@ -903,7 +909,7 @@ public class WebView extends AbsoluteLayout */ public void loadData(String data, String mimeType, String encoding) { checkThread(); - if (DebugFlags.TRACE_API) Log.d(LOGTAG, "loadData"); + if (TRACE) Log.d(LOGTAG, "loadData"); mProvider.loadData(data, mimeType, encoding); } @@ -936,7 +942,7 @@ public class WebView extends AbsoluteLayout public void loadDataWithBaseURL(String baseUrl, String data, String mimeType, String encoding, String historyUrl) { checkThread(); - if (DebugFlags.TRACE_API) Log.d(LOGTAG, "loadDataWithBaseURL=" + baseUrl); + if (TRACE) Log.d(LOGTAG, "loadDataWithBaseURL=" + baseUrl); mProvider.loadDataWithBaseURL(baseUrl, data, mimeType, encoding, historyUrl); } @@ -953,7 +959,7 @@ public class WebView extends AbsoluteLayout */ public void evaluateJavascript(String script, ValueCallback<String> resultCallback) { checkThread(); - if (DebugFlags.TRACE_API) Log.d(LOGTAG, "evaluateJavascript=" + script); + if (TRACE) Log.d(LOGTAG, "evaluateJavascript=" + script); mProvider.evaluateJavaScript(script, resultCallback); } @@ -964,7 +970,7 @@ public class WebView extends AbsoluteLayout */ public void saveWebArchive(String filename) { checkThread(); - if (DebugFlags.TRACE_API) Log.d(LOGTAG, "saveWebArchive=" + filename); + if (TRACE) Log.d(LOGTAG, "saveWebArchive=" + filename); mProvider.saveWebArchive(filename); } @@ -982,7 +988,7 @@ public class WebView extends AbsoluteLayout */ public void saveWebArchive(String basename, boolean autoname, ValueCallback<String> callback) { checkThread(); - if (DebugFlags.TRACE_API) Log.d(LOGTAG, "saveWebArchive(auto)=" + basename); + if (TRACE) Log.d(LOGTAG, "saveWebArchive(auto)=" + basename); mProvider.saveWebArchive(basename, autoname, callback); } @@ -991,7 +997,7 @@ public class WebView extends AbsoluteLayout */ public void stopLoading() { checkThread(); - if (DebugFlags.TRACE_API) Log.d(LOGTAG, "stopLoading"); + if (TRACE) Log.d(LOGTAG, "stopLoading"); mProvider.stopLoading(); } @@ -1000,7 +1006,7 @@ public class WebView extends AbsoluteLayout */ public void reload() { checkThread(); - if (DebugFlags.TRACE_API) Log.d(LOGTAG, "reload"); + if (TRACE) Log.d(LOGTAG, "reload"); mProvider.reload(); } @@ -1019,7 +1025,7 @@ public class WebView extends AbsoluteLayout */ public void goBack() { checkThread(); - if (DebugFlags.TRACE_API) Log.d(LOGTAG, "goBack"); + if (TRACE) Log.d(LOGTAG, "goBack"); mProvider.goBack(); } @@ -1038,7 +1044,7 @@ public class WebView extends AbsoluteLayout */ public void goForward() { checkThread(); - if (DebugFlags.TRACE_API) Log.d(LOGTAG, "goForward"); + if (TRACE) Log.d(LOGTAG, "goForward"); mProvider.goForward(); } @@ -1064,7 +1070,7 @@ public class WebView extends AbsoluteLayout */ public void goBackOrForward(int steps) { checkThread(); - if (DebugFlags.TRACE_API) Log.d(LOGTAG, "goBackOrForwad=" + steps); + if (TRACE) Log.d(LOGTAG, "goBackOrForwad=" + steps); mProvider.goBackOrForward(steps); } @@ -1084,7 +1090,7 @@ public class WebView extends AbsoluteLayout */ public boolean pageUp(boolean top) { checkThread(); - if (DebugFlags.TRACE_API) Log.d(LOGTAG, "pageUp"); + if (TRACE) Log.d(LOGTAG, "pageUp"); return mProvider.pageUp(top); } @@ -1096,7 +1102,7 @@ public class WebView extends AbsoluteLayout */ public boolean pageDown(boolean bottom) { checkThread(); - if (DebugFlags.TRACE_API) Log.d(LOGTAG, "pageDown"); + if (TRACE) Log.d(LOGTAG, "pageDown"); return mProvider.pageDown(bottom); } @@ -1109,7 +1115,7 @@ public class WebView extends AbsoluteLayout @Deprecated public void clearView() { checkThread(); - if (DebugFlags.TRACE_API) Log.d(LOGTAG, "clearView"); + if (TRACE) Log.d(LOGTAG, "clearView"); mProvider.clearView(); } @@ -1140,7 +1146,7 @@ public class WebView extends AbsoluteLayout @Deprecated public Picture capturePicture() { checkThread(); - if (DebugFlags.TRACE_API) Log.d(LOGTAG, "capturePicture"); + if (TRACE) Log.d(LOGTAG, "capturePicture"); return mProvider.capturePicture(); } @@ -1151,7 +1157,7 @@ public class WebView extends AbsoluteLayout @Deprecated public PrintDocumentAdapter createPrintDocumentAdapter() { checkThread(); - if (DebugFlags.TRACE_API) Log.d(LOGTAG, "createPrintDocumentAdapter"); + if (TRACE) Log.d(LOGTAG, "createPrintDocumentAdapter"); return mProvider.createPrintDocumentAdapter("default"); } @@ -1170,7 +1176,7 @@ public class WebView extends AbsoluteLayout */ public PrintDocumentAdapter createPrintDocumentAdapter(String documentName) { checkThread(); - if (DebugFlags.TRACE_API) Log.d(LOGTAG, "createPrintDocumentAdapter"); + if (TRACE) Log.d(LOGTAG, "createPrintDocumentAdapter"); return mProvider.createPrintDocumentAdapter(documentName); } @@ -1210,7 +1216,7 @@ public class WebView extends AbsoluteLayout */ public void setInitialScale(int scaleInPercent) { checkThread(); - if (DebugFlags.TRACE_API) Log.d(LOGTAG, "setInitialScale=" + scaleInPercent); + if (TRACE) Log.d(LOGTAG, "setInitialScale=" + scaleInPercent); mProvider.setInitialScale(scaleInPercent); } @@ -1221,7 +1227,7 @@ public class WebView extends AbsoluteLayout */ public void invokeZoomPicker() { checkThread(); - if (DebugFlags.TRACE_API) Log.d(LOGTAG, "invokeZoomPicker"); + if (TRACE) Log.d(LOGTAG, "invokeZoomPicker"); mProvider.invokeZoomPicker(); } @@ -1245,7 +1251,7 @@ public class WebView extends AbsoluteLayout */ public HitTestResult getHitTestResult() { checkThread(); - if (DebugFlags.TRACE_API) Log.d(LOGTAG, "getHitTestResult"); + if (TRACE) Log.d(LOGTAG, "getHitTestResult"); return mProvider.getHitTestResult(); } @@ -1264,7 +1270,7 @@ public class WebView extends AbsoluteLayout */ public void requestFocusNodeHref(Message hrefMsg) { checkThread(); - if (DebugFlags.TRACE_API) Log.d(LOGTAG, "requestFocusNodeHref"); + if (TRACE) Log.d(LOGTAG, "requestFocusNodeHref"); mProvider.requestFocusNodeHref(hrefMsg); } @@ -1277,7 +1283,7 @@ public class WebView extends AbsoluteLayout */ public void requestImageRef(Message msg) { checkThread(); - if (DebugFlags.TRACE_API) Log.d(LOGTAG, "requestImageRef"); + if (TRACE) Log.d(LOGTAG, "requestImageRef"); mProvider.requestImageRef(msg); } @@ -1382,7 +1388,7 @@ public class WebView extends AbsoluteLayout */ public void pauseTimers() { checkThread(); - if (DebugFlags.TRACE_API) Log.d(LOGTAG, "pauseTimers"); + if (TRACE) Log.d(LOGTAG, "pauseTimers"); mProvider.pauseTimers(); } @@ -1392,7 +1398,7 @@ public class WebView extends AbsoluteLayout */ public void resumeTimers() { checkThread(); - if (DebugFlags.TRACE_API) Log.d(LOGTAG, "resumeTimers"); + if (TRACE) Log.d(LOGTAG, "resumeTimers"); mProvider.resumeTimers(); } @@ -1405,7 +1411,7 @@ public class WebView extends AbsoluteLayout */ public void onPause() { checkThread(); - if (DebugFlags.TRACE_API) Log.d(LOGTAG, "onPause"); + if (TRACE) Log.d(LOGTAG, "onPause"); mProvider.onPause(); } @@ -1414,7 +1420,7 @@ public class WebView extends AbsoluteLayout */ public void onResume() { checkThread(); - if (DebugFlags.TRACE_API) Log.d(LOGTAG, "onResume"); + if (TRACE) Log.d(LOGTAG, "onResume"); mProvider.onResume(); } @@ -1437,7 +1443,7 @@ public class WebView extends AbsoluteLayout @Deprecated public void freeMemory() { checkThread(); - if (DebugFlags.TRACE_API) Log.d(LOGTAG, "freeMemory"); + if (TRACE) Log.d(LOGTAG, "freeMemory"); mProvider.freeMemory(); } @@ -1449,7 +1455,7 @@ public class WebView extends AbsoluteLayout */ public void clearCache(boolean includeDiskFiles) { checkThread(); - if (DebugFlags.TRACE_API) Log.d(LOGTAG, "clearCache"); + if (TRACE) Log.d(LOGTAG, "clearCache"); mProvider.clearCache(includeDiskFiles); } @@ -1461,7 +1467,7 @@ public class WebView extends AbsoluteLayout */ public void clearFormData() { checkThread(); - if (DebugFlags.TRACE_API) Log.d(LOGTAG, "clearFormData"); + if (TRACE) Log.d(LOGTAG, "clearFormData"); mProvider.clearFormData(); } @@ -1470,7 +1476,7 @@ public class WebView extends AbsoluteLayout */ public void clearHistory() { checkThread(); - if (DebugFlags.TRACE_API) Log.d(LOGTAG, "clearHistory"); + if (TRACE) Log.d(LOGTAG, "clearHistory"); mProvider.clearHistory(); } @@ -1480,7 +1486,7 @@ public class WebView extends AbsoluteLayout */ public void clearSslPreferences() { checkThread(); - if (DebugFlags.TRACE_API) Log.d(LOGTAG, "clearSslPreferences"); + if (TRACE) Log.d(LOGTAG, "clearSslPreferences"); mProvider.clearSslPreferences(); } @@ -1496,7 +1502,7 @@ public class WebView extends AbsoluteLayout * callback. The runnable will be called in UI thread. */ public static void clearClientCertPreferences(Runnable onCleared) { - if (DebugFlags.TRACE_API) Log.d(LOGTAG, "clearClientCertPreferences"); + if (TRACE) Log.d(LOGTAG, "clearClientCertPreferences"); getFactory().getStatics().clearClientCertPreferences(onCleared); } @@ -1538,7 +1544,7 @@ public class WebView extends AbsoluteLayout */ public void findNext(boolean forward) { checkThread(); - if (DebugFlags.TRACE_API) Log.d(LOGTAG, "findNext"); + if (TRACE) Log.d(LOGTAG, "findNext"); mProvider.findNext(forward); } @@ -1554,7 +1560,7 @@ public class WebView extends AbsoluteLayout @Deprecated public int findAll(String find) { checkThread(); - if (DebugFlags.TRACE_API) Log.d(LOGTAG, "findAll"); + if (TRACE) Log.d(LOGTAG, "findAll"); StrictMode.noteSlowCall("findAll blocks UI: prefer findAllAsync"); return mProvider.findAll(find); } @@ -1569,7 +1575,7 @@ public class WebView extends AbsoluteLayout */ public void findAllAsync(String find) { checkThread(); - if (DebugFlags.TRACE_API) Log.d(LOGTAG, "findAllAsync"); + if (TRACE) Log.d(LOGTAG, "findAllAsync"); mProvider.findAllAsync(find); } @@ -1590,7 +1596,7 @@ public class WebView extends AbsoluteLayout @Deprecated public boolean showFindDialog(String text, boolean showIme) { checkThread(); - if (DebugFlags.TRACE_API) Log.d(LOGTAG, "showFindDialog"); + if (TRACE) Log.d(LOGTAG, "showFindDialog"); return mProvider.showFindDialog(text, showIme); } @@ -1646,7 +1652,7 @@ public class WebView extends AbsoluteLayout */ public void clearMatches() { checkThread(); - if (DebugFlags.TRACE_API) Log.d(LOGTAG, "clearMatches"); + if (TRACE) Log.d(LOGTAG, "clearMatches"); mProvider.clearMatches(); } @@ -1707,7 +1713,7 @@ public class WebView extends AbsoluteLayout @Deprecated public void setPictureListener(PictureListener listener) { checkThread(); - if (DebugFlags.TRACE_API) Log.d(LOGTAG, "setPictureListener=" + listener); + if (TRACE) Log.d(LOGTAG, "setPictureListener=" + listener); mProvider.setPictureListener(listener); } @@ -1764,7 +1770,7 @@ public class WebView extends AbsoluteLayout */ public void addJavascriptInterface(Object object, String name) { checkThread(); - if (DebugFlags.TRACE_API) Log.d(LOGTAG, "addJavascriptInterface=" + name); + if (TRACE) Log.d(LOGTAG, "addJavascriptInterface=" + name); mProvider.addJavascriptInterface(object, name); } @@ -1777,7 +1783,7 @@ public class WebView extends AbsoluteLayout */ public void removeJavascriptInterface(String name) { checkThread(); - if (DebugFlags.TRACE_API) Log.d(LOGTAG, "removeJavascriptInterface=" + name); + if (TRACE) Log.d(LOGTAG, "removeJavascriptInterface=" + name); mProvider.removeJavascriptInterface(name); } @@ -1881,7 +1887,7 @@ public class WebView extends AbsoluteLayout public void flingScroll(int vx, int vy) { checkThread(); - if (DebugFlags.TRACE_API) Log.d(LOGTAG, "flingScroll"); + if (TRACE) Log.d(LOGTAG, "flingScroll"); mProvider.flingScroll(vx, vy); } @@ -2006,6 +2012,7 @@ public class WebView extends AbsoluteLayout * * @hide WebViewProvider is not public API. */ + @SystemApi public WebViewProvider getWebViewProvider() { return mProvider; } @@ -2015,6 +2022,7 @@ public class WebView extends AbsoluteLayout * and fields, and make super-class calls in this WebView instance. * @hide Only for use by WebViewProvider implementations */ + @SystemApi public class PrivateAccess { // ---- Access to super-class methods ---- public int super_getScrollBarStyle() { diff --git a/core/java/android/webkit/WebViewDatabase.java b/core/java/android/webkit/WebViewDatabase.java index 99e0ffb24171..bfea4811c4cc 100644 --- a/core/java/android/webkit/WebViewDatabase.java +++ b/core/java/android/webkit/WebViewDatabase.java @@ -16,6 +16,7 @@ package android.webkit; +import android.annotation.SystemApi; import android.content.Context; /** @@ -28,18 +29,12 @@ import android.content.Context; * <li>Data entered into text fields (e.g. for autocomplete suggestions)</li> * </ul> */ -public class WebViewDatabase { +public abstract class WebViewDatabase { /** * @hide Since API level {@link android.os.Build.VERSION_CODES#JELLY_BEAN_MR1} */ protected static final String LOGTAG = "webviewdatabase"; - /** - * @hide Only for use by WebViewProvider implementations. - */ - protected WebViewDatabase() { - } - public static WebViewDatabase getInstance(Context context) { return WebViewFactory.getProvider().getWebViewDatabase(context); } @@ -54,9 +49,7 @@ public class WebViewDatabase { * @deprecated Saving passwords in WebView will not be supported in future versions. */ @Deprecated - public boolean hasUsernamePassword() { - throw new MustOverrideException(); - } + public abstract boolean hasUsernamePassword(); /** * Clears any saved username/password pairs for web forms. @@ -67,9 +60,7 @@ public class WebViewDatabase { * @deprecated Saving passwords in WebView will not be supported in future versions. */ @Deprecated - public void clearUsernamePassword() { - throw new MustOverrideException(); - } + public abstract void clearUsernamePassword(); /** * Gets whether there are any saved credentials for HTTP authentication. @@ -79,9 +70,7 @@ public class WebViewDatabase { * @see WebView#setHttpAuthUsernamePassword * @see #clearHttpAuthUsernamePassword */ - public boolean hasHttpAuthUsernamePassword() { - throw new MustOverrideException(); - } + public abstract boolean hasHttpAuthUsernamePassword(); /** * Clears any saved credentials for HTTP authentication. @@ -90,9 +79,7 @@ public class WebViewDatabase { * @see WebView#setHttpAuthUsernamePassword * @see #hasHttpAuthUsernamePassword */ - public void clearHttpAuthUsernamePassword() { - throw new MustOverrideException(); - } + public abstract void clearHttpAuthUsernamePassword(); /** * Gets whether there is any saved data for web forms. @@ -100,16 +87,12 @@ public class WebViewDatabase { * @return whether there is any saved data for web forms * @see #clearFormData */ - public boolean hasFormData() { - throw new MustOverrideException(); - } + public abstract boolean hasFormData(); /** * Clears any saved data for web forms. * * @see #hasFormData */ - public void clearFormData() { - throw new MustOverrideException(); - } + public abstract void clearFormData(); } diff --git a/core/java/android/webkit/WebViewDelegate.java b/core/java/android/webkit/WebViewDelegate.java new file mode 100644 index 000000000000..3dcfda333398 --- /dev/null +++ b/core/java/android/webkit/WebViewDelegate.java @@ -0,0 +1,163 @@ +/* + * 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.webkit; + +import android.annotation.SystemApi; +import android.app.ActivityThread; +import android.app.Application; +import android.content.Context; +import android.content.res.Resources; +import android.graphics.Canvas; +import android.net.http.ErrorStrings; +import android.os.SystemProperties; +import android.os.Trace; +import android.util.SparseArray; +import android.view.HardwareCanvas; +import android.view.View; +import android.view.ViewRootImpl; + +/** + * Delegate used by the WebView provider implementation to access + * the required framework functionality needed to implement a {@link WebView}. + * + * @hide + */ +@SystemApi +public final class WebViewDelegate { + + /* package */ WebViewDelegate() { } + + /** + * Listener that gets notified whenever tracing has been enabled/disabled. + */ + public interface OnTraceEnabledChangeListener { + void onTraceEnabledChange(boolean enabled); + } + + /** + * Register a callback to be invoked when tracing for the WebView component has been + * enabled/disabled. + */ + public void setOnTraceEnabledChangeListener(final OnTraceEnabledChangeListener listener) { + SystemProperties.addChangeCallback(new Runnable() { + @Override + public void run() { + listener.onTraceEnabledChange(isTraceTagEnabled()); + } + }); + } + + /** + * Returns true if the WebView trace tag is enabled and false otherwise. + */ + public boolean isTraceTagEnabled() { + return Trace.isTagEnabled(Trace.TRACE_TAG_WEBVIEW); + } + + /** + * Returns true if the draw GL functor can be invoked (see {@link #invokeDrawGlFunctor}) + * and false otherwise. + */ + public boolean canInvokeDrawGlFunctor(View containerView) { + ViewRootImpl viewRootImpl = containerView.getViewRootImpl(); + // viewRootImpl can be null during teardown when window is leaked. + return viewRootImpl != null; + } + + /** + * Invokes the draw GL functor. If waitForCompletion is false the functor + * may be invoked asynchronously. + * + * @param nativeDrawGLFunctor the pointer to the native functor that implements + * system/core/include/utils/Functor.h + */ + public void invokeDrawGlFunctor(View containerView, long nativeDrawGLFunctor, + boolean waitForCompletion) { + ViewRootImpl viewRootImpl = containerView.getViewRootImpl(); + viewRootImpl.invokeFunctor(nativeDrawGLFunctor, waitForCompletion); + } + + /** + * Calls the function specified with the nativeDrawGLFunctor functor pointer. This + * functionality is used by the WebView for calling into their renderer from the + * framework display lists. + * + * @param canvas a hardware accelerated canvas (see {@link Canvas#isHardwareAccelerated()}) + * @param nativeDrawGLFunctor the pointer to the native functor that implements + * system/core/include/utils/Functor.h + * @throws IllegalArgumentException if the canvas is not hardware accelerated + */ + public void callDrawGlFunction(Canvas canvas, long nativeDrawGLFunctor) { + if (!(canvas instanceof HardwareCanvas)) { + // Canvas#isHardwareAccelerated() is only true for subclasses of HardwareCanvas. + throw new IllegalArgumentException(canvas.getClass().getName() + + " is not hardware accelerated"); + } + ((HardwareCanvas) canvas).callDrawGLFunction(nativeDrawGLFunctor); + } + + /** + * Detaches the draw GL functor. + * + * @param nativeDrawGLFunctor the pointer to the native functor that implements + * system/core/include/utils/Functor.h + */ + public void detachDrawGlFunctor(View containerView, long nativeDrawGLFunctor) { + ViewRootImpl viewRootImpl = containerView.getViewRootImpl(); + if (nativeDrawGLFunctor != 0 && viewRootImpl != null) { + viewRootImpl.detachFunctor(nativeDrawGLFunctor); + } + } + + /** + * Returns the package id of the given {@code packageName}. + */ + public int getPackageId(Resources resources, String packageName) { + SparseArray<String> packageIdentifiers = + resources.getAssets().getAssignedPackageIdentifiers(); + for (int i = 0; i < packageIdentifiers.size(); i++) { + final String name = packageIdentifiers.valueAt(i); + + if (packageName.equals(name)) { + return packageIdentifiers.keyAt(i); + } + } + throw new RuntimeException("Package not found: " + packageName); + } + + /** + * Returns the application which is embedding the WebView. + */ + public Application getApplication() { + return ActivityThread.currentApplication(); + } + + /** + * Returns the error string for the given {@code errorCode}. + */ + public String getErrorString(Context context, int errorCode) { + return ErrorStrings.getString(errorCode, context); + } + + /** + * Adds the WebView asset path to {@link AssetManager}. + */ + public void addWebViewAssetPath(Context context) { + context.getAssets().addAssetPath( + WebViewFactory.getLoadedPackageInfo().applicationInfo.sourceDir); + } +} diff --git a/core/java/android/webkit/WebViewFactory.java b/core/java/android/webkit/WebViewFactory.java index c7ffedc1e0f9..474ef422d006 100644 --- a/core/java/android/webkit/WebViewFactory.java +++ b/core/java/android/webkit/WebViewFactory.java @@ -16,9 +16,10 @@ package android.webkit; +import android.annotation.SystemApi; import android.app.ActivityManagerInternal; -import android.app.Application; import android.app.AppGlobals; +import android.app.Application; import android.content.Context; import android.content.pm.ApplicationInfo; import android.content.pm.PackageInfo; @@ -33,19 +34,20 @@ import android.os.Trace; import android.text.TextUtils; import android.util.AndroidRuntimeException; import android.util.Log; + import com.android.server.LocalServices; + import dalvik.system.VMRuntime; import java.io.File; import java.util.Arrays; -import com.android.internal.os.Zygote; - /** * Top level factory, used creating all the main WebView implementation classes. * * @hide */ +@SystemApi public final class WebViewFactory { private static final String CHROMIUM_WEBVIEW_FACTORY = @@ -89,6 +91,12 @@ public final class WebViewFactory { // us honest and minimize usage of WebView internals when binding the proxy. if (sProviderInstance != null) return sProviderInstance; + final int uid = android.os.Process.myUid(); + if (uid == android.os.Process.ROOT_UID || uid == android.os.Process.SYSTEM_UID) { + throw new UnsupportedOperationException( + "For security reasons, WebView is not allowed in privileged processes"); + } + Trace.traceBegin(Trace.TRACE_TAG_WEBVIEW, "WebViewFactory.getProvider()"); try { Trace.traceBegin(Trace.TRACE_TAG_WEBVIEW, "WebViewFactory.loadNativeLibrary()"); @@ -109,7 +117,12 @@ public final class WebViewFactory { StrictMode.ThreadPolicy oldPolicy = StrictMode.allowThreadDiskReads(); Trace.traceBegin(Trace.TRACE_TAG_WEBVIEW, "providerClass.newInstance()"); try { - sProviderInstance = providerClass.newInstance(); + try { + sProviderInstance = providerClass.getConstructor(WebViewDelegate.class) + .newInstance(new WebViewDelegate()); + } catch (Exception e) { + sProviderInstance = providerClass.newInstance(); + } if (DEBUG) Log.v(LOGTAG, "Loaded provider: " + sProviderInstance); return sProviderInstance; } catch (Exception e) { diff --git a/core/java/android/webkit/WebViewFactoryProvider.java b/core/java/android/webkit/WebViewFactoryProvider.java index d37d217ae099..91053940f3cd 100644 --- a/core/java/android/webkit/WebViewFactoryProvider.java +++ b/core/java/android/webkit/WebViewFactoryProvider.java @@ -16,6 +16,7 @@ package android.webkit; +import android.annotation.SystemApi; import android.content.Context; import android.content.Intent; import android.net.Uri; @@ -26,6 +27,7 @@ import android.net.Uri; * implementation of this interface, and make it available to the WebView via mechanism TBD. * @hide */ +@SystemApi public interface WebViewFactoryProvider { /** * This Interface provides glue for implementing the backend of WebView static methods which diff --git a/core/java/android/webkit/WebViewProvider.java b/core/java/android/webkit/WebViewProvider.java index fe18138892ad..2aee57b4a63a 100644 --- a/core/java/android/webkit/WebViewProvider.java +++ b/core/java/android/webkit/WebViewProvider.java @@ -16,6 +16,7 @@ package android.webkit; +import android.annotation.SystemApi; import android.content.res.Configuration; import android.graphics.Bitmap; import android.graphics.Canvas; @@ -53,6 +54,7 @@ import java.util.Map; * * @hide Not part of the public API; only required by system implementors. */ +@SystemApi public interface WebViewProvider { //------------------------------------------------------------------------- // Main interface for backend provider of the WebView class. diff --git a/core/java/android/widget/AutoCompleteTextView.java b/core/java/android/widget/AutoCompleteTextView.java index 3b16aba010e0..e6392b9d3a75 100644 --- a/core/java/android/widget/AutoCompleteTextView.java +++ b/core/java/android/widget/AutoCompleteTextView.java @@ -1005,6 +1005,12 @@ public class AutoCompleteTextView extends EditText implements Filter.FilterListe @Override protected void onFocusChanged(boolean focused, int direction, Rect previouslyFocusedRect) { super.onFocusChanged(focused, direction, previouslyFocusedRect); + + if (mTemporaryDetach) { + // If we are temporarily in the detach state, then do nothing. + return; + } + // Perform validation if the view is losing focus. if (!focused) { performValidation(); diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java index 0917b32e89d4..bc8b53553cb9 100644 --- a/core/java/android/widget/TextView.java +++ b/core/java/android/widget/TextView.java @@ -287,9 +287,11 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener private int mCurTextColor; private int mCurHintTextColor; private boolean mFreezesText; - private boolean mTemporaryDetach; private boolean mDispatchTemporaryDetach; + /** Whether this view is temporarily detached from the parent view. */ + boolean mTemporaryDetach; + private Editable.Factory mEditableFactory = Editable.Factory.getInstance(); private Spannable.Factory mSpannableFactory = Spannable.Factory.getInstance(); @@ -3632,9 +3634,11 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener } if (mHintTextColor != null) { color = mHintTextColor.getColorForState(getDrawableState(), 0); - if (color != mCurHintTextColor && mText.length() == 0) { + if (color != mCurHintTextColor) { mCurHintTextColor = color; - inval = true; + if (mText.length() == 0) { + inval = true; + } } } if (inval) { @@ -5368,9 +5372,13 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener final int vspace = mBottom - mTop - compoundPaddingBottom - compoundPaddingTop; final int maxScrollY = mLayout.getHeight() - vspace; + // Add sufficient space for cursor and tone marks + int cursorWidth = 2 + (int)mTextPaint.density; // adequate for Material cursors + int fudgedPaddingRight = Math.max(0, compoundPaddingRight - (cursorWidth - 1)); + float clipLeft = compoundPaddingLeft + scrollX; float clipTop = (scrollY == 0) ? 0 : extendedPaddingTop + scrollY; - float clipRight = right - left - compoundPaddingRight + scrollX; + float clipRight = right - left - fudgedPaddingRight + scrollX; float clipBottom = bottom - top + scrollY - ((scrollY == maxScrollY) ? 0 : extendedPaddingBottom); diff --git a/core/java/com/android/internal/app/ProcessStats.java b/core/java/com/android/internal/app/ProcessStats.java index e3e5647f891b..1b254866d2ac 100644 --- a/core/java/com/android/internal/app/ProcessStats.java +++ b/core/java/com/android/internal/app/ProcessStats.java @@ -2746,6 +2746,7 @@ public final class ProcessStats implements Parcelable { pw.print("total"); dumpAdjTimesCheckin(pw, ",", mMemFactorDurations, mMemFactor, mStartTime, now); + pw.println(); if (mSysMemUsageTable != null) { pw.print("sysmemusage"); for (int i=0; i<mSysMemUsageTableSize; i++) { diff --git a/core/java/com/android/internal/app/ResolverActivity.java b/core/java/com/android/internal/app/ResolverActivity.java index 376db6e821f3..2db466aa7889 100644 --- a/core/java/com/android/internal/app/ResolverActivity.java +++ b/core/java/com/android/internal/app/ResolverActivity.java @@ -840,7 +840,7 @@ public class ResolverActivity extends Activity implements AdapterView.OnItemClic } if (N > 1) { Comparator<ResolveInfo> rComparator = - new ResolverComparator(ResolverActivity.this); + new ResolverComparator(ResolverActivity.this, mIntent); Collections.sort(currentResolveList, rComparator); } // First put the initial items at the top. @@ -1093,11 +1093,20 @@ public class ResolverActivity extends Activity implements AdapterView.OnItemClic } } + static final boolean isSpecificUriMatch(int match) { + match = match&IntentFilter.MATCH_CATEGORY_MASK; + return match >= IntentFilter.MATCH_CATEGORY_HOST + && match <= IntentFilter.MATCH_CATEGORY_PATH; + } + class ResolverComparator implements Comparator<ResolveInfo> { private final Collator mCollator; + private final boolean mHttp; - public ResolverComparator(Context context) { + public ResolverComparator(Context context, Intent intent) { mCollator = Collator.getInstance(context.getResources().getConfiguration().locale); + String scheme = intent.getScheme(); + mHttp = "http".equals(scheme) || "https".equals(scheme); } @Override @@ -1107,6 +1116,17 @@ public class ResolverActivity extends Activity implements AdapterView.OnItemClic return 1; } + if (mHttp) { + // Special case: we want filters that match URI paths/schemes to be + // ordered before others. This is for the case when opening URIs, + // to make native apps go above browsers. + final boolean lhsSpecific = isSpecificUriMatch(lhs.match); + final boolean rhsSpecific = isSpecificUriMatch(rhs.match); + if (lhsSpecific != rhsSpecific) { + return lhsSpecific ? -1 : 1; + } + } + if (mStats != null) { final long timeDiff = getPackageTimeSpent(rhs.activityInfo.packageName) - diff --git a/core/java/com/android/internal/backup/LocalTransport.java b/core/java/com/android/internal/backup/LocalTransport.java index d8dffe099c9b..044383e9f2b6 100644 --- a/core/java/com/android/internal/backup/LocalTransport.java +++ b/core/java/com/android/internal/backup/LocalTransport.java @@ -35,6 +35,8 @@ import android.util.Log; import com.android.org.bouncycastle.util.encoders.Base64; +import libcore.io.IoUtils; + import java.io.BufferedOutputStream; import java.io.File; import java.io.FileInputStream; @@ -559,11 +561,7 @@ public class LocalTransport extends BackupTransport { // Full restore handling private void resetFullRestoreState() { - try { - mCurFullRestoreStream.close(); - } catch (IOException e) { - Log.w(TAG, "Unable to close full restore input stream"); - } + IoUtils.closeQuietly(mCurFullRestoreStream); mCurFullRestoreStream = null; mFullRestoreSocketStream = null; mFullRestoreBuffer = null; diff --git a/core/java/com/android/internal/os/ZygoteInit.java b/core/java/com/android/internal/os/ZygoteInit.java index 4dde217460a2..d95cf71043be 100644 --- a/core/java/com/android/internal/os/ZygoteInit.java +++ b/core/java/com/android/internal/os/ZygoteInit.java @@ -45,6 +45,8 @@ import libcore.io.IoUtils; import java.io.BufferedReader; import java.io.FileDescriptor; +import java.io.FileInputStream; +import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; @@ -97,9 +99,9 @@ public class ZygoteInit { static final int GC_LOOP_COUNT = 10; /** - * The name of a resource file that contains classes to preload. + * The path of a file that contains classes to preload. */ - private static final String PRELOADED_CLASSES = "preloaded-classes"; + private static final String PRELOADED_CLASSES = "/system/etc/preloaded-classes"; /** Controls whether we should preload resources during zygote init. */ private static final boolean PRELOAD_RESOURCES = true; @@ -284,90 +286,92 @@ public class ZygoteInit { private static void preloadClasses() { final VMRuntime runtime = VMRuntime.getRuntime(); - InputStream is = ClassLoader.getSystemClassLoader().getResourceAsStream( - PRELOADED_CLASSES); - if (is == null) { + InputStream is; + try { + is = new FileInputStream(PRELOADED_CLASSES); + } catch (FileNotFoundException e) { Log.e(TAG, "Couldn't find " + PRELOADED_CLASSES + "."); - } else { - Log.i(TAG, "Preloading classes..."); - long startTime = SystemClock.uptimeMillis(); + return; + } - // Drop root perms while running static initializers. - setEffectiveGroup(UNPRIVILEGED_GID); - setEffectiveUser(UNPRIVILEGED_UID); + Log.i(TAG, "Preloading classes..."); + long startTime = SystemClock.uptimeMillis(); - // Alter the target heap utilization. With explicit GCs this - // is not likely to have any effect. - float defaultUtilization = runtime.getTargetHeapUtilization(); - runtime.setTargetHeapUtilization(0.8f); + // Drop root perms while running static initializers. + setEffectiveGroup(UNPRIVILEGED_GID); + setEffectiveUser(UNPRIVILEGED_UID); - // Start with a clean slate. - System.gc(); - runtime.runFinalizationSync(); - Debug.startAllocCounting(); + // Alter the target heap utilization. With explicit GCs this + // is not likely to have any effect. + float defaultUtilization = runtime.getTargetHeapUtilization(); + runtime.setTargetHeapUtilization(0.8f); - try { - BufferedReader br - = new BufferedReader(new InputStreamReader(is), 256); - - int count = 0; - String line; - while ((line = br.readLine()) != null) { - // Skip comments and blank lines. - line = line.trim(); - if (line.startsWith("#") || line.equals("")) { - continue; - } + // Start with a clean slate. + System.gc(); + runtime.runFinalizationSync(); + Debug.startAllocCounting(); + + try { + BufferedReader br + = new BufferedReader(new InputStreamReader(is), 256); + + int count = 0; + String line; + while ((line = br.readLine()) != null) { + // Skip comments and blank lines. + line = line.trim(); + if (line.startsWith("#") || line.equals("")) { + continue; + } - try { + try { + if (false) { + Log.v(TAG, "Preloading " + line + "..."); + } + Class.forName(line); + if (Debug.getGlobalAllocSize() > PRELOAD_GC_THRESHOLD) { if (false) { - Log.v(TAG, "Preloading " + line + "..."); - } - Class.forName(line); - if (Debug.getGlobalAllocSize() > PRELOAD_GC_THRESHOLD) { - if (false) { - Log.v(TAG, - " GC at " + Debug.getGlobalAllocSize()); - } - System.gc(); - runtime.runFinalizationSync(); - Debug.resetGlobalAllocSize(); + Log.v(TAG, + " GC at " + Debug.getGlobalAllocSize()); } - count++; - } catch (ClassNotFoundException e) { - Log.w(TAG, "Class not found for preloading: " + line); - } catch (UnsatisfiedLinkError e) { - Log.w(TAG, "Problem preloading " + line + ": " + e); - } catch (Throwable t) { - Log.e(TAG, "Error preloading " + line + ".", t); - if (t instanceof Error) { - throw (Error) t; - } - if (t instanceof RuntimeException) { - throw (RuntimeException) t; - } - throw new RuntimeException(t); + System.gc(); + runtime.runFinalizationSync(); + Debug.resetGlobalAllocSize(); + } + count++; + } catch (ClassNotFoundException e) { + Log.w(TAG, "Class not found for preloading: " + line); + } catch (UnsatisfiedLinkError e) { + Log.w(TAG, "Problem preloading " + line + ": " + e); + } catch (Throwable t) { + Log.e(TAG, "Error preloading " + line + ".", t); + if (t instanceof Error) { + throw (Error) t; } + if (t instanceof RuntimeException) { + throw (RuntimeException) t; + } + throw new RuntimeException(t); } + } - Log.i(TAG, "...preloaded " + count + " classes in " - + (SystemClock.uptimeMillis()-startTime) + "ms."); - } catch (IOException e) { - Log.e(TAG, "Error reading " + PRELOADED_CLASSES + ".", e); - } finally { - IoUtils.closeQuietly(is); - // Restore default. - runtime.setTargetHeapUtilization(defaultUtilization); + Log.i(TAG, "...preloaded " + count + " classes in " + + (SystemClock.uptimeMillis()-startTime) + "ms."); + } catch (IOException e) { + Log.e(TAG, "Error reading " + PRELOADED_CLASSES + ".", e); + } finally { + IoUtils.closeQuietly(is); + // Restore default. + runtime.setTargetHeapUtilization(defaultUtilization); - // Fill in dex caches with classes, fields, and methods brought in by preloading. - runtime.preloadDexCaches(); + // Fill in dex caches with classes, fields, and methods brought in by preloading. + runtime.preloadDexCaches(); - Debug.stopAllocCounting(); + Debug.stopAllocCounting(); - // Bring back root. We'll need it later. - setEffectiveUser(ROOT_UID); - setEffectiveGroup(ROOT_GID); - } + // Bring back root. We'll need it later. + setEffectiveUser(ROOT_UID); + setEffectiveGroup(ROOT_GID); } } diff --git a/core/jni/AndroidRuntime.cpp b/core/jni/AndroidRuntime.cpp index 4d178779e32d..c5f1d88f535d 100644 --- a/core/jni/AndroidRuntime.cpp +++ b/core/jni/AndroidRuntime.cpp @@ -356,6 +356,15 @@ static int hasDir(const char* dir) return 0; } +static bool hasFile(const char* file) { + struct stat s; + int res = stat(file, &s); + if (res == 0) { + return S_ISREG(s.st_mode); + } + return false; +} + /* * Read the persistent locale. */ @@ -768,10 +777,16 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv) parseCompilerOption("dalvik.vm.image-dex2oat-filter", dex2oatImageCompilerFilterBuf, "--compiler-filter=", "-Ximage-compiler-option"); } + + // Make sure there is a preloaded-classes file. + if (!hasFile("/system/etc/preloaded-classes")) { + ALOGE("Missing preloaded-classes file, /system/etc/preloaded-classes not found: %s\n", + strerror(errno)); + goto bail; + } addOption("-Ximage-compiler-option"); - addOption("--image-classes-zip=/system/framework/framework.jar"); - addOption("-Ximage-compiler-option"); - addOption("--image-classes=preloaded-classes"); + addOption("--image-classes=/system/etc/preloaded-classes"); + property_get("dalvik.vm.image-dex2oat-flags", dex2oatImageFlagsBuf, ""); parseExtraOpts(dex2oatImageFlagsBuf, "-Ximage-compiler-option"); diff --git a/core/jni/android_hardware_camera2_DngCreator.cpp b/core/jni/android_hardware_camera2_DngCreator.cpp index 31c7b9f33658..533313a67806 100644 --- a/core/jni/android_hardware_camera2_DngCreator.cpp +++ b/core/jni/android_hardware_camera2_DngCreator.cpp @@ -1278,7 +1278,7 @@ static void DngCreator_init(JNIEnv* env, jobject thiz, jobject characteristicsPt } BAIL_IF_INVALID(writer->addEntry(TAG_CAMERACALIBRATION2, entry2.count, - calibrationTransform1, TIFF_IFD_0), env, TAG_CAMERACALIBRATION2, writer); + calibrationTransform2, TIFF_IFD_0), env, TAG_CAMERACALIBRATION2, writer); } } diff --git a/core/jni/android_media_AudioRecord.cpp b/core/jni/android_media_AudioRecord.cpp index e38f3d42a50b..d2eb8dd60086 100644 --- a/core/jni/android_media_AudioRecord.cpp +++ b/core/jni/android_media_AudioRecord.cpp @@ -431,7 +431,7 @@ static jint android_media_AudioRecord_readInShortArray(JNIEnv *env, jobject thi // read the new audio data from the native AudioRecord object const size_t recorderBuffSize = lpRecorder->frameCount()*lpRecorder->frameSize(); const size_t sizeInBytes = sizeInShorts * sizeof(short); - ssize_t readSize = lpRecorder->read(recordBuff + offsetInShorts * sizeof(short), + ssize_t readSize = lpRecorder->read(recordBuff + offsetInShorts, sizeInBytes > recorderBuffSize ? recorderBuffSize : sizeInBytes); diff --git a/core/jni/android_media_AudioSystem.cpp b/core/jni/android_media_AudioSystem.cpp index f09928979be4..4b4b367794c2 100644 --- a/core/jni/android_media_AudioSystem.cpp +++ b/core/jni/android_media_AudioSystem.cpp @@ -160,6 +160,9 @@ JNIAudioPortCallback::~JNIAudioPortCallback() { // remove global references JNIEnv *env = AndroidRuntime::getJNIEnv(); + if (env == NULL) { + return; + } env->DeleteGlobalRef(mObject); env->DeleteGlobalRef(mClass); } @@ -167,7 +170,9 @@ JNIAudioPortCallback::~JNIAudioPortCallback() void JNIAudioPortCallback::sendEvent(int event) { JNIEnv *env = AndroidRuntime::getJNIEnv(); - + if (env == NULL) { + return; + } env->CallStaticVoidMethod(mClass, gPostEventFromNative, mObject, event, 0, 0, NULL); if (env->ExceptionCheck()) { diff --git a/core/jni/android_os_Parcel.cpp b/core/jni/android_os_Parcel.cpp index 44863cc7ef4c..960acc070857 100644 --- a/core/jni/android_os_Parcel.cpp +++ b/core/jni/android_os_Parcel.cpp @@ -688,6 +688,16 @@ static void android_os_Parcel_enforceInterface(JNIEnv* env, jclass clazz, jlong "Binder invocation to an incorrect interface"); } +static jlong android_os_Parcel_getGlobalAllocSize(JNIEnv* env, jclass clazz) +{ + return Parcel::getGlobalAllocSize(); +} + +static jlong android_os_Parcel_getGlobalAllocCount(JNIEnv* env, jclass clazz) +{ + return Parcel::getGlobalAllocCount(); +} + // ---------------------------------------------------------------------------- static const JNINativeMethod gParcelMethods[] = { @@ -737,6 +747,9 @@ static const JNINativeMethod gParcelMethods[] = { {"nativeHasFileDescriptors", "(J)Z", (void*)android_os_Parcel_hasFileDescriptors}, {"nativeWriteInterfaceToken", "(JLjava/lang/String;)V", (void*)android_os_Parcel_writeInterfaceToken}, {"nativeEnforceInterface", "(JLjava/lang/String;)V", (void*)android_os_Parcel_enforceInterface}, + + {"getGlobalAllocSize", "()J", (void*)android_os_Parcel_getGlobalAllocSize}, + {"getGlobalAllocCount", "()J", (void*)android_os_Parcel_getGlobalAllocCount}, }; const char* const kParcelPathName = "android/os/Parcel"; diff --git a/core/jni/android_util_AssetManager.cpp b/core/jni/android_util_AssetManager.cpp index 94098c91880c..fba7255c0e95 100644 --- a/core/jni/android_util_AssetManager.cpp +++ b/core/jni/android_util_AssetManager.cpp @@ -33,6 +33,7 @@ #include <androidfw/Asset.h> #include <androidfw/AssetManager.h> +#include <androidfw/AttributeFinder.h> #include <androidfw/ResourceTypes.h> #include <private/android_filesystem_config.h> // for AID_SYSTEM @@ -999,6 +1000,30 @@ static void android_content_AssetManager_dumpTheme(JNIEnv* env, jobject clazz, theme->dumpToLog(); } +class XmlAttributeFinder : public BackTrackingAttributeFinder<XmlAttributeFinder, jsize> { +public: + XmlAttributeFinder(const ResXMLParser* parser) + : BackTrackingAttributeFinder(0, parser != NULL ? parser->getAttributeCount() : 0) + , mParser(parser) {} + + inline uint32_t getAttribute(jsize index) const { + return mParser->getAttributeNameResID(index); + } + +private: + const ResXMLParser* mParser; +}; + +class BagAttributeFinder : public BackTrackingAttributeFinder<BagAttributeFinder, const ResTable::bag_entry*> { +public: + BagAttributeFinder(const ResTable::bag_entry* start, const ResTable::bag_entry* end) + : BackTrackingAttributeFinder(start, end) {} + + inline uint32_t getAttribute(const ResTable::bag_entry* entry) const { + return entry->map.name.ident; + } +}; + static jboolean android_content_AssetManager_resolveAttrs(JNIEnv* env, jobject clazz, jlong themeToken, jint defStyleAttr, @@ -1074,13 +1099,13 @@ static jboolean android_content_AssetManager_resolveAttrs(JNIEnv* env, jobject c res.lock(); // Retrieve the default style bag, if requested. - const ResTable::bag_entry* defStyleEnt = NULL; + const ResTable::bag_entry* defStyleStart = NULL; uint32_t defStyleTypeSetFlags = 0; ssize_t bagOff = defStyleRes != 0 - ? res.getBagLocked(defStyleRes, &defStyleEnt, &defStyleTypeSetFlags) : -1; + ? res.getBagLocked(defStyleRes, &defStyleStart, &defStyleTypeSetFlags) : -1; defStyleTypeSetFlags |= defStyleBagTypeSetFlags; - const ResTable::bag_entry* endDefStyleEnt = defStyleEnt + - (bagOff >= 0 ? bagOff : 0);; + const ResTable::bag_entry* const defStyleEnd = defStyleStart + (bagOff >= 0 ? bagOff : 0); + BagAttributeFinder defStyleAttrFinder(defStyleStart, defStyleEnd); // Now iterate through all of the attributes that the client has requested, // filling in each with whatever data we can find. @@ -1108,20 +1133,15 @@ static jboolean android_content_AssetManager_resolveAttrs(JNIEnv* env, jobject c value.dataType, value.data)); } - // Skip through the default style values until the end or the next possible match. - while (defStyleEnt < endDefStyleEnt && curIdent > defStyleEnt->map.name.ident) { - defStyleEnt++; - } - // Retrieve the current default style attribute if it matches, and step to next. - if (defStyleEnt < endDefStyleEnt && curIdent == defStyleEnt->map.name.ident) { - if (value.dataType == Res_value::TYPE_NULL) { - block = defStyleEnt->stringBlock; + if (value.dataType == Res_value::TYPE_NULL) { + const ResTable::bag_entry* const defStyleEntry = defStyleAttrFinder.find(curIdent); + if (defStyleEntry != defStyleEnd) { + block = defStyleEntry->stringBlock; typeSetFlags = defStyleTypeSetFlags; - value = defStyleEnt->map.value; + value = defStyleEntry->map.value; DEBUG_STYLES(ALOGI("-> From def style: type=0x%x, data=0x%08x", value.dataType, value.data)); } - defStyleEnt++; } uint32_t resid = 0; @@ -1284,34 +1304,32 @@ static jboolean android_content_AssetManager_applyStyle(JNIEnv* env, jobject cla res.lock(); // Retrieve the default style bag, if requested. - const ResTable::bag_entry* defStyleEnt = NULL; + const ResTable::bag_entry* defStyleAttrStart = NULL; uint32_t defStyleTypeSetFlags = 0; ssize_t bagOff = defStyleRes != 0 - ? res.getBagLocked(defStyleRes, &defStyleEnt, &defStyleTypeSetFlags) : -1; + ? res.getBagLocked(defStyleRes, &defStyleAttrStart, &defStyleTypeSetFlags) : -1; defStyleTypeSetFlags |= defStyleBagTypeSetFlags; - const ResTable::bag_entry* endDefStyleEnt = defStyleEnt + - (bagOff >= 0 ? bagOff : 0); + const ResTable::bag_entry* const defStyleAttrEnd = defStyleAttrStart + (bagOff >= 0 ? bagOff : 0); + BagAttributeFinder defStyleAttrFinder(defStyleAttrStart, defStyleAttrEnd); // Retrieve the style class bag, if requested. - const ResTable::bag_entry* styleEnt = NULL; + const ResTable::bag_entry* styleAttrStart = NULL; uint32_t styleTypeSetFlags = 0; - bagOff = style != 0 ? res.getBagLocked(style, &styleEnt, &styleTypeSetFlags) : -1; + bagOff = style != 0 ? res.getBagLocked(style, &styleAttrStart, &styleTypeSetFlags) : -1; styleTypeSetFlags |= styleBagTypeSetFlags; - const ResTable::bag_entry* endStyleEnt = styleEnt + - (bagOff >= 0 ? bagOff : 0); + const ResTable::bag_entry* const styleAttrEnd = styleAttrStart + (bagOff >= 0 ? bagOff : 0); + BagAttributeFinder styleAttrFinder(styleAttrStart, styleAttrEnd); // Retrieve the XML attributes, if requested. - const jsize NX = xmlParser ? xmlParser->getAttributeCount() : 0; - jsize ix=0; - uint32_t curXmlAttr = xmlParser ? xmlParser->getAttributeNameResID(ix) : 0; - static const ssize_t kXmlBlock = 0x10000000; + XmlAttributeFinder xmlAttrFinder(xmlParser); + const jsize xmlAttrEnd = xmlParser != NULL ? xmlParser->getAttributeCount() : 0; // Now iterate through all of the attributes that the client has requested, // filling in each with whatever data we can find. ssize_t block = 0; uint32_t typeSetFlags; - for (jsize ii=0; ii<NI; ii++) { + for (jsize ii = 0; ii < NI; ii++) { const uint32_t curIdent = (uint32_t)src[ii]; DEBUG_STYLES(ALOGI("RETRIEVING ATTR 0x%08x...", curIdent)); @@ -1324,51 +1342,40 @@ static jboolean android_content_AssetManager_applyStyle(JNIEnv* env, jobject cla typeSetFlags = 0; config.density = 0; - // Skip through XML attributes until the end or the next possible match. - while (ix < NX && curIdent > curXmlAttr) { - ix++; - curXmlAttr = xmlParser->getAttributeNameResID(ix); - } - // Retrieve the current XML attribute if it matches, and step to next. - if (ix < NX && curIdent == curXmlAttr) { + // Walk through the xml attributes looking for the requested attribute. + const jsize xmlAttrIdx = xmlAttrFinder.find(curIdent); + if (xmlAttrIdx != xmlAttrEnd) { + // We found the attribute we were looking for. block = kXmlBlock; - xmlParser->getAttributeValue(ix, &value); - ix++; - curXmlAttr = xmlParser->getAttributeNameResID(ix); + xmlParser->getAttributeValue(xmlAttrIdx, &value); DEBUG_STYLES(ALOGI("-> From XML: type=0x%x, data=0x%08x", value.dataType, value.data)); } - // Skip through the style values until the end or the next possible match. - while (styleEnt < endStyleEnt && curIdent > styleEnt->map.name.ident) { - styleEnt++; - } - // Retrieve the current style attribute if it matches, and step to next. - if (styleEnt < endStyleEnt && curIdent == styleEnt->map.name.ident) { - if (value.dataType == Res_value::TYPE_NULL) { - block = styleEnt->stringBlock; + if (value.dataType == Res_value::TYPE_NULL) { + // Walk through the style class values looking for the requested attribute. + const ResTable::bag_entry* const styleAttrEntry = styleAttrFinder.find(curIdent); + if (styleAttrEntry != styleAttrEnd) { + // We found the attribute we were looking for. + block = styleAttrEntry->stringBlock; typeSetFlags = styleTypeSetFlags; - value = styleEnt->map.value; + value = styleAttrEntry->map.value; DEBUG_STYLES(ALOGI("-> From style: type=0x%x, data=0x%08x", value.dataType, value.data)); } - styleEnt++; } - // Skip through the default style values until the end or the next possible match. - while (defStyleEnt < endDefStyleEnt && curIdent > defStyleEnt->map.name.ident) { - defStyleEnt++; - } - // Retrieve the current default style attribute if it matches, and step to next. - if (defStyleEnt < endDefStyleEnt && curIdent == defStyleEnt->map.name.ident) { - if (value.dataType == Res_value::TYPE_NULL) { - block = defStyleEnt->stringBlock; - typeSetFlags = defStyleTypeSetFlags; - value = defStyleEnt->map.value; + if (value.dataType == Res_value::TYPE_NULL) { + // Walk through the default style values looking for the requested attribute. + const ResTable::bag_entry* const defStyleAttrEntry = defStyleAttrFinder.find(curIdent); + if (defStyleAttrEntry != defStyleAttrEnd) { + // We found the attribute we were looking for. + block = defStyleAttrEntry->stringBlock; + typeSetFlags = styleTypeSetFlags; + value = defStyleAttrEntry->map.value; DEBUG_STYLES(ALOGI("-> From def style: type=0x%x, data=0x%08x", value.dataType, value.data)); } - defStyleEnt++; } uint32_t resid = 0; @@ -1376,7 +1383,9 @@ static jboolean android_content_AssetManager_applyStyle(JNIEnv* env, jobject cla // Take care of resolving the found resource to its final value. ssize_t newBlock = theme->resolveAttributeReference(&value, block, &resid, &typeSetFlags, &config); - if (newBlock >= 0) block = newBlock; + if (newBlock >= 0) { + block = newBlock; + } DEBUG_STYLES(ALOGI("-> Resolved attr: type=0x%x, data=0x%08x", value.dataType, value.data)); } else { @@ -1394,7 +1403,9 @@ static jboolean android_content_AssetManager_applyStyle(JNIEnv* env, jobject cla return JNI_FALSE; } #endif - if (newBlock >= 0) block = newBlock; + if (newBlock >= 0) { + block = newBlock; + } DEBUG_STYLES(ALOGI("-> Resolved theme: type=0x%x, data=0x%08x", value.dataType, value.data)); } @@ -1414,8 +1425,8 @@ static jboolean android_content_AssetManager_applyStyle(JNIEnv* env, jobject cla // Write the final value back to Java. dest[STYLE_TYPE] = value.dataType; dest[STYLE_DATA] = value.data; - dest[STYLE_ASSET_COOKIE] = - block != kXmlBlock ? reinterpret_cast<jint>(res.getTableCookie(block)) : (jint)-1; + dest[STYLE_ASSET_COOKIE] = block != kXmlBlock ? + static_cast<jint>(res.getTableCookie(block)) : -1; dest[STYLE_RESOURCE_ID] = resid; dest[STYLE_CHANGING_CONFIGURATIONS] = typeSetFlags; dest[STYLE_DENSITY] = config.density; diff --git a/core/jni/android_view_GLES20Canvas.cpp b/core/jni/android_view_GLES20Canvas.cpp index b023ebdce5b5..fe64aba3c3d3 100644 --- a/core/jni/android_view_GLES20Canvas.cpp +++ b/core/jni/android_view_GLES20Canvas.cpp @@ -172,6 +172,12 @@ static jint android_view_GLES20Canvas_getMaxTextureHeight(JNIEnv* env, jobject c return Caches::getInstance().maxTextureSize; } +static void android_view_GLES20Canvas_setOverrideXfermode(JNIEnv* env, jobject clazz, + jlong rendererPtr, int xfermode) { + DisplayListRenderer* renderer = reinterpret_cast<DisplayListRenderer*>(rendererPtr); + renderer->setOverrideXfermode(xfermode); +} + // ---------------------------------------------------------------------------- // State // ---------------------------------------------------------------------------- @@ -964,6 +970,8 @@ static JNINativeMethod gMethods[] = { { "nGetMaximumTextureWidth", "()I", (void*) android_view_GLES20Canvas_getMaxTextureWidth }, { "nGetMaximumTextureHeight", "()I", (void*) android_view_GLES20Canvas_getMaxTextureHeight }, + { "nSetOverrideXfermode", "(JI)V", (void*) android_view_GLES20Canvas_setOverrideXfermode }, + #endif }; diff --git a/core/jni/android_view_Surface.cpp b/core/jni/android_view_Surface.cpp index a0b2ca830b65..a39ff8eb6511 100644 --- a/core/jni/android_view_Surface.cpp +++ b/core/jni/android_view_Surface.cpp @@ -357,6 +357,22 @@ static void nativeWriteToParcel(JNIEnv* env, jclass clazz, parcel->writeStrongBinder( self != 0 ? self->getIGraphicBufferProducer()->asBinder() : NULL); } +static jint nativeGetWidth(JNIEnv* env, jclass clazz, jlong nativeObject) { + Surface* surface = reinterpret_cast<Surface*>(nativeObject); + ANativeWindow* anw = static_cast<ANativeWindow*>(surface); + int value = 0; + anw->query(anw, NATIVE_WINDOW_WIDTH, &value); + return value; +} + +static jint nativeGetHeight(JNIEnv* env, jclass clazz, jlong nativeObject) { + Surface* surface = reinterpret_cast<Surface*>(nativeObject); + ANativeWindow* anw = static_cast<ANativeWindow*>(surface); + int value = 0; + anw->query(anw, NATIVE_WINDOW_HEIGHT, &value); + return value; +} + namespace uirenderer { using namespace android::uirenderer::renderthread; @@ -426,6 +442,8 @@ static JNINativeMethod gSurfaceMethods[] = { (void*)nativeReadFromParcel }, {"nativeWriteToParcel", "(JLandroid/os/Parcel;)V", (void*)nativeWriteToParcel }, + {"nativeGetWidth", "(J)I", (void*)nativeGetWidth }, + {"nativeGetHeight", "(J)I", (void*)nativeGetHeight }, // HWUI context {"nHwuiCreate", "(JJ)J", (void*) hwui::create }, diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index b03103ed4264..3aaecc7a8424 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -2406,6 +2406,15 @@ android:description="@string/permdesc_controlWifiDisplay" android:protectionLevel="signature" /> + <!-- @SystemApi Allows an application to control VPN. + <p>Not for use by third-party applications.</p> + @hide --> + <permission android:name="android.permission.CONTROL_VPN" + android:label="@string/permlab_controlVpn" + android:description="@string/permdesc_controlVpn" + android:protectionLevel="signature|system" /> + <uses-permission android:name="android.permission.CONTROL_VPN" /> + <!-- @SystemApi Allows an application to capture audio output. <p>Not for use by third-party applications.</p> --> <permission android:name="android.permission.CAPTURE_AUDIO_OUTPUT" @@ -2895,6 +2904,12 @@ android:description="@string/permdesc_removeDrmCertificates" android:protectionLevel="signature|system" /> + <!-- Must be required by a {@link android.service.carriermessaging.CarrierMessagingService}. + Any service that filters for this intent must be a carrier privileged app. --> + <permission android:name="android.permission.BIND_CARRIER_MESSAGING_SERVICE" + android:label="@string/permlab_bindCarrierMessagingService" + android:description="@string/permdesc_bindCarrierMessagingService" /> + <!-- The system process is explicitly the only one allowed to launch the confirmation UI for full backup/restore --> <uses-permission android:name="android.permission.CONFIRM_FULL_BACKUP"/> diff --git a/core/res/res/drawable-hdpi/ic_sim_card_multi_24px_clr.png b/core/res/res/drawable-hdpi/ic_sim_card_multi_24px_clr.png Binary files differnew file mode 100644 index 000000000000..c4a66bbf05c5 --- /dev/null +++ b/core/res/res/drawable-hdpi/ic_sim_card_multi_24px_clr.png diff --git a/core/res/res/drawable-hdpi/ic_sim_card_multi_48px_clr.png b/core/res/res/drawable-hdpi/ic_sim_card_multi_48px_clr.png Binary files differnew file mode 100644 index 000000000000..db901d94912c --- /dev/null +++ b/core/res/res/drawable-hdpi/ic_sim_card_multi_48px_clr.png diff --git a/core/res/res/drawable-mdpi/ic_sim_card_multi_24px_clr.png b/core/res/res/drawable-mdpi/ic_sim_card_multi_24px_clr.png Binary files differnew file mode 100644 index 000000000000..5d212851c168 --- /dev/null +++ b/core/res/res/drawable-mdpi/ic_sim_card_multi_24px_clr.png diff --git a/core/res/res/drawable-mdpi/ic_sim_card_multi_48px_clr.png b/core/res/res/drawable-mdpi/ic_sim_card_multi_48px_clr.png Binary files differnew file mode 100644 index 000000000000..249379dd2c2c --- /dev/null +++ b/core/res/res/drawable-mdpi/ic_sim_card_multi_48px_clr.png diff --git a/core/res/res/drawable-xhdpi/ic_sim_card_multi_24px_clr.png b/core/res/res/drawable-xhdpi/ic_sim_card_multi_24px_clr.png Binary files differnew file mode 100644 index 000000000000..9675e568601b --- /dev/null +++ b/core/res/res/drawable-xhdpi/ic_sim_card_multi_24px_clr.png diff --git a/core/res/res/drawable-xhdpi/ic_sim_card_multi_48px_clr.png b/core/res/res/drawable-xhdpi/ic_sim_card_multi_48px_clr.png Binary files differnew file mode 100644 index 000000000000..a57a0b9f725c --- /dev/null +++ b/core/res/res/drawable-xhdpi/ic_sim_card_multi_48px_clr.png diff --git a/core/res/res/drawable-xxhdpi/ic_sim_card_multi_24px_clr.png b/core/res/res/drawable-xxhdpi/ic_sim_card_multi_24px_clr.png Binary files differnew file mode 100644 index 000000000000..db26fbf95c4e --- /dev/null +++ b/core/res/res/drawable-xxhdpi/ic_sim_card_multi_24px_clr.png diff --git a/core/res/res/drawable-xxhdpi/ic_sim_card_multi_48px_clr.png b/core/res/res/drawable-xxhdpi/ic_sim_card_multi_48px_clr.png Binary files differnew file mode 100644 index 000000000000..dddb0a162c53 --- /dev/null +++ b/core/res/res/drawable-xxhdpi/ic_sim_card_multi_48px_clr.png diff --git a/core/res/res/drawable-xxxhdpi/ic_sim_card_multi_24px_clr.png b/core/res/res/drawable-xxxhdpi/ic_sim_card_multi_24px_clr.png Binary files differnew file mode 100644 index 000000000000..fbda03745e61 --- /dev/null +++ b/core/res/res/drawable-xxxhdpi/ic_sim_card_multi_24px_clr.png diff --git a/core/res/res/drawable-xxxhdpi/ic_sim_card_multi_48px_clr.png b/core/res/res/drawable-xxxhdpi/ic_sim_card_multi_48px_clr.png Binary files differnew file mode 100644 index 000000000000..3316f1410106 --- /dev/null +++ b/core/res/res/drawable-xxxhdpi/ic_sim_card_multi_48px_clr.png diff --git a/core/res/res/drawable/vector_drawable_progress_indeterminate_horizontal.xml b/core/res/res/drawable/vector_drawable_progress_indeterminate_horizontal.xml index aa75a7a15e27..912b5bf79dd7 100644 --- a/core/res/res/drawable/vector_drawable_progress_indeterminate_horizontal.xml +++ b/core/res/res/drawable/vector_drawable_progress_indeterminate_horizontal.xml @@ -27,7 +27,7 @@ android:name="background_track" android:pathData="M -180.0,-1.0 l 360.0,0 l 0,2.0 l -360.0,0 Z" android:fillColor="?attr/colorControlActivated" - android:fillAlpha="0.1"/> + android:fillAlpha="?attr/disabledAlpha"/> <group android:name="rect2_grp" android:translateX="-197.60001" diff --git a/core/res/res/values-af/strings.xml b/core/res/res/values-af/strings.xml index b3806db498b3..f0a05ea2f4cf 100644 --- a/core/res/res/values-af/strings.xml +++ b/core/res/res/values-af/strings.xml @@ -34,8 +34,7 @@ <string name="durationHourMinutes" msgid="9029176248692041549">"<xliff:g id="HOURS">%1$d</xliff:g> u. <xliff:g id="MINUTES">%2$d</xliff:g> min."</string> <string name="durationHourMinute" msgid="2741677355177402539">"<xliff:g id="HOURS">%1$d</xliff:g> u. <xliff:g id="MINUTES">%2$d</xliff:g> min."</string> <string name="durationMinutes" msgid="3134226679883579347">"<xliff:g id="MINUTES">%1$d</xliff:g> minute"</string> - <!-- no translation found for durationMinute (7155301744174623818) --> - <skip /> + <string name="durationMinute" msgid="7155301744174623818">"<xliff:g id="MINUTES">%1$d</xliff:g> min."</string> <string name="durationMinuteSeconds" msgid="1424656185379003751">"<xliff:g id="MINUTES">%1$d</xliff:g> min. <xliff:g id="SECONDS">%2$d</xliff:g> s."</string> <string name="durationMinuteSecond" msgid="3989228718067466680">"<xliff:g id="MINUTES">%1$d</xliff:g> min. <xliff:g id="SECONDS">%2$d</xliff:g> s."</string> <string name="durationSeconds" msgid="8050088505238241405">"<xliff:g id="SECONDS">%1$d</xliff:g> sekondes"</string> @@ -834,6 +833,8 @@ <string name="permdesc_handoverStatus" msgid="4788144087245714948">"Laat hierdie program toe om inligting oor huidige Android Straal-oordragte te ontvang."</string> <string name="permlab_removeDrmCertificates" msgid="7044888287209892751">"verwyder DRM-sertifikate"</string> <string name="permdesc_removeDrmCertificates" msgid="7272999075113400993">"Laat \'n program toe om DRM-sertifikate te verwyder. Behoort nooit vir gewone programme nodig te wees nie."</string> + <string name="permlab_bindCarrierMessagingService" msgid="1490229371796969158">"bind aan \'n diensverskaffer-boodskapdiens"</string> + <string name="permdesc_bindCarrierMessagingService" msgid="2762882888502113944">"Dit laat die houer toe om aan die top-koppelvlak van \'n diensverskaffer-boodskapdiens te bind. Behoort nooit vir gewone programme nodig te wees nie."</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"Stel wagwoordreëls"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"Beheer lengte en watter karakters wat in die skermontsluit-wagwoorde gebruik word."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Monitor pogings om skerm te ontsluit"</string> @@ -1900,4 +1901,5 @@ <string name="toolbar_collapse_description" msgid="2821479483960330739">"Vou in"</string> <string name="zen_mode_next_alarm_summary" msgid="5915140424683747372">"Tot die volgende wekker om <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string> <string name="zen_mode_next_alarm_line_one" msgid="5537042951553420916">"Tot die volgende wekker"</string> + <string name="muted_by" msgid="6147073845094180001">"Gedemp deur <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> </resources> diff --git a/core/res/res/values-am/strings.xml b/core/res/res/values-am/strings.xml index 97635699ec07..7c90290ded5c 100644 --- a/core/res/res/values-am/strings.xml +++ b/core/res/res/values-am/strings.xml @@ -34,8 +34,7 @@ <string name="durationHourMinutes" msgid="9029176248692041549">"<xliff:g id="HOURS">%1$d</xliff:g> ሰዓ <xliff:g id="MINUTES">%2$d</xliff:g> ደቂቃ"</string> <string name="durationHourMinute" msgid="2741677355177402539">"<xliff:g id="HOURS">%1$d</xliff:g> ሰዓ <xliff:g id="MINUTES">%2$d</xliff:g> ደቂቃ"</string> <string name="durationMinutes" msgid="3134226679883579347">"<xliff:g id="MINUTES">%1$d</xliff:g> ደቂቃዎች"</string> - <!-- no translation found for durationMinute (7155301744174623818) --> - <skip /> + <string name="durationMinute" msgid="7155301744174623818">"<xliff:g id="MINUTES">%1$d</xliff:g> ደቂቃዎች"</string> <string name="durationMinuteSeconds" msgid="1424656185379003751">"<xliff:g id="MINUTES">%1$d</xliff:g> ደቂቃ <xliff:g id="SECONDS">%2$d</xliff:g> ሴ"</string> <string name="durationMinuteSecond" msgid="3989228718067466680">"<xliff:g id="MINUTES">%1$d</xliff:g> ደቂቃ <xliff:g id="SECONDS">%2$d</xliff:g> ሴ"</string> <string name="durationSeconds" msgid="8050088505238241405">"<xliff:g id="SECONDS">%1$d</xliff:g> ሴ"</string> @@ -834,6 +833,8 @@ <string name="permdesc_handoverStatus" msgid="4788144087245714948">"ይም መተግበሪያ ስለአሁን የAndroid Beam ሽግግሮች መረጃ እንዲቀበል ይፈቅዳል"</string> <string name="permlab_removeDrmCertificates" msgid="7044888287209892751">"የDRM እውቅና ማረጋገጫዎችን ያስወግዳል"</string> <string name="permdesc_removeDrmCertificates" msgid="7272999075113400993">"አንድ መተግበሪያ የDRM እውቅና ማረጋገጫዎችን እንዲያስወግድ ያስችለዋል። ለመደበኛ መተግበሪያዎች በጭራሽ ሊያስፈልግ አይገባም።"</string> + <string name="permlab_bindCarrierMessagingService" msgid="1490229371796969158">"ወደሞባይል አገልግሎት ሰጪ የመልዕክት አገልግሎት አያይዝ"</string> + <string name="permdesc_bindCarrierMessagingService" msgid="2762882888502113944">"ያዢው በሞባይል አገልግሎት ሰጪ የመልዕክት አላላክ አገልግሎት ላይ ከፍተኛውን ደረጃ በይነ ገጽ እንዲይዝ ይፈቅድለታል። ለመደበኛ መተግበሪያ በጭራሽ አያስፈልግም።"</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"የይለፍ ቃል ደንቦች አዘጋጅ"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"በማያ-መክፈት የተፈቀዱ የይለፍ ቃል ርዝመት እና ቁምፊዎች ተቆጣጠር።"</string> <string name="policylab_watchLogin" msgid="914130646942199503">"የማሳያ-ክፈት ሙከራዎችን አሳይ"</string> @@ -1900,4 +1901,5 @@ <string name="toolbar_collapse_description" msgid="2821479483960330739">"ሰብስብ"</string> <string name="zen_mode_next_alarm_summary" msgid="5915140424683747372">"በ<xliff:g id="FORMATTEDTIME">%1$s</xliff:g> ላይ እስከሚቀጥለው ማንቂያ ድረስ"</string> <string name="zen_mode_next_alarm_line_one" msgid="5537042951553420916">"እስከሚቀጥለው ማንቂያ ድረስ"</string> + <string name="muted_by" msgid="6147073845094180001">"ድምጽ በ<xliff:g id="THIRD_PARTY">%1$s</xliff:g> ተዘግቷል"</string> </resources> diff --git a/core/res/res/values-ar/strings.xml b/core/res/res/values-ar/strings.xml index 104dfb3527ee..f6969475c94b 100644 --- a/core/res/res/values-ar/strings.xml +++ b/core/res/res/values-ar/strings.xml @@ -833,6 +833,8 @@ <string name="permdesc_handoverStatus" msgid="4788144087245714948">"السماح لهذا التطبيق بتلقي معلومات حول عمليات نقل شعاع Android الحالية"</string> <string name="permlab_removeDrmCertificates" msgid="7044888287209892751">"إزالة شهادات DRM"</string> <string name="permdesc_removeDrmCertificates" msgid="7272999075113400993">"للسماح لأحد التطبيقات بإزالة شهادات DRM. لن تكون هناك حاجة إليه مطلقًا مع التطبيقات العادية."</string> + <string name="permlab_bindCarrierMessagingService" msgid="1490229371796969158">"الالتزام بخدمة المراسلة التابعة لمشغل شبكة الجوّال"</string> + <string name="permdesc_bindCarrierMessagingService" msgid="2762882888502113944">"يسمح لحامله بالالتزام بواجهة المستوى العالي لخدمة المراسلة التابعة لمشغل شبكة الجوَّال. ومن المفترض عدم الحاجة إليه مع التطبيقات العادية."</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"تعيين قواعد كلمة المرور"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"يمكنك التحكم في الطول والأحرف المسموح بها في كلمات مرور إلغاء تأمين الشاشة."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"مراقبة محاولات إلغاء قفل الشاشة"</string> @@ -1899,4 +1901,5 @@ <string name="toolbar_collapse_description" msgid="2821479483960330739">"تصغير"</string> <string name="zen_mode_next_alarm_summary" msgid="5915140424683747372">"حتى التنبيه التالي في <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string> <string name="zen_mode_next_alarm_line_one" msgid="5537042951553420916">"حتى التنبيه التالي"</string> + <string name="muted_by" msgid="6147073845094180001">"تم كتم الصوت بواسطة <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> </resources> diff --git a/core/res/res/values-bg/strings.xml b/core/res/res/values-bg/strings.xml index bfd5dbce5870..00640bb1106b 100644 --- a/core/res/res/values-bg/strings.xml +++ b/core/res/res/values-bg/strings.xml @@ -34,8 +34,7 @@ <string name="durationHourMinutes" msgid="9029176248692041549">"<xliff:g id="HOURS">%1$d</xliff:g> ч <xliff:g id="MINUTES">%2$d</xliff:g> мин"</string> <string name="durationHourMinute" msgid="2741677355177402539">"<xliff:g id="HOURS">%1$d</xliff:g> ч <xliff:g id="MINUTES">%2$d</xliff:g> мин"</string> <string name="durationMinutes" msgid="3134226679883579347">"<xliff:g id="MINUTES">%1$d</xliff:g> мин"</string> - <!-- no translation found for durationMinute (7155301744174623818) --> - <skip /> + <string name="durationMinute" msgid="7155301744174623818">"<xliff:g id="MINUTES">%1$d</xliff:g> мин"</string> <string name="durationMinuteSeconds" msgid="1424656185379003751">"<xliff:g id="MINUTES">%1$d</xliff:g> мин <xliff:g id="SECONDS">%2$d</xliff:g> сек"</string> <string name="durationMinuteSecond" msgid="3989228718067466680">"<xliff:g id="MINUTES">%1$d</xliff:g> мин <xliff:g id="SECONDS">%2$d</xliff:g> сек"</string> <string name="durationSeconds" msgid="8050088505238241405">"<xliff:g id="SECONDS">%1$d</xliff:g> сек"</string> @@ -834,6 +833,8 @@ <string name="permdesc_handoverStatus" msgid="4788144087245714948">"Разрешава на това приложение да получава информация относно текущите прехвърляния чрез Android Лъч"</string> <string name="permlab_removeDrmCertificates" msgid="7044888287209892751">"премахване на сертификатите за управление на цифровите права (DRM)"</string> <string name="permdesc_removeDrmCertificates" msgid="7272999075113400993">"Разрешава на приложението да премахва сертификатите за управление на цифровите права (DRM). Нормалните приложения би трябвало никога да се нуждаят от това."</string> + <string name="permlab_bindCarrierMessagingService" msgid="1490229371796969158">"свързване с услуга за съобщения от оператор"</string> + <string name="permdesc_bindCarrierMessagingService" msgid="2762882888502113944">"Разрешава на притежателя да се свърже към интерфейса от най-високото ниво на услуга за съобщения от оператор. Нормалните приложения би трябвало никога да не се нуждаят от това."</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"Задаване на правила за паролата"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"Контролирайте дължината и разрешените знаци за паролите за отключване на екрана."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Наблюдаване на опитите за отключване на екрана"</string> @@ -1900,4 +1901,5 @@ <string name="toolbar_collapse_description" msgid="2821479483960330739">"Свиване"</string> <string name="zen_mode_next_alarm_summary" msgid="5915140424683747372">"До следващия будилник в <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string> <string name="zen_mode_next_alarm_line_one" msgid="5537042951553420916">"До следващия будилник"</string> + <string name="muted_by" msgid="6147073845094180001">"Заглушено от <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> </resources> diff --git a/core/res/res/values-bn-rBD/strings.xml b/core/res/res/values-bn-rBD/strings.xml index f6192cc3f474..b865a188ed23 100644 --- a/core/res/res/values-bn-rBD/strings.xml +++ b/core/res/res/values-bn-rBD/strings.xml @@ -34,8 +34,7 @@ <string name="durationHourMinutes" msgid="9029176248692041549">"<xliff:g id="HOURS">%1$d</xliff:g> ঘন্টা <xliff:g id="MINUTES">%2$d</xliff:g> মিনিট"</string> <string name="durationHourMinute" msgid="2741677355177402539">"<xliff:g id="HOURS">%1$d</xliff:g> ঘন্টা <xliff:g id="MINUTES">%2$d</xliff:g> মিনিট"</string> <string name="durationMinutes" msgid="3134226679883579347">"<xliff:g id="MINUTES">%1$d</xliff:g> মিনিট"</string> - <!-- no translation found for durationMinute (7155301744174623818) --> - <skip /> + <string name="durationMinute" msgid="7155301744174623818">"<xliff:g id="MINUTES">%1$d</xliff:g> মিনিট"</string> <string name="durationMinuteSeconds" msgid="1424656185379003751">"<xliff:g id="MINUTES">%1$d</xliff:g> মিনিট <xliff:g id="SECONDS">%2$d</xliff:g> সেকেন্ড"</string> <string name="durationMinuteSecond" msgid="3989228718067466680">"<xliff:g id="MINUTES">%1$d</xliff:g> মিনিট <xliff:g id="SECONDS">%2$d</xliff:g> সেকেন্ড"</string> <string name="durationSeconds" msgid="8050088505238241405">"<xliff:g id="SECONDS">%1$d</xliff:g> সেকেন্ড"</string> @@ -834,6 +833,8 @@ <string name="permdesc_handoverStatus" msgid="4788144087245714948">"এই অ্যাপ্লিকেশানকে বর্তমান Android বীম স্থানান্তর সম্বন্ধে তথ্য গ্রহণ করার অনুমিত দেয়"</string> <string name="permlab_removeDrmCertificates" msgid="7044888287209892751">"DRM শংসাপত্রগুলি সরান"</string> <string name="permdesc_removeDrmCertificates" msgid="7272999075113400993">"কোনো অ্যাপ্লিকেশানকে DRM শংসাপত্রগুলি সরানোর অনুমতি দেয়। সাধারণ অ্যাপ্লিকেশানগুলির জন্য কখনো প্রয়োজন হয় না।"</string> + <string name="permlab_bindCarrierMessagingService" msgid="1490229371796969158">"একটি ক্যারিয়ার বার্তাপ্রেরণ পরিষেবা আবদ্ধ করতে"</string> + <string name="permdesc_bindCarrierMessagingService" msgid="2762882888502113944">"ধারককে, একটি ক্যারিয়ার বার্তাপ্রেরণ পরিষেবার উচ্চ স্তরের ইন্টারফেসে জুড়তে অনুমতি দেয়৷ সধারণ অ্যাপ্লিকেশানগুলির জন্য কখনই প্রয়োজন হয় না৷"</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"পাসওয়ার্ড নিয়মগুলি সেট করে"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"স্ক্রীন আনলক করার পাসওয়ার্ডগুলিতে অনুমতিপ্রাপ্ত অক্ষর এবং দৈর্ঘ্য নিয়ন্ত্রণ করে৷"</string> <string name="policylab_watchLogin" msgid="914130646942199503">"স্ক্রীণ আনলক করার প্রচেষ্টাগুলি নিরীক্ষণ করে"</string> @@ -1900,4 +1901,5 @@ <string name="toolbar_collapse_description" msgid="2821479483960330739">"সঙ্কুচিত করুন"</string> <string name="zen_mode_next_alarm_summary" msgid="5915140424683747372">"<xliff:g id="FORMATTEDTIME">%1$s</xliff:g> এ পরবর্তী অ্যালার্ম পর্যন্ত"</string> <string name="zen_mode_next_alarm_line_one" msgid="5537042951553420916">"পরবর্তী অ্যালার্ম পর্যন্ত"</string> + <string name="muted_by" msgid="6147073845094180001">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> দ্বারা নিঃশব্দ করা হয়েছে"</string> </resources> diff --git a/core/res/res/values-ca/strings.xml b/core/res/res/values-ca/strings.xml index 04e52496a40e..72179d826d71 100644 --- a/core/res/res/values-ca/strings.xml +++ b/core/res/res/values-ca/strings.xml @@ -34,8 +34,7 @@ <string name="durationHourMinutes" msgid="9029176248692041549">"<xliff:g id="HOURS">%1$d</xliff:g> h <xliff:g id="MINUTES">%2$d</xliff:g> min"</string> <string name="durationHourMinute" msgid="2741677355177402539">"<xliff:g id="HOURS">%1$d</xliff:g> h <xliff:g id="MINUTES">%2$d</xliff:g> min"</string> <string name="durationMinutes" msgid="3134226679883579347">"<xliff:g id="MINUTES">%1$d</xliff:g> minuts"</string> - <!-- no translation found for durationMinute (7155301744174623818) --> - <skip /> + <string name="durationMinute" msgid="7155301744174623818">"<xliff:g id="MINUTES">%1$d</xliff:g> min"</string> <string name="durationMinuteSeconds" msgid="1424656185379003751">"<xliff:g id="MINUTES">%1$d</xliff:g> min <xliff:g id="SECONDS">%2$d</xliff:g> s"</string> <string name="durationMinuteSecond" msgid="3989228718067466680">"<xliff:g id="MINUTES">%1$d</xliff:g> min <xliff:g id="SECONDS">%2$d</xliff:g> s"</string> <string name="durationSeconds" msgid="8050088505238241405">"<xliff:g id="SECONDS">%1$d</xliff:g> s"</string> @@ -834,6 +833,8 @@ <string name="permdesc_handoverStatus" msgid="4788144087245714948">"Permet que aquesta aplicació rebi informació sobre les transferències d\'Android Beam actuals."</string> <string name="permlab_removeDrmCertificates" msgid="7044888287209892751">"suprimir els certificats DRM"</string> <string name="permdesc_removeDrmCertificates" msgid="7272999075113400993">"Permet que una aplicació suprimeixi els certificats DRM. No ha de ser mai necessari per a aplicacions normals."</string> + <string name="permlab_bindCarrierMessagingService" msgid="1490229371796969158">"vincular-la a un servei de missatgeria"</string> + <string name="permdesc_bindCarrierMessagingService" msgid="2762882888502113944">"Permet que el propietari la pugui vincular a la interfície principal d\'un servei de missatgeria. És possible que no s\'hagi d\'utilitzar mai amb aplicacions normals."</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"Definir les normes de contrasenya"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"Controla la longitud i els caràcters permesos a les contrasenyes de desbloqueig de pantalla."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Controlar els intents de desbloqueig de pantalla"</string> @@ -1900,4 +1901,5 @@ <string name="toolbar_collapse_description" msgid="2821479483960330739">"Replega"</string> <string name="zen_mode_next_alarm_summary" msgid="5915140424683747372">"Fins que soni l\'alarma següent a les <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string> <string name="zen_mode_next_alarm_line_one" msgid="5537042951553420916">"Fins que soni l\'alarma següent"</string> + <string name="muted_by" msgid="6147073845094180001">"Silenciat per <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> </resources> diff --git a/core/res/res/values-cs/strings.xml b/core/res/res/values-cs/strings.xml index 0564656e3a9f..a91c3ba3eafd 100644 --- a/core/res/res/values-cs/strings.xml +++ b/core/res/res/values-cs/strings.xml @@ -34,8 +34,7 @@ <string name="durationHourMinutes" msgid="9029176248692041549">"<xliff:g id="HOURS">%1$d</xliff:g> h <xliff:g id="MINUTES">%2$d</xliff:g> min"</string> <string name="durationHourMinute" msgid="2741677355177402539">"<xliff:g id="HOURS">%1$d</xliff:g> h <xliff:g id="MINUTES">%2$d</xliff:g> min"</string> <string name="durationMinutes" msgid="3134226679883579347">"<xliff:g id="MINUTES">%1$d</xliff:g> min"</string> - <!-- no translation found for durationMinute (7155301744174623818) --> - <skip /> + <string name="durationMinute" msgid="7155301744174623818">"<xliff:g id="MINUTES">%1$d</xliff:g> min"</string> <string name="durationMinuteSeconds" msgid="1424656185379003751">"<xliff:g id="MINUTES">%1$d</xliff:g> min <xliff:g id="SECONDS">%2$d</xliff:g> s"</string> <string name="durationMinuteSecond" msgid="3989228718067466680">"<xliff:g id="MINUTES">%1$d</xliff:g> min <xliff:g id="SECONDS">%2$d</xliff:g> s"</string> <string name="durationSeconds" msgid="8050088505238241405">"<xliff:g id="SECONDS">%1$d</xliff:g> s"</string> @@ -834,6 +833,8 @@ <string name="permdesc_handoverStatus" msgid="4788144087245714948">"Umožňuje této aplikaci přijímat informace o aktuálních přenosech pomocí technologie Android Beam"</string> <string name="permlab_removeDrmCertificates" msgid="7044888287209892751">"odstranění certifikátů DRM"</string> <string name="permdesc_removeDrmCertificates" msgid="7272999075113400993">"Povoluje aplikaci odstranit certifikáty DRM. Běžné aplikace by toto oprávnění neměly nikdy potřebovat."</string> + <string name="permlab_bindCarrierMessagingService" msgid="1490229371796969158">"navázat se na nejvyšší úroveň rozhraní služby zasílání zpráv prostřednictvím operátora"</string> + <string name="permdesc_bindCarrierMessagingService" msgid="2762882888502113944">"Umožňuje držiteli navázat se na nejvyšší úroveň rozhraní služby zasílání zpráv prostřednictvím operátora. Běžné aplikace by toto oprávnění neměly nikdy potřebovat."</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"Nastavit pravidla pro heslo"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"Řídit délku hesel pro odemčení obrazovky a povolené znaky."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Sledovat pokusy o odemčení obrazovky"</string> @@ -1900,4 +1901,5 @@ <string name="toolbar_collapse_description" msgid="2821479483960330739">"Sbalit"</string> <string name="zen_mode_next_alarm_summary" msgid="5915140424683747372">"Do dalšího budíku v <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string> <string name="zen_mode_next_alarm_line_one" msgid="5537042951553420916">"Do příštího budíku"</string> + <string name="muted_by" msgid="6147073845094180001">"Ignorováno stranou <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> </resources> diff --git a/core/res/res/values-da/strings.xml b/core/res/res/values-da/strings.xml index c35f7e8dacf1..2088ac488912 100644 --- a/core/res/res/values-da/strings.xml +++ b/core/res/res/values-da/strings.xml @@ -34,8 +34,7 @@ <string name="durationHourMinutes" msgid="9029176248692041549">"<xliff:g id="HOURS">%1$d</xliff:g> t. <xliff:g id="MINUTES">%2$d</xliff:g> min."</string> <string name="durationHourMinute" msgid="2741677355177402539">"<xliff:g id="HOURS">%1$d</xliff:g> t. <xliff:g id="MINUTES">%2$d</xliff:g> min."</string> <string name="durationMinutes" msgid="3134226679883579347">"<xliff:g id="MINUTES">%1$d</xliff:g> min."</string> - <!-- no translation found for durationMinute (7155301744174623818) --> - <skip /> + <string name="durationMinute" msgid="7155301744174623818">"<xliff:g id="MINUTES">%1$d</xliff:g> min."</string> <string name="durationMinuteSeconds" msgid="1424656185379003751">"<xliff:g id="MINUTES">%1$d</xliff:g> min. <xliff:g id="SECONDS">%2$d</xliff:g> s"</string> <string name="durationMinuteSecond" msgid="3989228718067466680">"<xliff:g id="MINUTES">%1$d</xliff:g> min. <xliff:g id="SECONDS">%2$d</xliff:g> s"</string> <string name="durationSeconds" msgid="8050088505238241405">"<xliff:g id="SECONDS">%1$d</xliff:g> sek."</string> @@ -834,6 +833,8 @@ <string name="permdesc_handoverStatus" msgid="4788144087245714948">"Tillader, at applikationen modtager oplysninger om aktuelle Android Beam-overførsler"</string> <string name="permlab_removeDrmCertificates" msgid="7044888287209892751">"fjerne DRM-certifikater"</string> <string name="permdesc_removeDrmCertificates" msgid="7272999075113400993">"Tillader, at en app fjerner DRM-certifikater. Dette bør aldrig være nødvendigt for almindelige apps."</string> + <string name="permlab_bindCarrierMessagingService" msgid="1490229371796969158">"knytte til et mobilselskabs beskedtjeneste"</string> + <string name="permdesc_bindCarrierMessagingService" msgid="2762882888502113944">"Dette giver indehaveren mulighed for at knytte sig til det øverste grænsefladeniveau for et mobilselskabs beskedtjeneste. Dette bør ikke være nødvendigt i normale apps."</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"Indstil regler for adgangskode"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"Kontroller længden samt tilladte tegn i adgangskoder til oplåsning af skærmen."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Overvåg forsøg på oplåsning af skærm"</string> @@ -1900,4 +1901,5 @@ <string name="toolbar_collapse_description" msgid="2821479483960330739">"Skjul"</string> <string name="zen_mode_next_alarm_summary" msgid="5915140424683747372">"Indtil næste alarm kl. <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string> <string name="zen_mode_next_alarm_line_one" msgid="5537042951553420916">"Indtil næste alarm"</string> + <string name="muted_by" msgid="6147073845094180001">"Lyden blev afbrudt af <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> </resources> diff --git a/core/res/res/values-de/strings.xml b/core/res/res/values-de/strings.xml index 5b8fcdd9f05a..bd38d66d7ad7 100644 --- a/core/res/res/values-de/strings.xml +++ b/core/res/res/values-de/strings.xml @@ -34,8 +34,7 @@ <string name="durationHourMinutes" msgid="9029176248692041549">"<xliff:g id="HOURS">%1$d</xliff:g> Std. <xliff:g id="MINUTES">%2$d</xliff:g> Min."</string> <string name="durationHourMinute" msgid="2741677355177402539">"<xliff:g id="HOURS">%1$d</xliff:g> Std. <xliff:g id="MINUTES">%2$d</xliff:g> Min."</string> <string name="durationMinutes" msgid="3134226679883579347">"<xliff:g id="MINUTES">%1$d</xliff:g> Min."</string> - <!-- no translation found for durationMinute (7155301744174623818) --> - <skip /> + <string name="durationMinute" msgid="7155301744174623818">"<xliff:g id="MINUTES">%1$d</xliff:g> min"</string> <string name="durationMinuteSeconds" msgid="1424656185379003751">"<xliff:g id="MINUTES">%1$d</xliff:g> Min. <xliff:g id="SECONDS">%2$d</xliff:g> Sek."</string> <string name="durationMinuteSecond" msgid="3989228718067466680">"<xliff:g id="MINUTES">%1$d</xliff:g> Min. <xliff:g id="SECONDS">%2$d</xliff:g> Sek."</string> <string name="durationSeconds" msgid="8050088505238241405">"<xliff:g id="SECONDS">%1$d</xliff:g> Sek."</string> @@ -834,6 +833,8 @@ <string name="permdesc_handoverStatus" msgid="4788144087245714948">"Ermöglicht dieser App, Informationen zu aktuellen Android Beam-Übertragungen zu erhalten"</string> <string name="permlab_removeDrmCertificates" msgid="7044888287209892751">"DRM-Zertifikate entfernen"</string> <string name="permdesc_removeDrmCertificates" msgid="7272999075113400993">"Ermöglicht einer App das Entfernen von DRM-Zertifikaten. Sollte für normale Apps nie benötigt werden."</string> + <string name="permlab_bindCarrierMessagingService" msgid="1490229371796969158">"An einen Mobilfunkanbieter-SMS/MMS-Dienst binden"</string> + <string name="permdesc_bindCarrierMessagingService" msgid="2762882888502113944">"Ermöglicht dem Inhaber die Bindung an die Oberfläche eines Mobilfunkanbieter-SMS/MMS-Dienstes auf oberster Ebene. Für normale Apps sollte dies nie erforderlich sein."</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"Passwortregeln festlegen"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"Zulässige Länge und Zeichen für Passwörter zum Entsperren des Bildschirms festlegen"</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Versuche zum Entsperren des Displays überwachen"</string> @@ -1900,4 +1901,5 @@ <string name="toolbar_collapse_description" msgid="2821479483960330739">"Minimieren"</string> <string name="zen_mode_next_alarm_summary" msgid="5915140424683747372">"Bis zum nächsten Weckruf um <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string> <string name="zen_mode_next_alarm_line_one" msgid="5537042951553420916">"Bis zum nächsten Weckruf"</string> + <string name="muted_by" msgid="6147073845094180001">"Stummgeschaltet durch <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> </resources> diff --git a/core/res/res/values-el/strings.xml b/core/res/res/values-el/strings.xml index 86f032365018..fcd4a9d57a94 100644 --- a/core/res/res/values-el/strings.xml +++ b/core/res/res/values-el/strings.xml @@ -34,8 +34,7 @@ <string name="durationHourMinutes" msgid="9029176248692041549">"<xliff:g id="HOURS">%1$d</xliff:g> ώρα <xliff:g id="MINUTES">%2$d</xliff:g> λ"</string> <string name="durationHourMinute" msgid="2741677355177402539">"<xliff:g id="HOURS">%1$d</xliff:g> ώρα <xliff:g id="MINUTES">%2$d</xliff:g> λ"</string> <string name="durationMinutes" msgid="3134226679883579347">"<xliff:g id="MINUTES">%1$d</xliff:g> λεπτά"</string> - <!-- no translation found for durationMinute (7155301744174623818) --> - <skip /> + <string name="durationMinute" msgid="7155301744174623818">"<xliff:g id="MINUTES">%1$d</xliff:g> λεπτά"</string> <string name="durationMinuteSeconds" msgid="1424656185379003751">"<xliff:g id="MINUTES">%1$d</xliff:g> λ. <xliff:g id="SECONDS">%2$d</xliff:g> δευτ."</string> <string name="durationMinuteSecond" msgid="3989228718067466680">"<xliff:g id="MINUTES">%1$d</xliff:g> λ <xliff:g id="SECONDS">%2$d</xliff:g> δευτ."</string> <string name="durationSeconds" msgid="8050088505238241405">"<xliff:g id="SECONDS">%1$d</xliff:g> δευτ."</string> @@ -834,6 +833,8 @@ <string name="permdesc_handoverStatus" msgid="4788144087245714948">"Επιτρέπει σε αυτήν την εφαρμογή να λαμβάνει πληροφορίες σχετικά με τις τρέχουσες μεταφορές Android Beam"</string> <string name="permlab_removeDrmCertificates" msgid="7044888287209892751">"κατάργηση πιστοποιητικών DRM"</string> <string name="permdesc_removeDrmCertificates" msgid="7272999075113400993">"Επιτρέπει σε μια εφαρμογή την κατάργηση πιστοποιητικών DRM. Δεν χρειάζεται ποτέ για κανονικές εφαρμογές."</string> + <string name="permlab_bindCarrierMessagingService" msgid="1490229371796969158">"δέσμευση σε υπηρεσία ανταλλαγής μηνυμάτων εταιρείας κινητής τηλεφωνίας"</string> + <string name="permdesc_bindCarrierMessagingService" msgid="2762882888502113944">"Επιτρέπει στον κάτοχο τη δέσμευση στη διεπαφή ανωτάτου επιπέδου μιας υπηρεσίας ανταλλαγής μηνυμάτων εταιρείας κινητής τηλεφωνίας. Δεν απαιτείται για συνήθεις εφαρμογές."</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"Ορισμός κανόνων κωδικού πρόσβασης"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"Έλεγχος του μεγέθους και των χαρακτήρων που επιτρέπονται στους κωδικούς πρόσβασης ξεκλειδώματος οθόνης."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Παρακολούθηση προσπαθειών ξεκλειδώματος οθόνης"</string> @@ -1900,4 +1901,5 @@ <string name="toolbar_collapse_description" msgid="2821479483960330739">"Σύμπτυξη"</string> <string name="zen_mode_next_alarm_summary" msgid="5915140424683747372">"Έως την επόμενη ειδοποίηση στις <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string> <string name="zen_mode_next_alarm_line_one" msgid="5537042951553420916">"Έως την επόμενη ειδοποίηση"</string> + <string name="muted_by" msgid="6147073845094180001">"Σίγαση από <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> </resources> diff --git a/core/res/res/values-en-rGB/strings.xml b/core/res/res/values-en-rGB/strings.xml index 7e1fc9e953b5..678f2e67afe0 100644 --- a/core/res/res/values-en-rGB/strings.xml +++ b/core/res/res/values-en-rGB/strings.xml @@ -833,6 +833,8 @@ <string name="permdesc_handoverStatus" msgid="4788144087245714948">"Allows this application to receive information about current Android Beam transfers"</string> <string name="permlab_removeDrmCertificates" msgid="7044888287209892751">"remove DRM certificates"</string> <string name="permdesc_removeDrmCertificates" msgid="7272999075113400993">"Allows an application to remove DRM certficates. Should never be needed for normal apps."</string> + <string name="permlab_bindCarrierMessagingService" msgid="1490229371796969158">"bind to a carrier messaging service"</string> + <string name="permdesc_bindCarrierMessagingService" msgid="2762882888502113944">"Allows the holder to bind to the top-level interface of a carrier messaging service. Should never be needed for normal apps."</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"Set password rules"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"Control the length and the characters allowed in screen-unlock passwords."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Monitor screen-unlock attempts"</string> @@ -1899,4 +1901,5 @@ <string name="toolbar_collapse_description" msgid="2821479483960330739">"Collapse"</string> <string name="zen_mode_next_alarm_summary" msgid="5915140424683747372">"Until next alarm at <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string> <string name="zen_mode_next_alarm_line_one" msgid="5537042951553420916">"Until next alarm"</string> + <string name="muted_by" msgid="6147073845094180001">"Muted by <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> </resources> diff --git a/core/res/res/values-en-rIN/strings.xml b/core/res/res/values-en-rIN/strings.xml index 7e1fc9e953b5..678f2e67afe0 100644 --- a/core/res/res/values-en-rIN/strings.xml +++ b/core/res/res/values-en-rIN/strings.xml @@ -833,6 +833,8 @@ <string name="permdesc_handoverStatus" msgid="4788144087245714948">"Allows this application to receive information about current Android Beam transfers"</string> <string name="permlab_removeDrmCertificates" msgid="7044888287209892751">"remove DRM certificates"</string> <string name="permdesc_removeDrmCertificates" msgid="7272999075113400993">"Allows an application to remove DRM certficates. Should never be needed for normal apps."</string> + <string name="permlab_bindCarrierMessagingService" msgid="1490229371796969158">"bind to a carrier messaging service"</string> + <string name="permdesc_bindCarrierMessagingService" msgid="2762882888502113944">"Allows the holder to bind to the top-level interface of a carrier messaging service. Should never be needed for normal apps."</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"Set password rules"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"Control the length and the characters allowed in screen-unlock passwords."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Monitor screen-unlock attempts"</string> @@ -1899,4 +1901,5 @@ <string name="toolbar_collapse_description" msgid="2821479483960330739">"Collapse"</string> <string name="zen_mode_next_alarm_summary" msgid="5915140424683747372">"Until next alarm at <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string> <string name="zen_mode_next_alarm_line_one" msgid="5537042951553420916">"Until next alarm"</string> + <string name="muted_by" msgid="6147073845094180001">"Muted by <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> </resources> diff --git a/core/res/res/values-es-rUS/strings.xml b/core/res/res/values-es-rUS/strings.xml index 122b24712689..18424ab75911 100644 --- a/core/res/res/values-es-rUS/strings.xml +++ b/core/res/res/values-es-rUS/strings.xml @@ -34,8 +34,7 @@ <string name="durationHourMinutes" msgid="9029176248692041549">"<xliff:g id="HOURS">%1$d</xliff:g> h <xliff:g id="MINUTES">%2$d</xliff:g> min"</string> <string name="durationHourMinute" msgid="2741677355177402539">"<xliff:g id="HOURS">%1$d</xliff:g> h <xliff:g id="MINUTES">%2$d</xliff:g> min"</string> <string name="durationMinutes" msgid="3134226679883579347">"<xliff:g id="MINUTES">%1$d</xliff:g> min"</string> - <!-- no translation found for durationMinute (7155301744174623818) --> - <skip /> + <string name="durationMinute" msgid="7155301744174623818">"<xliff:g id="MINUTES">%1$d</xliff:g> min"</string> <string name="durationMinuteSeconds" msgid="1424656185379003751">"<xliff:g id="MINUTES">%1$d</xliff:g> min <xliff:g id="SECONDS">%2$d</xliff:g> s"</string> <string name="durationMinuteSecond" msgid="3989228718067466680">"<xliff:g id="MINUTES">%1$d</xliff:g> min <xliff:g id="SECONDS">%2$d</xliff:g> s"</string> <string name="durationSeconds" msgid="8050088505238241405">"<xliff:g id="SECONDS">%1$d</xliff:g> s"</string> @@ -834,6 +833,8 @@ <string name="permdesc_handoverStatus" msgid="4788144087245714948">"Permite que esta aplicación reciba información sobre las transferencias actuales de Android Beam"</string> <string name="permlab_removeDrmCertificates" msgid="7044888287209892751">"eliminar certificados DRM"</string> <string name="permdesc_removeDrmCertificates" msgid="7272999075113400993">"Permite que una aplicación elimine certificados DRM. Las aplicaciones normales no deberían necesitar este permiso."</string> + <string name="permlab_bindCarrierMessagingService" msgid="1490229371796969158">"vincular al servicio de mensajería del proveedor"</string> + <string name="permdesc_bindCarrierMessagingService" msgid="2762882888502113944">"Permite al propietario vincularse a la interfaz de nivel superior del servicio de mensajería del proveedor. Las aplicaciones regulares no lo necesitan."</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"Establecer reglas de contraseña"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"Controlar la longitud y los caracteres permitidos en las contraseñas para desbloquear la pantalla"</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Supervisa los intentos para desbloquear la pantalla"</string> @@ -1900,4 +1901,5 @@ <string name="toolbar_collapse_description" msgid="2821479483960330739">"Contraer"</string> <string name="zen_mode_next_alarm_summary" msgid="5915140424683747372">"Hasta la próxima alarma a la(s) <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string> <string name="zen_mode_next_alarm_line_one" msgid="5537042951553420916">"Hasta la próxima alarma"</string> + <string name="muted_by" msgid="6147073845094180001">"Silenciados por <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> </resources> diff --git a/core/res/res/values-es/strings.xml b/core/res/res/values-es/strings.xml index a4f58ec386d2..a90ef65b3454 100644 --- a/core/res/res/values-es/strings.xml +++ b/core/res/res/values-es/strings.xml @@ -34,8 +34,7 @@ <string name="durationHourMinutes" msgid="9029176248692041549">"<xliff:g id="HOURS">%1$d</xliff:g> h <xliff:g id="MINUTES">%2$d</xliff:g> min"</string> <string name="durationHourMinute" msgid="2741677355177402539">"<xliff:g id="HOURS">%1$d</xliff:g> h <xliff:g id="MINUTES">%2$d</xliff:g> min"</string> <string name="durationMinutes" msgid="3134226679883579347">"<xliff:g id="MINUTES">%1$d</xliff:g> min"</string> - <!-- no translation found for durationMinute (7155301744174623818) --> - <skip /> + <string name="durationMinute" msgid="7155301744174623818">"<xliff:g id="MINUTES">%1$d</xliff:g> min"</string> <string name="durationMinuteSeconds" msgid="1424656185379003751">"<xliff:g id="MINUTES">%1$d</xliff:g> min <xliff:g id="SECONDS">%2$d</xliff:g> s"</string> <string name="durationMinuteSecond" msgid="3989228718067466680">"<xliff:g id="MINUTES">%1$d</xliff:g> min <xliff:g id="SECONDS">%2$d</xliff:g> s"</string> <string name="durationSeconds" msgid="8050088505238241405">"<xliff:g id="SECONDS">%1$d</xliff:g> s"</string> @@ -834,6 +833,8 @@ <string name="permdesc_handoverStatus" msgid="4788144087245714948">"Permite que esta aplicación reciba información sobre las transferencias actuales de Android Beam"</string> <string name="permlab_removeDrmCertificates" msgid="7044888287209892751">"eliminar certificados DRM"</string> <string name="permdesc_removeDrmCertificates" msgid="7272999075113400993">"Permite a una aplicación eliminar los certificados DRM. Las aplicaciones normales no deberían necesitar este permiso."</string> + <string name="permlab_bindCarrierMessagingService" msgid="1490229371796969158">"enlazar con el servicio de mensajería de un operador"</string> + <string name="permdesc_bindCarrierMessagingService" msgid="2762882888502113944">"Permite enlazar con la interfaz de nivel superior del servicio de mensajería de un operador. Las aplicaciones normales no deberían necesitar este permiso."</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"Establecimiento de reglas de contraseña"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"Controlar la longitud y los caracteres permitidos en las contraseñas de bloqueo de pantalla"</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Control de intentos de bloqueo de pantalla"</string> @@ -1900,4 +1901,5 @@ <string name="toolbar_collapse_description" msgid="2821479483960330739">"Contraer"</string> <string name="zen_mode_next_alarm_summary" msgid="5915140424683747372">"Hasta la próxima alarma a las <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string> <string name="zen_mode_next_alarm_line_one" msgid="5537042951553420916">"Hasta la próxima alarma"</string> + <string name="muted_by" msgid="6147073845094180001">"Silenciado por <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> </resources> diff --git a/core/res/res/values-et-rEE/strings.xml b/core/res/res/values-et-rEE/strings.xml index ab5fe003f94f..08b82a7b6459 100644 --- a/core/res/res/values-et-rEE/strings.xml +++ b/core/res/res/values-et-rEE/strings.xml @@ -34,8 +34,7 @@ <string name="durationHourMinutes" msgid="9029176248692041549">"<xliff:g id="HOURS">%1$d</xliff:g> h <xliff:g id="MINUTES">%2$d</xliff:g> min"</string> <string name="durationHourMinute" msgid="2741677355177402539">"<xliff:g id="HOURS">%1$d</xliff:g> h <xliff:g id="MINUTES">%2$d</xliff:g> min"</string> <string name="durationMinutes" msgid="3134226679883579347">"<xliff:g id="MINUTES">%1$d</xliff:g> min"</string> - <!-- no translation found for durationMinute (7155301744174623818) --> - <skip /> + <string name="durationMinute" msgid="7155301744174623818">"<xliff:g id="MINUTES">%1$d</xliff:g> min"</string> <string name="durationMinuteSeconds" msgid="1424656185379003751">"<xliff:g id="MINUTES">%1$d</xliff:g> min <xliff:g id="SECONDS">%2$d</xliff:g> s"</string> <string name="durationMinuteSecond" msgid="3989228718067466680">"<xliff:g id="MINUTES">%1$d</xliff:g> min <xliff:g id="SECONDS">%2$d</xliff:g> s"</string> <string name="durationSeconds" msgid="8050088505238241405">"<xliff:g id="SECONDS">%1$d</xliff:g> s"</string> @@ -834,6 +833,8 @@ <string name="permdesc_handoverStatus" msgid="4788144087245714948">"Lubab rakendusel saada teavet praeguste Android Beami ülekannete kohta"</string> <string name="permlab_removeDrmCertificates" msgid="7044888287209892751">"DRM-sertifikaatide eemaldamine"</string> <string name="permdesc_removeDrmCertificates" msgid="7272999075113400993">"Lubab rakendusel eemaldada DRM-sertifikaate. Pole kunagi vajalik tavaliste rakenduste puhul."</string> + <string name="permlab_bindCarrierMessagingService" msgid="1490229371796969158">"seose loomine operaatori sõnumisideteenusega"</string> + <string name="permdesc_bindCarrierMessagingService" msgid="2762882888502113944">"Lubab omanikul luua seose operaatori sõnumisideteenuse ülataseme liidesega. Pole kunagi vajalik tavalise rakenduse puhul."</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"Parooli reeglite määramine"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"Kontrollige ekraaniluku avamise paroolide pikkust ja tähemärke."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Ekraani avamiskatsed"</string> @@ -1900,4 +1901,5 @@ <string name="toolbar_collapse_description" msgid="2821479483960330739">"Ahendamine"</string> <string name="zen_mode_next_alarm_summary" msgid="5915140424683747372">"Kuni järgmise alarmini <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string> <string name="zen_mode_next_alarm_line_one" msgid="5537042951553420916">"Kuni järgmise alarmini"</string> + <string name="muted_by" msgid="6147073845094180001">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> vaigistas"</string> </resources> diff --git a/core/res/res/values-eu-rES/strings.xml b/core/res/res/values-eu-rES/strings.xml index fb24723b3797..bc4912cb39be 100644 --- a/core/res/res/values-eu-rES/strings.xml +++ b/core/res/res/values-eu-rES/strings.xml @@ -34,8 +34,7 @@ <string name="durationHourMinutes" msgid="9029176248692041549">"<xliff:g id="HOURS">%1$d</xliff:g> h <xliff:g id="MINUTES">%2$d</xliff:g> m"</string> <string name="durationHourMinute" msgid="2741677355177402539">"<xliff:g id="HOURS">%1$d</xliff:g> h <xliff:g id="MINUTES">%2$d</xliff:g> m"</string> <string name="durationMinutes" msgid="3134226679883579347">"<xliff:g id="MINUTES">%1$d</xliff:g> m"</string> - <!-- no translation found for durationMinute (7155301744174623818) --> - <skip /> + <string name="durationMinute" msgid="7155301744174623818">"<xliff:g id="MINUTES">%1$d</xliff:g> min"</string> <string name="durationMinuteSeconds" msgid="1424656185379003751">"<xliff:g id="MINUTES">%1$d</xliff:g> m <xliff:g id="SECONDS">%2$d</xliff:g> s"</string> <string name="durationMinuteSecond" msgid="3989228718067466680">"<xliff:g id="MINUTES">%1$d</xliff:g> m <xliff:g id="SECONDS">%2$d</xliff:g> s"</string> <string name="durationSeconds" msgid="8050088505238241405">"<xliff:g id="SECONDS">%1$d</xliff:g> s"</string> @@ -834,6 +833,8 @@ <string name="permdesc_handoverStatus" msgid="4788144087245714948">"Uneko Android Beam transferentziei buruzko informazioa jasotzea baimentzen die aplikazioei"</string> <string name="permlab_removeDrmCertificates" msgid="7044888287209892751">"kendu DRM ziurtagiriak"</string> <string name="permdesc_removeDrmCertificates" msgid="7272999075113400993">"DRM ziurtagiriak kentzea baimentzen die aplikazioei. Aplikazio normalek ez lukete beharko."</string> + <string name="permlab_bindCarrierMessagingService" msgid="1490229371796969158">"lotu operadorearen mezularitza-zerbitzuari"</string> + <string name="permdesc_bindCarrierMessagingService" msgid="2762882888502113944">"Operadore baten mezularitza-zerbitzuaren goi-mailako interfazeari lotzea baimentzen die erabiltzaileei. Aplikazio normalek ez lukete inoiz beharko."</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"Ezarri pasahitzen arauak"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"Kontrolatu pantaila desblokeatzeko pasahitzen luzera eta onartutako karaktereak."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Kontrolatu pantaila desblokeatzeko saiakerak"</string> @@ -1900,4 +1901,5 @@ <string name="toolbar_collapse_description" msgid="2821479483960330739">"Tolestu"</string> <string name="zen_mode_next_alarm_summary" msgid="5915140424683747372">"Hurrengo alarmara arte (<xliff:g id="FORMATTEDTIME">%1$s</xliff:g>)"</string> <string name="zen_mode_next_alarm_line_one" msgid="5537042951553420916">"Hurrengo alarmara arte"</string> + <string name="muted_by" msgid="6147073845094180001">"Audioa desaktibatu da (<xliff:g id="THIRD_PARTY">%1$s</xliff:g>)"</string> </resources> diff --git a/core/res/res/values-fa/strings.xml b/core/res/res/values-fa/strings.xml index c864b42fa82e..0ddb458a3a1a 100644 --- a/core/res/res/values-fa/strings.xml +++ b/core/res/res/values-fa/strings.xml @@ -34,8 +34,7 @@ <string name="durationHourMinutes" msgid="9029176248692041549">"<xliff:g id="HOURS">%1$d</xliff:g> ساعت و <xliff:g id="MINUTES">%2$d</xliff:g> دقیقه"</string> <string name="durationHourMinute" msgid="2741677355177402539">"<xliff:g id="HOURS">%1$d</xliff:g> ساعت و <xliff:g id="MINUTES">%2$d</xliff:g> دقیقه"</string> <string name="durationMinutes" msgid="3134226679883579347">"<xliff:g id="MINUTES">%1$d</xliff:g> دقیقه"</string> - <!-- no translation found for durationMinute (7155301744174623818) --> - <skip /> + <string name="durationMinute" msgid="7155301744174623818">"<xliff:g id="MINUTES">%1$d</xliff:g> دقیقه"</string> <string name="durationMinuteSeconds" msgid="1424656185379003751">"<xliff:g id="MINUTES">%1$d</xliff:g> دقیقه و <xliff:g id="SECONDS">%2$d</xliff:g> ثانیه"</string> <string name="durationMinuteSecond" msgid="3989228718067466680">"<xliff:g id="MINUTES">%1$d</xliff:g> دقیقه و <xliff:g id="SECONDS">%2$d</xliff:g> ثانیه"</string> <string name="durationSeconds" msgid="8050088505238241405">"<xliff:g id="SECONDS">%1$d</xliff:g> ثانیه"</string> @@ -834,6 +833,8 @@ <string name="permdesc_handoverStatus" msgid="4788144087245714948">"به برنامه امکان میدهد تا اطلاعاتی درباره انتقالهای کنونی پرتوی Android به دست آورد"</string> <string name="permlab_removeDrmCertificates" msgid="7044888287209892751">"حذف گواهیهای DRM"</string> <string name="permdesc_removeDrmCertificates" msgid="7272999075113400993">"به برنامه امکان میدهد گواهیهای DRM را حذف کند. نباید برای برنامههای عادی هیچوقت لازم باشد."</string> + <string name="permlab_bindCarrierMessagingService" msgid="1490229371796969158">"مقید به سرویس پیامرسانی شرکت مخابراتی"</string> + <string name="permdesc_bindCarrierMessagingService" msgid="2762882888502113944">"به کنترلکننده اجازه میدهد که به سطح بالای رابط کاربر سرویس پیامرسانی شرکت مخابراتی مقید شود. هرگز نباید برای برنامههای عادی مورد نیاز شود."</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"تنظیم قوانین رمز ورود"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"طول و نویسههای مجاز در گذرواژههای بازکردن قفل صفحه را کنترل کنید."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"نمایش تلاشهای قفل گشایی صفحه"</string> @@ -1900,4 +1901,5 @@ <string name="toolbar_collapse_description" msgid="2821479483960330739">"کوچک کردن"</string> <string name="zen_mode_next_alarm_summary" msgid="5915140424683747372">"تا هشدار بعدی در <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string> <string name="zen_mode_next_alarm_line_one" msgid="5537042951553420916">"تا هشدار بعدی"</string> + <string name="muted_by" msgid="6147073845094180001">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> آن را بیصدا کرد"</string> </resources> diff --git a/core/res/res/values-fi/strings.xml b/core/res/res/values-fi/strings.xml index 72b788059160..a484cf776f1b 100644 --- a/core/res/res/values-fi/strings.xml +++ b/core/res/res/values-fi/strings.xml @@ -34,8 +34,7 @@ <string name="durationHourMinutes" msgid="9029176248692041549">"<xliff:g id="HOURS">%1$d</xliff:g> t <xliff:g id="MINUTES">%2$d</xliff:g> min"</string> <string name="durationHourMinute" msgid="2741677355177402539">"<xliff:g id="HOURS">%1$d</xliff:g> t <xliff:g id="MINUTES">%2$d</xliff:g> min"</string> <string name="durationMinutes" msgid="3134226679883579347">"<xliff:g id="MINUTES">%1$d</xliff:g> min"</string> - <!-- no translation found for durationMinute (7155301744174623818) --> - <skip /> + <string name="durationMinute" msgid="7155301744174623818">"<xliff:g id="MINUTES">%1$d</xliff:g> min"</string> <string name="durationMinuteSeconds" msgid="1424656185379003751">"<xliff:g id="MINUTES">%1$d</xliff:g> min <xliff:g id="SECONDS">%2$d</xliff:g> s"</string> <string name="durationMinuteSecond" msgid="3989228718067466680">"<xliff:g id="MINUTES">%1$d</xliff:g> min <xliff:g id="SECONDS">%2$d</xliff:g> s"</string> <string name="durationSeconds" msgid="8050088505238241405">"<xliff:g id="SECONDS">%1$d</xliff:g> s"</string> @@ -834,6 +833,8 @@ <string name="permdesc_handoverStatus" msgid="4788144087245714948">"Antaa sovelluksen vastaanottaa tietoja nykyisistä Android Beam -siirroista"</string> <string name="permlab_removeDrmCertificates" msgid="7044888287209892751">"DRM-varmenteiden poistaminen"</string> <string name="permdesc_removeDrmCertificates" msgid="7272999075113400993">"Antaa sovelluksen poistaa DRM-varmenteita. Ei tavallisten sovellusten käyttöön."</string> + <string name="permlab_bindCarrierMessagingService" msgid="1490229371796969158">"Operaattorin viestipalveluun sitoutuminen"</string> + <string name="permdesc_bindCarrierMessagingService" msgid="2762882888502113944">"Antaa sovelluksen sitoutua operaattorin viestipalvelun ylätason liittymään. Ei tavallisten sovellusten käyttöön."</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"Aseta salasanasäännöt"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"Hallinnoi ruudun lukituksenpoistosalasanoissa sallittuja merkkejä ja salasanan pituutta."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Tarkkaile ruudun lukituksen poistoyrityksiä"</string> @@ -1900,4 +1901,5 @@ <string name="toolbar_collapse_description" msgid="2821479483960330739">"Kutista"</string> <string name="zen_mode_next_alarm_summary" msgid="5915140424683747372">"Seuraavaan herätykseen saakka (<xliff:g id="FORMATTEDTIME">%1$s</xliff:g>)"</string> <string name="zen_mode_next_alarm_line_one" msgid="5537042951553420916">"Seuraavaan herätykseen saakka"</string> + <string name="muted_by" msgid="6147073845094180001">"Mykistänyt <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> </resources> diff --git a/core/res/res/values-fr-rCA/strings.xml b/core/res/res/values-fr-rCA/strings.xml index 18db5c6ca917..8f0892603bae 100644 --- a/core/res/res/values-fr-rCA/strings.xml +++ b/core/res/res/values-fr-rCA/strings.xml @@ -34,8 +34,7 @@ <string name="durationHourMinutes" msgid="9029176248692041549">"<xliff:g id="HOURS">%1$d</xliff:g> h et <xliff:g id="MINUTES">%2$d</xliff:g> min"</string> <string name="durationHourMinute" msgid="2741677355177402539">"<xliff:g id="HOURS">%1$d</xliff:g> h et <xliff:g id="MINUTES">%2$d</xliff:g> min"</string> <string name="durationMinutes" msgid="3134226679883579347">"<xliff:g id="MINUTES">%1$d</xliff:g> min"</string> - <!-- no translation found for durationMinute (7155301744174623818) --> - <skip /> + <string name="durationMinute" msgid="7155301744174623818">"<xliff:g id="MINUTES">%1$d</xliff:g> min"</string> <string name="durationMinuteSeconds" msgid="1424656185379003751">"<xliff:g id="MINUTES">%1$d</xliff:g> min et <xliff:g id="SECONDS">%2$d</xliff:g> s"</string> <string name="durationMinuteSecond" msgid="3989228718067466680">"<xliff:g id="MINUTES">%1$d</xliff:g> min et <xliff:g id="SECONDS">%2$d</xliff:g> s"</string> <string name="durationSeconds" msgid="8050088505238241405">"<xliff:g id="SECONDS">%1$d</xliff:g> s"</string> @@ -834,6 +833,8 @@ <string name="permdesc_handoverStatus" msgid="4788144087245714948">"Autoriser cette application à recevoir des données sur les transferts Android Beam en cours"</string> <string name="permlab_removeDrmCertificates" msgid="7044888287209892751">"supprimer des certificats GDN"</string> <string name="permdesc_removeDrmCertificates" msgid="7272999075113400993">"Permet à une application de supprimer les certificats GDN. Cela ne devrait jamais être nécessaire pour des applications normales."</string> + <string name="permlab_bindCarrierMessagingService" msgid="1490229371796969158">"s\'associer à un service de messagerie d\'un fournisseur"</string> + <string name="permdesc_bindCarrierMessagingService" msgid="2762882888502113944">"Permet à l\'application autorisée de s\'associer à l\'interface de plus haut niveau d\'un service de messagerie d\'un fournisseur. Les applications standards ne devraient jamais avoir recours à cette fonctionnalité."</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"Définir les règles du mot de passe"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"Choisir le nombre et le type de caractères autorisés dans les mots de passe de déverrouillage de l\'écran"</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Gérer les tentatives de déverrouillage de l\'écran"</string> @@ -1900,4 +1901,5 @@ <string name="toolbar_collapse_description" msgid="2821479483960330739">"Réduire"</string> <string name="zen_mode_next_alarm_summary" msgid="5915140424683747372">"Jusqu\'à la prochaine alarme, à <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string> <string name="zen_mode_next_alarm_line_one" msgid="5537042951553420916">"Jusqu\'à la prochaine alarme"</string> + <string name="muted_by" msgid="6147073845094180001">"Mis en sourdine par <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> </resources> diff --git a/core/res/res/values-fr/strings.xml b/core/res/res/values-fr/strings.xml index 04d23b0cf736..95d58ade0691 100644 --- a/core/res/res/values-fr/strings.xml +++ b/core/res/res/values-fr/strings.xml @@ -34,8 +34,7 @@ <string name="durationHourMinutes" msgid="9029176248692041549">"<xliff:g id="HOURS">%1$d</xliff:g> h et <xliff:g id="MINUTES">%2$d</xliff:g> min"</string> <string name="durationHourMinute" msgid="2741677355177402539">"<xliff:g id="HOURS">%1$d</xliff:g> h et <xliff:g id="MINUTES">%2$d</xliff:g> min"</string> <string name="durationMinutes" msgid="3134226679883579347">"<xliff:g id="MINUTES">%1$d</xliff:g> min"</string> - <!-- no translation found for durationMinute (7155301744174623818) --> - <skip /> + <string name="durationMinute" msgid="7155301744174623818">"<xliff:g id="MINUTES">%1$d</xliff:g> min"</string> <string name="durationMinuteSeconds" msgid="1424656185379003751">"<xliff:g id="MINUTES">%1$d</xliff:g> min et <xliff:g id="SECONDS">%2$d</xliff:g> s"</string> <string name="durationMinuteSecond" msgid="3989228718067466680">"<xliff:g id="MINUTES">%1$d</xliff:g> min et <xliff:g id="SECONDS">%2$d</xliff:g> s"</string> <string name="durationSeconds" msgid="8050088505238241405">"<xliff:g id="SECONDS">%1$d</xliff:g> s"</string> @@ -834,6 +833,8 @@ <string name="permdesc_handoverStatus" msgid="4788144087245714948">"Autoriser cette application à recevoir des informations sur les transferts Android Beam en cours"</string> <string name="permlab_removeDrmCertificates" msgid="7044888287209892751">"supprimer les certificats de GDN"</string> <string name="permdesc_removeDrmCertificates" msgid="7272999075113400993">"Permet à une application de supprimer les certificats de GDN. Ne devrait jamais être nécessaire pour les applications standards."</string> + <string name="permlab_bindCarrierMessagingService" msgid="1490229371796969158">"s\'associer au service SMS/MMS d\'un opérateur"</string> + <string name="permdesc_bindCarrierMessagingService" msgid="2762882888502113944">"Permettre à l\'application de s\'associer à l\'interface de niveau supérieur du service SMS/MMS d\'un opérateur. Ne devrait jamais être nécessaire pour les applications standards."</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"Définir les règles du mot de passe"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"Choisir le nombre et le type de caractères autorisés dans les mots de passe de déverrouillage de l\'écran"</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Gérer les tentatives de déverrouillage de l\'écran"</string> @@ -1900,4 +1901,5 @@ <string name="toolbar_collapse_description" msgid="2821479483960330739">"Réduire"</string> <string name="zen_mode_next_alarm_summary" msgid="5915140424683747372">"Jusqu\'à la prochaine alarme à <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string> <string name="zen_mode_next_alarm_line_one" msgid="5537042951553420916">"Jusqu\'à la prochaine alarme"</string> + <string name="muted_by" msgid="6147073845094180001">"Son coupé par : <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> </resources> diff --git a/core/res/res/values-gl-rES/strings.xml b/core/res/res/values-gl-rES/strings.xml index 20a9e43302af..c6264b9532ea 100644 --- a/core/res/res/values-gl-rES/strings.xml +++ b/core/res/res/values-gl-rES/strings.xml @@ -34,8 +34,7 @@ <string name="durationHourMinutes" msgid="9029176248692041549">"<xliff:g id="HOURS">%1$d</xliff:g> hr <xliff:g id="MINUTES">%2$d</xliff:g> min"</string> <string name="durationHourMinute" msgid="2741677355177402539">"<xliff:g id="HOURS">%1$d</xliff:g> hr <xliff:g id="MINUTES">%2$d</xliff:g> min"</string> <string name="durationMinutes" msgid="3134226679883579347">"<xliff:g id="MINUTES">%1$d</xliff:g> min"</string> - <!-- no translation found for durationMinute (7155301744174623818) --> - <skip /> + <string name="durationMinute" msgid="7155301744174623818">"<xliff:g id="MINUTES">%1$d</xliff:g> minuto"</string> <string name="durationMinuteSeconds" msgid="1424656185379003751">"<xliff:g id="MINUTES">%1$d</xliff:g> min <xliff:g id="SECONDS">%2$d</xliff:g> seg"</string> <string name="durationMinuteSecond" msgid="3989228718067466680">"<xliff:g id="MINUTES">%1$d</xliff:g> min <xliff:g id="SECONDS">%2$d</xliff:g> seg"</string> <string name="durationSeconds" msgid="8050088505238241405">"<xliff:g id="SECONDS">%1$d</xliff:g> segundos"</string> @@ -834,6 +833,8 @@ <string name="permdesc_handoverStatus" msgid="4788144087245714948">"Permite a esta aplicación recibir información acerca das transferencias actuais de Android Beam"</string> <string name="permlab_removeDrmCertificates" msgid="7044888287209892751">"eliminar certificados DRM"</string> <string name="permdesc_removeDrmCertificates" msgid="7272999075113400993">"Permite a unha aplicación eliminar os certificados DRM. As aplicacións normais non o deberían precisar nunca."</string> + <string name="permlab_bindCarrierMessagingService" msgid="1490229371796969158">"vincular a un servizo de mensaxería do operador"</string> + <string name="permdesc_bindCarrierMessagingService" msgid="2762882888502113944">"Permite ao propietario vincularse á interface de nivel superior dun servizo de mensaxería do operador. As aplicacións normais non deberían necesitar este permiso."</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"Establecer as normas de contrasinal"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"Controlar a lonxitude e os caracteres permitidos nos contrasinais de desbloqueo da pantalla."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Supervisar os intentos de desbloqueo da pantalla"</string> @@ -1898,6 +1899,7 @@ <string name="zen_mode_until" msgid="7336308492289875088">"Ata as <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string> <string name="zen_mode_forever" msgid="4316804956488785559">"Indefinidamente"</string> <string name="toolbar_collapse_description" msgid="2821479483960330739">"Contraer"</string> - <string name="zen_mode_next_alarm_summary" msgid="5915140424683747372">"Ata a seguinte alarma ás <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string> - <string name="zen_mode_next_alarm_line_one" msgid="5537042951553420916">"Ata a seguinte alarma"</string> + <string name="zen_mode_next_alarm_summary" msgid="5915140424683747372">"Ata que soe a seguinte alarma ás <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string> + <string name="zen_mode_next_alarm_line_one" msgid="5537042951553420916">"Ata que soe a seguinte alarma"</string> + <string name="muted_by" msgid="6147073845094180001">"Silenciado por <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> </resources> diff --git a/core/res/res/values-hi/strings.xml b/core/res/res/values-hi/strings.xml index fdc68ec0a14b..cdff61509bf7 100644 --- a/core/res/res/values-hi/strings.xml +++ b/core/res/res/values-hi/strings.xml @@ -34,8 +34,7 @@ <string name="durationHourMinutes" msgid="9029176248692041549">"<xliff:g id="HOURS">%1$d</xliff:g> घं. <xliff:g id="MINUTES">%2$d</xliff:g> मि."</string> <string name="durationHourMinute" msgid="2741677355177402539">"<xliff:g id="HOURS">%1$d</xliff:g> घं. <xliff:g id="MINUTES">%2$d</xliff:g> मि."</string> <string name="durationMinutes" msgid="3134226679883579347">"<xliff:g id="MINUTES">%1$d</xliff:g> मिनट"</string> - <!-- no translation found for durationMinute (7155301744174623818) --> - <skip /> + <string name="durationMinute" msgid="7155301744174623818">"<xliff:g id="MINUTES">%1$d</xliff:g> मिनट"</string> <string name="durationMinuteSeconds" msgid="1424656185379003751">"<xliff:g id="MINUTES">%1$d</xliff:g> मि. <xliff:g id="SECONDS">%2$d</xliff:g> से."</string> <string name="durationMinuteSecond" msgid="3989228718067466680">"<xliff:g id="MINUTES">%1$d</xliff:g> मि. <xliff:g id="SECONDS">%2$d</xliff:g> से."</string> <string name="durationSeconds" msgid="8050088505238241405">"<xliff:g id="SECONDS">%1$d</xliff:g> सेकंड"</string> @@ -834,6 +833,8 @@ <string name="permdesc_handoverStatus" msgid="4788144087245714948">"इस ऐप्लिकेशन को वर्तमान Android Beam स्थानान्तरणों के बारे में जानकारी प्राप्त करने देती है."</string> <string name="permlab_removeDrmCertificates" msgid="7044888287209892751">"DRM प्रमाणपत्रों को निकाल सकता है"</string> <string name="permdesc_removeDrmCertificates" msgid="7272999075113400993">"एप्लिकेशन को DRM प्रमाणपत्रों को निकालने देता है. सामान्य ऐप्स के लिए कभी भी आवश्यकता नहीं होनी चाहिए."</string> + <string name="permlab_bindCarrierMessagingService" msgid="1490229371796969158">"किसी वाहक संदेश सेवा से आबद्ध करें"</string> + <string name="permdesc_bindCarrierMessagingService" msgid="2762882888502113944">"धारक को किसी वाहक संदेश सेवा के शीर्ष-स्तरीय इंटरफ़ेस से आबद्ध होने देती है. सामान्य ऐप्स के लिए कभी भी आवश्यक नहीं होना चाहिए."</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"पासवर्ड नियम सेट करें"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"स्क्रीन-अनलॉक पासवर्ड में अनुमति प्राप्त लंबाई और वर्णों को नियंत्रित करें."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"स्क्रीन-अनलॉक के प्रयासों पर निगरानी रखें"</string> @@ -1900,4 +1901,5 @@ <string name="toolbar_collapse_description" msgid="2821479483960330739">"संक्षिप्त करें"</string> <string name="zen_mode_next_alarm_summary" msgid="5915140424683747372">"<xliff:g id="FORMATTEDTIME">%1$s</xliff:g> पर अगले अलार्म तक"</string> <string name="zen_mode_next_alarm_line_one" msgid="5537042951553420916">"अगले अलार्म तक"</string> + <string name="muted_by" msgid="6147073845094180001">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> द्वारा म्यूट किया गया"</string> </resources> diff --git a/core/res/res/values-hr/strings.xml b/core/res/res/values-hr/strings.xml index c8c37e6eda2e..6c82b25787f0 100644 --- a/core/res/res/values-hr/strings.xml +++ b/core/res/res/values-hr/strings.xml @@ -34,8 +34,7 @@ <string name="durationHourMinutes" msgid="9029176248692041549">"<xliff:g id="HOURS">%1$d</xliff:g> h <xliff:g id="MINUTES">%2$d</xliff:g> min"</string> <string name="durationHourMinute" msgid="2741677355177402539">"<xliff:g id="HOURS">%1$d</xliff:g> h <xliff:g id="MINUTES">%2$d</xliff:g> min"</string> <string name="durationMinutes" msgid="3134226679883579347">"<xliff:g id="MINUTES">%1$d</xliff:g> min"</string> - <!-- no translation found for durationMinute (7155301744174623818) --> - <skip /> + <string name="durationMinute" msgid="7155301744174623818">"<xliff:g id="MINUTES">%1$d</xliff:g> min"</string> <string name="durationMinuteSeconds" msgid="1424656185379003751">"<xliff:g id="MINUTES">%1$d</xliff:g> min <xliff:g id="SECONDS">%2$d</xliff:g> s"</string> <string name="durationMinuteSecond" msgid="3989228718067466680">"<xliff:g id="MINUTES">%1$d</xliff:g> min <xliff:g id="SECONDS">%2$d</xliff:g> s"</string> <string name="durationSeconds" msgid="8050088505238241405">"<xliff:g id="SECONDS">%1$d</xliff:g> s"</string> @@ -834,6 +833,8 @@ <string name="permdesc_handoverStatus" msgid="4788144087245714948">"Omogućuje aplikaciji primanje podataka o trenutačnim prijenosima Android Beama"</string> <string name="permlab_removeDrmCertificates" msgid="7044888287209892751">"uklanjanje DRM certifikata"</string> <string name="permdesc_removeDrmCertificates" msgid="7272999075113400993">"Omogućuje aplikaciji uklanjanje DRM certifikata. Ne bi trebalo biti potrebno za uobičajene aplikacije."</string> + <string name="permlab_bindCarrierMessagingService" msgid="1490229371796969158">"povezivanje s uslugom mobilnog operatera za slanje poruka"</string> + <string name="permdesc_bindCarrierMessagingService" msgid="2762882888502113944">"Omogućuje nositelju povezivanje sa sučeljem najviše razine usluge mobilnog operatera za slanje poruka. Ne bi trebalo biti potrebno za uobičajene aplikacije."</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"Postavi pravila zaporke"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"Upravljajte duljinom zaporki za otključavanje zaslona i dopuštenim znakovima u tim zaporkama."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Nadgledaj pokušaje otključavanja zaslona"</string> @@ -1900,4 +1901,5 @@ <string name="toolbar_collapse_description" msgid="2821479483960330739">"Sažmi"</string> <string name="zen_mode_next_alarm_summary" msgid="5915140424683747372">"Do sljedećeg alarma u <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string> <string name="zen_mode_next_alarm_line_one" msgid="5537042951553420916">"Do sljedećeg alarma"</string> + <string name="muted_by" msgid="6147073845094180001">"Zvuk je isklj. treća strana <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> </resources> diff --git a/core/res/res/values-hu/strings.xml b/core/res/res/values-hu/strings.xml index 1f91ef227225..79f36c061869 100644 --- a/core/res/res/values-hu/strings.xml +++ b/core/res/res/values-hu/strings.xml @@ -34,8 +34,7 @@ <string name="durationHourMinutes" msgid="9029176248692041549">"<xliff:g id="HOURS">%1$d</xliff:g> óra <xliff:g id="MINUTES">%2$d</xliff:g> perc"</string> <string name="durationHourMinute" msgid="2741677355177402539">"<xliff:g id="HOURS">%1$d</xliff:g> óra <xliff:g id="MINUTES">%2$d</xliff:g> perc"</string> <string name="durationMinutes" msgid="3134226679883579347">"<xliff:g id="MINUTES">%1$d</xliff:g> perc"</string> - <!-- no translation found for durationMinute (7155301744174623818) --> - <skip /> + <string name="durationMinute" msgid="7155301744174623818">"<xliff:g id="MINUTES">%1$d</xliff:g> perc"</string> <string name="durationMinuteSeconds" msgid="1424656185379003751">"<xliff:g id="MINUTES">%1$d</xliff:g> perc <xliff:g id="SECONDS">%2$d</xliff:g> mp"</string> <string name="durationMinuteSecond" msgid="3989228718067466680">"<xliff:g id="MINUTES">%1$d</xliff:g> perc <xliff:g id="SECONDS">%2$d</xliff:g> mp"</string> <string name="durationSeconds" msgid="8050088505238241405">"<xliff:g id="SECONDS">%1$d</xliff:g> másodperc"</string> @@ -834,6 +833,8 @@ <string name="permdesc_handoverStatus" msgid="4788144087245714948">"Lehetővé teszi az alkalmazás számára a folyamatban lévő Android Beam-átvitelekről szóló információk fogadását"</string> <string name="permlab_removeDrmCertificates" msgid="7044888287209892751">"DRM-tanúsítványok eltávolítása"</string> <string name="permdesc_removeDrmCertificates" msgid="7272999075113400993">"Lehetővé teszi, hogy az alkalmazás eltávolítsa a DRM-tanúsítványokat. A normál alkalmazásoknak erre soha nincs szükségük."</string> + <string name="permlab_bindCarrierMessagingService" msgid="1490229371796969158">"kapcsolódás egy üzenetszolgáltatáshoz"</string> + <string name="permdesc_bindCarrierMessagingService" msgid="2762882888502113944">"Lehetővé teszi, hogy a tulajdonos kapcsolódjon egy üzenetszolgáltatás legfelső szintű kezelőfelületéhez. A normál alkalmazásoknak erre soha nincs szükségük."</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"Jelszavakkal kapcsolatos szabályok beállítása"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"A képernyőzár-feloldási jelszavakban engedélyezett karakterek és hosszúság vezérlése."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Képernyőzár-feloldási kísérletek figyelése"</string> @@ -1900,4 +1901,5 @@ <string name="toolbar_collapse_description" msgid="2821479483960330739">"Összecsukás"</string> <string name="zen_mode_next_alarm_summary" msgid="5915140424683747372">"A következő ébresztésig ekkor: <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string> <string name="zen_mode_next_alarm_line_one" msgid="5537042951553420916">"A következő ébresztésig"</string> + <string name="muted_by" msgid="6147073845094180001">"A(z) <xliff:g id="THIRD_PARTY">%1$s</xliff:g> elnémította"</string> </resources> diff --git a/core/res/res/values-hy-rAM/strings.xml b/core/res/res/values-hy-rAM/strings.xml index eed4f86b00cb..ec4e5511aeca 100644 --- a/core/res/res/values-hy-rAM/strings.xml +++ b/core/res/res/values-hy-rAM/strings.xml @@ -833,6 +833,8 @@ <string name="permdesc_handoverStatus" msgid="4788144087245714948">"Ծրագրին թույլ է տալիս ստանալ Android Beam-ով ընթացիկ փոխանցումների մասին տեղեկատվություն:"</string> <string name="permlab_removeDrmCertificates" msgid="7044888287209892751">"հեռացնել DRM վկայագրեր"</string> <string name="permdesc_removeDrmCertificates" msgid="7272999075113400993">"Ծրագրին թույլ է տալիս հեռացնել DRM վկայագրեր: Սովորական ծրագրերի համար երբեք պետք չի գալիս:"</string> + <string name="permlab_bindCarrierMessagingService" msgid="1490229371796969158">"կապվել օպերատորի հաղորդագրությունների ծառայության հետ"</string> + <string name="permdesc_bindCarrierMessagingService" msgid="2762882888502113944">"Թույլ է տալիս տիրոջը կապվել օպերատորի հաղորդագրությունների ծառայության վերին մակարդակի միջերեսի հետ: Սա երբեք չի պահանջվում սովորական հավելվածների համար:"</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"Սահմանել գաղտնաբառի կանոնները"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"Վերահսկել էկրանի ապակողպման գաղտնաբառերի թույլատրելի երկարությունն ու գրանշանները:"</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Վերահսկել էկրանի ապակողպման փորձերը"</string> @@ -1899,4 +1901,5 @@ <string name="toolbar_collapse_description" msgid="2821479483960330739">"Թաքցնել"</string> <string name="zen_mode_next_alarm_summary" msgid="5915140424683747372">"Մինչև հաջորդ զարթուցիչը՝ <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string> <string name="zen_mode_next_alarm_line_one" msgid="5537042951553420916">"Մինչև հաջորդ զարթուցիչը"</string> + <string name="muted_by" msgid="6147073845094180001">"Համրեցվել է <xliff:g id="THIRD_PARTY">%1$s</xliff:g>-ի կողմից"</string> </resources> diff --git a/core/res/res/values-in/strings.xml b/core/res/res/values-in/strings.xml index 7e4bc4d6aa0d..c5748e6fc090 100644 --- a/core/res/res/values-in/strings.xml +++ b/core/res/res/values-in/strings.xml @@ -34,8 +34,7 @@ <string name="durationHourMinutes" msgid="9029176248692041549">"<xliff:g id="HOURS">%1$d</xliff:g> jam <xliff:g id="MINUTES">%2$d</xliff:g> mnt"</string> <string name="durationHourMinute" msgid="2741677355177402539">"<xliff:g id="HOURS">%1$d</xliff:g> jam <xliff:g id="MINUTES">%2$d</xliff:g> mnt"</string> <string name="durationMinutes" msgid="3134226679883579347">"<xliff:g id="MINUTES">%1$d</xliff:g> mnt"</string> - <!-- no translation found for durationMinute (7155301744174623818) --> - <skip /> + <string name="durationMinute" msgid="7155301744174623818">"<xliff:g id="MINUTES">%1$d</xliff:g> mnt"</string> <string name="durationMinuteSeconds" msgid="1424656185379003751">"<xliff:g id="MINUTES">%1$d</xliff:g> mnt <xliff:g id="SECONDS">%2$d</xliff:g> dtk"</string> <string name="durationMinuteSecond" msgid="3989228718067466680">"<xliff:g id="MINUTES">%1$d</xliff:g> mnt <xliff:g id="SECONDS">%2$d</xliff:g> dtk"</string> <string name="durationSeconds" msgid="8050088505238241405">"<xliff:g id="SECONDS">%1$d</xliff:g> dtk"</string> @@ -834,6 +833,8 @@ <string name="permdesc_handoverStatus" msgid="4788144087245714948">"Memungkinkan aplikasi ini menerima informasi tentang transfer Android Beam saat ini"</string> <string name="permlab_removeDrmCertificates" msgid="7044888287209892751">"membuang serifikat DRM"</string> <string name="permdesc_removeDrmCertificates" msgid="7272999075113400993">"Memungkinkan aplikasi membuang sertifikat DRM. Tidak pernah dibutuhkan untuk aplikasi normal."</string> + <string name="permlab_bindCarrierMessagingService" msgid="1490229371796969158">"ikat ke layanan perpesanan operator"</string> + <string name="permdesc_bindCarrierMessagingService" msgid="2762882888502113944">"Mengizinkan pemegang untuk mengikat ke antarmuka tingkat tinggi dari suatu layanan perpesanan operator. Tidak pernah diperlukan oleh aplikasi normal."</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"Setel aturan sandi"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"Kontrol panjang dan karakter yang diizinkan dalam sandi pembuka layar."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Upaya pembukaan kunci layar monitor"</string> @@ -1878,7 +1879,7 @@ <string name="lock_to_app_unlock_password" msgid="6380979775916974414">"Meminta sandi sebelum melepas sematan"</string> <string name="battery_saver_description" msgid="2510530476513605742">"Guna membantu meningkatkan masa pakai baterai, penghemat baterai mengurangi kinerja perangkat dan membatasi getaran serta sebagian besar data latar belakang. Email, perpesanan, dan aplikasi lain yang bergantung pada sinkronisasi mungkin tidak akan diperbarui kecuali Anda membukanya.\n\nPenghemat baterai dinonaktifkan secara otomatis saat perangkat diisi daya."</string> <string name="downtime_condition_summary" msgid="8761776337475705749">"Hingga waktu perbaikan Anda berakhir pukul <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string> - <string name="downtime_condition_line_one" msgid="8762708714645352010">"Hingga waktu henti berakhir"</string> + <string name="downtime_condition_line_one" msgid="8762708714645352010">"Hingga waktu non-operasional berakhir"</string> <plurals name="zen_mode_duration_minutes_summary"> <item quantity="one" msgid="3177683545388923234">"Selama semenit (hingga <xliff:g id="FORMATTEDTIME">%2$s</xliff:g>)"</item> <item quantity="other" msgid="2787867221129368935">"Selama %1$d menit (hingga <xliff:g id="FORMATTEDTIME">%2$s</xliff:g>)"</item> @@ -1898,6 +1899,7 @@ <string name="zen_mode_until" msgid="7336308492289875088">"Hingga <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string> <string name="zen_mode_forever" msgid="4316804956488785559">"Tidak ditentukan"</string> <string name="toolbar_collapse_description" msgid="2821479483960330739">"Ciutkan"</string> - <string name="zen_mode_next_alarm_summary" msgid="5915140424683747372">"Hingga alarm berikutnya pukul <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string> - <string name="zen_mode_next_alarm_line_one" msgid="5537042951553420916">"Hingga alarm berikutnya"</string> + <string name="zen_mode_next_alarm_summary" msgid="5915140424683747372">"Sampai alarm berikutnya pukul <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string> + <string name="zen_mode_next_alarm_line_one" msgid="5537042951553420916">"Sampai alarm berikutnya"</string> + <string name="muted_by" msgid="6147073845094180001">"Dinonaktifkan oleh <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> </resources> diff --git a/core/res/res/values-is-rIS/strings.xml b/core/res/res/values-is-rIS/strings.xml index a58cb8c6b54c..5c9def430735 100644 --- a/core/res/res/values-is-rIS/strings.xml +++ b/core/res/res/values-is-rIS/strings.xml @@ -34,8 +34,7 @@ <string name="durationHourMinutes" msgid="9029176248692041549">"<xliff:g id="HOURS">%1$d</xliff:g> k. <xliff:g id="MINUTES">%2$d</xliff:g> mín."</string> <string name="durationHourMinute" msgid="2741677355177402539">"<xliff:g id="HOURS">%1$d</xliff:g> k. <xliff:g id="MINUTES">%2$d</xliff:g> mín."</string> <string name="durationMinutes" msgid="3134226679883579347">"<xliff:g id="MINUTES">%1$d</xliff:g> mín."</string> - <!-- no translation found for durationMinute (7155301744174623818) --> - <skip /> + <string name="durationMinute" msgid="7155301744174623818">"<xliff:g id="MINUTES">%1$d</xliff:g> mín."</string> <string name="durationMinuteSeconds" msgid="1424656185379003751">"<xliff:g id="MINUTES">%1$d</xliff:g> m. <xliff:g id="SECONDS">%2$d</xliff:g> sek."</string> <string name="durationMinuteSecond" msgid="3989228718067466680">"<xliff:g id="MINUTES">%1$d</xliff:g> m. <xliff:g id="SECONDS">%2$d</xliff:g> sek."</string> <string name="durationSeconds" msgid="8050088505238241405">"<xliff:g id="SECONDS">%1$d</xliff:g> sek."</string> @@ -834,6 +833,8 @@ <string name="permdesc_handoverStatus" msgid="4788144087245714948">"Leyfir þessu forriti að fá upplýsingar um flutning sem fram fer með Android Beam"</string> <string name="permlab_removeDrmCertificates" msgid="7044888287209892751">"fjarlægja DRM-vottorð"</string> <string name="permdesc_removeDrmCertificates" msgid="7272999075113400993">"Leyfir forriti að fjarlægja DRM-vottorð. Ætti aldrei að vera nauðsynlegt fyrir venjuleg forrit."</string> + <string name="permlab_bindCarrierMessagingService" msgid="1490229371796969158">"bindast skilaboðaþjónustu símafyrirtækis"</string> + <string name="permdesc_bindCarrierMessagingService" msgid="2762882888502113944">"Leyfir forriti að bindast efsta viðmótslagi skilaboðaþjónustu símafyrirtækis. Ætti aldrei að vera nauðsynlegt fyrir venjuleg forrit."</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"Setja reglur um aðgangsorð"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"Stjórna lengd aðgangsorða til að taka skjáinn úr lás og leyfðum stöfum."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Fylgjast með tilraunum til að taka skjáinn úr lás"</string> @@ -1900,4 +1901,5 @@ <string name="toolbar_collapse_description" msgid="2821479483960330739">"Minnka"</string> <string name="zen_mode_next_alarm_summary" msgid="5915140424683747372">"Fram að næsta vekjara kl. <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string> <string name="zen_mode_next_alarm_line_one" msgid="5537042951553420916">"Fram að næsta vekjara"</string> + <string name="muted_by" msgid="6147073845094180001">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> tók hljóðið af"</string> </resources> diff --git a/core/res/res/values-it/strings.xml b/core/res/res/values-it/strings.xml index ffc8aecb230e..e08b34f1de12 100644 --- a/core/res/res/values-it/strings.xml +++ b/core/res/res/values-it/strings.xml @@ -34,8 +34,7 @@ <string name="durationHourMinutes" msgid="9029176248692041549">"<xliff:g id="HOURS">%1$d</xliff:g> ora <xliff:g id="MINUTES">%2$d</xliff:g> minuti"</string> <string name="durationHourMinute" msgid="2741677355177402539">"<xliff:g id="HOURS">%1$d</xliff:g> ora <xliff:g id="MINUTES">%2$d</xliff:g> minuto"</string> <string name="durationMinutes" msgid="3134226679883579347">"<xliff:g id="MINUTES">%1$d</xliff:g> minuti"</string> - <!-- no translation found for durationMinute (7155301744174623818) --> - <skip /> + <string name="durationMinute" msgid="7155301744174623818">"<xliff:g id="MINUTES">%1$d</xliff:g> min"</string> <string name="durationMinuteSeconds" msgid="1424656185379003751">"<xliff:g id="MINUTES">%1$d</xliff:g> minuto <xliff:g id="SECONDS">%2$d</xliff:g> secondi"</string> <string name="durationMinuteSecond" msgid="3989228718067466680">"<xliff:g id="MINUTES">%1$d</xliff:g> minuto <xliff:g id="SECONDS">%2$d</xliff:g> secondo"</string> <string name="durationSeconds" msgid="8050088505238241405">"<xliff:g id="SECONDS">%1$d</xliff:g> secondi"</string> @@ -834,6 +833,8 @@ <string name="permdesc_handoverStatus" msgid="4788144087245714948">"Consente all\'applicazione di ricevere informazioni sugli attuali trasferimenti Android Beam"</string> <string name="permlab_removeDrmCertificates" msgid="7044888287209892751">"rimozione di certificati DRM"</string> <string name="permdesc_removeDrmCertificates" msgid="7272999075113400993">"Consente a un\'applicazione di rimuovere certificati DRM. Non dovrebbe mai essere necessaria per le normali applicazioni."</string> + <string name="permlab_bindCarrierMessagingService" msgid="1490229371796969158">"associazione a un servizio di messaggi dell\'operatore"</string> + <string name="permdesc_bindCarrierMessagingService" msgid="2762882888502113944">"Consente l\'associazione di un servizio di messaggi dell\'operatore all\'interfaccia principale. Non dovrebbe mai essere necessaria per le normali applicazioni."</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"Impostazione regole password"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"Controlla la lunghezza e i caratteri ammessi nelle password di sblocco dello schermo."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Controllo tentativi di sblocco dello schermo"</string> @@ -1900,4 +1901,5 @@ <string name="toolbar_collapse_description" msgid="2821479483960330739">"Comprimi"</string> <string name="zen_mode_next_alarm_summary" msgid="5915140424683747372">"Fino alla prossima sveglia alle ore <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string> <string name="zen_mode_next_alarm_line_one" msgid="5537042951553420916">"Fino alla prossima sveglia"</string> + <string name="muted_by" msgid="6147073845094180001">"Audio disattivato da <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> </resources> diff --git a/core/res/res/values-iw/strings.xml b/core/res/res/values-iw/strings.xml index 2e630df563d7..a7f88705f5ea 100644 --- a/core/res/res/values-iw/strings.xml +++ b/core/res/res/values-iw/strings.xml @@ -34,8 +34,7 @@ <string name="durationHourMinutes" msgid="9029176248692041549">"שעה <xliff:g id="HOURS">%1$d</xliff:g> <xliff:g id="MINUTES">%2$d</xliff:g> דק\'"</string> <string name="durationHourMinute" msgid="2741677355177402539">"<xliff:g id="HOURS">%1$d</xliff:g> שעות <xliff:g id="MINUTES">%2$d</xliff:g> דק\'"</string> <string name="durationMinutes" msgid="3134226679883579347">"<xliff:g id="MINUTES">%1$d</xliff:g> דקות"</string> - <!-- no translation found for durationMinute (7155301744174623818) --> - <skip /> + <string name="durationMinute" msgid="7155301744174623818">"<xliff:g id="MINUTES">%1$d</xliff:g> דקות"</string> <string name="durationMinuteSeconds" msgid="1424656185379003751">"דקה <xliff:g id="MINUTES">%1$d</xliff:g> <xliff:g id="SECONDS">%2$d</xliff:g> שנ\'"</string> <string name="durationMinuteSecond" msgid="3989228718067466680">"דקה <xliff:g id="MINUTES">%1$d</xliff:g> שנ\' <xliff:g id="SECONDS">%2$d</xliff:g>"</string> <string name="durationSeconds" msgid="8050088505238241405">"<xliff:g id="SECONDS">%1$d</xliff:g> שניות"</string> @@ -834,6 +833,8 @@ <string name="permdesc_handoverStatus" msgid="4788144087245714948">"מאפשר לאפליקציה הזו לקבל מידע על העברות Android Beam נוכחיות"</string> <string name="permlab_removeDrmCertificates" msgid="7044888287209892751">"הסרת אישורי DRM"</string> <string name="permdesc_removeDrmCertificates" msgid="7272999075113400993">"הרשאה זו מאפשרת לאפליקציה להסיר אישורי DRM. באפליקציות רגילות אף פעם לא אמור להיות בה צורך."</string> + <string name="permlab_bindCarrierMessagingService" msgid="1490229371796969158">"איגוד לשירות העברת הודעות של ספק"</string> + <string name="permdesc_bindCarrierMessagingService" msgid="2762882888502113944">"מאפשרת לבעלים לאגד לממשק ברמה העליונה של שירות העברת הודעות של ספק. לעולם לא אמורה להיות נחוצה עבור אפליקציות רגילות."</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"הגדר כללי סיסמה"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"שלוט באורך ובתווים המותרים בסיסמאות לביטול נעילת מסך."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"עקוב אחר ניסיונות לביטול נעילת מסך"</string> @@ -1900,4 +1901,5 @@ <string name="toolbar_collapse_description" msgid="2821479483960330739">"כווץ"</string> <string name="zen_mode_next_alarm_summary" msgid="5915140424683747372">"עד ההתראה הבאה ב-<xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string> <string name="zen_mode_next_alarm_line_one" msgid="5537042951553420916">"עד ההתראה הבאה"</string> + <string name="muted_by" msgid="6147073845094180001">"הושתק על ידי <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> </resources> diff --git a/core/res/res/values-ja/strings.xml b/core/res/res/values-ja/strings.xml index fb1741f3fb96..f44681d51514 100644 --- a/core/res/res/values-ja/strings.xml +++ b/core/res/res/values-ja/strings.xml @@ -34,8 +34,7 @@ <string name="durationHourMinutes" msgid="9029176248692041549">"<xliff:g id="HOURS">%1$d</xliff:g>時間<xliff:g id="MINUTES">%2$d</xliff:g>分"</string> <string name="durationHourMinute" msgid="2741677355177402539">"<xliff:g id="HOURS">%1$d</xliff:g>時間<xliff:g id="MINUTES">%2$d</xliff:g>分"</string> <string name="durationMinutes" msgid="3134226679883579347">"<xliff:g id="MINUTES">%1$d</xliff:g>分"</string> - <!-- no translation found for durationMinute (7155301744174623818) --> - <skip /> + <string name="durationMinute" msgid="7155301744174623818">"<xliff:g id="MINUTES">%1$d</xliff:g>分"</string> <string name="durationMinuteSeconds" msgid="1424656185379003751">"<xliff:g id="MINUTES">%1$d</xliff:g>分<xliff:g id="SECONDS">%2$d</xliff:g>秒"</string> <string name="durationMinuteSecond" msgid="3989228718067466680">"<xliff:g id="MINUTES">%1$d</xliff:g>分<xliff:g id="SECONDS">%2$d</xliff:g>秒"</string> <string name="durationSeconds" msgid="8050088505238241405">"<xliff:g id="SECONDS">%1$d</xliff:g>秒"</string> @@ -834,6 +833,8 @@ <string name="permdesc_handoverStatus" msgid="4788144087245714948">"現在のAndroidビーム転送に関する情報を受信することをこのアプリに許可します。"</string> <string name="permlab_removeDrmCertificates" msgid="7044888287209892751">"DRM証明書の削除"</string> <string name="permdesc_removeDrmCertificates" msgid="7272999075113400993">"DRM証明書の削除をアプリに許可します。通常のアプリでは不要です。"</string> + <string name="permlab_bindCarrierMessagingService" msgid="1490229371796969158">"携帯通信会社のSMSサービスへのバインド"</string> + <string name="permdesc_bindCarrierMessagingService" msgid="2762882888502113944">"携帯通信会社のSMSサービスのトップレベルインターフェースにバインドすることを所有者に許可します。通常のアプリでは不要です。"</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"パスワードルールの設定"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"画面ロック解除パスワードの長さと使用できる文字を制御します。"</string> <string name="policylab_watchLogin" msgid="914130646942199503">"画面ロック解除試行の監視"</string> @@ -1900,4 +1901,5 @@ <string name="toolbar_collapse_description" msgid="2821479483960330739">"折りたたむ"</string> <string name="zen_mode_next_alarm_summary" msgid="5915140424683747372">"次のアラーム（<xliff:g id="FORMATTEDTIME">%1$s</xliff:g>）まで"</string> <string name="zen_mode_next_alarm_line_one" msgid="5537042951553420916">"次のアラームまで"</string> + <string name="muted_by" msgid="6147073845094180001">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g>によりミュートになっています"</string> </resources> diff --git a/core/res/res/values-ka-rGE/strings.xml b/core/res/res/values-ka-rGE/strings.xml index 235c754506b5..d6f48fde0279 100644 --- a/core/res/res/values-ka-rGE/strings.xml +++ b/core/res/res/values-ka-rGE/strings.xml @@ -34,8 +34,7 @@ <string name="durationHourMinutes" msgid="9029176248692041549">"<xliff:g id="HOURS">%1$d</xliff:g> სთ <xliff:g id="MINUTES">%2$d</xliff:g> წთ"</string> <string name="durationHourMinute" msgid="2741677355177402539">"<xliff:g id="HOURS">%1$d</xliff:g> სთ <xliff:g id="MINUTES">%2$d</xliff:g> წთ"</string> <string name="durationMinutes" msgid="3134226679883579347">"<xliff:g id="MINUTES">%1$d</xliff:g> წთ"</string> - <!-- no translation found for durationMinute (7155301744174623818) --> - <skip /> + <string name="durationMinute" msgid="7155301744174623818">"<xliff:g id="MINUTES">%1$d</xliff:g> წთ"</string> <string name="durationMinuteSeconds" msgid="1424656185379003751">"<xliff:g id="MINUTES">%1$d</xliff:g> წთ <xliff:g id="SECONDS">%2$d</xliff:g> წმ"</string> <string name="durationMinuteSecond" msgid="3989228718067466680">"<xliff:g id="MINUTES">%1$d</xliff:g> წთ <xliff:g id="SECONDS">%2$d</xliff:g> წმ"</string> <string name="durationSeconds" msgid="8050088505238241405">"<xliff:g id="SECONDS">%1$d</xliff:g> წმ"</string> @@ -834,6 +833,8 @@ <string name="permdesc_handoverStatus" msgid="4788144087245714948">"ნებას რთავს ამ აპლიკაციას, მიიღოს ინფორმაცია მიმდინარე Android Beam-ის ტრანსფერების შესახებ"</string> <string name="permlab_removeDrmCertificates" msgid="7044888287209892751">"DRM სერტიფიკატების ამოშლა"</string> <string name="permdesc_removeDrmCertificates" msgid="7272999075113400993">"საშუალებას აძლევს აპლიკაციას ამოშალოს DRM სერtიფიკატები. ეს წესით ჩვეულებრივ აპებს არ უნდა დაჭირდეს."</string> + <string name="permlab_bindCarrierMessagingService" msgid="1490229371796969158">"აკავშირებს შეტყობინების გაცვლის მომსახურებას"</string> + <string name="permdesc_bindCarrierMessagingService" msgid="2762882888502113944">"საშუალებას აძლევს მფლობელს შექმნას შეტყობინების გაცვლის მომსახურების უმახლესი დონის ინტერფეისი. არასდროს იქნება საჭირო ნორმალური აპლიკაციებისათვის."</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"პაროლის წესების დაყენება"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"გააკონტროლეთ ეკრანის განბლოკვის პაროლში დაშვებული სიმბოლოები და მისი სიგრძე."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"ეკრანის განბლოკვის მცდელობების გაკონტროლება"</string> @@ -1900,4 +1901,5 @@ <string name="toolbar_collapse_description" msgid="2821479483960330739">"აკეცვა"</string> <string name="zen_mode_next_alarm_summary" msgid="5915140424683747372">"შემდეგ მაღვიძარამდე <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>-ში"</string> <string name="zen_mode_next_alarm_line_one" msgid="5537042951553420916">"შემდეგ მაღვიძარამდე"</string> + <string name="muted_by" msgid="6147073845094180001">"დადუმებულია <xliff:g id="THIRD_PARTY">%1$s</xliff:g>-ის მიერ"</string> </resources> diff --git a/core/res/res/values-kk-rKZ/strings.xml b/core/res/res/values-kk-rKZ/strings.xml index 7b810a4e38d6..a15ac78830a7 100644 --- a/core/res/res/values-kk-rKZ/strings.xml +++ b/core/res/res/values-kk-rKZ/strings.xml @@ -34,8 +34,7 @@ <string name="durationHourMinutes" msgid="9029176248692041549">"<xliff:g id="HOURS">%1$d</xliff:g> сағ. <xliff:g id="MINUTES">%2$d</xliff:g> м."</string> <string name="durationHourMinute" msgid="2741677355177402539">"<xliff:g id="HOURS">%1$d</xliff:g> сағ. <xliff:g id="MINUTES">%2$d</xliff:g> м."</string> <string name="durationMinutes" msgid="3134226679883579347">"<xliff:g id="MINUTES">%1$d</xliff:g> мин."</string> - <!-- no translation found for durationMinute (7155301744174623818) --> - <skip /> + <string name="durationMinute" msgid="7155301744174623818">"<xliff:g id="MINUTES">%1$d</xliff:g> мин"</string> <string name="durationMinuteSeconds" msgid="1424656185379003751">"<xliff:g id="MINUTES">%1$d</xliff:g> мин. <xliff:g id="SECONDS">%2$d</xliff:g> с."</string> <string name="durationMinuteSecond" msgid="3989228718067466680">"<xliff:g id="MINUTES">%1$d</xliff:g> мин. <xliff:g id="SECONDS">%2$d</xliff:g> с."</string> <string name="durationSeconds" msgid="8050088505238241405">"<xliff:g id="SECONDS">%1$d</xliff:g> сек."</string> @@ -834,6 +833,8 @@ <string name="permdesc_handoverStatus" msgid="4788144087245714948">"Осы қолданбаға ағымдағы Android Beam тасымалдаулары туралы ақпарат алуға рұқсат ету"</string> <string name="permlab_removeDrmCertificates" msgid="7044888287209892751">"DRM сертификаттарын жою"</string> <string name="permdesc_removeDrmCertificates" msgid="7272999075113400993">"Қолданбаға DRM сертификаттарын жоюға рұқсат етеді. Қалыпты қолданбалар үшін ешқашан қажет болмайды."</string> + <string name="permlab_bindCarrierMessagingService" msgid="1490229371796969158">"оператордың хабар алмасу қызметіне байластыру"</string> + <string name="permdesc_bindCarrierMessagingService" msgid="2762882888502113944">"Иесіне оператордың хабар алмасу қызметінің жоғарғы деңгейлі интерфейсіне байластыруға рұқсат етеді. Қалыпты қолданбалар үшін ешқашан қажет болмайды."</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"Кілтсөз ережелерін тағайындау"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"Экранды ашу кілтсөздерінің ұзындығы мен қолдануға болатын таңбаларды басқару."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Экранды ашу әркеттерін бақылау"</string> @@ -1900,4 +1901,5 @@ <string name="toolbar_collapse_description" msgid="2821479483960330739">"Тасалау"</string> <string name="zen_mode_next_alarm_summary" msgid="5915140424683747372">"<xliff:g id="FORMATTEDTIME">%1$s</xliff:g> уақытындағы келесі дабылға дейін"</string> <string name="zen_mode_next_alarm_line_one" msgid="5537042951553420916">"Келесі дабылға дейін"</string> + <string name="muted_by" msgid="6147073845094180001">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> үнін өшірген"</string> </resources> diff --git a/core/res/res/values-km-rKH/strings.xml b/core/res/res/values-km-rKH/strings.xml index 566351a0cff9..5be27a85b1ae 100644 --- a/core/res/res/values-km-rKH/strings.xml +++ b/core/res/res/values-km-rKH/strings.xml @@ -833,6 +833,8 @@ <string name="permdesc_handoverStatus" msgid="4788144087245714948">"ឲ្យកម្មវិធីទទួលព័ត៌មានអំពីការផ្ទេរ Android Beam បច្ចុប្បន្ន"</string> <string name="permlab_removeDrmCertificates" msgid="7044888287209892751">"លុបវិញ្ញាបនបត្រ DRM ចេញ"</string> <string name="permdesc_removeDrmCertificates" msgid="7272999075113400993">"អនុញ្ញាតឲ្យកម្មវិធីលុបចេញវិញ្ញាបនបត្រ DRM ។ គួរតែមិនត្រូវការសម្រាប់កម្មវិធីធម្មតា។"</string> + <string name="permlab_bindCarrierMessagingService" msgid="1490229371796969158">"ភ្ជាប់ទៅសេវាកម្មសារអ្នកផ្តល់សេវាកម្មទូរស័ព្ទ"</string> + <string name="permdesc_bindCarrierMessagingService" msgid="2762882888502113944">"អនុញ្ញាតឲ្យអ្នកប្រើភ្ជាប់ទៅអ៊ីនធឺហ្វេសកម្រិតខ្ពស់នៃសេវាកម្មសារអ្នកផ្តល់សេវាកម្មទូរស័ព្ទ។ មិនគួរចាំបាច់សម្រាប់កម្មវិធីធម្មតាទេ។"</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"កំណត់ក្បួនពាក្យសម្ងាត់"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"ពិនិត្យប្រវែង និងតួអក្សរដែលបានអនុញ្ញាតក្នុងពាក្យសម្ងាត់ចាក់សោអេក្រង់។"</string> <string name="policylab_watchLogin" msgid="914130646942199503">"ពិនិត្យការព្យាយាមដោះសោអេក្រង់"</string> @@ -1901,4 +1903,5 @@ <string name="toolbar_collapse_description" msgid="2821479483960330739">"បង្រួម"</string> <string name="zen_mode_next_alarm_summary" msgid="5915140424683747372">"រហូតដល់ការជូនដំណឹងបន្ទាប់នៅ <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string> <string name="zen_mode_next_alarm_line_one" msgid="5537042951553420916">"រហូតការជូនដំណឹងបន្ទាប់"</string> + <string name="muted_by" msgid="6147073845094180001">"បានបិទសំឡេងដោយ <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> </resources> diff --git a/core/res/res/values-kn-rIN/strings.xml b/core/res/res/values-kn-rIN/strings.xml index 0211057aba6c..f932c1dce56f 100644 --- a/core/res/res/values-kn-rIN/strings.xml +++ b/core/res/res/values-kn-rIN/strings.xml @@ -34,8 +34,7 @@ <string name="durationHourMinutes" msgid="9029176248692041549">"<xliff:g id="HOURS">%1$d</xliff:g> ಗಂಟೆ <xliff:g id="MINUTES">%2$d</xliff:g> ನಿಮಿಷಗಳು"</string> <string name="durationHourMinute" msgid="2741677355177402539">"<xliff:g id="HOURS">%1$d</xliff:g> ಗಂಟೆ <xliff:g id="MINUTES">%2$d</xliff:g> ನಿಮಿಷ"</string> <string name="durationMinutes" msgid="3134226679883579347">"<xliff:g id="MINUTES">%1$d</xliff:g> ನಿಮಿಷಗಳು"</string> - <!-- no translation found for durationMinute (7155301744174623818) --> - <skip /> + <string name="durationMinute" msgid="7155301744174623818">"<xliff:g id="MINUTES">%1$d</xliff:g> ನಿಮಿಷ"</string> <string name="durationMinuteSeconds" msgid="1424656185379003751">"<xliff:g id="MINUTES">%1$d</xliff:g> ನಿಮಿ <xliff:g id="SECONDS">%2$d</xliff:g> ಸೆಕೆಂಡುಗಳು"</string> <string name="durationMinuteSecond" msgid="3989228718067466680">"<xliff:g id="MINUTES">%1$d</xliff:g> ನಿಮಿ <xliff:g id="SECONDS">%2$d</xliff:g> ಸೆ"</string> <string name="durationSeconds" msgid="8050088505238241405">"<xliff:g id="SECONDS">%1$d</xliff:g> ಸೆಕೆಂಡುಗಳು"</string> @@ -834,6 +833,8 @@ <string name="permdesc_handoverStatus" msgid="4788144087245714948">"ಪ್ರಸ್ತುತ Android Beam ವರ್ಗಾವಣೆಗಳ ಕುರಿತ ಮಾಹಿತಿಯನ್ನು ಸ್ವೀಕರಿಸಲು ಈ ಅಪ್ಲಿಕೇಶನ್ಗೆ ಅನುಮತಿಸಿ"</string> <string name="permlab_removeDrmCertificates" msgid="7044888287209892751">"DRM ಪ್ರಮಾಣಪತ್ರಗಳನ್ನು ತೆಗೆದುಹಾಕಿ"</string> <string name="permdesc_removeDrmCertificates" msgid="7272999075113400993">"DRM ಪ್ರಮಾಣಪತ್ರಗಳನ್ನು ತೆಗೆದುಹಾಕಲು ಅಪ್ಲಿಕೇಶನ್ಗೆ ಅನುಮತಿಸುತ್ತದೆ. ಸಾಮಾನ್ಯ ಅಪ್ಲಿಕೇಶನ್ಗಳಿಗೆ ಎಂದಿಗೂ ಅಗತ್ಯವಿರುವುದಿಲ್ಲ."</string> + <string name="permlab_bindCarrierMessagingService" msgid="1490229371796969158">"ವಾಹಕ ಸಂದೇಶ ಕಳುಹಿಸುವಿಕೆ ಸೇವೆಗೆ ಪ್ರತಿಬಂಧಿಸಿ"</string> + <string name="permdesc_bindCarrierMessagingService" msgid="2762882888502113944">"ವಾಹಕ ಸಂದೇಶ ಕಳುಹಿಸುವಿಕೆ ಸೇವೆಯ ಮೇಲ್ಮಟ್ಟದ ಇಂಟರ್ಫೇಸ್ಗೆ ಪ್ರತಿಬಂಧಿಸಲು ಹೊಂದಿರುವವರಿಗೆ ಅವಕಾಶ ಮಾಡಿಕೊಡುತ್ತದೆ. ಸಾಮಾನ್ಯ ಅಪ್ಲಿಕೇಶನ್ಗಳಿಗಾಗಿ ಎಂದಿಗೂ ಅಗತ್ಯವಿರುವುದಿಲ್ಲ."</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"ಪಾಸ್ವರ್ಡ್ ನಿಮಯಗಳನ್ನು ಹೊಂದಿಸಿ"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"ಪರದೆ-ಅನ್ಲಾಕ್ ಪಾಸ್ವರ್ಡ್ಗಳಲ್ಲಿ ಅನುಮತಿಸಿರುವ ಅಳತೆ ಮತ್ತು ಅಕ್ಷರಗಳನ್ನು ನಿಯಂತ್ರಿಸಿ."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"ಪರದೆಯ-ಅನ್ಲಾಕ್ ಪ್ರಯತ್ನಗಳನ್ನು ಮಾನಿಟರ್ ಮಾಡಿ"</string> @@ -1900,4 +1901,5 @@ <string name="toolbar_collapse_description" msgid="2821479483960330739">"ಸಂಕುಚಿಸು"</string> <string name="zen_mode_next_alarm_summary" msgid="5915140424683747372">"ಮುಂದಿನ ಅಲಾರಮ್ <xliff:g id="FORMATTEDTIME">%1$s</xliff:g> ವರೆಗೆ"</string> <string name="zen_mode_next_alarm_line_one" msgid="5537042951553420916">"ಮುಂದಿನ ಅಲಾರಮ್ವರೆಗೆ"</string> + <string name="muted_by" msgid="6147073845094180001">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> ಅವರಿಂದ ಮ್ಯೂಟ್ ಮಾಡಲಾಗಿದೆ"</string> </resources> diff --git a/core/res/res/values-ko/strings.xml b/core/res/res/values-ko/strings.xml index 490f64e69963..d279b734d3a3 100644 --- a/core/res/res/values-ko/strings.xml +++ b/core/res/res/values-ko/strings.xml @@ -34,8 +34,7 @@ <string name="durationHourMinutes" msgid="9029176248692041549">"<xliff:g id="HOURS">%1$d</xliff:g>시간 <xliff:g id="MINUTES">%2$d</xliff:g>분"</string> <string name="durationHourMinute" msgid="2741677355177402539">"<xliff:g id="HOURS">%1$d</xliff:g>시간 <xliff:g id="MINUTES">%2$d</xliff:g>분"</string> <string name="durationMinutes" msgid="3134226679883579347">"<xliff:g id="MINUTES">%1$d</xliff:g>분"</string> - <!-- no translation found for durationMinute (7155301744174623818) --> - <skip /> + <string name="durationMinute" msgid="7155301744174623818">"<xliff:g id="MINUTES">%1$d</xliff:g>분"</string> <string name="durationMinuteSeconds" msgid="1424656185379003751">"<xliff:g id="MINUTES">%1$d</xliff:g>분 <xliff:g id="SECONDS">%2$d</xliff:g>초"</string> <string name="durationMinuteSecond" msgid="3989228718067466680">"<xliff:g id="MINUTES">%1$d</xliff:g>분 <xliff:g id="SECONDS">%2$d</xliff:g>초"</string> <string name="durationSeconds" msgid="8050088505238241405">"<xliff:g id="SECONDS">%1$d</xliff:g>초"</string> @@ -834,6 +833,8 @@ <string name="permdesc_handoverStatus" msgid="4788144087245714948">"이 애플리케이션이 현재 Android Beam 전송 관련 정보를 수신하도록 허용합니다."</string> <string name="permlab_removeDrmCertificates" msgid="7044888287209892751">"DRM 인증서 삭제"</string> <string name="permdesc_removeDrmCertificates" msgid="7272999075113400993">"애플리케이션이 DRM 인증서를 삭제하도록 허용합니다. 일반 앱에서는 필요하지 않습니다."</string> + <string name="permlab_bindCarrierMessagingService" msgid="1490229371796969158">"이동통신사 메시지 서비스에 고정"</string> + <string name="permdesc_bindCarrierMessagingService" msgid="2762882888502113944">"보유자가 이동통신사 메시지 서비스의 최상위 인터페이스에 고정할 수 있습니다. 일반 앱에는 필요하지 않습니다."</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"비밀번호 규칙 설정"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"화면 잠금해제 비밀번호에 허용되는 길이 및 문자 수를 제어합니다."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"화면 잠금해제 시도 모니터링"</string> @@ -1900,4 +1901,5 @@ <string name="toolbar_collapse_description" msgid="2821479483960330739">"접기"</string> <string name="zen_mode_next_alarm_summary" msgid="5915140424683747372">"다음 <xliff:g id="FORMATTEDTIME">%1$s</xliff:g> 알람까지"</string> <string name="zen_mode_next_alarm_line_one" msgid="5537042951553420916">"다음 알람까지"</string> + <string name="muted_by" msgid="6147073845094180001">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g>에서 알림음 음소거"</string> </resources> diff --git a/core/res/res/values-ky-rKG/strings.xml b/core/res/res/values-ky-rKG/strings.xml index 8882bf6154c3..392f790b8e6f 100644 --- a/core/res/res/values-ky-rKG/strings.xml +++ b/core/res/res/values-ky-rKG/strings.xml @@ -40,8 +40,7 @@ <string name="durationHourMinutes" msgid="9029176248692041549">"<xliff:g id="HOURS">%1$d</xliff:g> с. <xliff:g id="MINUTES">%2$d</xliff:g> мүн"</string> <string name="durationHourMinute" msgid="2741677355177402539">"<xliff:g id="HOURS">%1$d</xliff:g> саат <xliff:g id="MINUTES">%2$d</xliff:g> мүн"</string> <string name="durationMinutes" msgid="3134226679883579347">"<xliff:g id="MINUTES">%1$d</xliff:g> мүн"</string> - <!-- no translation found for durationMinute (7155301744174623818) --> - <skip /> + <string name="durationMinute" msgid="7155301744174623818">"<xliff:g id="MINUTES">%1$d</xliff:g> мүн."</string> <string name="durationMinuteSeconds" msgid="1424656185379003751">"<xliff:g id="MINUTES">%1$d</xliff:g> мүн. <xliff:g id="SECONDS">%2$d</xliff:g> сек"</string> <string name="durationMinuteSecond" msgid="3989228718067466680">"<xliff:g id="MINUTES">%1$d</xliff:g> мүн. <xliff:g id="SECONDS">%2$d</xliff:g> сек"</string> <string name="durationSeconds" msgid="8050088505238241405">"<xliff:g id="SECONDS">%1$d</xliff:g> сек"</string> @@ -1047,6 +1046,8 @@ <string name="permdesc_handoverStatus" msgid="4788144087245714948">"Бул колдонмого учурдагы Android Beam өткөрүүлөрү жөнүндө маалымат алуу мүмкүнчүлүгүн берет"</string> <string name="permlab_removeDrmCertificates" msgid="7044888287209892751">"DRM тастыктамаларын алып салуу"</string> <string name="permdesc_removeDrmCertificates" msgid="7272999075113400993">"Колдонмого DRM тастыктамаларын алып салуу мүмкүнчүлүгүн берет. Кадимки колдонмолорго эч качан талап кылынбайт."</string> + <string name="permlab_bindCarrierMessagingService" msgid="1490229371796969158">"оператордун билдирүү кызматына байланышуу"</string> + <string name="permdesc_bindCarrierMessagingService" msgid="2762882888502113944">"Кармоочуга оператордун билдирүү кызматынын жогорку деңгээлдеги интерфейсине байланышуу мүмкүнчүлүгүн берет. Кадимки колдонмолорго эч качан талап кылынбашы мүмкүн."</string> <!-- no translation found for policylab_limitPassword (4497420728857585791) --> <skip /> <string name="policydesc_limitPassword" msgid="3252114203919510394">"Экранды бөгөттөн чыгаруу сырсөзүнүн узундугун жана уруксат берилген белгилерди башкаруу."</string> @@ -2380,4 +2381,5 @@ <string name="toolbar_collapse_description" msgid="2821479483960330739">"Жыйнап коюу"</string> <string name="zen_mode_next_alarm_summary" msgid="5915140424683747372">"Саат <xliff:g id="FORMATTEDTIME">%1$s</xliff:g> боло турган кийинки айгайга чейин"</string> <string name="zen_mode_next_alarm_line_one" msgid="5537042951553420916">"Кийинки айгайга чейин"</string> + <string name="muted_by" msgid="6147073845094180001">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> тарабынан үнсүздөлдү"</string> </resources> diff --git a/core/res/res/values-lo-rLA/strings.xml b/core/res/res/values-lo-rLA/strings.xml index 25b9cec1281e..94ad1ec6ba5d 100644 --- a/core/res/res/values-lo-rLA/strings.xml +++ b/core/res/res/values-lo-rLA/strings.xml @@ -833,6 +833,8 @@ <string name="permdesc_handoverStatus" msgid="4788144087245714948">"ອະນຸຍາດໃຫ້ແອັບພລິເຄຊັນນີ້ຮັບຂໍ້ມູນກ່ຽວກັບການໂອນຂໍ້ມູນ Android Beam ໃນປັດຈຸບັນ"</string> <string name="permlab_removeDrmCertificates" msgid="7044888287209892751">"ລຶບໃບຮັບຮອງ DRM"</string> <string name="permdesc_removeDrmCertificates" msgid="7272999075113400993">"ອະນຸຍາດໃຫ້ແອັບພລິເຄຊັນລຶບໃບຮັບຮອງ DRM. ແອັບຯທົ່ວໄປບໍ່ຄວນຈຳເປັນຕ້ອງໃຊ້."</string> + <string name="permlab_bindCarrierMessagingService" msgid="1490229371796969158">"ຜູກພັນກັບການບໍລິການສົ່ງຂໍ້ຄວາມຜູ້ໃຫ້ບໍລິການ"</string> + <string name="permdesc_bindCarrierMessagingService" msgid="2762882888502113944">"ອະນຸຍາດໃຫ້ຜູ້ຖືຜູກພັນກັບຕົວປະສານລະດັບສູງສຸດຂອງບໍລິການສົ່ງຂໍ້ຄວາມຜູ້ໃຫ້ບໍລິການ. ບໍ່ຈຳເປັນສຳລັບແອັບຯທົ່ວໄປ."</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"ຕັ້ງຄ່າກົດຂອງລະຫັດຜ່ານ"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"ຄວບຄຸມຄວາມຍາວຂອງໂຕອັກສອນທີ່ສາມາດໃຊ້ກັບລະຫັດປົດລັອກໜ້າຈໍ"</string> <string name="policylab_watchLogin" msgid="914130646942199503">"ຕິດຕາມການພະຍາຍາມປົດລັອກໜ້າຈໍ"</string> @@ -1899,4 +1901,5 @@ <string name="toolbar_collapse_description" msgid="2821479483960330739">"ຫຍໍ້"</string> <string name="zen_mode_next_alarm_summary" msgid="5915140424683747372">"ຈົນກວ່າໂມງປຸກຄັ້ງຕໍ່ໄປໃນເວລາ <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string> <string name="zen_mode_next_alarm_line_one" msgid="5537042951553420916">"ຈົນກວ່າໂມງປຸກຄັ້ງຕໍ່ໄປ"</string> + <string name="muted_by" msgid="6147073845094180001">"ຖືກປິດສຽງໂດຍ <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> </resources> diff --git a/core/res/res/values-lt/strings.xml b/core/res/res/values-lt/strings.xml index 6b9b3ace1257..24b5e01a4ae5 100644 --- a/core/res/res/values-lt/strings.xml +++ b/core/res/res/values-lt/strings.xml @@ -833,6 +833,8 @@ <string name="permdesc_handoverStatus" msgid="4788144087245714948">"Programai leidžiama gauti informaciją apie dabartinius „Android“ perdavimo funkcijos perkėlimus"</string> <string name="permlab_removeDrmCertificates" msgid="7044888287209892751">"pašalinti DRM sertifikatus"</string> <string name="permdesc_removeDrmCertificates" msgid="7272999075113400993">"Programai leidžiama pašalinti DRM sertifikatus. Neturėtų prireikti naudojant įprastas programas."</string> + <string name="permlab_bindCarrierMessagingService" msgid="1490229371796969158">"susaistyti su operatoriaus susirašinėjimo žinutėmis paslauga"</string> + <string name="permdesc_bindCarrierMessagingService" msgid="2762882888502113944">"Leidžiama savininkui susisaistyti su aukščiausio lygio operatoriaus susirašinėjimo žinutėmis paslaugos sąsaja. Įprastoms programoms to neturėtų prireikti."</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"Nustatyti slaptažodžio taisykles"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"Valdyti leidžiamą ekrano atrakinimo slaptažodžių ilgį ir leidžiamus naudoti simbolius."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Stebėti bandymus atrakinti ekraną"</string> @@ -1899,4 +1901,5 @@ <string name="toolbar_collapse_description" msgid="2821479483960330739">"Sutraukti"</string> <string name="zen_mode_next_alarm_summary" msgid="5915140424683747372">"Iki kito įspėjimo <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string> <string name="zen_mode_next_alarm_line_one" msgid="5537042951553420916">"Iki kito įspėjimo"</string> + <string name="muted_by" msgid="6147073845094180001">"Nutildė <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> </resources> diff --git a/core/res/res/values-lv/strings.xml b/core/res/res/values-lv/strings.xml index ded0f7652971..ce85173de120 100644 --- a/core/res/res/values-lv/strings.xml +++ b/core/res/res/values-lv/strings.xml @@ -34,8 +34,7 @@ <string name="durationHourMinutes" msgid="9029176248692041549">"<xliff:g id="HOURS">%1$d</xliff:g> h <xliff:g id="MINUTES">%2$d</xliff:g> min"</string> <string name="durationHourMinute" msgid="2741677355177402539">"<xliff:g id="HOURS">%1$d</xliff:g> h <xliff:g id="MINUTES">%2$d</xliff:g> min"</string> <string name="durationMinutes" msgid="3134226679883579347">"<xliff:g id="MINUTES">%1$d</xliff:g> min"</string> - <!-- no translation found for durationMinute (7155301744174623818) --> - <skip /> + <string name="durationMinute" msgid="7155301744174623818">"<xliff:g id="MINUTES">%1$d</xliff:g> min"</string> <string name="durationMinuteSeconds" msgid="1424656185379003751">"<xliff:g id="MINUTES">%1$d</xliff:g> min <xliff:g id="SECONDS">%2$d</xliff:g> s"</string> <string name="durationMinuteSecond" msgid="3989228718067466680">"<xliff:g id="MINUTES">%1$d</xliff:g> min <xliff:g id="SECONDS">%2$d</xliff:g> s"</string> <string name="durationSeconds" msgid="8050088505238241405">"<xliff:g id="SECONDS">%1$d</xliff:g> s"</string> @@ -834,6 +833,8 @@ <string name="permdesc_handoverStatus" msgid="4788144087245714948">"Ļauj šai lietojumprogrammai saņemt informāciju par pašreizēju Android Beam pārsūtīšanu"</string> <string name="permlab_removeDrmCertificates" msgid="7044888287209892751">"noņemt DRM sertifikātus"</string> <string name="permdesc_removeDrmCertificates" msgid="7272999075113400993">"Ļauj lietojumprogrammai noņemt DRM sertifikātus. Parastās lietotnēs tas nebūs nepieciešams."</string> + <string name="permlab_bindCarrierMessagingService" msgid="1490229371796969158">"Savienojuma izveide ar mobilo sakaru operatora ziņojumapmaiņas pakalpojumu"</string> + <string name="permdesc_bindCarrierMessagingService" msgid="2762882888502113944">"Ļauj īpašniekam izveidot savienojumu ar mobilo sakaru operatora ziņojumapmaiņas pakalpojuma augšējā līmeņa saskarni. Parastajām lietotnēm tas nekad nav nepieciešams."</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"Paroles kārtulu iestatīšana"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"Kontrolē ekrāna atbloķēšanas parolē atļautās rakstzīmes un garumu."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Ekrāna atbloķēšanas mēģinājumu pārraudzīšana"</string> @@ -1900,4 +1901,5 @@ <string name="toolbar_collapse_description" msgid="2821479483960330739">"Sakļaut"</string> <string name="zen_mode_next_alarm_summary" msgid="5915140424683747372">"Līdz nākamajam signālam: <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string> <string name="zen_mode_next_alarm_line_one" msgid="5537042951553420916">"Līdz nākamajam signālam"</string> + <string name="muted_by" msgid="6147073845094180001">"Skaņu izslēdza <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> </resources> diff --git a/core/res/res/values-mcc202-mnc05/config.xml b/core/res/res/values-mcc202-mnc05/config.xml index ec5ecaf12134..c74f2d7bde90 100644 --- a/core/res/res/values-mcc202-mnc05/config.xml +++ b/core/res/res/values-mcc202-mnc05/config.xml @@ -33,8 +33,11 @@ <!-- String containing the apn value for tethering. May be overriden by secure settings TETHER_DUN_APN. Value is a comma separated series of strings: - "name,apn,proxy,port,username,password,server,mmsc,mmsproxy,mmsport,mcc,mnc,auth,type" + "name,apn,proxy,port,username,password,server,mmsc,mmsproxy,mmsport,mcc,mnc,auth,type", + Or string format of ApnSettingV3. note that empty fields can be ommitted: "name,apn,,,,,,,,,310,260,,DUN" --> - <string translatable="false" name="config_tether_apndata">Vf Tethering,internet.vodafone.gr,,,,,,,,,202,05,,DUN</string> + <string-array translatable="false" name="config_tether_apndata"> + <item>Vf Tethering,internet.vodafone.gr,,,,,,,,,202,05,,DUN</item> + </string-array> </resources> diff --git a/core/res/res/values-mcc204-mnc04/config.xml b/core/res/res/values-mcc204-mnc04/config.xml index 0e67669f76a4..2cc73742bc01 100644 --- a/core/res/res/values-mcc204-mnc04/config.xml +++ b/core/res/res/values-mcc204-mnc04/config.xml @@ -43,4 +43,24 @@ <item>true;BAE0000000000000</item> <item>false</item> </string-array> + + <!-- Array of ConnectivityManager.TYPE_xxxx values allowable for tethering --> + <!-- Common options are [1, 4] for TYPE_WIFI and TYPE_MOBILE_DUN or + <!== [0,1,5,7] for TYPE_MOBILE, TYPE_WIFI, TYPE_MOBILE_HIPRI and TYPE_BLUETOOTH --> + <integer-array translatable="false" name="config_tether_upstream_types"> + <item>1</item> + <item>4</item> + <item>7</item> + <item>9</item> + </integer-array> + + <!-- String containing the apn value for tethering. May be overriden by secure settings + TETHER_DUN_APN. Value is a comma separated series of strings: + "name,apn,proxy,port,username,password,server,mmsc,mmsproxy,mmsport,mcc,mnc,auth,type", + Or string format of ApnSettingV3. + note that empty fields can be ommitted: "name,apn,,,,,,,,,310,260,,DUN" --> + <string-array translatable="false" name="config_tether_apndata"> + <item>Vodafone NL,live.vodafone.com,,,vodafone,vodafone,,,,,204,04,,DUN</item> + <item>[ApnSettingV3]SaskTel Tethering,inet.stm.sk.ca,,,,,,,,,204,04,,DUN,,,true,0,,,,,,,gid,5A</item> + </string-array> </resources> diff --git a/core/res/res/values-mcc208-mnc01/config.xml b/core/res/res/values-mcc208-mnc01/config.xml new file mode 100644 index 000000000000..7e44624ae88e --- /dev/null +++ b/core/res/res/values-mcc208-mnc01/config.xml @@ -0,0 +1,45 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** Copyright 2009, 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. +*/ +--> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. Do not translate. --> +<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- Array of ConnectivityManager.TYPE_xxxx values allowable for tethering --> + <!-- Common options are [1, 4] for TYPE_WIFI and TYPE_MOBILE_DUN or + <!== [0,1,5,7] for TYPE_MOBILE, TYPE_WIFI, TYPE_MOBILE_HIPRI and TYPE_BLUETOOTH --> + <integer-array translatable="false" name="config_tether_upstream_types"> + <item>1</item> + <item>4</item> + <item>7</item> + <item>9</item> + </integer-array> + + <!-- String containing the apn value for tethering. May be overriden by secure settings + TETHER_DUN_APN. Value is a comma separated series of strings: + "name,apn,proxy,port,username,password,server,mmsc,mmsproxy,mmsport,mcc,mnc,auth,type", + Or string format of ApnSettingV3. + note that empty fields can be ommitted: "name,apn,,,,,,,,,310,260,,DUN" --> + <string-array translatable="false" name="config_tether_apndata"> + <item>Orange Internet,orange.fr,,,orange,orange,,,,,208,01,1,DUN</item> + <item>[ApnSettingV3]Carrefour WAP,ofnew.fr,,,orange,orange,,,,,208,01,1,DUN,,,true,0,,,,,,,gid,33</item> + <item>[ApnSettingV3]VM WAP,ofnew.fr,,,orange,orange,,,,,208,01,1,DUN,,,true,0,,,,,,,gid,52</item> + <item>[ApnSettingV3]NRJWEB,ofnew.fr,,,orange,orange,,,,,208,01,1,DUN,,,true,0,,,,,,,gid,4E</item> + </string-array> + +</resources> diff --git a/core/res/res/values-mcc208-mnc10/config.xml b/core/res/res/values-mcc208-mnc10/config.xml index 10a6c5dd8353..10e8dcca36ad 100644 --- a/core/res/res/values-mcc208-mnc10/config.xml +++ b/core/res/res/values-mcc208-mnc10/config.xml @@ -31,9 +31,18 @@ <!-- String containing the apn value for tethering. May be overriden by secure settings TETHER_DUN_APN. Value is a comma separated series of strings: - "name,apn,proxy,port,username,password,server,mmsc,mmsproxy,mmsport,mcc,mnc,auth,type" + "name,apn,proxy,port,username,password,server,mmsc,mmsproxy,mmsport,mcc,mnc,auth,type", + Or string format of ApnSettingV3. note that empty fields can be ommitted: "name,apn,,,,,,,,,310,260,,DUN" --> - <string translatable="false" name="config_tether_apndata">SFR option modem,websfr,,,,,,,,,208,10,,DUN</string> + <string-array translatable="false" name="config_tether_apndata"> + <item>SFR option modem,websfr,,,,,,,,,208,10,,DUN</item> + <item>[ApnSettingV3]INTERNET NRJ,internetnrj,,,,,,,,,208,10,,DUN,,,true,0,,,,,,,gid,4E</item> + <item>[ApnSettingV3]Auchan,wap65,,,,,,,,,208,10,,DUN,,,true,0,,,,,,,spn,A MOBILE</item> + <item>[ApnSettingV3]LeclercMobile,wap66,,,,,,,,,208,10,,DUN,,,true,0,,,,,,,spn,LeclercMobile</item> + <item>[ApnSettingV3]Coriolis,fnetcoriolis,,,,,,,,,208,10,,DUN,,,true,0,,,,,,,gid,12</item> + <item>[ApnSettingV3]WEB La Poste Mobile,wapdebitel,,,,,,,,,208,10,,DUN,,,true,0,,,,,,,gid,4C</item> + <item>[ApnSettingV3]Darty Surf Mails,wap68,,,,,,,,,208,10,,DUN,,,true,0,,,,,,,gid,44</item> + </string-array> <string-array translatable="false" name="config_operatorConsideredNonRoaming"> <item>21401</item> diff --git a/core/res/res/values-mcc214-mnc01/config.xml b/core/res/res/values-mcc214-mnc01/config.xml index ecd812440a88..895b770d771c 100644 --- a/core/res/res/values-mcc214-mnc01/config.xml +++ b/core/res/res/values-mcc214-mnc01/config.xml @@ -33,9 +33,12 @@ <!-- String containing the apn value for tethering. May be overriden by secure settings TETHER_DUN_APN. Value is a comma separated series of strings: - "name,apn,proxy,port,username,password,server,mmsc,mmsproxy,mmsport,mcc,mnc,auth,type" + "name,apn,proxy,port,username,password,server,mmsc,mmsproxy,mmsport,mcc,mnc,auth,type", + Or string format of ApnSettingV3. note that empty fields can be ommitted: "name,apn,,,,,,,,,310,260,,DUN" --> - <string translatable="false" name="config_tether_apndata">INTERNET,airtelnet.es,,,vodafone,vodafone,,,,,214,01,1,DUN</string> + <string-array translatable="false" name="config_tether_apndata"> + <item>INTERNET,airtelnet.es,,,vodafone,vodafone,,,,,214,01,1,DUN</item> + </string-array> <string-array translatable="false" name="config_operatorConsideredNonRoaming"> <item>21402</item> diff --git a/core/res/res/values-mcc214-mnc03/config.xml b/core/res/res/values-mcc214-mnc03/config.xml new file mode 100644 index 000000000000..25997078ec3b --- /dev/null +++ b/core/res/res/values-mcc214-mnc03/config.xml @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** Copyright 2009, 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. +*/ +--> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. Do not translate. --> +<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- Array of ConnectivityManager.TYPE_xxxx values allowable for tethering --> + <!-- Common options are [1, 4] for TYPE_WIFI and TYPE_MOBILE_DUN or + <!== [0,1,5,7] for TYPE_MOBILE, TYPE_WIFI, TYPE_MOBILE_HIPRI and TYPE_BLUETOOTH --> + <integer-array translatable="false" name="config_tether_upstream_types"> + <item>1</item> + <item>4</item> + <item>7</item> + <item>9</item> + </integer-array> + + <!-- String containing the apn value for tethering. May be overriden by secure settings + TETHER_DUN_APN. Value is a comma separated series of strings: + "name,apn,proxy,port,username,password,server,mmsc,mmsproxy,mmsport,mcc,mnc,auth,type", + Or string format of ApnSettingV3. + note that empty fields can be ommitted: "name,apn,,,,,,,,,310,260,,DUN" --> + <string-array translatable="false" name="config_tether_apndata"> + <item>Orange Internet PC,internet,,,orange,orange,,,,,214,03,1,DUN</item> + </string-array> + +</resources> diff --git a/core/res/res/values-mcc214-mnc07/config.xml b/core/res/res/values-mcc214-mnc07/config.xml index ce7526c02ebd..b8328dfd892c 100644 --- a/core/res/res/values-mcc214-mnc07/config.xml +++ b/core/res/res/values-mcc214-mnc07/config.xml @@ -33,8 +33,12 @@ <!-- String containing the apn value for tethering. May be overriden by secure settings TETHER_DUN_APN. Value is a comma separated series of strings: - "name,apn,proxy,port,username,password,server,mmsc,mmsproxy,mmsport,mcc,mnc,auth,type" + "name,apn,proxy,port,username,password,server,mmsc,mmsproxy,mmsport,mcc,mnc,auth,type", + Or string format of ApnSettingV3. note that empty fields can be ommitted: "name,apn,,,,,,,,,310,260,,DUN" --> - <string translatable="false" name="config_tether_apndata">Conexion Compartida,movistar.es,,,MOVISTAR,MOVISTAR,,,,,214,07,1,DUN</string> + <string-array translatable="false" name="config_tether_apndata"> + <item>Conexión Compartida,movistar.es,,,MOVISTAR,MOVISTAR,,,,,214,07,1,DUN</item> + <item>[ApnSettingV3]Jazztel Internet,jazzinternet,,,,,,,,,214,07,,DUN,,,true,0,,,,,,,spn,JAZZTEL</item> + </string-array> </resources> diff --git a/core/res/res/values-mcc222-mnc01/config.xml b/core/res/res/values-mcc222-mnc01/config.xml new file mode 100644 index 000000000000..0d61c6ed1f53 --- /dev/null +++ b/core/res/res/values-mcc222-mnc01/config.xml @@ -0,0 +1,41 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** Copyright 2009, 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. +*/ +--> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. Do not translate. --> +<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- Array of ConnectivityManager.TYPE_xxxx values allowable for tethering --> + <!-- Common options are [1, 4] for TYPE_WIFI and TYPE_MOBILE_DUN or + <!== [0,1,5,7] for TYPE_MOBILE, TYPE_WIFI, TYPE_MOBILE_HIPRI and TYPE_BLUETOOTH --> + <integer-array translatable="false" name="config_tether_upstream_types"> + <item>1</item> + <item>4</item> + <item>7</item> + <item>9</item> + </integer-array> + + <!-- String containing the apn value for tethering. May be overriden by secure settings + TETHER_DUN_APN. Value is a comma separated series of strings: + "name,apn,proxy,port,username,password,server,mmsc,mmsproxy,mmsport,mcc,mnc,auth,type", + Or string format of ApnSettingV3. + note that empty fields can be ommitted: "name,apn,,,,,,,,,310,260,,DUN" --> + <string-array translatable="false" name="config_tether_apndata"> + <item>TIM WEB,ibox.tim.it,,,,,,,,,222,01,,DUN</item> + </string-array> +</resources> diff --git a/core/res/res/values-mcc222-mnc10/config.xml b/core/res/res/values-mcc222-mnc10/config.xml index 67467a07fedc..5a74462e5c55 100644 --- a/core/res/res/values-mcc222-mnc10/config.xml +++ b/core/res/res/values-mcc222-mnc10/config.xml @@ -32,9 +32,12 @@ <!-- String containing the apn value for tethering. May be overriden by secure settings TETHER_DUN_APN. Value is a comma separated series of strings: - "name,apn,proxy,port,username,password,server,mmsc,mmsproxy,mmsport,mcc,mnc,auth,type" + "name,apn,proxy,port,username,password,server,mmsc,mmsproxy,mmsport,mcc,mnc,auth,type", + Or string format of ApnSettingV3. note that empty fields can be ommitted: "name,apn,,,,,,,,,310,260,,DUN" --> - <string translatable="false" name="config_tether_apndata">Tethering Internet,web.omnitel.it,,,,,,,,,222,10,,DUN</string> + <string-array translatable="false" name="config_tether_apndata"> + <item>Tethering Internet,web.omnitel.it,,,,,,,,,222,10,,DUN</item> + </string-array> <string-array translatable="false" name="config_operatorConsideredNonRoaming"> <item>21401</item> diff --git a/core/res/res/values-mcc234-mnc20/config.xml b/core/res/res/values-mcc234-mnc20/config.xml index 619e517c148c..814960a545a1 100644 --- a/core/res/res/values-mcc234-mnc20/config.xml +++ b/core/res/res/values-mcc234-mnc20/config.xml @@ -35,7 +35,9 @@ TETHER_DUN_APN. Value is a comma separated series of strings: "name,apn,proxy,port,username,password,server,mmsc,mmsproxy,mmsport,mcc,mnc,auth,type" note that empty fields can be ommitted: "name,apn,,,,,,,,,310,260,,DUN" --> - <string translatable="false" name="config_tether_apndata">3hotspot,3hotspot,,,,,,,,,234,20,0,DUN</string> + <string-array translatable="false" name="config_tether_apndata"> + <item>3hotspot,3hotspot,,,,,,,,,234,20,0,DUN</item> + </string-array> <!-- Configure mobile network MTU. Carrier specific value is set here. --> diff --git a/core/res/res/values-mcc234-mnc33/config.xml b/core/res/res/values-mcc234-mnc33/config.xml index 776b5702a0d0..e9d3bdb144ec 100644 --- a/core/res/res/values-mcc234-mnc33/config.xml +++ b/core/res/res/values-mcc234-mnc33/config.xml @@ -29,4 +29,23 @@ <item>23434</item> <item>23486</item> </string-array> + + <!-- Array of ConnectivityManager.TYPE_xxxx values allowable for tethering --> + <!-- Common options are [1, 4] for TYPE_WIFI and TYPE_MOBILE_DUN or + <!== [0,1,5,7] for TYPE_MOBILE, TYPE_WIFI, TYPE_MOBILE_HIPRI and TYPE_BLUETOOTH --> + <integer-array translatable="false" name="config_tether_upstream_types"> + <item>1</item> + <item>4</item> + <item>7</item> + <item>9</item> + </integer-array> + + <!-- String containing the apn value for tethering. May be overriden by secure settings + TETHER_DUN_APN. Value is a comma separated series of strings: + "name,apn,proxy,port,username,password,server,mmsc,mmsproxy,mmsport,mcc,mnc,auth,type", + Or string format of ApnSettingV3. + note that empty fields can be ommitted: "name,apn,,,,,,,,,310,260,,DUN" --> + <string-array translatable="false" name="config_tether_apndata"> + <item>Consumer Broadband,consumerbroadband,,,,,,,,,234,33,,DUN</item> + </string-array> </resources> diff --git a/core/res/res/values-mcc235-mnc94/config.xml b/core/res/res/values-mcc235-mnc94/config.xml index 723af3dfd845..d527304379fb 100644 --- a/core/res/res/values-mcc235-mnc94/config.xml +++ b/core/res/res/values-mcc235-mnc94/config.xml @@ -35,7 +35,9 @@ TETHER_DUN_APN. Value is a comma separated series of strings: "name,apn,proxy,port,username,password,server,mmsc,mmsproxy,mmsport,mcc,mnc,auth,type" note that empty fields can be ommitted: "name,apn,,,,,,,,,310,260,,DUN" --> - <string translatable="false" name="config_tether_apndata">3hotspot,3hotspot,,,,,,,,,235,94,0,DUN</string> + <string-array translatable="false" name="config_tether_apndata"> + <item>3hotspot,3hotspot,,,,,,,,,235,94,0,DUN</item> + </string-array> <!-- Configure mobile network MTU. Carrier specific value is set here. --> diff --git a/core/res/res/values-mcc268-mnc03/config.xml b/core/res/res/values-mcc268-mnc03/config.xml index 0d5fe5717d2d..2f5171bccf35 100644 --- a/core/res/res/values-mcc268-mnc03/config.xml +++ b/core/res/res/values-mcc268-mnc03/config.xml @@ -33,8 +33,10 @@ <!-- String containing the apn value for tethering. May be overriden by secure settings TETHER_DUN_APN. Value is a comma separated series of strings: - "name,apn,proxy,port,username,password,server,mmsc,mmsproxy,mmsport,mcc,mnc,auth,type" + "name,apn,proxy,port,username,password,server,mmsc,mmsproxy,mmsport,mcc,mnc,auth,type", + Or string format of ApnSettingV3. note that empty fields can be ommitted: "name,apn,,,,,,,,,310,270,,DUN" --> - <string translatable="false" name="config_tether_apndata">Optimus HotSpot,modem,,,,,,,,,268,03,,DUN</string> - + <string-array translatable="false" name="config_tether_apndata"> + <item>Optimus HotSpot,modem,,,,,,,,,268,03,,DUN</item> + </string-array> </resources> diff --git a/core/res/res/values-mcc302-mnc220/config.xml b/core/res/res/values-mcc302-mnc220/config.xml index 06b6efe03dda..387292235e61 100644 --- a/core/res/res/values-mcc302-mnc220/config.xml +++ b/core/res/res/values-mcc302-mnc220/config.xml @@ -17,7 +17,10 @@ */ --> +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array translatable="false" name="config_operatorConsideredNonRoaming"> <item>302370</item> <item>302610</item> @@ -27,4 +30,26 @@ </string-array> <integer name="config_mobile_mtu">1410</integer> + + <!-- Array of ConnectivityManager.TYPE_xxxx values allowable for tethering --> + <!-- Common options are [1, 4] for TYPE_WIFI and TYPE_MOBILE_DUN or + <!== [0,1,5,7] for TYPE_MOBILE, TYPE_WIFI, TYPE_MOBILE_HIPRI and TYPE_BLUETOOTH --> + <integer-array translatable="false" name="config_tether_upstream_types"> + <item>1</item> + <item>4</item> + <item>7</item> + <item>9</item> + </integer-array> + + <!-- String containing the apn value for tethering. May be overriden by secure settings + TETHER_DUN_APN. Value is a comma separated series of strings: + "name,apn,proxy,port,username,password,server,mmsc,mmsproxy,mmsport,mcc,mnc,auth,type", + Or string format of ApnSettingV3. + note that empty fields can be ommitted: "name,apn,,,,,,,,,310,260,,DUN" --> + <string-array translatable="false" name="config_tether_apndata"> + <item>[ApnSettingV3]TELUS ISP,isp.telus.com,,,,,,,,,302,220,,DUN,,,true,0,,,,,,,gid,54</item> + <item>[ApnSettingV3]Tethered PC Mobile,isp.mb.com,,,,,,,,,302,220,,DUN,,,true,0,,,,,,,gid,50</item> + <item>[ApnSettingV3]Koodo,sp.koodo.com,,,,,,,,,302,220,,DUN,,,true,0,,,,,,,gid,4B</item> + </string-array> + </resources> diff --git a/core/res/res/values-mcc302-mnc221/config.xml b/core/res/res/values-mcc302-mnc221/config.xml new file mode 100644 index 000000000000..3a453b779e73 --- /dev/null +++ b/core/res/res/values-mcc302-mnc221/config.xml @@ -0,0 +1,45 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** Copyright 2013, 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. +*/ +--> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> +<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + + <!-- Array of ConnectivityManager.TYPE_xxxx values allowable for tethering --> + <!-- Common options are [1, 4] for TYPE_WIFI and TYPE_MOBILE_DUN or + <!== [0,1,5,7] for TYPE_MOBILE, TYPE_WIFI, TYPE_MOBILE_HIPRI and TYPE_BLUETOOTH --> + <integer-array translatable="false" name="config_tether_upstream_types"> + <item>1</item> + <item>4</item> + <item>7</item> + <item>9</item> + </integer-array> + + <!-- String containing the apn value for tethering. May be overriden by secure settings + TETHER_DUN_APN. Value is a comma separated series of strings: + "name,apn,proxy,port,username,password,server,mmsc,mmsproxy,mmsport,mcc,mnc,auth,type", + Or string format of ApnSettingV3. + note that empty fields can be ommitted: "name,apn,,,,,,,,,310,260,,DUN" --> + <string-array translatable="false" name="config_tether_apndata"> + <item>[ApnSettingV3]TELUS ISP,isp.telus.com,,,,,,,,,302,221,,DUN,,,true,0,,,,,,,gid,54</item> + <item>[ApnSettingV3]Tethered PC Mobile,isp.mb.com,,,,,,,,,302,221,,DUN,,,true,0,,,,,,,gid,50</item> + <item>[ApnSettingV3]Koodo,sp.koodo.com,,,,,,,,,302,221,,DUN,,,true,0,,,,,,,gid,4B</item> + </string-array> + +</resources> diff --git a/core/res/res/values-mcc302-mnc370/config.xml b/core/res/res/values-mcc302-mnc370/config.xml index 9cfe31fed354..13f19f777e70 100644 --- a/core/res/res/values-mcc302-mnc370/config.xml +++ b/core/res/res/values-mcc302-mnc370/config.xml @@ -32,9 +32,13 @@ <!-- String containing the apn value for tethering. May be overriden by secure settings TETHER_DUN_APN. Value is a comma separated series of strings: - "name,apn,proxy,port,username,password,server,mmsc,mmsproxy,mmsport,mcc,mnc,auth,type" + "name,apn,proxy,port,username,password,server,mmsc,mmsproxy,mmsport,mcc,mnc,auth,type", + Or string format of ApnSettingV3. note that empty fields can be ommitted: "name,apn,,,,,,,,,310,260,,DUN" --> - <string translatable="false" name="config_tether_apndata">Fido LTE Tethering,ltedata.apn,,,,,,,,,302,370,,DUN</string> + <string-array translatable="false" name="config_tether_apndata"> + <item>Fido LTE Tethering,ltedata.apn,,,,,,,,,302,370,,DUN</item> + <item>[ApnSettingV3]MTS Tethering,internet.mts,,,,,,,,,302,370,,DUN,,,true,0,,,,,,,gid,2C</item> + </string-array> <!-- Configure mobile network MTU. Carrier specific value is set here. --> diff --git a/core/res/res/values-mcc302-mnc660/config.xml b/core/res/res/values-mcc302-mnc660/config.xml index 000f8971d581..c689d22f28d0 100644 --- a/core/res/res/values-mcc302-mnc660/config.xml +++ b/core/res/res/values-mcc302-mnc660/config.xml @@ -32,9 +32,12 @@ <!-- String containing the apn value for tethering. May be overriden by secure settings TETHER_DUN_APN. Value is a comma separated series of strings: - "name,apn,proxy,port,username,password,server,mmsc,mmsproxy,mmsport,mcc,mnc,auth,type" + "name,apn,proxy,port,username,password,server,mmsc,mmsproxy,mmsport,mcc,mnc,auth,type", + Or string format of ApnSettingV3. note that empty fields can be ommitted: "name,apn,,,,,,,,,310,260,,DUN" --> - <string translatable="false" name="config_tether_apndata">MTS -Tethering,internet.mts,,,,,,,,,302,660,,DUN</string> + <string-array translatable="false" name="config_tether_apndata"> + <item>MTS -Tethering,internet.mts,,,,,,,,,302,660,,DUN</item> + </string-array> <!-- Configure mobile network MTU. Carrier specific value is set here. --> diff --git a/core/res/res/values-mcc302-mnc720/config.xml b/core/res/res/values-mcc302-mnc720/config.xml index dfc58fe59ba5..c20ca12ff5e0 100644 --- a/core/res/res/values-mcc302-mnc720/config.xml +++ b/core/res/res/values-mcc302-mnc720/config.xml @@ -32,9 +32,13 @@ <!-- String containing the apn value for tethering. May be overriden by secure settings TETHER_DUN_APN. Value is a comma separated series of strings: - "name,apn,proxy,port,username,password,server,mmsc,mmsproxy,mmsport,mcc,mnc,auth,type" + "name,apn,proxy,port,username,password,server,mmsc,mmsproxy,mmsport,mcc,mnc,auth,type", + Or string format of ApnSettingV3. note that empty fields can be ommitted: "name,apn,,,,,,,,,310,260,,DUN" --> - <string translatable="false" name="config_tether_apndata">Rogers LTE Tethering,ltedata.apn,,,,,,,,,302,720,,DUN</string> + <string-array translatable="false" name="config_tether_apndata"> + <item>Rogers LTE Tethering,ltedata.apn,,,,,,,,,302,720,,DUN</item> + <item>[ApnSettingV3]chatr Tethering,chatrisp.apn,,,,,,,,,302,720,,DUN,,,true,0,,,,,,,imsi,302720x94</item> + </string-array> <!-- Configure mobile network MTU. Carrier specific value is set here. --> diff --git a/core/res/res/values-mcc302-mnc780/config.xml b/core/res/res/values-mcc302-mnc780/config.xml index cd401912745d..51abd36b365d 100644 --- a/core/res/res/values-mcc302-mnc780/config.xml +++ b/core/res/res/values-mcc302-mnc780/config.xml @@ -33,9 +33,12 @@ <!-- String containing the apn value for tethering. May be overriden by secure settings TETHER_DUN_APN. Value is a comma separated series of strings: - "name,apn,proxy,port,username,password,server,mmsc,mmsproxy,mmsport,mcc,mnc,auth,type" + "name,apn,proxy,port,username,password,server,mmsc,mmsproxy,mmsport,mcc,mnc,auth,type", + Or string format of ApnSettingV3. note that empty fields can be ommitted: "name,apn,,,,,,,,,310,260,,DUN" --> - <string translatable="false" name="config_tether_apndata">SaskTel Tethering,inet.stm.sk.ca,,,,,,,,,302,780,,DUN</string> + <string-array translatable="false" name="config_tether_apndata"> + <item>SaskTel Tethering,inet.stm.sk.ca,,,,,,,,,302,780,,DUN</item> + </string-array> <!-- Don't use roaming icon for considered operators --> <string-array translatable="false" name="config_operatorConsideredNonRoaming"> diff --git a/core/res/res/values-mcc310-mnc160/config.xml b/core/res/res/values-mcc310-mnc160/config.xml index 28cd69533197..6bfc3d19ac64 100644 --- a/core/res/res/values-mcc310-mnc160/config.xml +++ b/core/res/res/values-mcc310-mnc160/config.xml @@ -25,8 +25,8 @@ --> <integer name="config_mobile_mtu">1440</integer> - <!-- Flag specifying whether VoLTE & VT should be available for carrier: independent of + <!-- Flag specifying whether VoLTE should be available for carrier: independent of carrier provisioning. If false: hard disabled. If true: then depends on carrier provisioning, availability etc --> - <bool name="config_carrier_volte_vt_available">true</bool> + <bool name="config_carrier_volte_available">true</bool> </resources> diff --git a/core/res/res/values-mcc310-mnc200/config.xml b/core/res/res/values-mcc310-mnc200/config.xml index 28cd69533197..6bfc3d19ac64 100644 --- a/core/res/res/values-mcc310-mnc200/config.xml +++ b/core/res/res/values-mcc310-mnc200/config.xml @@ -25,8 +25,8 @@ --> <integer name="config_mobile_mtu">1440</integer> - <!-- Flag specifying whether VoLTE & VT should be available for carrier: independent of + <!-- Flag specifying whether VoLTE should be available for carrier: independent of carrier provisioning. If false: hard disabled. If true: then depends on carrier provisioning, availability etc --> - <bool name="config_carrier_volte_vt_available">true</bool> + <bool name="config_carrier_volte_available">true</bool> </resources> diff --git a/core/res/res/values-mcc310-mnc210/config.xml b/core/res/res/values-mcc310-mnc210/config.xml index 28cd69533197..6bfc3d19ac64 100644 --- a/core/res/res/values-mcc310-mnc210/config.xml +++ b/core/res/res/values-mcc310-mnc210/config.xml @@ -25,8 +25,8 @@ --> <integer name="config_mobile_mtu">1440</integer> - <!-- Flag specifying whether VoLTE & VT should be available for carrier: independent of + <!-- Flag specifying whether VoLTE should be available for carrier: independent of carrier provisioning. If false: hard disabled. If true: then depends on carrier provisioning, availability etc --> - <bool name="config_carrier_volte_vt_available">true</bool> + <bool name="config_carrier_volte_available">true</bool> </resources> diff --git a/core/res/res/values-mcc310-mnc220/config.xml b/core/res/res/values-mcc310-mnc220/config.xml index 28cd69533197..6bfc3d19ac64 100644 --- a/core/res/res/values-mcc310-mnc220/config.xml +++ b/core/res/res/values-mcc310-mnc220/config.xml @@ -25,8 +25,8 @@ --> <integer name="config_mobile_mtu">1440</integer> - <!-- Flag specifying whether VoLTE & VT should be available for carrier: independent of + <!-- Flag specifying whether VoLTE should be available for carrier: independent of carrier provisioning. If false: hard disabled. If true: then depends on carrier provisioning, availability etc --> - <bool name="config_carrier_volte_vt_available">true</bool> + <bool name="config_carrier_volte_available">true</bool> </resources> diff --git a/core/res/res/values-mcc310-mnc230/config.xml b/core/res/res/values-mcc310-mnc230/config.xml index 28cd69533197..6bfc3d19ac64 100644 --- a/core/res/res/values-mcc310-mnc230/config.xml +++ b/core/res/res/values-mcc310-mnc230/config.xml @@ -25,8 +25,8 @@ --> <integer name="config_mobile_mtu">1440</integer> - <!-- Flag specifying whether VoLTE & VT should be available for carrier: independent of + <!-- Flag specifying whether VoLTE should be available for carrier: independent of carrier provisioning. If false: hard disabled. If true: then depends on carrier provisioning, availability etc --> - <bool name="config_carrier_volte_vt_available">true</bool> + <bool name="config_carrier_volte_available">true</bool> </resources> diff --git a/core/res/res/values-mcc310-mnc240/config.xml b/core/res/res/values-mcc310-mnc240/config.xml index 28cd69533197..6bfc3d19ac64 100644 --- a/core/res/res/values-mcc310-mnc240/config.xml +++ b/core/res/res/values-mcc310-mnc240/config.xml @@ -25,8 +25,8 @@ --> <integer name="config_mobile_mtu">1440</integer> - <!-- Flag specifying whether VoLTE & VT should be available for carrier: independent of + <!-- Flag specifying whether VoLTE should be available for carrier: independent of carrier provisioning. If false: hard disabled. If true: then depends on carrier provisioning, availability etc --> - <bool name="config_carrier_volte_vt_available">true</bool> + <bool name="config_carrier_volte_available">true</bool> </resources> diff --git a/core/res/res/values-mcc310-mnc250/config.xml b/core/res/res/values-mcc310-mnc250/config.xml index 28cd69533197..6bfc3d19ac64 100644 --- a/core/res/res/values-mcc310-mnc250/config.xml +++ b/core/res/res/values-mcc310-mnc250/config.xml @@ -25,8 +25,8 @@ --> <integer name="config_mobile_mtu">1440</integer> - <!-- Flag specifying whether VoLTE & VT should be available for carrier: independent of + <!-- Flag specifying whether VoLTE should be available for carrier: independent of carrier provisioning. If false: hard disabled. If true: then depends on carrier provisioning, availability etc --> - <bool name="config_carrier_volte_vt_available">true</bool> + <bool name="config_carrier_volte_available">true</bool> </resources> diff --git a/core/res/res/values-mcc310-mnc270/config.xml b/core/res/res/values-mcc310-mnc270/config.xml index 28cd69533197..6bfc3d19ac64 100644 --- a/core/res/res/values-mcc310-mnc270/config.xml +++ b/core/res/res/values-mcc310-mnc270/config.xml @@ -25,8 +25,8 @@ --> <integer name="config_mobile_mtu">1440</integer> - <!-- Flag specifying whether VoLTE & VT should be available for carrier: independent of + <!-- Flag specifying whether VoLTE should be available for carrier: independent of carrier provisioning. If false: hard disabled. If true: then depends on carrier provisioning, availability etc --> - <bool name="config_carrier_volte_vt_available">true</bool> + <bool name="config_carrier_volte_available">true</bool> </resources> diff --git a/core/res/res/values-mcc310-mnc300/config.xml b/core/res/res/values-mcc310-mnc300/config.xml index 28cd69533197..6bfc3d19ac64 100644 --- a/core/res/res/values-mcc310-mnc300/config.xml +++ b/core/res/res/values-mcc310-mnc300/config.xml @@ -25,8 +25,8 @@ --> <integer name="config_mobile_mtu">1440</integer> - <!-- Flag specifying whether VoLTE & VT should be available for carrier: independent of + <!-- Flag specifying whether VoLTE should be available for carrier: independent of carrier provisioning. If false: hard disabled. If true: then depends on carrier provisioning, availability etc --> - <bool name="config_carrier_volte_vt_available">true</bool> + <bool name="config_carrier_volte_available">true</bool> </resources> diff --git a/core/res/res/values-mcc310-mnc310/config.xml b/core/res/res/values-mcc310-mnc310/config.xml index 28cd69533197..6bfc3d19ac64 100644 --- a/core/res/res/values-mcc310-mnc310/config.xml +++ b/core/res/res/values-mcc310-mnc310/config.xml @@ -25,8 +25,8 @@ --> <integer name="config_mobile_mtu">1440</integer> - <!-- Flag specifying whether VoLTE & VT should be available for carrier: independent of + <!-- Flag specifying whether VoLTE should be available for carrier: independent of carrier provisioning. If false: hard disabled. If true: then depends on carrier provisioning, availability etc --> - <bool name="config_carrier_volte_vt_available">true</bool> + <bool name="config_carrier_volte_available">true</bool> </resources> diff --git a/core/res/res/values-mcc310-mnc490/config.xml b/core/res/res/values-mcc310-mnc490/config.xml index 28cd69533197..6bfc3d19ac64 100644 --- a/core/res/res/values-mcc310-mnc490/config.xml +++ b/core/res/res/values-mcc310-mnc490/config.xml @@ -25,8 +25,8 @@ --> <integer name="config_mobile_mtu">1440</integer> - <!-- Flag specifying whether VoLTE & VT should be available for carrier: independent of + <!-- Flag specifying whether VoLTE should be available for carrier: independent of carrier provisioning. If false: hard disabled. If true: then depends on carrier provisioning, availability etc --> - <bool name="config_carrier_volte_vt_available">true</bool> + <bool name="config_carrier_volte_available">true</bool> </resources> diff --git a/core/res/res/values-mcc310-mnc530/config.xml b/core/res/res/values-mcc310-mnc530/config.xml index 28cd69533197..6bfc3d19ac64 100644 --- a/core/res/res/values-mcc310-mnc530/config.xml +++ b/core/res/res/values-mcc310-mnc530/config.xml @@ -25,8 +25,8 @@ --> <integer name="config_mobile_mtu">1440</integer> - <!-- Flag specifying whether VoLTE & VT should be available for carrier: independent of + <!-- Flag specifying whether VoLTE should be available for carrier: independent of carrier provisioning. If false: hard disabled. If true: then depends on carrier provisioning, availability etc --> - <bool name="config_carrier_volte_vt_available">true</bool> + <bool name="config_carrier_volte_available">true</bool> </resources> diff --git a/core/res/res/values-mcc310-mnc580/config.xml b/core/res/res/values-mcc310-mnc580/config.xml index 28cd69533197..6bfc3d19ac64 100644 --- a/core/res/res/values-mcc310-mnc580/config.xml +++ b/core/res/res/values-mcc310-mnc580/config.xml @@ -25,8 +25,8 @@ --> <integer name="config_mobile_mtu">1440</integer> - <!-- Flag specifying whether VoLTE & VT should be available for carrier: independent of + <!-- Flag specifying whether VoLTE should be available for carrier: independent of carrier provisioning. If false: hard disabled. If true: then depends on carrier provisioning, availability etc --> - <bool name="config_carrier_volte_vt_available">true</bool> + <bool name="config_carrier_volte_available">true</bool> </resources> diff --git a/core/res/res/values-mcc310-mnc590/config.xml b/core/res/res/values-mcc310-mnc590/config.xml index 28cd69533197..6bfc3d19ac64 100644 --- a/core/res/res/values-mcc310-mnc590/config.xml +++ b/core/res/res/values-mcc310-mnc590/config.xml @@ -25,8 +25,8 @@ --> <integer name="config_mobile_mtu">1440</integer> - <!-- Flag specifying whether VoLTE & VT should be available for carrier: independent of + <!-- Flag specifying whether VoLTE should be available for carrier: independent of carrier provisioning. If false: hard disabled. If true: then depends on carrier provisioning, availability etc --> - <bool name="config_carrier_volte_vt_available">true</bool> + <bool name="config_carrier_volte_available">true</bool> </resources> diff --git a/core/res/res/values-mcc310-mnc640/config.xml b/core/res/res/values-mcc310-mnc640/config.xml index 28cd69533197..6bfc3d19ac64 100644 --- a/core/res/res/values-mcc310-mnc640/config.xml +++ b/core/res/res/values-mcc310-mnc640/config.xml @@ -25,8 +25,8 @@ --> <integer name="config_mobile_mtu">1440</integer> - <!-- Flag specifying whether VoLTE & VT should be available for carrier: independent of + <!-- Flag specifying whether VoLTE should be available for carrier: independent of carrier provisioning. If false: hard disabled. If true: then depends on carrier provisioning, availability etc --> - <bool name="config_carrier_volte_vt_available">true</bool> + <bool name="config_carrier_volte_available">true</bool> </resources> diff --git a/core/res/res/values-mcc310-mnc660/config.xml b/core/res/res/values-mcc310-mnc660/config.xml index 28cd69533197..6bfc3d19ac64 100644 --- a/core/res/res/values-mcc310-mnc660/config.xml +++ b/core/res/res/values-mcc310-mnc660/config.xml @@ -25,8 +25,8 @@ --> <integer name="config_mobile_mtu">1440</integer> - <!-- Flag specifying whether VoLTE & VT should be available for carrier: independent of + <!-- Flag specifying whether VoLTE should be available for carrier: independent of carrier provisioning. If false: hard disabled. If true: then depends on carrier provisioning, availability etc --> - <bool name="config_carrier_volte_vt_available">true</bool> + <bool name="config_carrier_volte_available">true</bool> </resources> diff --git a/core/res/res/values-mcc310-mnc800/config.xml b/core/res/res/values-mcc310-mnc800/config.xml index 28cd69533197..6bfc3d19ac64 100644 --- a/core/res/res/values-mcc310-mnc800/config.xml +++ b/core/res/res/values-mcc310-mnc800/config.xml @@ -25,8 +25,8 @@ --> <integer name="config_mobile_mtu">1440</integer> - <!-- Flag specifying whether VoLTE & VT should be available for carrier: independent of + <!-- Flag specifying whether VoLTE should be available for carrier: independent of carrier provisioning. If false: hard disabled. If true: then depends on carrier provisioning, availability etc --> - <bool name="config_carrier_volte_vt_available">true</bool> + <bool name="config_carrier_volte_available">true</bool> </resources> diff --git a/core/res/res/values-mcc311-mnc190/config.xml b/core/res/res/values-mcc311-mnc190/config.xml index a6c4d1b6dfe2..c17a07c963e0 100644 --- a/core/res/res/values-mcc311-mnc190/config.xml +++ b/core/res/res/values-mcc311-mnc190/config.xml @@ -35,6 +35,8 @@ TETHER_DUN_APN. Value is a comma separated series of strings: "name,apn,proxy,port,username,password,server,mmsc,mmsproxy,mmsport,mcc,mnc,auth,type" note that empty fields can be ommitted: "name,apn,,,,,,,,,310,260,,DUN" --> - <string translatable="false" name="config_tether_apndata">Tether,broadband.cellular1.net,,,,,,,,,311,190,,DUN</string> + <string-array translatable="false" name="config_tether_apndata"> + <item>Tether,broadband.cellular1.net,,,,,,,,,311,190,,DUN</item> + </string-array> </resources> diff --git a/core/res/res/values-mcc334-mnc050/config.xml b/core/res/res/values-mcc334-mnc050/config.xml index 00c415551f8b..f6777d0391df 100644 --- a/core/res/res/values-mcc334-mnc050/config.xml +++ b/core/res/res/values-mcc334-mnc050/config.xml @@ -33,8 +33,11 @@ <!-- String containing the apn value for tethering. May be overriden by secure settings TETHER_DUN_APN. Value is a comma separated series of strings: - "name,apn,proxy,port,username,password,server,mmsc,mmsproxy,mmsport,mcc,mnc,auth,type" + "name,apn,proxy,port,username,password,server,mmsc,mmsproxy,mmsport,mcc,mnc,auth,type", + Or string format of ApnSettingV3. note that empty fields can be ommitted: "name,apn,,,,,,,,,310,260,,DUN" --> - <string translatable="false" name="config_tether_apndata">Modem,modem.iusacellgsm.mx,,,iusacellgsm,iusacellgsm,,,,,334,050,1,DUN</string> + <string-array translatable="false" name="config_tether_apndata"> + <item>Modem,modem.iusacellgsm.mx,,,iusacellgsm,iusacellgsm,,,,,334,050,1,DUN</item> + </string-array> </resources> diff --git a/core/res/res/values-mcc340-mnc01/config.xml b/core/res/res/values-mcc340-mnc01/config.xml index bb491ed6a16a..cfc1380dd26f 100644 --- a/core/res/res/values-mcc340-mnc01/config.xml +++ b/core/res/res/values-mcc340-mnc01/config.xml @@ -32,9 +32,12 @@ <!-- String containing the apn value for tethering. May be overriden by secure settings TETHER_DUN_APN. Value is a comma separated series of strings: - "name,apn,proxy,port,username,password,server,mmsc,mmsproxy,mmsport,mcc,mnc,auth,type" + "name,apn,proxy,port,username,password,server,mmsc,mmsproxy,mmsport,mcc,mnc,auth,type", + Or string format of ApnSettingV3. note that empty fields can be ommitted: "name,apn,,,,,,,,,310,260,,DUN" --> - <string translatable="false" name="config_tether_apndata">Orangeweb,orangeweb,,,orange,orange,,,,,340,01,1,DUN</string> + <string-array translatable="false" name="config_tether_apndata"> + <item>Orangeweb,orangeweb,,,orange,orange,,,,,340,01,1,DUN</item> + </string-array> <string-array translatable="false" name="config_operatorConsideredNonRoaming"> <item>20801</item> diff --git a/core/res/res/values-mcc425-mnc07/config.xml b/core/res/res/values-mcc425-mnc07/config.xml index 51a9934f387c..a092fb97ffcd 100644 --- a/core/res/res/values-mcc425-mnc07/config.xml +++ b/core/res/res/values-mcc425-mnc07/config.xml @@ -33,9 +33,12 @@ <!-- String containing the apn value for tethering. May be overriden by secure settings TETHER_DUN_APN. Value is a comma separated series of strings: - "name,apn,proxy,port,username,password,server,mmsc,mmsproxy,mmsport,mcc,mnc,auth,type" + "name,apn,proxy,port,username,password,server,mmsc,mmsproxy,mmsport,mcc,mnc,auth,type", + Or string format of ApnSettingV3. note that empty fields can be ommitted: "name,apn,,,,,,,,,310,260,,DUN" --> - <string translatable="false" name="config_tether_apndata">PC HOT mobile,pc.hotm,,,,,,,,,425,07,,DUN</string> + <string-array translatable="false" name="config_tether_apndata"> + <item>PC HOT mobile,pc.hotm,,,,,,,,,425,07,,DUN</item> + </string-array> <!-- Don't use roaming icon for considered operators --> <string-array translatable="false" name="config_operatorConsideredNonRoaming"> diff --git a/core/res/res/values-mcc454-mnc10/config.xml b/core/res/res/values-mcc454-mnc10/config.xml new file mode 100644 index 000000000000..e7622a05aab2 --- /dev/null +++ b/core/res/res/values-mcc454-mnc10/config.xml @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** Copyright 2013, 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 my 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. +*/ +--> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> +<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + + <!-- Array of ConnectivityManager.TYPE_xxxx values allowable for tethering --> + <!-- Common options are [1, 4] for TYPE_WIFI and TYPE_MOBILE_DUN or + <!== [0,1,5,7] for TYPE_MOBILE, TYPE_WIFI, TYPE_MOBILE_HIPRI and TYPE_BLUETOOTH --> + <integer-array translatable="false" name="config_tether_upstream_types"> + <item>1</item> + <item>4</item> + <item>7</item> + <item>9</item> + </integer-array> + + <!-- String containing the apn value for tethering. May be overriden by secure settings + TETHER_DUN_APN. Value is a comma separated series of strings: + "name,apn,proxy,port,username,password,server,mmsc,mmsproxy,mmsport,mcc,mnc,auth,type", + Or string format of ApnSettingV3. + note that empty fields can be ommitted: "name,apn,,,,,,,,,310,260,,DUN" --> + <string-array translatable="false" name="config_tether_apndata"> + <item>one2free Tethering,internet,,,,,,,,,454,10,0,DUN</item> + </string-array> + +</resources> diff --git a/core/res/res/values-mcc505-mnc01/config.xml b/core/res/res/values-mcc505-mnc01/config.xml index 7331c5009b17..1705e4a50451 100644 --- a/core/res/res/values-mcc505-mnc01/config.xml +++ b/core/res/res/values-mcc505-mnc01/config.xml @@ -33,9 +33,12 @@ <!-- String containing the apn value for tethering. May be overriden by secure settings TETHER_DUN_APN. Value is a comma separated series of strings: - "name,apn,proxy,port,username,password,server,mmsc,mmsproxy,mmsport,mcc,mnc,auth,type" + "name,apn,proxy,port,username,password,server,mmsc,mmsproxy,mmsport,mcc,mnc,auth,type", + Or string format of ApnSettingV3. note that empty fields can be ommitted: "name,apn,,,,,,,,,310,260,,DUN" --> - <string translatable="false" name="config_tether_apndata">Telstra Tethering,telstra.internet,,,,,,,,,505,01,,DUN</string> + <string-array translatable="false" name="config_tether_apndata"> + <item>Telstra Tethering,telstra.internet,,,,,,,,,505,01,,DUN</item> + </string-array> <!-- Configure mobile network MTU. Carrier specific value is set here. --> diff --git a/core/res/res/values-mk-rMK/strings.xml b/core/res/res/values-mk-rMK/strings.xml index fab4ecf5ba55..78ff999cfbe8 100644 --- a/core/res/res/values-mk-rMK/strings.xml +++ b/core/res/res/values-mk-rMK/strings.xml @@ -34,8 +34,7 @@ <string name="durationHourMinutes" msgid="9029176248692041549">"<xliff:g id="HOURS">%1$d</xliff:g> ч. <xliff:g id="MINUTES">%2$d</xliff:g> мин."</string> <string name="durationHourMinute" msgid="2741677355177402539">"<xliff:g id="HOURS">%1$d</xliff:g> ч. <xliff:g id="MINUTES">%2$d</xliff:g> мин."</string> <string name="durationMinutes" msgid="3134226679883579347">"<xliff:g id="MINUTES">%1$d</xliff:g> мин."</string> - <!-- no translation found for durationMinute (7155301744174623818) --> - <skip /> + <string name="durationMinute" msgid="7155301744174623818">"<xliff:g id="MINUTES">%1$d</xliff:g> мин."</string> <string name="durationMinuteSeconds" msgid="1424656185379003751">"<xliff:g id="MINUTES">%1$d</xliff:g> мин. <xliff:g id="SECONDS">%2$d</xliff:g> с."</string> <string name="durationMinuteSecond" msgid="3989228718067466680">"<xliff:g id="MINUTES">%1$d</xliff:g> мин. <xliff:g id="SECONDS">%2$d</xliff:g> с."</string> <string name="durationSeconds" msgid="8050088505238241405">"<xliff:g id="SECONDS">%1$d</xliff:g> сек."</string> @@ -834,6 +833,8 @@ <string name="permdesc_handoverStatus" msgid="4788144087245714948">"Ѝ дозволува на оваа апликација да добива информации за моменталните трансфери на Android Beam"</string> <string name="permlab_removeDrmCertificates" msgid="7044888287209892751">"отстранување ДРМ-сетификати"</string> <string name="permdesc_removeDrmCertificates" msgid="7272999075113400993">"Дозволува апликација да отстранува ДРМ-сертификати. Не треба да се користи за стандардни апликации."</string> + <string name="permlab_bindCarrierMessagingService" msgid="1490229371796969158">"сврзување со давателот на услугата за пораки"</string> + <string name="permdesc_bindCarrierMessagingService" msgid="2762882888502113944">"Дозволува сопственикот да се сврзе со интерфејсот од највисоко ниво на давателот на услугата за пораки. Не треба да се користи за стандардни апликации."</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"Подеси правила за лозинката"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"Контролирај ги должината и знаците што се дозволени за лозинки за отклучување екран."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Следи ги обидите за отклучување на екранот"</string> @@ -1902,4 +1903,5 @@ <string name="toolbar_collapse_description" msgid="2821479483960330739">"Собери"</string> <string name="zen_mode_next_alarm_summary" msgid="5915140424683747372">"До следниот аларм во <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string> <string name="zen_mode_next_alarm_line_one" msgid="5537042951553420916">"До следниот аларм"</string> + <string name="muted_by" msgid="6147073845094180001">"Звукот го исклучи <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> </resources> diff --git a/core/res/res/values-ml-rIN/strings.xml b/core/res/res/values-ml-rIN/strings.xml index 12975e4991cf..2ab0fa8cd64f 100644 --- a/core/res/res/values-ml-rIN/strings.xml +++ b/core/res/res/values-ml-rIN/strings.xml @@ -34,8 +34,7 @@ <string name="durationHourMinutes" msgid="9029176248692041549">"<xliff:g id="HOURS">%1$d</xliff:g> മണിക്കൂർ <xliff:g id="MINUTES">%2$d</xliff:g> മിനിറ്റ്"</string> <string name="durationHourMinute" msgid="2741677355177402539">"<xliff:g id="HOURS">%1$d</xliff:g> മണിക്കൂർ <xliff:g id="MINUTES">%2$d</xliff:g> മിനിറ്റ്"</string> <string name="durationMinutes" msgid="3134226679883579347">"<xliff:g id="MINUTES">%1$d</xliff:g> മിനിറ്റ്"</string> - <!-- no translation found for durationMinute (7155301744174623818) --> - <skip /> + <string name="durationMinute" msgid="7155301744174623818">"<xliff:g id="MINUTES">%1$d</xliff:g> മി."</string> <string name="durationMinuteSeconds" msgid="1424656185379003751">"<xliff:g id="MINUTES">%1$d</xliff:g> മിനിറ്റ് <xliff:g id="SECONDS">%2$d</xliff:g> സെക്കൻഡ്"</string> <string name="durationMinuteSecond" msgid="3989228718067466680">"<xliff:g id="MINUTES">%1$d</xliff:g> മിനിറ്റ് <xliff:g id="SECONDS">%2$d</xliff:g> സെക്കൻഡ്"</string> <string name="durationSeconds" msgid="8050088505238241405">"<xliff:g id="SECONDS">%1$d</xliff:g> സെക്കൻഡ്"</string> @@ -834,6 +833,8 @@ <string name="permdesc_handoverStatus" msgid="4788144087245714948">"നിലവിലെ Android ബീം കൈമാറ്റങ്ങളെക്കുറിച്ച് വിവരങ്ങൾ നേടാൻ ഈ അപ്ലിക്കേഷനെ അനുവദിക്കുന്നു"</string> <string name="permlab_removeDrmCertificates" msgid="7044888287209892751">"DRM സർട്ടിഫിക്കറ്റുകൾ നീക്കം ചെയ്യുക"</string> <string name="permdesc_removeDrmCertificates" msgid="7272999075113400993">"DRM സർട്ടിഫിക്കറ്റുകൾ നീക്കംചെയ്യുന്നതിന് അപ്ലിക്കേഷനെ അനുവദിക്കുന്നു. സാധാരണ അപ്ലിക്കേഷനുകൾക്ക് ഒരിക്കലും ആവശ്യമില്ല."</string> + <string name="permlab_bindCarrierMessagingService" msgid="1490229371796969158">"കാരിയർ സന്ദേശമയയ്ക്കൽ സേവനത്തിലേക്ക് ബന്ധിപ്പിക്കുക"</string> + <string name="permdesc_bindCarrierMessagingService" msgid="2762882888502113944">"ഒരു കാരിയർ സന്ദേശമയയ്ക്കൽ സേവനത്തിന്റെ ഉയർന്ന നിലയിലുള്ള ഇന്റർഫേസിലേക്ക് ബന്ധിപ്പിക്കാൻ ദാതാവിനെ അനുവദിക്കുന്നു. സാധാരണ അപ്ലിക്കേഷനുകൾക്ക് ഒരിക്കലും ആവശ്യമില്ല."</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"പാസ്വേഡ് നിയമങ്ങൾ സജ്ജീകരിക്കുക"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"സ്ക്രീൻ-അൺലോക്ക് പാസ്വേഡുകളിൽ അനുവദിച്ചിരിക്കുന്ന ദൈർഘ്യവും പ്രതീകങ്ങളും നിയന്ത്രിക്കുക."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"സ്ക്രീൻ അൺലോക്ക് ശ്രമങ്ങൾ നിരീക്ഷിക്കുക"</string> @@ -1898,4 +1899,5 @@ <string name="toolbar_collapse_description" msgid="2821479483960330739">"ചുരുക്കുക"</string> <string name="zen_mode_next_alarm_summary" msgid="5915140424683747372">"<xliff:g id="FORMATTEDTIME">%1$s</xliff:g>-നുള്ള അടുത്ത അലാറം വരെ"</string> <string name="zen_mode_next_alarm_line_one" msgid="5537042951553420916">"അടുത്ത അലാറം വരെ"</string> + <string name="muted_by" msgid="6147073845094180001">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g>, മ്യൂട്ടുചെയ്തു"</string> </resources> diff --git a/core/res/res/values-mn-rMN/strings.xml b/core/res/res/values-mn-rMN/strings.xml index 52fe1b59a6f7..47fb415eb441 100644 --- a/core/res/res/values-mn-rMN/strings.xml +++ b/core/res/res/values-mn-rMN/strings.xml @@ -34,8 +34,7 @@ <string name="durationHourMinutes" msgid="9029176248692041549">"<xliff:g id="HOURS">%1$d</xliff:g> цаг <xliff:g id="MINUTES">%2$d</xliff:g> минут"</string> <string name="durationHourMinute" msgid="2741677355177402539">"<xliff:g id="HOURS">%1$d</xliff:g> цаг <xliff:g id="MINUTES">%2$d</xliff:g> мин"</string> <string name="durationMinutes" msgid="3134226679883579347">"<xliff:g id="MINUTES">%1$d</xliff:g> мин"</string> - <!-- no translation found for durationMinute (7155301744174623818) --> - <skip /> + <string name="durationMinute" msgid="7155301744174623818">"<xliff:g id="MINUTES">%1$d</xliff:g> минут"</string> <string name="durationMinuteSeconds" msgid="1424656185379003751">"<xliff:g id="MINUTES">%1$d</xliff:g> мин <xliff:g id="SECONDS">%2$d</xliff:g> секунд"</string> <string name="durationMinuteSecond" msgid="3989228718067466680">"<xliff:g id="MINUTES">%1$d</xliff:g> мин <xliff:g id="SECONDS">%2$d</xliff:g> сек"</string> <string name="durationSeconds" msgid="8050088505238241405">"<xliff:g id="SECONDS">%1$d</xliff:g> сек"</string> @@ -834,6 +833,8 @@ <string name="permdesc_handoverStatus" msgid="4788144087245714948">"Одоогийн Андройд Бийм дамжуулалтын мэдээллийг хүлээн авахыг аппликешнд зөвшөөрөх"</string> <string name="permlab_removeDrmCertificates" msgid="7044888287209892751">"DRM сертификатыг устгах"</string> <string name="permdesc_removeDrmCertificates" msgid="7272999075113400993">"Аппликешнд DRM сертификатыг устгахыг зөвшөөрнө. Энгийн апп-уудад хэзээ ч ашиглагдахгүй."</string> + <string name="permlab_bindCarrierMessagingService" msgid="1490229371796969158">"зөөгч зурвасын үйлчилгээнд холбох"</string> + <string name="permdesc_bindCarrierMessagingService" msgid="2762882888502113944">"Эзэмшигчид зөөгч зурвасын үйлчилгээний түвшний интерфэйст холбогдохыг зөвшөөрдөг. Энгийн апп-д шаардлагагүй."</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"Нууц үгний дүрмийг тохируулах"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"Дэлгэц түгжих нууц үгэнд зөвшөөрөгдсөн тэмдэгт болон уртыг удирдах"</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Дэлгэц тайлах оролдлогыг хянах"</string> @@ -1900,4 +1901,5 @@ <string name="toolbar_collapse_description" msgid="2821479483960330739">"Хумих"</string> <string name="zen_mode_next_alarm_summary" msgid="5915140424683747372">"<xliff:g id="FORMATTEDTIME">%1$s</xliff:g> дахь дараагийн анхааруулга хүртэл"</string> <string name="zen_mode_next_alarm_line_one" msgid="5537042951553420916">"Дараагийн анхааруулга хүртэл"</string> + <string name="muted_by" msgid="6147073845094180001">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g>-с хаасан"</string> </resources> diff --git a/core/res/res/values-mr-rIN/strings.xml b/core/res/res/values-mr-rIN/strings.xml index 7f286b829e7f..f0391dd766ab 100644 --- a/core/res/res/values-mr-rIN/strings.xml +++ b/core/res/res/values-mr-rIN/strings.xml @@ -34,8 +34,7 @@ <string name="durationHourMinutes" msgid="9029176248692041549">"<xliff:g id="HOURS">%1$d</xliff:g> ता <xliff:g id="MINUTES">%2$d</xliff:g> मि"</string> <string name="durationHourMinute" msgid="2741677355177402539">"<xliff:g id="HOURS">%1$d</xliff:g> ता <xliff:g id="MINUTES">%2$d</xliff:g> मि"</string> <string name="durationMinutes" msgid="3134226679883579347">"<xliff:g id="MINUTES">%1$d</xliff:g> मिनिटे"</string> - <!-- no translation found for durationMinute (7155301744174623818) --> - <skip /> + <string name="durationMinute" msgid="7155301744174623818">"<xliff:g id="MINUTES">%1$d</xliff:g> मिनिट"</string> <string name="durationMinuteSeconds" msgid="1424656185379003751">"<xliff:g id="MINUTES">%1$d</xliff:g> मि <xliff:g id="SECONDS">%2$d</xliff:g> से"</string> <string name="durationMinuteSecond" msgid="3989228718067466680">"<xliff:g id="MINUTES">%1$d</xliff:g> मि <xliff:g id="SECONDS">%2$d</xliff:g> से"</string> <string name="durationSeconds" msgid="8050088505238241405">"<xliff:g id="SECONDS">%1$d</xliff:g> सेकंद"</string> @@ -834,6 +833,8 @@ <string name="permdesc_handoverStatus" msgid="4788144087245714948">"वर्तमान Android बीम स्थानांतरणांविषयी माहिती प्राप्त करण्यासाठी या अनुप्रयोगास अनुमती देते"</string> <string name="permlab_removeDrmCertificates" msgid="7044888287209892751">"DRM प्रमाणपत्रे काढा"</string> <string name="permdesc_removeDrmCertificates" msgid="7272999075113400993">"DRM प्रमाणपत्रे काढण्यासाठी अनुप्रयोगास अनुमती देते. सामान्य अॅप्स साठी कधीही आवश्यकता नसते."</string> + <string name="permlab_bindCarrierMessagingService" msgid="1490229371796969158">"एका वाहक संदेशन सेवेवर प्रतिबद्ध करा"</string> + <string name="permdesc_bindCarrierMessagingService" msgid="2762882888502113944">"वाहक संदेशन सेवेचा शीर्ष-स्तर इंटरफेस प्रतिबद्ध करण्यासाठी होल्डरला अनुमती देते. सामान्य अॅप्सकरिता कधीही आवश्यक नसते."</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"संकेतशब्द नियम सेट करा"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"स्क्रीन-अनलॉक संकेतशब्दांमध्ये अनुमती दिलेली लांबी आणि वर्ण नियंत्रित करा."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"स्क्रीन-अनलॉक प्रयत्नांचे परीक्षण करा"</string> @@ -1900,4 +1901,5 @@ <string name="toolbar_collapse_description" msgid="2821479483960330739">"संक्षिप्त करा"</string> <string name="zen_mode_next_alarm_summary" msgid="5915140424683747372">"<xliff:g id="FORMATTEDTIME">%1$s</xliff:g> वाजता पुढील अलार्मपर्यंत"</string> <string name="zen_mode_next_alarm_line_one" msgid="5537042951553420916">"पुढील अलार्मपर्यंत"</string> + <string name="muted_by" msgid="6147073845094180001">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> द्वारे नि:शब्द केले"</string> </resources> diff --git a/core/res/res/values-ms-rMY/strings.xml b/core/res/res/values-ms-rMY/strings.xml index 117274e686af..1a295d2114fd 100644 --- a/core/res/res/values-ms-rMY/strings.xml +++ b/core/res/res/values-ms-rMY/strings.xml @@ -34,8 +34,7 @@ <string name="durationHourMinutes" msgid="9029176248692041549">"<xliff:g id="HOURS">%1$d</xliff:g> jam <xliff:g id="MINUTES">%2$d</xliff:g> min"</string> <string name="durationHourMinute" msgid="2741677355177402539">"<xliff:g id="HOURS">%1$d</xliff:g> jam <xliff:g id="MINUTES">%2$d</xliff:g> min"</string> <string name="durationMinutes" msgid="3134226679883579347">"<xliff:g id="MINUTES">%1$d</xliff:g> minit"</string> - <!-- no translation found for durationMinute (7155301744174623818) --> - <skip /> + <string name="durationMinute" msgid="7155301744174623818">"<xliff:g id="MINUTES">%1$d</xliff:g> minit"</string> <string name="durationMinuteSeconds" msgid="1424656185379003751">"<xliff:g id="MINUTES">%1$d</xliff:g> min <xliff:g id="SECONDS">%2$d</xliff:g> saat"</string> <string name="durationMinuteSecond" msgid="3989228718067466680">"<xliff:g id="MINUTES">%1$d</xliff:g> min <xliff:g id="SECONDS">%2$d</xliff:g> saat"</string> <string name="durationSeconds" msgid="8050088505238241405">"<xliff:g id="SECONDS">%1$d</xliff:g> saat"</string> @@ -834,6 +833,8 @@ <string name="permdesc_handoverStatus" msgid="4788144087245714948">"Membenarkan aplikasi ini menerima maklumat mengenai pemindahan Pancaran Android semasa"</string> <string name="permlab_removeDrmCertificates" msgid="7044888287209892751">"alih keluar sijil DRM"</string> <string name="permdesc_removeDrmCertificates" msgid="7272999075113400993">"Membenarkan aplikasi mengalih keluar sijil DRM. Tidak sekali-kali diperlukan untuk apl biasa."</string> + <string name="permlab_bindCarrierMessagingService" msgid="1490229371796969158">"terikat kepada perkhidmatan pemesejan pembawa"</string> + <string name="permdesc_bindCarrierMessagingService" msgid="2762882888502113944">"Membenarkan pemegang terikat dengan antara muka peringkat tertinggi bagi perkhidmatan pemesejan pembawa. Tidak sekali-kali diperlukan untuk apl biasa."</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"Tetapkan peraturan kata laluan"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"Mengawal panjang dan aksara yang dibenarkan dalam kata laluan buka kunci skrin."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Memantau percubaan buka kunci skrin"</string> @@ -1900,4 +1901,5 @@ <string name="toolbar_collapse_description" msgid="2821479483960330739">"Runtuhkan"</string> <string name="zen_mode_next_alarm_summary" msgid="5915140424683747372">"Sehingga penggera seterusnya pada <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string> <string name="zen_mode_next_alarm_line_one" msgid="5537042951553420916">"Sehingga penggera seterusnya"</string> + <string name="muted_by" msgid="6147073845094180001">"Diredam oleh <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> </resources> diff --git a/core/res/res/values-my-rMM/strings.xml b/core/res/res/values-my-rMM/strings.xml index 0766243556a3..2beba37ac037 100644 --- a/core/res/res/values-my-rMM/strings.xml +++ b/core/res/res/values-my-rMM/strings.xml @@ -34,8 +34,7 @@ <string name="durationHourMinutes" msgid="9029176248692041549">"<xliff:g id="HOURS">%1$d</xliff:g> နာရီ <xliff:g id="MINUTES">%2$d</xliff:g> မိနစ်"</string> <string name="durationHourMinute" msgid="2741677355177402539">"<xliff:g id="HOURS">%1$d</xliff:g> နာရီ <xliff:g id="MINUTES">%2$d</xliff:g> မိနစ်"</string> <string name="durationMinutes" msgid="3134226679883579347">"<xliff:g id="MINUTES">%1$d</xliff:g> မိနစ်"</string> - <!-- no translation found for durationMinute (7155301744174623818) --> - <skip /> + <string name="durationMinute" msgid="7155301744174623818">"<xliff:g id="MINUTES">%1$d</xliff:g> မိနစ်"</string> <string name="durationMinuteSeconds" msgid="1424656185379003751">"<xliff:g id="MINUTES">%1$d</xliff:g> မိနစ် <xliff:g id="SECONDS">%2$d</xliff:g> စက္ကန့်"</string> <string name="durationMinuteSecond" msgid="3989228718067466680">"<xliff:g id="MINUTES">%1$d</xliff:g> မိနစ် <xliff:g id="SECONDS">%2$d</xliff:g> စက္ကန့်"</string> <string name="durationSeconds" msgid="8050088505238241405">"<xliff:g id="SECONDS">%1$d</xliff:g> စက္ကန့်"</string> @@ -834,6 +833,8 @@ <string name="permdesc_handoverStatus" msgid="4788144087245714948">"ဒီအပလီကေးရှင်းအား အန်ဒရွိုက်၏ လက်ရှိ အလင်းတန်းထိုး လွှဲပြောင်းမှု အကြောင်း အချက်အလက်ကို ရယူခွင့် ပြုသည်"</string> <string name="permlab_removeDrmCertificates" msgid="7044888287209892751">"DRM လက်မှတ်များ ဖယ်ရှားရန်"</string> <string name="permdesc_removeDrmCertificates" msgid="7272999075113400993">"အပလီကေးရှင်းအား DRM လက်မှတ်များကို ဖယ်ရှားခွင့် ပြုသည်။ သာမန် appများ အတွက် ဘယ်တော့မှ မလိုအပ်နိုင်ပါ။"</string> + <string name="permlab_bindCarrierMessagingService" msgid="1490229371796969158">"စာပို့စာယူ ဆက်သွယ်ရေးဝန်ဆောင်မှုတစ်ခုအား ပူးပေါင်းခွင့်ပြုရန်"</string> + <string name="permdesc_bindCarrierMessagingService" msgid="2762882888502113944">"စာပို့စာယူဆက်သွယ်ရေးဝန်ဆောင်မှုတစ်ခု၏ ထိပ်ဆုံးရှိအင်တာဖေ့စ်ဖြင့် ပူးပေါင်းရန် ပိုင်ရှင်အားခွင့်ပြုပါ။ ပုံမှန် app များအတွက် မလိုအပ်ပါ။"</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"စကားဝှက်စည်းမျဥ်းကိုသတ်မှတ်ရန်"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"မျက်နှာပြင် သော့ဖွင့်ရန် လိုအပ်သော စကားလုံးအရေအတွက်နှင့် အမျိုးအစားအား ထိန်းချုပ်ရန်"</string> <string name="policylab_watchLogin" msgid="914130646942199503">"မော်နီတာမျက်နှာပြင်ဖွင့်ရန် ကြိုးစားခွင့်များ"</string> @@ -1898,4 +1899,5 @@ <string name="toolbar_collapse_description" msgid="2821479483960330739">"ခေါက်ရန်"</string> <string name="zen_mode_next_alarm_summary" msgid="5915140424683747372">"နောက်ထပ် <xliff:g id="FORMATTEDTIME">%1$s</xliff:g> ၌နိုးစက်အထိ"</string> <string name="zen_mode_next_alarm_line_one" msgid="5537042951553420916">"နောက်ထပ်နိုးစက်အထိ"</string> + <string name="muted_by" msgid="6147073845094180001">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> အသံပိတ်သည်"</string> </resources> diff --git a/core/res/res/values-nb/strings.xml b/core/res/res/values-nb/strings.xml index 2363a36c54b4..e2c8f05078da 100644 --- a/core/res/res/values-nb/strings.xml +++ b/core/res/res/values-nb/strings.xml @@ -34,8 +34,7 @@ <string name="durationHourMinutes" msgid="9029176248692041549">"<xliff:g id="HOURS">%1$d</xliff:g> t <xliff:g id="MINUTES">%2$d</xliff:g> min"</string> <string name="durationHourMinute" msgid="2741677355177402539">"<xliff:g id="HOURS">%1$d</xliff:g> t <xliff:g id="MINUTES">%2$d</xliff:g> min"</string> <string name="durationMinutes" msgid="3134226679883579347">"<xliff:g id="MINUTES">%1$d</xliff:g> min"</string> - <!-- no translation found for durationMinute (7155301744174623818) --> - <skip /> + <string name="durationMinute" msgid="7155301744174623818">"<xliff:g id="MINUTES">%1$d</xliff:g> min"</string> <string name="durationMinuteSeconds" msgid="1424656185379003751">"<xliff:g id="MINUTES">%1$d</xliff:g> min <xliff:g id="SECONDS">%2$d</xliff:g> sek"</string> <string name="durationMinuteSecond" msgid="3989228718067466680">"<xliff:g id="MINUTES">%1$d</xliff:g> min <xliff:g id="SECONDS">%2$d</xliff:g> sek"</string> <string name="durationSeconds" msgid="8050088505238241405">"<xliff:g id="SECONDS">%1$d</xliff:g> sek"</string> @@ -834,6 +833,8 @@ <string name="permdesc_handoverStatus" msgid="4788144087245714948">"Lar appen motta informasjon om aktuelle Android Beam-overføringer"</string> <string name="permlab_removeDrmCertificates" msgid="7044888287209892751">"fjern sertifikater for digital rettighetsadministrasjon"</string> <string name="permdesc_removeDrmCertificates" msgid="7272999075113400993">"Gir en app tillatelse til å fjerne sertifikater for digital rettighetsadministrasjon. Skal ikke være nødvendig for vanlige apper."</string> + <string name="permlab_bindCarrierMessagingService" msgid="1490229371796969158">"bindes til en operatørmeldingstjeneste"</string> + <string name="permdesc_bindCarrierMessagingService" msgid="2762882888502113944">"Tillater at innehaveren binder seg til det øverste nivået av grensesnittet til en operatørtjeneste. Dette skal aldri være nødvendig for vanlige apper."</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"Angi passordregler"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"Kontroller tillatt lengde og tillatte tegn i passord for opplåsing av skjerm."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Overvåk forsøk på opplåsing av skjerm"</string> @@ -1900,4 +1901,5 @@ <string name="toolbar_collapse_description" msgid="2821479483960330739">"Skjul"</string> <string name="zen_mode_next_alarm_summary" msgid="5915140424683747372">"Inntil neste alarm kl. <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string> <string name="zen_mode_next_alarm_line_one" msgid="5537042951553420916">"Inntil neste alarm"</string> + <string name="muted_by" msgid="6147073845094180001">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> har kuttet lyden"</string> </resources> diff --git a/core/res/res/values-ne-rNP/strings.xml b/core/res/res/values-ne-rNP/strings.xml index ccd3f47fde0e..168e5f231bb5 100644 --- a/core/res/res/values-ne-rNP/strings.xml +++ b/core/res/res/values-ne-rNP/strings.xml @@ -34,8 +34,7 @@ <string name="durationHourMinutes" msgid="9029176248692041549">"<xliff:g id="HOURS">%1$d</xliff:g> घण्टा <xliff:g id="MINUTES">%2$d</xliff:g> मि"</string> <string name="durationHourMinute" msgid="2741677355177402539">"<xliff:g id="HOURS">%1$d</xliff:g> घण्टा <xliff:g id="MINUTES">%2$d</xliff:g> मिनेट"</string> <string name="durationMinutes" msgid="3134226679883579347">"<xliff:g id="MINUTES">%1$d</xliff:g> मिनेट"</string> - <!-- no translation found for durationMinute (7155301744174623818) --> - <skip /> + <string name="durationMinute" msgid="7155301744174623818">"<xliff:g id="MINUTES">%1$d</xliff:g> मिनेट"</string> <string name="durationMinuteSeconds" msgid="1424656185379003751">"<xliff:g id="MINUTES">%1$d</xliff:g> मिनेट <xliff:g id="SECONDS">%2$d</xliff:g> से"</string> <string name="durationMinuteSecond" msgid="3989228718067466680">"<xliff:g id="MINUTES">%1$d</xliff:g> मिनेट <xliff:g id="SECONDS">%2$d</xliff:g> से"</string> <string name="durationSeconds" msgid="8050088505238241405">"<xliff:g id="SECONDS">%1$d</xliff:g> सेकेन्ड"</string> @@ -834,6 +833,8 @@ <string name="permdesc_handoverStatus" msgid="4788144087245714948">"यस आवेदनले वर्तमान Android Beam स्थानान्तरण बारेमा जानकारी प्राप्त गर्न अनुमति दिन्छ"</string> <string name="permlab_removeDrmCertificates" msgid="7044888287209892751">"DRM प्रमाणपत्रहरू हटाउनुहोस्"</string> <string name="permdesc_removeDrmCertificates" msgid="7272999075113400993">"DRM प्रमाणपत्रहरू हटाउन अनुप्रयोगलाई अनुमति दिन्छ। सामान्य अनुप्रयोगहरूको लागि कहिल्यै आवश्यकता पर्दैन।"</string> + <string name="permlab_bindCarrierMessagingService" msgid="1490229371796969158">"वाहक मेसेजिङ सेवामा आबद्ध हुनुहोस्"</string> + <string name="permdesc_bindCarrierMessagingService" msgid="2762882888502113944">"धारकलाई वाहक मेसेजिङ सेवाको उच्च-स्तरको इन्टरफेसमा आबद्ध हुन अनुमति दिनुहोस्। सामान्य एपहरूको लागि कहिल्यै आवश्यकता पर्दैन।"</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"पासवर्ड नियमहरू मिलाउनुहोस्"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"स्क्रिन-अनलक पासवर्डहरूमा अनुमति दिइएको लम्बाइ र अक्षरहरू नियन्त्रण गर्नुहोस्।"</string> <string name="policylab_watchLogin" msgid="914130646942199503">"मोनिटर स्क्रिन-अनलक प्रयत्नहरू"</string> @@ -1908,4 +1909,5 @@ <string name="toolbar_collapse_description" msgid="2821479483960330739">"संक्षिप्त पार्नुहोस्"</string> <string name="zen_mode_next_alarm_summary" msgid="5915140424683747372">"<xliff:g id="FORMATTEDTIME">%1$s</xliff:g> मा अर्को अलार्म सम्म"</string> <string name="zen_mode_next_alarm_line_one" msgid="5537042951553420916">"अर्को अलार्म सम्म"</string> + <string name="muted_by" msgid="6147073845094180001">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> द्वारा मौन गरिएको"</string> </resources> diff --git a/core/res/res/values-nl/strings.xml b/core/res/res/values-nl/strings.xml index 254bc6fbf36d..c5e70bdaae57 100644 --- a/core/res/res/values-nl/strings.xml +++ b/core/res/res/values-nl/strings.xml @@ -34,8 +34,7 @@ <string name="durationHourMinutes" msgid="9029176248692041549">"<xliff:g id="HOURS">%1$d</xliff:g> uur <xliff:g id="MINUTES">%2$d</xliff:g> min."</string> <string name="durationHourMinute" msgid="2741677355177402539">"<xliff:g id="HOURS">%1$d</xliff:g> uur <xliff:g id="MINUTES">%2$d</xliff:g> min."</string> <string name="durationMinutes" msgid="3134226679883579347">"<xliff:g id="MINUTES">%1$d</xliff:g> minuten"</string> - <!-- no translation found for durationMinute (7155301744174623818) --> - <skip /> + <string name="durationMinute" msgid="7155301744174623818">"<xliff:g id="MINUTES">%1$d</xliff:g> min."</string> <string name="durationMinuteSeconds" msgid="1424656185379003751">"<xliff:g id="MINUTES">%1$d</xliff:g> min <xliff:g id="SECONDS">%2$d</xliff:g> sec"</string> <string name="durationMinuteSecond" msgid="3989228718067466680">"<xliff:g id="MINUTES">%1$d</xliff:g> min <xliff:g id="SECONDS">%2$d</xliff:g> sec"</string> <string name="durationSeconds" msgid="8050088505238241405">"<xliff:g id="SECONDS">%1$d</xliff:g> seconden"</string> @@ -834,6 +833,8 @@ <string name="permdesc_handoverStatus" msgid="4788144087245714948">"Hiermee kan deze app informatie over huidige Android Beam-overdrachten ontvangen"</string> <string name="permlab_removeDrmCertificates" msgid="7044888287209892751">"DRM-certificaten verwijderen"</string> <string name="permdesc_removeDrmCertificates" msgid="7272999075113400993">"Toestaan dat een app DRM-certificaten verwijdert. Nooit vereist voor normale apps."</string> + <string name="permlab_bindCarrierMessagingService" msgid="1490229371796969158">"binden aan de berichtenservice van een provider"</string> + <string name="permdesc_bindCarrierMessagingService" msgid="2762882888502113944">"Hiermee wordt de houder toegestaan te binden aan de berichteninterface van een provider. Nooit vereist voor normale apps."</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"Wachtwoordregels instellen"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"De lengte en tekens beheren die zijn toegestaan in wachtwoorden voor schermontgrendeling."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Pogingen voor schermontgrendeling bijhouden"</string> @@ -1900,4 +1901,5 @@ <string name="toolbar_collapse_description" msgid="2821479483960330739">"Samenvouwen"</string> <string name="zen_mode_next_alarm_summary" msgid="5915140424683747372">"Tot het volgende alarm om <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string> <string name="zen_mode_next_alarm_line_one" msgid="5537042951553420916">"Tot het volgende alarm"</string> + <string name="muted_by" msgid="6147073845094180001">"Gedempt door <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> </resources> diff --git a/core/res/res/values-pl/strings.xml b/core/res/res/values-pl/strings.xml index 6e78fd2a4a7a..f50ab9bcbef3 100644 --- a/core/res/res/values-pl/strings.xml +++ b/core/res/res/values-pl/strings.xml @@ -34,8 +34,7 @@ <string name="durationHourMinutes" msgid="9029176248692041549">"<xliff:g id="HOURS">%1$d</xliff:g> godz. <xliff:g id="MINUTES">%2$d</xliff:g> min"</string> <string name="durationHourMinute" msgid="2741677355177402539">"<xliff:g id="HOURS">%1$d</xliff:g> godz. <xliff:g id="MINUTES">%2$d</xliff:g> min"</string> <string name="durationMinutes" msgid="3134226679883579347">"<xliff:g id="MINUTES">%1$d</xliff:g> min"</string> - <!-- no translation found for durationMinute (7155301744174623818) --> - <skip /> + <string name="durationMinute" msgid="7155301744174623818">"<xliff:g id="MINUTES">%1$d</xliff:g> min"</string> <string name="durationMinuteSeconds" msgid="1424656185379003751">"<xliff:g id="MINUTES">%1$d</xliff:g> min <xliff:g id="SECONDS">%2$d</xliff:g> s"</string> <string name="durationMinuteSecond" msgid="3989228718067466680">"<xliff:g id="MINUTES">%1$d</xliff:g> min <xliff:g id="SECONDS">%2$d</xliff:g> s"</string> <string name="durationSeconds" msgid="8050088505238241405">"<xliff:g id="SECONDS">%1$d</xliff:g> s"</string> @@ -834,6 +833,8 @@ <string name="permdesc_handoverStatus" msgid="4788144087245714948">"Zezwala tej aplikacji na otrzymywanie informacji o aktualnych transmisjach Android Beam"</string> <string name="permlab_removeDrmCertificates" msgid="7044888287209892751">"usuwanie certyfikatów DRM"</string> <string name="permdesc_removeDrmCertificates" msgid="7272999075113400993">"Zezwala aplikacji na usuwanie certyfikatów DRM. Nie powinno być nigdy potrzebne w zwykłych aplikacjach."</string> + <string name="permlab_bindCarrierMessagingService" msgid="1490229371796969158">"powiąż z usługą przesyłania wiadomości przez operatora"</string> + <string name="permdesc_bindCarrierMessagingService" msgid="2762882888502113944">"Zezwala posiadaczowi na tworzenie powiązania z interfejsem najwyższego poziomu w usłudze przesyłania wiadomości przez operatora. Nie powinno być nigdy potrzebne dla zwykłych aplikacji."</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"Określ reguły hasła"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"Kontrolowanie długości haseł odblokowania ekranu i dozwolonych w nich znaków"</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Monitoruj próby odblokowania ekranu"</string> @@ -1900,4 +1901,5 @@ <string name="toolbar_collapse_description" msgid="2821479483960330739">"Zwiń"</string> <string name="zen_mode_next_alarm_summary" msgid="5915140424683747372">"Do następnego alarmu o <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string> <string name="zen_mode_next_alarm_line_one" msgid="5537042951553420916">"Do następnego alarmu"</string> + <string name="muted_by" msgid="6147073845094180001">"Ściszone przez: <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> </resources> diff --git a/core/res/res/values-pt-rPT/strings.xml b/core/res/res/values-pt-rPT/strings.xml index 6d882350fe26..16385b412555 100644 --- a/core/res/res/values-pt-rPT/strings.xml +++ b/core/res/res/values-pt-rPT/strings.xml @@ -34,8 +34,7 @@ <string name="durationHourMinutes" msgid="9029176248692041549">"<xliff:g id="HOURS">%1$d</xliff:g> h <xliff:g id="MINUTES">%2$d</xliff:g> min"</string> <string name="durationHourMinute" msgid="2741677355177402539">"<xliff:g id="HOURS">%1$d</xliff:g> h <xliff:g id="MINUTES">%2$d</xliff:g> min"</string> <string name="durationMinutes" msgid="3134226679883579347">"<xliff:g id="MINUTES">%1$d</xliff:g> min"</string> - <!-- no translation found for durationMinute (7155301744174623818) --> - <skip /> + <string name="durationMinute" msgid="7155301744174623818">"<xliff:g id="MINUTES">%1$d</xliff:g> min."</string> <string name="durationMinuteSeconds" msgid="1424656185379003751">"<xliff:g id="MINUTES">%1$d</xliff:g> min <xliff:g id="SECONDS">%2$d</xliff:g> seg"</string> <string name="durationMinuteSecond" msgid="3989228718067466680">"<xliff:g id="MINUTES">%1$d</xliff:g> min <xliff:g id="SECONDS">%2$d</xliff:g> seg"</string> <string name="durationSeconds" msgid="8050088505238241405">"<xliff:g id="SECONDS">%1$d</xliff:g> seg"</string> @@ -834,6 +833,8 @@ <string name="permdesc_handoverStatus" msgid="4788144087245714948">"Permite que esta aplicação receba informações acerca das transferências atuais do Android Beam"</string> <string name="permlab_removeDrmCertificates" msgid="7044888287209892751">"remover certificados DRM"</string> <string name="permdesc_removeDrmCertificates" msgid="7272999075113400993">"Permite que uma aplicação remova certificados DRM. Nunca deverá ser necessário para aplicações normais."</string> + <string name="permlab_bindCarrierMessagingService" msgid="1490229371796969158">"ligar ao serviço de mensagens de um operador"</string> + <string name="permdesc_bindCarrierMessagingService" msgid="2762882888502113944">"Permite ao titular ligar à interface de nível superior do serviço de mensagens de um operador. Nunca deve ser necessário para aplicações normais."</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"Definir regras de palavra-passe"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"Controlar o comprimento e os caracteres permitidos nas palavras-passe de desbloqueio do ecrã."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Monitorizar tentativas de desbloqueio do ecrã"</string> @@ -1900,4 +1901,5 @@ <string name="toolbar_collapse_description" msgid="2821479483960330739">"Reduzir"</string> <string name="zen_mode_next_alarm_summary" msgid="5915140424683747372">"Até ao próximo alarme, às <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string> <string name="zen_mode_next_alarm_line_one" msgid="5537042951553420916">"Até ao próximo alarme"</string> + <string name="muted_by" msgid="6147073845094180001">"Som desativado por <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> </resources> diff --git a/core/res/res/values-pt/strings.xml b/core/res/res/values-pt/strings.xml index 1d3cf00e5ab7..92143b9ccbdf 100644 --- a/core/res/res/values-pt/strings.xml +++ b/core/res/res/values-pt/strings.xml @@ -34,8 +34,7 @@ <string name="durationHourMinutes" msgid="9029176248692041549">"<xliff:g id="HOURS">%1$d</xliff:g> h <xliff:g id="MINUTES">%2$d</xliff:g> min"</string> <string name="durationHourMinute" msgid="2741677355177402539">"<xliff:g id="HOURS">%1$d</xliff:g> h <xliff:g id="MINUTES">%2$d</xliff:g> min"</string> <string name="durationMinutes" msgid="3134226679883579347">"<xliff:g id="MINUTES">%1$d</xliff:g> min"</string> - <!-- no translation found for durationMinute (7155301744174623818) --> - <skip /> + <string name="durationMinute" msgid="7155301744174623818">"<xliff:g id="MINUTES">%1$d</xliff:g> m"</string> <string name="durationMinuteSeconds" msgid="1424656185379003751">"<xliff:g id="MINUTES">%1$d</xliff:g> min <xliff:g id="SECONDS">%2$d</xliff:g> s"</string> <string name="durationMinuteSecond" msgid="3989228718067466680">"<xliff:g id="MINUTES">%1$d</xliff:g> min <xliff:g id="SECONDS">%2$d</xliff:g> s"</string> <string name="durationSeconds" msgid="8050088505238241405">"<xliff:g id="SECONDS">%1$d</xliff:g> s"</string> @@ -838,6 +837,8 @@ <string name="permdesc_handoverStatus" msgid="4788144087245714948">"Permite que este app receba informações sobre as atuais transferências do Android Beam"</string> <string name="permlab_removeDrmCertificates" msgid="7044888287209892751">"remover certificados de DRM"</string> <string name="permdesc_removeDrmCertificates" msgid="7272999075113400993">"Permite que um app remova certificados de DRM. Não deve ser necessário para apps comuns."</string> + <string name="permlab_bindCarrierMessagingService" msgid="1490229371796969158">"vincular a um serviço de mensagens de operadora"</string> + <string name="permdesc_bindCarrierMessagingService" msgid="2762882888502113944">"Permite que o proprietário use a interface de nível superior de um serviço de mensagens de operadora. Não deve ser necessária para apps comuns."</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"Definir regras para senha"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"Controlar o tamanho e os caracteres permitidos nas senhas de desbloqueio de tela."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Monitorar tentativas de desbloqueio da tela"</string> @@ -1904,4 +1905,5 @@ <string name="toolbar_collapse_description" msgid="2821479483960330739">"Recolher"</string> <string name="zen_mode_next_alarm_summary" msgid="5915140424683747372">"Até o próximo alarme em <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string> <string name="zen_mode_next_alarm_line_one" msgid="5537042951553420916">"Até o próximo alarme"</string> + <string name="muted_by" msgid="6147073845094180001">"Som desativado por <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> </resources> diff --git a/core/res/res/values-ro/strings.xml b/core/res/res/values-ro/strings.xml index b44d8dc8c45b..70f3b4913962 100644 --- a/core/res/res/values-ro/strings.xml +++ b/core/res/res/values-ro/strings.xml @@ -34,8 +34,7 @@ <string name="durationHourMinutes" msgid="9029176248692041549">"<xliff:g id="HOURS">%1$d</xliff:g> h <xliff:g id="MINUTES">%2$d</xliff:g> (de) min"</string> <string name="durationHourMinute" msgid="2741677355177402539">"<xliff:g id="HOURS">%1$d</xliff:g> h <xliff:g id="MINUTES">%2$d</xliff:g> min"</string> <string name="durationMinutes" msgid="3134226679883579347">"<xliff:g id="MINUTES">%1$d</xliff:g> min"</string> - <!-- no translation found for durationMinute (7155301744174623818) --> - <skip /> + <string name="durationMinute" msgid="7155301744174623818">"<xliff:g id="MINUTES">%1$d</xliff:g> min."</string> <string name="durationMinuteSeconds" msgid="1424656185379003751">"<xliff:g id="MINUTES">%1$d</xliff:g> min <xliff:g id="SECONDS">%2$d</xliff:g> sec"</string> <string name="durationMinuteSecond" msgid="3989228718067466680">"<xliff:g id="MINUTES">%1$d</xliff:g> min <xliff:g id="SECONDS">%2$d</xliff:g> sec"</string> <string name="durationSeconds" msgid="8050088505238241405">"<xliff:g id="SECONDS">%1$d</xliff:g> sec"</string> @@ -834,6 +833,8 @@ <string name="permdesc_handoverStatus" msgid="4788144087245714948">"Permite acestei aplicații să primească informații despre transferurile actuale Android Beam"</string> <string name="permlab_removeDrmCertificates" msgid="7044888287209892751">"eliminarea certificatelor DRM"</string> <string name="permdesc_removeDrmCertificates" msgid="7272999075113400993">"Permite unei aplicații să elimine certificatele DRM. Nu ar trebui să fie necesară pentru aplicațiile obișnuite."</string> + <string name="permlab_bindCarrierMessagingService" msgid="1490229371796969158">"se conectează la un serviciu de mesagerie oferit de operator"</string> + <string name="permdesc_bindCarrierMessagingService" msgid="2762882888502113944">"Permite proprietarului să se conecteze la interfața de nivel superior a unui serviciu de mesagerie oferit de operator. Nu ar trebui să fie niciodată necesară pentru aplicațiile obișnuite."</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"Setaţi reguli pentru parolă"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"Stabiliţi lungimea şi tipul de caractere permise în parolele pentru deblocarea ecranului."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Monitorizaţi încercările de deblocare a ecranului"</string> @@ -1900,4 +1901,5 @@ <string name="toolbar_collapse_description" msgid="2821479483960330739">"Restrângeți"</string> <string name="zen_mode_next_alarm_summary" msgid="5915140424683747372">"Până la alarma următoare, la <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string> <string name="zen_mode_next_alarm_line_one" msgid="5537042951553420916">"Până la alarma următoare"</string> + <string name="muted_by" msgid="6147073845094180001">"Dezactivate de <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> </resources> diff --git a/core/res/res/values-ru/strings.xml b/core/res/res/values-ru/strings.xml index 5f75fd74ec5d..18fc49f6dad4 100644 --- a/core/res/res/values-ru/strings.xml +++ b/core/res/res/values-ru/strings.xml @@ -34,8 +34,7 @@ <string name="durationHourMinutes" msgid="9029176248692041549">"<xliff:g id="HOURS">%1$d</xliff:g> ч. <xliff:g id="MINUTES">%2$d</xliff:g> мин."</string> <string name="durationHourMinute" msgid="2741677355177402539">"<xliff:g id="HOURS">%1$d</xliff:g> ч. <xliff:g id="MINUTES">%2$d</xliff:g> мин."</string> <string name="durationMinutes" msgid="3134226679883579347">"<xliff:g id="MINUTES">%1$d</xliff:g> мин."</string> - <!-- no translation found for durationMinute (7155301744174623818) --> - <skip /> + <string name="durationMinute" msgid="7155301744174623818">"<xliff:g id="MINUTES">%1$d</xliff:g> мин."</string> <string name="durationMinuteSeconds" msgid="1424656185379003751">"<xliff:g id="MINUTES">%1$d</xliff:g> мин. <xliff:g id="SECONDS">%2$d</xliff:g> с"</string> <string name="durationMinuteSecond" msgid="3989228718067466680">"<xliff:g id="MINUTES">%1$d</xliff:g> мин. <xliff:g id="SECONDS">%2$d</xliff:g> с"</string> <string name="durationSeconds" msgid="8050088505238241405">"<xliff:g id="SECONDS">%1$d</xliff:g> с"</string> @@ -834,6 +833,8 @@ <string name="permdesc_handoverStatus" msgid="4788144087245714948">"Получение информации о текущих передачах Android Beam."</string> <string name="permlab_removeDrmCertificates" msgid="7044888287209892751">"удаление сертификатов DRM"</string> <string name="permdesc_removeDrmCertificates" msgid="7272999075113400993">"Удаление сертификатов DRM. Большинству приложений это разрешение не требуется."</string> + <string name="permlab_bindCarrierMessagingService" msgid="1490229371796969158">"Подключение к службе обмена сообщениями"</string> + <string name="permdesc_bindCarrierMessagingService" msgid="2762882888502113944">"Подключение к базовому интерфейсу службы обмена сообщениями, предоставляемой оператором связи. Это разрешение обычно используется только специальными приложениями."</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"Правила выбора паролей"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"Контролировать длину и символы при вводе паролей для снятия блокировки экрана."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Отслеживать попытки снятия блокировки экрана"</string> @@ -1878,7 +1879,7 @@ <string name="lock_to_app_unlock_password" msgid="6380979775916974414">"Запрашивать пароль для отключения блокировки"</string> <string name="battery_saver_description" msgid="2510530476513605742">"Чтобы продлить время работы устройства от батареи, в режиме энергосбережения снижается производительность, а также ограничивается использование вибросигнала и фоновой передачи данных. Данные, требующие синхронизации, могут обновляться только когда вы откроете приложение.\n\nРежим энергосбережения автоматически отключается во время зарядки устройства."</string> <string name="downtime_condition_summary" msgid="8761776337475705749">"До отключения режима (в <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>)"</string> - <string name="downtime_condition_line_one" msgid="8762708714645352010">"На весь период простоя"</string> + <string name="downtime_condition_line_one" msgid="8762708714645352010">"До отключения режима"</string> <plurals name="zen_mode_duration_minutes_summary"> <item quantity="one" msgid="3177683545388923234">"На 1 мин. (до <xliff:g id="FORMATTEDTIME">%2$s</xliff:g>)"</item> <item quantity="other" msgid="2787867221129368935">"На %1$d мин. (до <xliff:g id="FORMATTEDTIME">%2$s</xliff:g>)"</item> @@ -1900,4 +1901,5 @@ <string name="toolbar_collapse_description" msgid="2821479483960330739">"Свернуть"</string> <string name="zen_mode_next_alarm_summary" msgid="5915140424683747372">"До следующего будильника в <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string> <string name="zen_mode_next_alarm_line_one" msgid="5537042951553420916">"До следующего будильника"</string> + <string name="muted_by" msgid="6147073845094180001">"Звук отключен приложением \"<xliff:g id="THIRD_PARTY">%1$s</xliff:g>\""</string> </resources> diff --git a/core/res/res/values-si-rLK/strings.xml b/core/res/res/values-si-rLK/strings.xml index 704d82898302..af76b0ffb35e 100644 --- a/core/res/res/values-si-rLK/strings.xml +++ b/core/res/res/values-si-rLK/strings.xml @@ -34,8 +34,7 @@ <string name="durationHourMinutes" msgid="9029176248692041549">"පැය <xliff:g id="HOURS">%1$d</xliff:g> මිනි <xliff:g id="MINUTES">%2$d</xliff:g>"</string> <string name="durationHourMinute" msgid="2741677355177402539">"පැය <xliff:g id="HOURS">%1$d</xliff:g> මිනි <xliff:g id="MINUTES">%2$d</xliff:g>"</string> <string name="durationMinutes" msgid="3134226679883579347">"මිනි <xliff:g id="MINUTES">%1$d</xliff:g>"</string> - <!-- no translation found for durationMinute (7155301744174623818) --> - <skip /> + <string name="durationMinute" msgid="7155301744174623818">"මිනිත්තු <xliff:g id="MINUTES">%1$d</xliff:g>"</string> <string name="durationMinuteSeconds" msgid="1424656185379003751">"මිනි <xliff:g id="MINUTES">%1$d</xliff:g> තත් <xliff:g id="SECONDS">%2$d</xliff:g>"</string> <string name="durationMinuteSecond" msgid="3989228718067466680">"මිනි <xliff:g id="MINUTES">%1$d</xliff:g> තත් <xliff:g id="SECONDS">%2$d</xliff:g>"</string> <string name="durationSeconds" msgid="8050088505238241405">"තත් <xliff:g id="SECONDS">%1$d</xliff:g>"</string> @@ -796,14 +795,10 @@ <string name="permdesc_cache_filesystem" msgid="5578967642265550955">"හැඹිලි ගොනු පද්ධති කියවීමට සහ ලිවීමට යෙදුමට අවසර දෙන්න."</string> <string name="permlab_use_sip" msgid="2052499390128979920">"SIP ඇමතුම් සිදුකිරීමට/ලබාගැනීමට"</string> <string name="permdesc_use_sip" msgid="2297804849860225257">"SIP ඇමතුම් සිදුකිරීමට සහ ලබාගැනීමට යෙදුමට ඉඩ දෙන්න."</string> - <!-- no translation found for permlab_register_sim_subscription (3166535485877549177) --> - <skip /> - <!-- no translation found for permdesc_register_sim_subscription (2138909035926222911) --> - <skip /> - <!-- no translation found for permlab_register_call_provider (108102120289029841) --> - <skip /> - <!-- no translation found for permdesc_register_call_provider (7034310263521081388) --> - <skip /> + <string name="permlab_register_sim_subscription" msgid="3166535485877549177">"අලුත් විදුලි සංදේශ SIM සම්බන්ධතාවක් ලියාපදිංචි කරන්න"</string> + <string name="permdesc_register_sim_subscription" msgid="2138909035926222911">"අලුත් විදුලි සංදේශ SIM සම්බන්ධතාවක් ලියාපදිංචි කිරීමට යෙදුමට ඉඩ දෙන්න."</string> + <string name="permlab_register_call_provider" msgid="108102120289029841">"අලුත් විදුලි සංදේශ සම්බන්ධතාවක් ලියාපදිංචි කරන්න"</string> + <string name="permdesc_register_call_provider" msgid="7034310263521081388">"අලුත් විදුලි සංදේශන සම්බන්ධතා ලියාපදිංචි කිරීමට යෙදුමට ඉඩ දෙන්න."</string> <string name="permlab_connection_manager" msgid="1116193254522105375">"විදුලි සංදේශන සම්බන්ධතා කළමණාකරණය කරන්න"</string> <string name="permdesc_connection_manager" msgid="5925480810356483565">"විදුලි සංදේශන සම්බන්ධතා කළමණාකරණය කිරීමට යෙදුමට ඉඩ දෙන්න."</string> <string name="permlab_bind_incall_service" msgid="6773648341975287125">"ලැබෙන ඇමතුම් තිරය සමග අන්තර් ක්රියාකාරී වන්න"</string> @@ -838,6 +833,8 @@ <string name="permdesc_handoverStatus" msgid="4788144087245714948">"දැනට තිබෙන Android බීම් හුවමාරු පිළිබඳ තොරතුරු ලබාගැනීමට මෙම යෙදුමට ඉඩ දෙන්න"</string> <string name="permlab_removeDrmCertificates" msgid="7044888287209892751">"DRM සහතික ඉවත් කරන්න"</string> <string name="permdesc_removeDrmCertificates" msgid="7272999075113400993">"යෙදුමකට DRM සහතික ඉවත් කිරීමට ඉඩ දේ. සාමාන්ය යෙදුම් වලට කිසිදා අවශ්ය නොවේ."</string> + <string name="permlab_bindCarrierMessagingService" msgid="1490229371796969158">"වාහක පණිවිඩ යැවීමේ සේවාවට බදින්න"</string> + <string name="permdesc_bindCarrierMessagingService" msgid="2762882888502113944">"වාහක සේවාව ඉහල මට්ටමේ අතුරු මුහුණතක් වෙත සම්බන්ධ කිරීමට ධාරකයාට අවසර දෙන්න. සාමාන්ය යෙදුම්වලට කිසි විටෙක අවශ්ය නොවෙයි."</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"මුරපද නීති සකස් කිරීම"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"තිරය අගුළු ඇරීමේ මුරපදයට අනුමත අකුරු සහ දිග පාලනය කරන්න."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"තිරය අගුළු ඇරීමේ උත්සාහයන් නිරීක්ෂණය කරන්න"</string> @@ -1884,8 +1881,7 @@ <string name="lock_to_app_unlock_password" msgid="6380979775916974414">"ගැලවීමට පෙර මුරපදය විමසන්න"</string> <string name="battery_saver_description" msgid="2510530476513605742">"බැටරියේ ජීව කාලය දියුණු කිරීමට උදව් කිරීමට, ඔබගේ උපාංගයේ ක්රියාකාරිත්වය සහ සීමා කළ කම්පනයන් සහ බොහොමයක් පසුබිම් දත්ත බැටරි සුරැකීමෙන් අඩු කරයි. සමමුහුර්ත කිරීම බලාපොරොත්තු වෙන ඊ-තැපෑල, පණිවිඩ යැවීම සහ වෙනත් යෙදුම් යාවත්කාලීන වන්නේ ඔබ ඒවා විවෘත කළ විට පමණි.\n\nඔබගේ උපාංගය ආරෝපණය වන විට බැටරි සුරැකීම ස්වයංක්රීයව අක්රිය වේ."</string> <string name="downtime_condition_summary" msgid="8761776337475705749">"ඔබගේ බිඳවැටුම් වේලාව <xliff:g id="FORMATTEDTIME">%1$s</xliff:g> දී අවසන්වන තුරු"</string> - <!-- no translation found for downtime_condition_line_one (8762708714645352010) --> - <skip /> + <string name="downtime_condition_line_one" msgid="8762708714645352010">"ඔබගේ බිදවැටුම් කාලය අවසන් වන තෙක්"</string> <plurals name="zen_mode_duration_minutes_summary"> <item quantity="one" msgid="3177683545388923234">"මිනිත්තු එකක් සඳහා (<xliff:g id="FORMATTEDTIME">%2$s</xliff:g> තෙක්)"</item> <item quantity="other" msgid="2787867221129368935">"මිනිත්තු %1$d සඳහා (<xliff:g id="FORMATTEDTIME">%2$s</xliff:g> තෙක්)"</item> @@ -1905,8 +1901,7 @@ <string name="zen_mode_until" msgid="7336308492289875088">"<xliff:g id="FORMATTEDTIME">%1$s</xliff:g> තෙක්"</string> <string name="zen_mode_forever" msgid="4316804956488785559">"අනියත ආකාරයට"</string> <string name="toolbar_collapse_description" msgid="2821479483960330739">"හකුළන්න"</string> - <!-- no translation found for zen_mode_next_alarm_summary (5915140424683747372) --> - <skip /> - <!-- no translation found for zen_mode_next_alarm_line_one (5537042951553420916) --> - <skip /> + <string name="zen_mode_next_alarm_summary" msgid="5915140424683747372">"<xliff:g id="FORMATTEDTIME">%1$s</xliff:g> හි ඊළඟ සීනුව තෙක්"</string> + <string name="zen_mode_next_alarm_line_one" msgid="5537042951553420916">"ඊළඟ සීනුව තෙක්"</string> + <string name="muted_by" msgid="6147073845094180001">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> විසින් නිශ්ශබ්ද කරන ලදි"</string> </resources> diff --git a/core/res/res/values-sk/strings.xml b/core/res/res/values-sk/strings.xml index f623be8f1d3b..f42a7dc2c99d 100644 --- a/core/res/res/values-sk/strings.xml +++ b/core/res/res/values-sk/strings.xml @@ -34,8 +34,7 @@ <string name="durationHourMinutes" msgid="9029176248692041549">"<xliff:g id="HOURS">%1$d</xliff:g> hod. <xliff:g id="MINUTES">%2$d</xliff:g> min."</string> <string name="durationHourMinute" msgid="2741677355177402539">"<xliff:g id="HOURS">%1$d</xliff:g> hod. <xliff:g id="MINUTES">%2$d</xliff:g> min."</string> <string name="durationMinutes" msgid="3134226679883579347">"<xliff:g id="MINUTES">%1$d</xliff:g> min."</string> - <!-- no translation found for durationMinute (7155301744174623818) --> - <skip /> + <string name="durationMinute" msgid="7155301744174623818">"<xliff:g id="MINUTES">%1$d</xliff:g> min"</string> <string name="durationMinuteSeconds" msgid="1424656185379003751">"<xliff:g id="MINUTES">%1$d</xliff:g> min. <xliff:g id="SECONDS">%2$d</xliff:g> s"</string> <string name="durationMinuteSecond" msgid="3989228718067466680">"<xliff:g id="MINUTES">%1$d</xliff:g> min. <xliff:g id="SECONDS">%2$d</xliff:g> s"</string> <string name="durationSeconds" msgid="8050088505238241405">"<xliff:g id="SECONDS">%1$d</xliff:g> s"</string> @@ -834,6 +833,8 @@ <string name="permdesc_handoverStatus" msgid="4788144087245714948">"Povoľuje tejto aplikácii prijímať informácie o aktuálnych prenosoch funkcie Android Beam"</string> <string name="permlab_removeDrmCertificates" msgid="7044888287209892751">"odstránenie certifikátov DRM"</string> <string name="permdesc_removeDrmCertificates" msgid="7272999075113400993">"Umožňuje aplikácii odstraňovať certifikáty DRM. Bežné aplikácie by toto povolenie nemali nikdy potrebovať."</string> + <string name="permlab_bindCarrierMessagingService" msgid="1490229371796969158">"viazať sa na službu na odosielanie správ SMS a MMS operátora"</string> + <string name="permdesc_bindCarrierMessagingService" msgid="2762882888502113944">"Umožňuje držiteľovi viazať sa na najvyššiu úroveň rozhrania služby na odosielanie správ SMS a MMS operátora. Bežné aplikácie by toto nastavenie nemali nikdy potrebovať."</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"Nastaviť pravidlá pre heslo"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"Ovládanie dĺžky hesiel na odomknutie obrazovky a v nich používané znaky."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Sledovať pokusy o odomknutie obrazovky"</string> @@ -1900,4 +1901,5 @@ <string name="toolbar_collapse_description" msgid="2821479483960330739">"Zbaliť"</string> <string name="zen_mode_next_alarm_summary" msgid="5915140424683747372">"Do ďalšieho budíka o <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string> <string name="zen_mode_next_alarm_line_one" msgid="5537042951553420916">"Do ďalšieho budíka"</string> + <string name="muted_by" msgid="6147073845094180001">"Stlmené aplikáciou <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> </resources> diff --git a/core/res/res/values-sl/strings.xml b/core/res/res/values-sl/strings.xml index 370ebfd9e990..ba85bdecefae 100644 --- a/core/res/res/values-sl/strings.xml +++ b/core/res/res/values-sl/strings.xml @@ -34,8 +34,7 @@ <string name="durationHourMinutes" msgid="9029176248692041549">"<xliff:g id="HOURS">%1$d</xliff:g> h <xliff:g id="MINUTES">%2$d</xliff:g> min"</string> <string name="durationHourMinute" msgid="2741677355177402539">"<xliff:g id="HOURS">%1$d</xliff:g> h <xliff:g id="MINUTES">%2$d</xliff:g> min"</string> <string name="durationMinutes" msgid="3134226679883579347">"<xliff:g id="MINUTES">%1$d</xliff:g> min"</string> - <!-- no translation found for durationMinute (7155301744174623818) --> - <skip /> + <string name="durationMinute" msgid="7155301744174623818">"<xliff:g id="MINUTES">%1$d</xliff:g> min"</string> <string name="durationMinuteSeconds" msgid="1424656185379003751">"<xliff:g id="MINUTES">%1$d</xliff:g> min <xliff:g id="SECONDS">%2$d</xliff:g> s"</string> <string name="durationMinuteSecond" msgid="3989228718067466680">"<xliff:g id="MINUTES">%1$d</xliff:g> min <xliff:g id="SECONDS">%2$d</xliff:g> s"</string> <string name="durationSeconds" msgid="8050088505238241405">"<xliff:g id="SECONDS">%1$d</xliff:g> s"</string> @@ -834,6 +833,8 @@ <string name="permdesc_handoverStatus" msgid="4788144087245714948">"Omogoči tej aplikaciji prejemanje podatkov o trenutnih prenosih s funkcijo Android Beam"</string> <string name="permlab_removeDrmCertificates" msgid="7044888287209892751">"odstranjevanje potrdil za upravljanje digitalnih pravic"</string> <string name="permdesc_removeDrmCertificates" msgid="7272999075113400993">"Aplikaciji omogoča odstranjevanje potrdil za upravljanje digitalnih pravic. Tega ni treba nikoli uporabiti za navadne aplikacije."</string> + <string name="permlab_bindCarrierMessagingService" msgid="1490229371796969158">"povezovanje z operaterjevo sporočilno storitvijo"</string> + <string name="permdesc_bindCarrierMessagingService" msgid="2762882888502113944">"Imetniku omogoča povezovanje z vmesnikom operaterjeve sporočilne storitve najvišje ravni. To naj ne bi bilo nikoli potrebno za navadne aplikacije."</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"Nastavitev pravil za geslo"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"Nadzor nad dolžino in znaki, ki so dovoljeni v geslih za odklepanje zaslona."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"nadzor nad poskusi odklepanja zaslona"</string> @@ -1900,4 +1901,5 @@ <string name="toolbar_collapse_description" msgid="2821479483960330739">"Strni"</string> <string name="zen_mode_next_alarm_summary" msgid="5915140424683747372">"Do naslednjega alarma ob <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string> <string name="zen_mode_next_alarm_line_one" msgid="5537042951553420916">"Do naslednjega alarma"</string> + <string name="muted_by" msgid="6147073845094180001">"Izklop zvoka: <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> </resources> diff --git a/core/res/res/values-sr/strings.xml b/core/res/res/values-sr/strings.xml index b7923b443a47..108b99dfe3a0 100644 --- a/core/res/res/values-sr/strings.xml +++ b/core/res/res/values-sr/strings.xml @@ -34,8 +34,7 @@ <string name="durationHourMinutes" msgid="9029176248692041549">"<xliff:g id="HOURS">%1$d</xliff:g> с <xliff:g id="MINUTES">%2$d</xliff:g> мин"</string> <string name="durationHourMinute" msgid="2741677355177402539">"<xliff:g id="HOURS">%1$d</xliff:g> с <xliff:g id="MINUTES">%2$d</xliff:g> мин"</string> <string name="durationMinutes" msgid="3134226679883579347">"<xliff:g id="MINUTES">%1$d</xliff:g> мин"</string> - <!-- no translation found for durationMinute (7155301744174623818) --> - <skip /> + <string name="durationMinute" msgid="7155301744174623818">"<xliff:g id="MINUTES">%1$d</xliff:g> мин"</string> <string name="durationMinuteSeconds" msgid="1424656185379003751">"<xliff:g id="MINUTES">%1$d</xliff:g> мин <xliff:g id="SECONDS">%2$d</xliff:g> сек"</string> <string name="durationMinuteSecond" msgid="3989228718067466680">"<xliff:g id="MINUTES">%1$d</xliff:g> мин <xliff:g id="SECONDS">%2$d</xliff:g> сек"</string> <string name="durationSeconds" msgid="8050088505238241405">"<xliff:g id="SECONDS">%1$d</xliff:g> сек"</string> @@ -834,6 +833,8 @@ <string name="permdesc_handoverStatus" msgid="4788144087245714948">"Дозвољава овој апликацији да прима информације о актуелним пребацивањима помоћу Android пребацивања"</string> <string name="permlab_removeDrmCertificates" msgid="7044888287209892751">"уклањај DRM сертификате"</string> <string name="permdesc_removeDrmCertificates" msgid="7272999075113400993">"Дозвољава апликацији да уклања DRM сертификате. Никада не би требало да се користи за обичне апликације."</string> + <string name="permlab_bindCarrierMessagingService" msgid="1490229371796969158">"повезивање са услугом за размену порука мобилног оператера"</string> + <string name="permdesc_bindCarrierMessagingService" msgid="2762882888502113944">"Дозвољава власнику да се повеже са интерфејсом највишег нивоа за услугу за размену порука мобилног оператера. Никада не би требало да буде потребно за стандардне апликације."</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"Подешавање правила за лозинку"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"Контролишите дужину и знакове дозвољене у лозинкама за откључавање екрана."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Надгледање покушаја откључавања екрана"</string> @@ -1900,4 +1901,5 @@ <string name="toolbar_collapse_description" msgid="2821479483960330739">"Скупи"</string> <string name="zen_mode_next_alarm_summary" msgid="5915140424683747372">"До следећег аларма у <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string> <string name="zen_mode_next_alarm_line_one" msgid="5537042951553420916">"До следећег аларма"</string> + <string name="muted_by" msgid="6147073845094180001">"Звук је искључио/ла <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> </resources> diff --git a/core/res/res/values-sv/strings.xml b/core/res/res/values-sv/strings.xml index 3cec045326eb..abbf28af9459 100644 --- a/core/res/res/values-sv/strings.xml +++ b/core/res/res/values-sv/strings.xml @@ -833,6 +833,8 @@ <string name="permdesc_handoverStatus" msgid="4788144087245714948">"Tillåter att appen tar emot information om aktuella Android Beam-överföringar"</string> <string name="permlab_removeDrmCertificates" msgid="7044888287209892751">"ta bort DRM-certifikat"</string> <string name="permdesc_removeDrmCertificates" msgid="7272999075113400993">"Tillåter ett program att ta bort DRM-certifikat. Behövs inte för vanliga appar."</string> + <string name="permlab_bindCarrierMessagingService" msgid="1490229371796969158">"binda till en operatörs meddelandetjänst"</string> + <string name="permdesc_bindCarrierMessagingService" msgid="2762882888502113944">"Innehavaren tillåts att binda till den översta nivåns gränssnitt för en operatörs meddelandetjänst. Ska inte behövas för vanliga appar."</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"Ange lösenordsregler"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"Bestäm hur många och vilka tecken som är tillåtna i skärmlåsets lösenord."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Övervaka försök att låsa upp skärmen"</string> @@ -1899,4 +1901,5 @@ <string name="toolbar_collapse_description" msgid="2821479483960330739">"Komprimera"</string> <string name="zen_mode_next_alarm_summary" msgid="5915140424683747372">"Till nästa alarm kl. <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string> <string name="zen_mode_next_alarm_line_one" msgid="5537042951553420916">"Till nästa alarm"</string> + <string name="muted_by" msgid="6147073845094180001">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> har stängt av ljudet"</string> </resources> diff --git a/core/res/res/values-sw/strings.xml b/core/res/res/values-sw/strings.xml index fb06ce64e9c0..2e265c95e4c5 100644 --- a/core/res/res/values-sw/strings.xml +++ b/core/res/res/values-sw/strings.xml @@ -34,8 +34,7 @@ <string name="durationHourMinutes" msgid="9029176248692041549">"Saa <xliff:g id="HOURS">%1$d</xliff:g> dak <xliff:g id="MINUTES">%2$d</xliff:g>"</string> <string name="durationHourMinute" msgid="2741677355177402539">"Saa <xliff:g id="HOURS">%1$d</xliff:g> dak <xliff:g id="MINUTES">%2$d</xliff:g>"</string> <string name="durationMinutes" msgid="3134226679883579347">"Dakika <xliff:g id="MINUTES">%1$d</xliff:g>"</string> - <!-- no translation found for durationMinute (7155301744174623818) --> - <skip /> + <string name="durationMinute" msgid="7155301744174623818">"Dak <xliff:g id="MINUTES">%1$d</xliff:g>"</string> <string name="durationMinuteSeconds" msgid="1424656185379003751">"Dak <xliff:g id="MINUTES">%1$d</xliff:g> sek <xliff:g id="SECONDS">%2$d</xliff:g>"</string> <string name="durationMinuteSecond" msgid="3989228718067466680">"Dak <xliff:g id="MINUTES">%1$d</xliff:g> sek <xliff:g id="SECONDS">%2$d</xliff:g>"</string> <string name="durationSeconds" msgid="8050088505238241405">"Sekunde <xliff:g id="SECONDS">%1$d</xliff:g>"</string> @@ -834,6 +833,8 @@ <string name="permdesc_handoverStatus" msgid="4788144087245714948">"Huruhusu programu hii kupokea taarifa kuhusu uhamisho wa Boriti ya Android"</string> <string name="permlab_removeDrmCertificates" msgid="7044888287209892751">"ondoa vyeti vya DRM"</string> <string name="permdesc_removeDrmCertificates" msgid="7272999075113400993">"Huruhusu programu kuondoa vyeti vya DRM. Haipaswi kuhitajika kwa programu za kawaida kamwe."</string> + <string name="permlab_bindCarrierMessagingService" msgid="1490229371796969158">"Shurutisha kwa huduma ya ujumbe ya mtoa huduma"</string> + <string name="permdesc_bindCarrierMessagingService" msgid="2762882888502113944">"Huruhusu kishikiliaji kushurutisha kwa kiolesura cha hali ya juu cha huduma ya ujumbe ya mtoa huduma. Haipaswi kuhitajika kwa programu za kawaida."</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"Kuweka kanuni za nenosiri"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"Kudhibiti urefu na herufi zinazoruhusiwa katika manenosiri ya kufungua skrini."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Kuhesabu mara ambazo skrini inajaribu kufunguliwa"</string> @@ -1900,4 +1901,5 @@ <string name="toolbar_collapse_description" msgid="2821479483960330739">"Kunja"</string> <string name="zen_mode_next_alarm_summary" msgid="5915140424683747372">"Hadi kengele inayofuata saa <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string> <string name="zen_mode_next_alarm_line_one" msgid="5537042951553420916">"Hadi kengele inayofuata"</string> + <string name="muted_by" msgid="6147073845094180001">"Sauti imezimwa na <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> </resources> diff --git a/core/res/res/values-ta-rIN/strings.xml b/core/res/res/values-ta-rIN/strings.xml index e66bf266d18e..4c8c97a4ea9d 100644 --- a/core/res/res/values-ta-rIN/strings.xml +++ b/core/res/res/values-ta-rIN/strings.xml @@ -34,8 +34,7 @@ <string name="durationHourMinutes" msgid="9029176248692041549">"<xliff:g id="HOURS">%1$d</xliff:g> ம.நே. <xliff:g id="MINUTES">%2$d</xliff:g> நிமி."</string> <string name="durationHourMinute" msgid="2741677355177402539">"<xliff:g id="HOURS">%1$d</xliff:g> மநே <xliff:g id="MINUTES">%2$d</xliff:g> நிமி"</string> <string name="durationMinutes" msgid="3134226679883579347">"<xliff:g id="MINUTES">%1$d</xliff:g> நிமிடங்கள்"</string> - <!-- no translation found for durationMinute (7155301744174623818) --> - <skip /> + <string name="durationMinute" msgid="7155301744174623818">"<xliff:g id="MINUTES">%1$d</xliff:g> நிமி."</string> <string name="durationMinuteSeconds" msgid="1424656185379003751">"<xliff:g id="MINUTES">%1$d</xliff:g> நிமி <xliff:g id="SECONDS">%2$d</xliff:g> வி"</string> <string name="durationMinuteSecond" msgid="3989228718067466680">"<xliff:g id="MINUTES">%1$d</xliff:g> நிமி <xliff:g id="SECONDS">%2$d</xliff:g> வி"</string> <string name="durationSeconds" msgid="8050088505238241405">"<xliff:g id="SECONDS">%1$d</xliff:g> வினாடிகள்"</string> @@ -834,6 +833,8 @@ <string name="permdesc_handoverStatus" msgid="4788144087245714948">"நடப்பு Android பீம் பரிமாற்றங்கள் குறித்த தகவலைப் பெற, பயன்பாட்டை அனுமதிக்கிறது"</string> <string name="permlab_removeDrmCertificates" msgid="7044888287209892751">"DRM சான்றிதழ்களை அகற்று"</string> <string name="permdesc_removeDrmCertificates" msgid="7272999075113400993">"DRM சான்றிதழ்களை அகற்ற, பயன்பாட்டை அனுமதிக்கிறது. சாதாரண பயன்பாடுகளுக்கு எப்போதுமே தேவைப்படாது."</string> + <string name="permlab_bindCarrierMessagingService" msgid="1490229371796969158">"மொபைல் நிறுவனச் செய்தியிடல் சேவையுடன் இணைத்தல்"</string> + <string name="permdesc_bindCarrierMessagingService" msgid="2762882888502113944">"மொபைல் நிறுவனச் செய்தியிடல் சேவையின் உயர்-நிலை இடைமுகத்துடன் ஹோல்டரை இணைக்க அனுமதிக்கும். இயல்பான பயன்பாடுகளுக்குத் தேவைப்படாது."</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"கடவுச்சொல் விதிகளை அமைக்கவும்"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"திரையைத் திறக்க கடவுச்சொற்களில் அனுமதிக்கப்பட்ட நீளத்தையும், எழுத்துக்குறிகளையும் கட்டுப்படுத்தலாம்."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"திரைத் திறக்க முயற்சிகளைக் கண்காணித்தல்"</string> @@ -1900,4 +1901,5 @@ <string name="toolbar_collapse_description" msgid="2821479483960330739">"சுருக்கு"</string> <string name="zen_mode_next_alarm_summary" msgid="5915140424683747372">"<xliff:g id="FORMATTEDTIME">%1$s</xliff:g>க்கு ஒலிக்கும் அடுத்த அலாரம் வரை"</string> <string name="zen_mode_next_alarm_line_one" msgid="5537042951553420916">"அடுத்த அலாரம் வரை"</string> + <string name="muted_by" msgid="6147073845094180001">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> ஒலியடக்கினார்"</string> </resources> diff --git a/core/res/res/values-te-rIN/strings.xml b/core/res/res/values-te-rIN/strings.xml index 513d8929d4cb..104c052ab9c6 100644 --- a/core/res/res/values-te-rIN/strings.xml +++ b/core/res/res/values-te-rIN/strings.xml @@ -34,8 +34,7 @@ <string name="durationHourMinutes" msgid="9029176248692041549">"<xliff:g id="HOURS">%1$d</xliff:g> గం <xliff:g id="MINUTES">%2$d</xliff:g> నిమి"</string> <string name="durationHourMinute" msgid="2741677355177402539">"<xliff:g id="HOURS">%1$d</xliff:g> గం <xliff:g id="MINUTES">%2$d</xliff:g> నిమి"</string> <string name="durationMinutes" msgid="3134226679883579347">"<xliff:g id="MINUTES">%1$d</xliff:g> నిమిషాలు"</string> - <!-- no translation found for durationMinute (7155301744174623818) --> - <skip /> + <string name="durationMinute" msgid="7155301744174623818">"<xliff:g id="MINUTES">%1$d</xliff:g> నిమి"</string> <string name="durationMinuteSeconds" msgid="1424656185379003751">"<xliff:g id="MINUTES">%1$d</xliff:g> నిమి <xliff:g id="SECONDS">%2$d</xliff:g> సె"</string> <string name="durationMinuteSecond" msgid="3989228718067466680">"<xliff:g id="MINUTES">%1$d</xliff:g> నిమి <xliff:g id="SECONDS">%2$d</xliff:g> సె"</string> <string name="durationSeconds" msgid="8050088505238241405">"<xliff:g id="SECONDS">%1$d</xliff:g> సెకన్లు"</string> @@ -834,6 +833,8 @@ <string name="permdesc_handoverStatus" msgid="4788144087245714948">"ప్రస్తుత Android Beam బదిలీలకు సంబంధించిన సమాచారాన్ని స్వీకరించడానికి ఈ అనువర్తనాన్ని అనుమతిస్తుంది"</string> <string name="permlab_removeDrmCertificates" msgid="7044888287209892751">"DRM ప్రమాణపత్రాలను తీసివేయడం"</string> <string name="permdesc_removeDrmCertificates" msgid="7272999075113400993">"DRM ప్రమాణపత్రాలను తీసివేయడానికి అనువర్తనాన్ని అనుమతిస్తుంది. సాధారణ అనువర్తనాలకు ఎప్పటికీ అవసరం ఉండదు."</string> + <string name="permlab_bindCarrierMessagingService" msgid="1490229371796969158">"క్యారియర్ సందేశ సేవకు అనుబంధించడం"</string> + <string name="permdesc_bindCarrierMessagingService" msgid="2762882888502113944">"క్యారియర్ సందేశ సేవ యొక్క అగ్ర-స్థాయి ఇంటర్ఫేస్కు అనుబంధించడానికి హోల్డర్ను అనుమతిస్తుంది. సాధారణ అనువర్తనాలకు ఎప్పటికీ అవసరం ఉండదు."</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"పాస్వర్డ్ నియమాలను సెట్ చేయండి"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"స్క్రీన్-అన్లాక్ పాస్వర్డ్ల్లో అనుమతించబడే అక్షరాల సంఖ్యను మరియు అక్షరాలను నియంత్రించండి."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"స్క్రీన్-అన్లాక్ ప్రయత్నాలను పర్యవేక్షించండి"</string> @@ -1900,4 +1901,5 @@ <string name="toolbar_collapse_description" msgid="2821479483960330739">"కుదించండి"</string> <string name="zen_mode_next_alarm_summary" msgid="5915140424683747372">"<xliff:g id="FORMATTEDTIME">%1$s</xliff:g>కి సెట్ చేసిన తదుపరి అలారం వరకు"</string> <string name="zen_mode_next_alarm_line_one" msgid="5537042951553420916">"తదుపరి అలారం వరకు"</string> + <string name="muted_by" msgid="6147073845094180001">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> ద్వారా మ్యూట్ చేయబడింది"</string> </resources> diff --git a/core/res/res/values-th/strings.xml b/core/res/res/values-th/strings.xml index 66960825567c..7455f844c6cf 100644 --- a/core/res/res/values-th/strings.xml +++ b/core/res/res/values-th/strings.xml @@ -34,8 +34,7 @@ <string name="durationHourMinutes" msgid="9029176248692041549">"<xliff:g id="HOURS">%1$d</xliff:g> ชม. <xliff:g id="MINUTES">%2$d</xliff:g> นาที"</string> <string name="durationHourMinute" msgid="2741677355177402539">"<xliff:g id="HOURS">%1$d</xliff:g> ชม. <xliff:g id="MINUTES">%2$d</xliff:g> นาที"</string> <string name="durationMinutes" msgid="3134226679883579347">"<xliff:g id="MINUTES">%1$d</xliff:g> นาที"</string> - <!-- no translation found for durationMinute (7155301744174623818) --> - <skip /> + <string name="durationMinute" msgid="7155301744174623818">"<xliff:g id="MINUTES">%1$d</xliff:g> นาที"</string> <string name="durationMinuteSeconds" msgid="1424656185379003751">"<xliff:g id="MINUTES">%1$d</xliff:g> นาที <xliff:g id="SECONDS">%2$d</xliff:g> วิ."</string> <string name="durationMinuteSecond" msgid="3989228718067466680">"<xliff:g id="MINUTES">%1$d</xliff:g> นาที <xliff:g id="SECONDS">%2$d</xliff:g> วิ."</string> <string name="durationSeconds" msgid="8050088505238241405">"<xliff:g id="SECONDS">%1$d</xliff:g> วินาที"</string> @@ -834,6 +833,8 @@ <string name="permdesc_handoverStatus" msgid="4788144087245714948">"อนุญาตให้แอปพลิเคชันนี้รับข้อมูลเกี่ยวกับการโอน Android Beam ปัจจุบัน"</string> <string name="permlab_removeDrmCertificates" msgid="7044888287209892751">"นำใบรับรอง DRM ออก"</string> <string name="permdesc_removeDrmCertificates" msgid="7272999075113400993">"อนุญาตให้แอปพลิเคชันนำใบรับรอง DRM ออก แอปทั่วไปไม่จำเป็นต้องใช้"</string> + <string name="permlab_bindCarrierMessagingService" msgid="1490229371796969158">"เชื่อมโยงกับบริการรับส่งข้อความของผู้ให้บริการ"</string> + <string name="permdesc_bindCarrierMessagingService" msgid="2762882888502113944">"อนุญาตให้แอปพลิเคชันเชื่อมโยงกับอินเทอร์เฟซระดับบนสุดของบริการรับส่งข้อความของผู้ให้บริการ ไม่ควรใช้สำหรับแอปธรรมดาทั่วไป"</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"ตั้งค่ากฎรหัสผ่าน"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"ควบคุมความยาวและอักขระที่อนุญาตให้ใช้ในรหัสผ่านการปลดล็อกหน้าจอ"</string> <string name="policylab_watchLogin" msgid="914130646942199503">"ตรวจสอบความพยายามในการปลดล็อกหน้าจอ"</string> @@ -1900,4 +1901,5 @@ <string name="toolbar_collapse_description" msgid="2821479483960330739">"ยุบ"</string> <string name="zen_mode_next_alarm_summary" msgid="5915140424683747372">"จนถึงการตั้งปลุกครั้งถัดไปในเวลา <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string> <string name="zen_mode_next_alarm_line_one" msgid="5537042951553420916">"จนถึงการตั้งปลุกครั้งถัดไป"</string> + <string name="muted_by" msgid="6147073845094180001">"ปิดเสียงโดย <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> </resources> diff --git a/core/res/res/values-tl/strings.xml b/core/res/res/values-tl/strings.xml index 1b3e7a0a94c7..a2f793a1b1b3 100644 --- a/core/res/res/values-tl/strings.xml +++ b/core/res/res/values-tl/strings.xml @@ -34,8 +34,7 @@ <string name="durationHourMinutes" msgid="9029176248692041549">"<xliff:g id="HOURS">%1$d</xliff:g> oras <xliff:g id="MINUTES">%2$d</xliff:g> min"</string> <string name="durationHourMinute" msgid="2741677355177402539">"<xliff:g id="HOURS">%1$d</xliff:g> oras <xliff:g id="MINUTES">%2$d</xliff:g> min"</string> <string name="durationMinutes" msgid="3134226679883579347">"<xliff:g id="MINUTES">%1$d</xliff:g> (na) min"</string> - <!-- no translation found for durationMinute (7155301744174623818) --> - <skip /> + <string name="durationMinute" msgid="7155301744174623818">"<xliff:g id="MINUTES">%1$d</xliff:g> min"</string> <string name="durationMinuteSeconds" msgid="1424656185379003751">"<xliff:g id="MINUTES">%1$d</xliff:g> min <xliff:g id="SECONDS">%2$d</xliff:g> seg"</string> <string name="durationMinuteSecond" msgid="3989228718067466680">"<xliff:g id="MINUTES">%1$d</xliff:g> min <xliff:g id="SECONDS">%2$d</xliff:g> seg"</string> <string name="durationSeconds" msgid="8050088505238241405">"<xliff:g id="SECONDS">%1$d</xliff:g> (na) seg"</string> @@ -834,6 +833,8 @@ <string name="permdesc_handoverStatus" msgid="4788144087245714948">"Pinapayagan ang application na ito na tumanggap ng impormasyon tungkol sa mga kasalukuyang paglilipat ng Android Beam"</string> <string name="permlab_removeDrmCertificates" msgid="7044888287209892751">"alisin ang mga DRM certificate"</string> <string name="permdesc_removeDrmCertificates" msgid="7272999075113400993">"Nagbibigay-daan sa isang application na alisin ang mga DRM certficate. Hindi dapat kailanman kailanganin para sa karaniwang apps."</string> + <string name="permlab_bindCarrierMessagingService" msgid="1490229371796969158">"sumailalim sa isang serbisyo ng pagmemensahe ng carrier"</string> + <string name="permdesc_bindCarrierMessagingService" msgid="2762882888502113944">"Binibigyang-daan ang may-ari na sumailalim sa interface sa nangungunang antas ng isang serbisyo ng pagmemensahe ng carrier. Hindi kailanman dapat kailanganin para sa mga normal na app."</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"Magtakda ng mga panuntunan sa password"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"Kontrolin ang haba at mga character na pinapayagan sa mga password sa pag-unlock ng screen."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Subaybayan ang mga pagsubok sa pag-unlock ng screen"</string> @@ -1900,4 +1901,5 @@ <string name="toolbar_collapse_description" msgid="2821479483960330739">"I-collapse"</string> <string name="zen_mode_next_alarm_summary" msgid="5915140424683747372">"Hanggang sa susunod na alarma sa <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string> <string name="zen_mode_next_alarm_line_one" msgid="5537042951553420916">"Hanggang sa susunod na alarma"</string> + <string name="muted_by" msgid="6147073845094180001">"Na-mute ng <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> </resources> diff --git a/core/res/res/values-tr/strings.xml b/core/res/res/values-tr/strings.xml index 249bae72caf0..dd95ce95f164 100644 --- a/core/res/res/values-tr/strings.xml +++ b/core/res/res/values-tr/strings.xml @@ -34,8 +34,7 @@ <string name="durationHourMinutes" msgid="9029176248692041549">"<xliff:g id="HOURS">%1$d</xliff:g> sa. <xliff:g id="MINUTES">%2$d</xliff:g> dk."</string> <string name="durationHourMinute" msgid="2741677355177402539">"<xliff:g id="HOURS">%1$d</xliff:g> sa. <xliff:g id="MINUTES">%2$d</xliff:g> dk."</string> <string name="durationMinutes" msgid="3134226679883579347">"<xliff:g id="MINUTES">%1$d</xliff:g> dk."</string> - <!-- no translation found for durationMinute (7155301744174623818) --> - <skip /> + <string name="durationMinute" msgid="7155301744174623818">"<xliff:g id="MINUTES">%1$d</xliff:g> dk."</string> <string name="durationMinuteSeconds" msgid="1424656185379003751">"<xliff:g id="MINUTES">%1$d</xliff:g> dk. <xliff:g id="SECONDS">%2$d</xliff:g> sn."</string> <string name="durationMinuteSecond" msgid="3989228718067466680">"<xliff:g id="MINUTES">%1$d</xliff:g> dk. <xliff:g id="SECONDS">%2$d</xliff:g> sn."</string> <string name="durationSeconds" msgid="8050088505238241405">"<xliff:g id="SECONDS">%1$d</xliff:g> sn."</string> @@ -834,6 +833,8 @@ <string name="permdesc_handoverStatus" msgid="4788144087245714948">"Bu uygulamanın mevcut Android Beam aktarımlarıyla ilgili bilgi almasına izin verir"</string> <string name="permlab_removeDrmCertificates" msgid="7044888287209892751">"DRM sertifikalarını kaldırma"</string> <string name="permdesc_removeDrmCertificates" msgid="7272999075113400993">"Uygulamaya, DRM sertifikalarını kaldırma izin verir. Normal uygulamalar için asla gerekmemelidir."</string> + <string name="permlab_bindCarrierMessagingService" msgid="1490229371796969158">"operatör mesajlaşma hizmetine bağlan"</string> + <string name="permdesc_bindCarrierMessagingService" msgid="2762882888502113944">"İzin sahibinin, operatör mesajlaşma hizmetinin üst düzey arayüzüne bağlanmasına olanak verir. Normal uygulamalarda hiçbir zaman gerekmez."</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"Şifre kuralları ayarla"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"Ekran kilidini açma şifrelerinde izin verilen uzunluğu ve karakterleri denetleme."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Ekran kilidini açma denemelerini izle"</string> @@ -1900,4 +1901,5 @@ <string name="toolbar_collapse_description" msgid="2821479483960330739">"Daralt"</string> <string name="zen_mode_next_alarm_summary" msgid="5915140424683747372">"<xliff:g id="FORMATTEDTIME">%1$s</xliff:g> saatindeki bir sonraki alarma kadar"</string> <string name="zen_mode_next_alarm_line_one" msgid="5537042951553420916">"Bir sonraki alarma kadar"</string> + <string name="muted_by" msgid="6147073845094180001">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> tarafından kapatıldı"</string> </resources> diff --git a/core/res/res/values-uk/strings.xml b/core/res/res/values-uk/strings.xml index 69bea7827be1..e3b34b1e8cbe 100644 --- a/core/res/res/values-uk/strings.xml +++ b/core/res/res/values-uk/strings.xml @@ -34,8 +34,7 @@ <string name="durationHourMinutes" msgid="9029176248692041549">"<xliff:g id="HOURS">%1$d</xliff:g> год <xliff:g id="MINUTES">%2$d</xliff:g> хв"</string> <string name="durationHourMinute" msgid="2741677355177402539">"<xliff:g id="HOURS">%1$d</xliff:g> год <xliff:g id="MINUTES">%2$d</xliff:g> хв"</string> <string name="durationMinutes" msgid="3134226679883579347">"<xliff:g id="MINUTES">%1$d</xliff:g> хв"</string> - <!-- no translation found for durationMinute (7155301744174623818) --> - <skip /> + <string name="durationMinute" msgid="7155301744174623818">"<xliff:g id="MINUTES">%1$d</xliff:g> хв"</string> <string name="durationMinuteSeconds" msgid="1424656185379003751">"<xliff:g id="MINUTES">%1$d</xliff:g> хв <xliff:g id="SECONDS">%2$d</xliff:g> с"</string> <string name="durationMinuteSecond" msgid="3989228718067466680">"<xliff:g id="MINUTES">%1$d</xliff:g> хв <xliff:g id="SECONDS">%2$d</xliff:g> с"</string> <string name="durationSeconds" msgid="8050088505238241405">"<xliff:g id="SECONDS">%1$d</xliff:g> с"</string> @@ -834,6 +833,8 @@ <string name="permdesc_handoverStatus" msgid="4788144087245714948">"Додаток може отримувати інформацію про поточне передавання даних за допомогою функції Передавання даних Android"</string> <string name="permlab_removeDrmCertificates" msgid="7044888287209892751">"видаляти сертифікати DRM"</string> <string name="permdesc_removeDrmCertificates" msgid="7272999075113400993">"Власник може видаляти сертифікати DRM. Ніколи не застосовується для звичайних додатків."</string> + <string name="permlab_bindCarrierMessagingService" msgid="1490229371796969158">"підключатися до служби надсилання повідомлень через оператора"</string> + <string name="permdesc_bindCarrierMessagingService" msgid="2762882888502113944">"Додаток зможе підключатися до інтерфейсу верхнього рівня служби надсилання повідомлень через оператора. Звичайні додатки ніколи не використовують цей дозвіл."</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"Устан. правила пароля"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"Контролювати довжину паролів для розблокування екрана та дозволені в них символи."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Відстежув. спроби розблок. екрана"</string> @@ -1900,4 +1901,5 @@ <string name="toolbar_collapse_description" msgid="2821479483960330739">"Згорнути"</string> <string name="zen_mode_next_alarm_summary" msgid="5915140424683747372">"До наступного сигналу о <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string> <string name="zen_mode_next_alarm_line_one" msgid="5537042951553420916">"До наступного сигналу"</string> + <string name="muted_by" msgid="6147073845094180001">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> вимикає звук"</string> </resources> diff --git a/core/res/res/values-ur-rPK/strings.xml b/core/res/res/values-ur-rPK/strings.xml index 859ac0308426..39657de7bcea 100644 --- a/core/res/res/values-ur-rPK/strings.xml +++ b/core/res/res/values-ur-rPK/strings.xml @@ -34,8 +34,7 @@ <string name="durationHourMinutes" msgid="9029176248692041549">"<xliff:g id="HOURS">%1$d</xliff:g> گھنٹہ <xliff:g id="MINUTES">%2$d</xliff:g> منٹ"</string> <string name="durationHourMinute" msgid="2741677355177402539">"<xliff:g id="HOURS">%1$d</xliff:g> گھنٹہ <xliff:g id="MINUTES">%2$d</xliff:g> منٹ"</string> <string name="durationMinutes" msgid="3134226679883579347">"<xliff:g id="MINUTES">%1$d</xliff:g> منٹ"</string> - <!-- no translation found for durationMinute (7155301744174623818) --> - <skip /> + <string name="durationMinute" msgid="7155301744174623818">"<xliff:g id="MINUTES">%1$d</xliff:g> منٹ"</string> <string name="durationMinuteSeconds" msgid="1424656185379003751">"<xliff:g id="MINUTES">%1$d</xliff:g> منٹ <xliff:g id="SECONDS">%2$d</xliff:g> سیکنڈ"</string> <string name="durationMinuteSecond" msgid="3989228718067466680">"<xliff:g id="MINUTES">%1$d</xliff:g> منٹ <xliff:g id="SECONDS">%2$d</xliff:g> سیکنڈ"</string> <string name="durationSeconds" msgid="8050088505238241405">"<xliff:g id="SECONDS">%1$d</xliff:g> سیکنڈ"</string> @@ -834,6 +833,8 @@ <string name="permdesc_handoverStatus" msgid="4788144087245714948">"اس ایپلیکیشن کو Android Beam کی حالیہ منتقلیوں کے بارے میں معلومات موصول کرنے کی اجازت دیتا ہے"</string> <string name="permlab_removeDrmCertificates" msgid="7044888287209892751">"DRM سرٹیفکیٹس کو ہٹائیں"</string> <string name="permdesc_removeDrmCertificates" msgid="7272999075113400993">"ایک ایپلیکیشن کو DRM سرٹیفکیٹس کو ہٹانے کی اجازت دیتا ہے۔ عام ایپس کیلئے کبھی بھی اس کی ضرورت نہیں ہونی چاہیے۔"</string> + <string name="permlab_bindCarrierMessagingService" msgid="1490229371796969158">"ایک کیریئر پیغام رسانی سروس کا پابند بنیں"</string> + <string name="permdesc_bindCarrierMessagingService" msgid="2762882888502113944">"حامل کو ایک کیریئر پیغام رسانی سروس کے اعلی سطحی انٹرفیس کا پابند ہونے کی اجازت دیتی ہے۔ عام ایپس کیلئے کبھی بھی اس کی ضرورت نہیں ہونی چاہیے۔"</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"پاس ورڈ کے اصول سیٹ کریں"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"اسکرین غیر مقفل کرنے کے پاس ورڈز میں مجاز طوالت اور حروف کو کنٹرول کریں۔"</string> <string name="policylab_watchLogin" msgid="914130646942199503">"اسکرین غیر مقفل کرنے کی کوششیں مانیٹر کریں"</string> @@ -1900,4 +1901,5 @@ <string name="toolbar_collapse_description" msgid="2821479483960330739">"سکیڑیں"</string> <string name="zen_mode_next_alarm_summary" msgid="5915140424683747372">"اگلے الارم تک بوقت <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string> <string name="zen_mode_next_alarm_line_one" msgid="5537042951553420916">"اگلے الارم تک"</string> + <string name="muted_by" msgid="6147073845094180001">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> کے ذریعے خاموش کردہ"</string> </resources> diff --git a/core/res/res/values-uz-rUZ/strings.xml b/core/res/res/values-uz-rUZ/strings.xml index f2b31fd1c19e..0c5c83feae61 100644 --- a/core/res/res/values-uz-rUZ/strings.xml +++ b/core/res/res/values-uz-rUZ/strings.xml @@ -34,8 +34,7 @@ <string name="durationHourMinutes" msgid="9029176248692041549">"<xliff:g id="HOURS">%1$d</xliff:g> soat <xliff:g id="MINUTES">%2$d</xliff:g> daq"</string> <string name="durationHourMinute" msgid="2741677355177402539">"<xliff:g id="HOURS">%1$d</xliff:g> soat <xliff:g id="MINUTES">%2$d</xliff:g> daq"</string> <string name="durationMinutes" msgid="3134226679883579347">"<xliff:g id="MINUTES">%1$d</xliff:g> daqiqa"</string> - <!-- no translation found for durationMinute (7155301744174623818) --> - <skip /> + <string name="durationMinute" msgid="7155301744174623818">"<xliff:g id="MINUTES">%1$d</xliff:g> daqiqa"</string> <string name="durationMinuteSeconds" msgid="1424656185379003751">"<xliff:g id="MINUTES">%1$d</xliff:g> daq <xliff:g id="SECONDS">%2$d</xliff:g> son"</string> <string name="durationMinuteSecond" msgid="3989228718067466680">"<xliff:g id="MINUTES">%1$d</xliff:g> daq <xliff:g id="SECONDS">%2$d</xliff:g> son"</string> <string name="durationSeconds" msgid="8050088505238241405">"<xliff:g id="SECONDS">%1$d</xliff:g> soniya"</string> @@ -834,6 +833,8 @@ <string name="permdesc_handoverStatus" msgid="4788144087245714948">"Ushbu ilovaga joriy Android Beam uzatishlari haqida ma\'lumotlarni olish ruxsati berilsin."</string> <string name="permlab_removeDrmCertificates" msgid="7044888287209892751">"DRM sertifikatlarini o‘chirib tashlash"</string> <string name="permdesc_removeDrmCertificates" msgid="7272999075113400993">"Ilovaga DRM sertifikatlarini o‘chirib tashlash uchun ruxsat beradi. Oddiy ilovalar uchun talab qilinmaydi."</string> + <string name="permlab_bindCarrierMessagingService" msgid="1490229371796969158">"aloqa operatorining xabar almashinuv xizmatiga bog‘lanish"</string> + <string name="permdesc_bindCarrierMessagingService" msgid="2762882888502113944">"Egasiga aloqa operatorining xabar almashinuv xizmatining yuqori darajali interfeysiga bog‘lanish uchun ruxsat beradi. Oddiy ilovalar uchun hech qachon kerak bo‘lmaydi."</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"Parol qoidalarini o‘rnatish"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"Ekran qulfini ochish parollariga ruxsat berilgan belgilar va ularning uzunligini boshqarish."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Ekranni qulfdan chiqarish urinishlarini nazorat qilish"</string> @@ -1900,4 +1901,5 @@ <string name="toolbar_collapse_description" msgid="2821479483960330739">"Yig‘ish"</string> <string name="zen_mode_next_alarm_summary" msgid="5915140424683747372">"Keyingi uyg‘otkich vaqtigacha (<xliff:g id="FORMATTEDTIME">%1$s</xliff:g>)"</string> <string name="zen_mode_next_alarm_line_one" msgid="5537042951553420916">"Keyingi uyg‘otkich vaqtigacha"</string> + <string name="muted_by" msgid="6147073845094180001">"“<xliff:g id="THIRD_PARTY">%1$s</xliff:g>” tomonidan ovozsiz qilingan"</string> </resources> diff --git a/core/res/res/values-vi/strings.xml b/core/res/res/values-vi/strings.xml index a99f0aa76119..c088e6883e71 100644 --- a/core/res/res/values-vi/strings.xml +++ b/core/res/res/values-vi/strings.xml @@ -34,8 +34,7 @@ <string name="durationHourMinutes" msgid="9029176248692041549">"<xliff:g id="HOURS">%1$d</xliff:g> giờ <xliff:g id="MINUTES">%2$d</xliff:g> phút"</string> <string name="durationHourMinute" msgid="2741677355177402539">"<xliff:g id="HOURS">%1$d</xliff:g> giờ <xliff:g id="MINUTES">%2$d</xliff:g> phút"</string> <string name="durationMinutes" msgid="3134226679883579347">"<xliff:g id="MINUTES">%1$d</xliff:g> phút"</string> - <!-- no translation found for durationMinute (7155301744174623818) --> - <skip /> + <string name="durationMinute" msgid="7155301744174623818">"<xliff:g id="MINUTES">%1$d</xliff:g> phút"</string> <string name="durationMinuteSeconds" msgid="1424656185379003751">"<xliff:g id="MINUTES">%1$d</xliff:g> phút <xliff:g id="SECONDS">%2$d</xliff:g> giây"</string> <string name="durationMinuteSecond" msgid="3989228718067466680">"<xliff:g id="MINUTES">%1$d</xliff:g> phút <xliff:g id="SECONDS">%2$d</xliff:g> giây"</string> <string name="durationSeconds" msgid="8050088505238241405">"<xliff:g id="SECONDS">%1$d</xliff:g> giây"</string> @@ -834,6 +833,8 @@ <string name="permdesc_handoverStatus" msgid="4788144087245714948">"Cho phép ứng dụng này nhận thông tin về các lần chuyển hiện tại của Android Beam"</string> <string name="permlab_removeDrmCertificates" msgid="7044888287209892751">"xóa chứng chỉ DRM"</string> <string name="permdesc_removeDrmCertificates" msgid="7272999075113400993">"Cho phép ứng dụng xóa chứng chỉ DRM. Không cần thiết cho các ứng dụng thông thường."</string> + <string name="permlab_bindCarrierMessagingService" msgid="1490229371796969158">"liên kết với dịch vụ nhắn tin của nhà cung cấp dịch vụ"</string> + <string name="permdesc_bindCarrierMessagingService" msgid="2762882888502113944">"Cho phép chủ sở hữu liên kết với giao diện cấp cao nhất của dịch vụ nhắn tin của nhà cung cấp dịch vụ. Không cần thiết cho các ứng dụng thông thường."</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"Đặt quy tắc mật khẩu"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"Kiểm soát độ dài và ký tự được phép trong mật khẩu mở khóa màn hình."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Giám sát những lần thử mở khóa màn hình"</string> @@ -1900,4 +1901,5 @@ <string name="toolbar_collapse_description" msgid="2821479483960330739">"Thu gọn"</string> <string name="zen_mode_next_alarm_summary" msgid="5915140424683747372">"Cho đến lần báo thức tiếp theo vào <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string> <string name="zen_mode_next_alarm_line_one" msgid="5537042951553420916">"Cho đến lần báo thức tiếp theo"</string> + <string name="muted_by" msgid="6147073845094180001">"Do <xliff:g id="THIRD_PARTY">%1$s</xliff:g> tắt tiếng"</string> </resources> diff --git a/core/res/res/values-zh-rCN/strings.xml b/core/res/res/values-zh-rCN/strings.xml index a562a3967645..1b4aad1afbae 100644 --- a/core/res/res/values-zh-rCN/strings.xml +++ b/core/res/res/values-zh-rCN/strings.xml @@ -34,8 +34,7 @@ <string name="durationHourMinutes" msgid="9029176248692041549">"<xliff:g id="HOURS">%1$d</xliff:g>小时<xliff:g id="MINUTES">%2$d</xliff:g>分钟"</string> <string name="durationHourMinute" msgid="2741677355177402539">"<xliff:g id="HOURS">%1$d</xliff:g>小时<xliff:g id="MINUTES">%2$d</xliff:g>分钟"</string> <string name="durationMinutes" msgid="3134226679883579347">"<xliff:g id="MINUTES">%1$d</xliff:g>分钟"</string> - <!-- no translation found for durationMinute (7155301744174623818) --> - <skip /> + <string name="durationMinute" msgid="7155301744174623818">"<xliff:g id="MINUTES">%1$d</xliff:g> 分钟"</string> <string name="durationMinuteSeconds" msgid="1424656185379003751">"<xliff:g id="MINUTES">%1$d</xliff:g>分钟<xliff:g id="SECONDS">%2$d</xliff:g>秒"</string> <string name="durationMinuteSecond" msgid="3989228718067466680">"<xliff:g id="MINUTES">%1$d</xliff:g>分钟<xliff:g id="SECONDS">%2$d</xliff:g>秒"</string> <string name="durationSeconds" msgid="8050088505238241405">"<xliff:g id="SECONDS">%1$d</xliff:g>秒"</string> @@ -834,6 +833,10 @@ <string name="permdesc_handoverStatus" msgid="4788144087245714948">"允许此应用接收Android Beam当前传输内容的相关信息"</string> <string name="permlab_removeDrmCertificates" msgid="7044888287209892751">"移除DRM证书"</string> <string name="permdesc_removeDrmCertificates" msgid="7272999075113400993">"允许应用移除DRM证书。普通应用绝不需要此权限。"</string> + <!-- no translation found for permlab_bindCarrierMessagingService (1490229371796969158) --> + <skip /> + <!-- no translation found for permdesc_bindCarrierMessagingService (2762882888502113944) --> + <skip /> <string name="policylab_limitPassword" msgid="4497420728857585791">"设置密码规则"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"控制屏幕解锁密码所允许的长度和字符。"</string> <string name="policylab_watchLogin" msgid="914130646942199503">"监视屏幕解锁尝试次数"</string> @@ -1900,4 +1903,5 @@ <string name="toolbar_collapse_description" msgid="2821479483960330739">"收起"</string> <string name="zen_mode_next_alarm_summary" msgid="5915140424683747372">"到下次闹钟时间（<xliff:g id="FORMATTEDTIME">%1$s</xliff:g>）"</string> <string name="zen_mode_next_alarm_line_one" msgid="5537042951553420916">"到下次闹钟时间"</string> + <string name="muted_by" msgid="6147073845094180001">"已被<xliff:g id="THIRD_PARTY">%1$s</xliff:g>设为静音"</string> </resources> diff --git a/core/res/res/values-zh-rHK/strings.xml b/core/res/res/values-zh-rHK/strings.xml index 3fc82cfd2b3b..1759445ca1fe 100644 --- a/core/res/res/values-zh-rHK/strings.xml +++ b/core/res/res/values-zh-rHK/strings.xml @@ -34,8 +34,7 @@ <string name="durationHourMinutes" msgid="9029176248692041549">"<xliff:g id="HOURS">%1$d</xliff:g> 小時 <xliff:g id="MINUTES">%2$d</xliff:g> 分鐘"</string> <string name="durationHourMinute" msgid="2741677355177402539">"<xliff:g id="HOURS">%1$d</xliff:g> 小時 <xliff:g id="MINUTES">%2$d</xliff:g> 分鐘"</string> <string name="durationMinutes" msgid="3134226679883579347">"<xliff:g id="MINUTES">%1$d</xliff:g> 分鐘"</string> - <!-- no translation found for durationMinute (7155301744174623818) --> - <skip /> + <string name="durationMinute" msgid="7155301744174623818">"<xliff:g id="MINUTES">%1$d</xliff:g> 分鐘"</string> <string name="durationMinuteSeconds" msgid="1424656185379003751">"<xliff:g id="MINUTES">%1$d</xliff:g> 分鐘 <xliff:g id="SECONDS">%2$d</xliff:g> 秒"</string> <string name="durationMinuteSecond" msgid="3989228718067466680">"<xliff:g id="MINUTES">%1$d</xliff:g> 分鐘 <xliff:g id="SECONDS">%2$d</xliff:g> 秒"</string> <string name="durationSeconds" msgid="8050088505238241405">"<xliff:g id="SECONDS">%1$d</xliff:g> 秒"</string> @@ -834,6 +833,8 @@ <string name="permdesc_handoverStatus" msgid="4788144087245714948">"允許應用程式接收 Android Beam 目前傳送的資料"</string> <string name="permlab_removeDrmCertificates" msgid="7044888287209892751">"移除 DRM 憑證"</string> <string name="permdesc_removeDrmCertificates" msgid="7272999075113400993">"允許應用程式移除 DRM 憑證 (一般應用程式並不需要)。"</string> + <string name="permlab_bindCarrierMessagingService" msgid="1490229371796969158">"綁定到流動網絡供應商短訊服務"</string> + <string name="permdesc_bindCarrierMessagingService" msgid="2762882888502113944">"允許持有人綁定到流動網絡供應商短訊服務頂層介面 (一般應用程式不需要)。"</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"設定密碼規則"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"控制螢幕解鎖密碼所允許的長度和字元。"</string> <string name="policylab_watchLogin" msgid="914130646942199503">"監控螢幕解鎖嘗試次數"</string> @@ -1900,4 +1901,5 @@ <string name="toolbar_collapse_description" msgid="2821479483960330739">"收合"</string> <string name="zen_mode_next_alarm_summary" msgid="5915140424683747372">"直到下一個在 <xliff:g id="FORMATTEDTIME">%1$s</xliff:g> 的鬧鐘"</string> <string name="zen_mode_next_alarm_line_one" msgid="5537042951553420916">"直到下一個鬧鐘"</string> + <string name="muted_by" msgid="6147073845094180001">"靜音設定者：<xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> </resources> diff --git a/core/res/res/values-zh-rTW/strings.xml b/core/res/res/values-zh-rTW/strings.xml index 000243b03383..cde2929d9368 100644 --- a/core/res/res/values-zh-rTW/strings.xml +++ b/core/res/res/values-zh-rTW/strings.xml @@ -34,8 +34,7 @@ <string name="durationHourMinutes" msgid="9029176248692041549">"<xliff:g id="HOURS">%1$d</xliff:g> 小時 <xliff:g id="MINUTES">%2$d</xliff:g> 分鐘"</string> <string name="durationHourMinute" msgid="2741677355177402539">"<xliff:g id="HOURS">%1$d</xliff:g> 小時 <xliff:g id="MINUTES">%2$d</xliff:g> 分鐘"</string> <string name="durationMinutes" msgid="3134226679883579347">"<xliff:g id="MINUTES">%1$d</xliff:g> 分鐘"</string> - <!-- no translation found for durationMinute (7155301744174623818) --> - <skip /> + <string name="durationMinute" msgid="7155301744174623818">"<xliff:g id="MINUTES">%1$d</xliff:g> 分鐘"</string> <string name="durationMinuteSeconds" msgid="1424656185379003751">"<xliff:g id="MINUTES">%1$d</xliff:g> 分鐘 <xliff:g id="SECONDS">%2$d</xliff:g> 秒"</string> <string name="durationMinuteSecond" msgid="3989228718067466680">"<xliff:g id="MINUTES">%1$d</xliff:g> 分鐘 <xliff:g id="SECONDS">%2$d</xliff:g> 秒"</string> <string name="durationSeconds" msgid="8050088505238241405">"<xliff:g id="SECONDS">%1$d</xliff:g> 秒"</string> @@ -834,6 +833,8 @@ <string name="permdesc_handoverStatus" msgid="4788144087245714948">"允許應用程式接收 Android Beam 目前傳輸的資訊"</string> <string name="permlab_removeDrmCertificates" msgid="7044888287209892751">"移除 DRM 憑證"</string> <string name="permdesc_removeDrmCertificates" msgid="7272999075113400993">"允許應用程式移除 DRM 憑證 (一般應用程式並不需要)。"</string> + <string name="permlab_bindCarrierMessagingService" msgid="1490229371796969158">"繫結至行動通訊業者簡訊服務"</string> + <string name="permdesc_bindCarrierMessagingService" msgid="2762882888502113944">"允許應用程式繫結至行動通訊業者簡訊服務的頂層介面 (一般應用程式並不需要)。"</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"設定密碼規則"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"控制螢幕解鎖密碼所允許的長度和字元。"</string> <string name="policylab_watchLogin" msgid="914130646942199503">"監視螢幕解鎖嘗試次數"</string> @@ -1878,7 +1879,7 @@ <string name="lock_to_app_unlock_password" msgid="6380979775916974414">"取消固定時必須輸入密碼"</string> <string name="battery_saver_description" msgid="2510530476513605742">"節約耗電量功能會降低裝置的效能，並限制震動和大多數背景資料，藉此延長電池續航力。此外，電子郵件、聊天工具和其他需要使用同步功能的應用程式若未開啟，將不會自動更新。\n\n當您為裝置充電時，節約耗電量功能會自動關閉。"</string> <string name="downtime_condition_summary" msgid="8761776337475705749">"直到 <xliff:g id="FORMATTEDTIME">%1$s</xliff:g> 停機時間結束"</string> - <string name="downtime_condition_line_one" msgid="8762708714645352010">"到停機時間結束時"</string> + <string name="downtime_condition_line_one" msgid="8762708714645352010">"直到停機時間結束"</string> <plurals name="zen_mode_duration_minutes_summary"> <item quantity="one" msgid="3177683545388923234">"1 分鐘 (結束時間：<xliff:g id="FORMATTEDTIME">%2$s</xliff:g>)"</item> <item quantity="other" msgid="2787867221129368935">"%1$d 分鐘 (結束時間：<xliff:g id="FORMATTEDTIME">%2$s</xliff:g>)"</item> @@ -1898,6 +1899,7 @@ <string name="zen_mode_until" msgid="7336308492289875088">"結束時間：<xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string> <string name="zen_mode_forever" msgid="4316804956488785559">"無限期"</string> <string name="toolbar_collapse_description" msgid="2821479483960330739">"收合"</string> - <string name="zen_mode_next_alarm_summary" msgid="5915140424683747372">"到下次鬧鐘鈴響時：<xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string> - <string name="zen_mode_next_alarm_line_one" msgid="5537042951553420916">"到下次鬧鐘鈴響時"</string> + <string name="zen_mode_next_alarm_summary" msgid="5915140424683747372">"直到下次鬧鐘鈴響：<xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string> + <string name="zen_mode_next_alarm_line_one" msgid="5537042951553420916">"直到下次鬧鐘鈴響"</string> + <string name="muted_by" msgid="6147073845094180001">"由 <xliff:g id="THIRD_PARTY">%1$s</xliff:g> 設為靜音"</string> </resources> diff --git a/core/res/res/values-zu/strings.xml b/core/res/res/values-zu/strings.xml index df165136d22d..50a3008e02d5 100644 --- a/core/res/res/values-zu/strings.xml +++ b/core/res/res/values-zu/strings.xml @@ -34,8 +34,7 @@ <string name="durationHourMinutes" msgid="9029176248692041549">"<xliff:g id="HOURS">%1$d</xliff:g> ihora <xliff:g id="MINUTES">%2$d</xliff:g> amaminithi"</string> <string name="durationHourMinute" msgid="2741677355177402539">"<xliff:g id="HOURS">%1$d</xliff:g> ihora <xliff:g id="MINUTES">%2$d</xliff:g> iminithi"</string> <string name="durationMinutes" msgid="3134226679883579347">"<xliff:g id="MINUTES">%1$d</xliff:g> amaminithi"</string> - <!-- no translation found for durationMinute (7155301744174623818) --> - <skip /> + <string name="durationMinute" msgid="7155301744174623818">"<xliff:g id="MINUTES">%1$d</xliff:g> iminithi"</string> <string name="durationMinuteSeconds" msgid="1424656185379003751">"<xliff:g id="MINUTES">%1$d</xliff:g> iminithi <xliff:g id="SECONDS">%2$d</xliff:g> amasekhondi"</string> <string name="durationMinuteSecond" msgid="3989228718067466680">"<xliff:g id="MINUTES">%1$d</xliff:g> iminithi <xliff:g id="SECONDS">%2$d</xliff:g> isekhondi"</string> <string name="durationSeconds" msgid="8050088505238241405">"<xliff:g id="SECONDS">%1$d</xliff:g> amasekhondi"</string> @@ -834,6 +833,8 @@ <string name="permdesc_handoverStatus" msgid="4788144087245714948">"Ivumela lolu hlelo lokusebenza ukuthi luthole ulwazi mayelana nokundluliswa kwamanje kwe-Android Beam"</string> <string name="permlab_removeDrmCertificates" msgid="7044888287209892751">"susa izitifiketi ze-DRM"</string> <string name="permdesc_removeDrmCertificates" msgid="7272999075113400993">"Ivumela uhlelo lokusebenza ukususa izitifiketi ze-DRM. Akufanele idingeke ngezinhlelo zokusebenza ezivamile."</string> + <string name="permlab_bindCarrierMessagingService" msgid="1490229371796969158">"bophezela kusevisi yomlayezo yenkampani yenethiwekhi"</string> + <string name="permdesc_bindCarrierMessagingService" msgid="2762882888502113944">"Ivumela isibambi ukuhlanganisa isixhumanisi sokubona esiphezulu sesevisi yomlayezo yenkampani yenethiwekhi. Akufanele idingeke kuzinhlelo zokusebenza ezivamile."</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"Misa imithetho yephasiwedi"</string> <string name="policydesc_limitPassword" msgid="3252114203919510394">"Lawula ubude nezinhlamvu ezivunyelwe kumaphasiwedi okuvula isikrini"</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Gaka imizamo yokuvula isikrini"</string> @@ -1900,4 +1901,5 @@ <string name="toolbar_collapse_description" msgid="2821479483960330739">"Goqa"</string> <string name="zen_mode_next_alarm_summary" msgid="5915140424683747372">"Kuze kube yi-alamu elandelayo ngo-<xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string> <string name="zen_mode_next_alarm_line_one" msgid="5537042951553420916">"Kuze kube yi-alamu elandelayo"</string> + <string name="muted_by" msgid="6147073845094180001">"Ithuliswe ngu-<xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> </resources> diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index e4641ce5b4bd..cbdb256c71a7 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -323,9 +323,14 @@ <!-- String containing the apn value for tethering. May be overriden by secure settings TETHER_DUN_APN. Value is a comma separated series of strings: - "name,apn,proxy,port,username,password,server,mmsc,mmsproxy,mmsport,mcc,mnc,auth,type" - note that empty fields can be ommitted: "name,apn,,,,,,,,,310,260,,DUN" --> - <string translatable="false" name="config_tether_apndata"></string> + "name,apn,proxy,port,username,password,server,mmsc,mmsproxy,mmsport,mcc,mnc,auth,type", + Or string format of ApnSettingV3. + note that empty fields can be ommitted: "name,apn,,,,,,,,,310,260,,DUN" + Multiple entries are separated by using string-array: + "<item>[ApnSettingV3]Name,apn,,,,,,,,,123,45,,mms|*,IPV6,IP,true,14,,,,,,,spn,testspn</item> + <item>[ApnSettingV3]Name1,apn2,,,,,,,,,123,46,,mms|*,IPV6,IP,true,12,,,,,,,,</item>" --> + <string-array translatable="false" name="config_tether_apndata"> + </string-array> <!-- Boolean indicating whether the wifi chipset has dual frequency band support --> <bool translatable="false" name="config_wifi_dual_band_support">false</bool> diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index d6bc38f32f3e..b97be6ef47ae 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -1652,6 +1652,11 @@ <string name="permdesc_controlWifiDisplay">Allows the app to control low-level features of Wifi displays.</string> <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. --> + <string name="permlab_controlVpn">control Virtual Private Networks</string> + <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> + <string name="permdesc_controlVpn">Allows the app to control low-level features of Virtual Private Networks.</string> + + <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. --> <string name="permlab_captureAudioOutput">capture audio output</string> <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> <string name="permdesc_captureAudioOutput">Allows the app to capture and redirect audio output.</string> @@ -2344,6 +2349,11 @@ <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> <string name="permdesc_removeDrmCertificates">Allows an application to remove DRM certficates. Should never be needed for normal apps.</string> + <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. --> + <string name="permlab_bindCarrierMessagingService">bind to a carrier messaging service</string> + <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> + <string name="permdesc_bindCarrierMessagingService">Allows the holder to bind to the top-level interface of a carrier messaging service. Should never be needed for normal apps.</string> + <!-- Policy administration --> <!-- Title of policy access to limiting the user's password choices --> @@ -5113,4 +5123,13 @@ <!-- Zen mode condition - line one: until next alarm. [CHAR LIMIT=NONE] --> <string name="zen_mode_next_alarm_line_one">Until next alarm</string> + + <!-- Indication that the current volume and other effects (vibration) are being suppressed by a third party, such as a notification listener. [CHAR LIMIT=30] --> + <string name="muted_by">Muted by <xliff:g id="third_party">%1$s</xliff:g></string> + + <!-- Error message shown when there is a system error which can be solved by user performing factory reset. [CHAR LIMIT=NONE] --> + <string name="system_error_wipe_data">There\'s an internal problem with your device, and it may be unstable until you factory data reset.</string> + <!-- Error message shown when there is a system error which can be solved by the manufacturer. [CHAR LIMIT=NONE] --> + <string name="system_error_manufacturer">There\'s an internal problem with your device. Contact your manufacturer for details.</string> + </resources> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index e1584cd4c6b6..702d5edd956e 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -538,7 +538,6 @@ <java-symbol type="string" name="config_mms_user_agent" /> <java-symbol type="string" name="config_mms_user_agent_profile_url" /> <java-symbol type="string" name="config_ntpServer" /> - <java-symbol type="string" name="config_tether_apndata" /> <java-symbol type="string" name="config_useragentprofile_url" /> <java-symbol type="string" name="config_wifi_p2p_device_type" /> <java-symbol type="string" name="contentServiceSync" /> @@ -1206,6 +1205,9 @@ <java-symbol type="drawable" name="sim_dark_orange" /> <java-symbol type="drawable" name="sim_dark_purple" /> + <java-symbol type="drawable" name="ic_sim_card_multi_24px_clr" /> + <java-symbol type="drawable" name="ic_sim_card_multi_48px_clr" /> + <java-symbol type="drawable" name="ic_account_circle" /> <java-symbol type="color" name="user_icon_1" /> <java-symbol type="color" name="user_icon_2" /> @@ -1546,6 +1548,7 @@ <java-symbol type="array" name="config_tether_bluetooth_regexs" /> <java-symbol type="array" name="config_tether_dhcp_range" /> <java-symbol type="array" name="config_tether_upstream_types" /> + <java-symbol type="array" name="config_tether_apndata" /> <java-symbol type="array" name="config_tether_usb_regexs" /> <java-symbol type="array" name="config_tether_wifi_regexs" /> <java-symbol type="array" name="config_usbHostBlacklist" /> @@ -1994,6 +1997,7 @@ <java-symbol type="string" name="zen_mode_next_alarm_summary" /> <java-symbol type="string" name="zen_mode_next_alarm_line_one" /> <java-symbol type="integer" name="config_next_alarm_condition_lookahead_threshold_hrs" /> + <java-symbol type="string" name="muted_by" /> <java-symbol type="string" name="item_is_selected" /> <java-symbol type="string" name="day_of_week_label_typeface" /> @@ -2104,4 +2108,9 @@ <!-- From SignalStrength --> <java-symbol type="integer" name="config_LTE_RSRP_threshold_type" /> + + <java-symbol type="string" name="android_system_label" /> + <java-symbol type="string" name="system_error_wipe_data" /> + <java-symbol type="string" name="system_error_manufacturer" /> + </resources> diff --git a/core/res/res/values/themes_micro.xml b/core/res/res/values/themes_micro.xml index f1bc5dadae8d..1ebc70892d1c 100644 --- a/core/res/res/values/themes_micro.xml +++ b/core/res/res/values/themes_micro.xml @@ -28,6 +28,8 @@ to work properly. --> <item name="windowIsTranslucent">true</item> <item name="windowSwipeToDismiss">true</item> + <!-- Required to force windowInsets dispatch through application UI. --> + <item name="windowOverscan">true</item> </style> <style name="Theme.Micro.Light" parent="Theme.Holo.Light.NoActionBar"> @@ -44,6 +46,8 @@ to work properly. --> <item name="windowIsTranslucent">true</item> <item name="windowSwipeToDismiss">true</item> + <!-- Required to force windowInsets dispatch through application UI. --> + <item name="windowOverscan">true</item> </style> <style name="Theme.Micro.Dialog" parent="Theme.Holo.Light.Dialog"> @@ -52,6 +56,8 @@ <item name="windowFullscreen">true</item> <item name="textAppearance">@style/TextAppearance.Micro</item> <item name="textAppearanceInverse">@style/TextAppearance.Micro</item> + <!-- Required to force windowInsets dispatch through application UI. --> + <item name="windowOverscan">true</item> </style> <style name="Theme.Micro.Dialog.Alert"> diff --git a/core/tests/coretests/src/android/content/pm/ParceledListSliceTest.java b/core/tests/coretests/src/android/content/pm/ParceledListSliceTest.java new file mode 100644 index 000000000000..e7f4bad1dddc --- /dev/null +++ b/core/tests/coretests/src/android/content/pm/ParceledListSliceTest.java @@ -0,0 +1,263 @@ +package android.content.pm; + +import android.os.Parcel; +import android.os.Parcelable; +import junit.framework.TestCase; + +import java.util.ArrayList; +import java.util.List; + +public class ParceledListSliceTest extends TestCase { + + public void testSmallList() throws Exception { + final int objectCount = 100; + List<SmallObject> list = new ArrayList<>(); + for (int i = 0; i < objectCount; i++) { + list.add(new SmallObject(i * 2, (i * 2) + 1)); + } + + ParceledListSlice<SmallObject> slice; + + Parcel parcel = Parcel.obtain(); + try { + parcel.writeParcelable(new ParceledListSlice<>(list), 0); + parcel.setDataPosition(0); + slice = parcel.readParcelable(getClass().getClassLoader()); + } finally { + parcel.recycle(); + } + + assertNotNull(slice); + assertNotNull(slice.getList()); + assertEquals(objectCount, slice.getList().size()); + + for (int i = 0; i < objectCount; i++) { + assertEquals(i * 2, slice.getList().get(i).mFieldA); + assertEquals((i * 2) + 1, slice.getList().get(i).mFieldB); + } + } + + private static int measureLargeObject() { + Parcel p = Parcel.obtain(); + try { + new LargeObject(0, 0, 0, 0, 0).writeToParcel(p, 0); + return p.dataPosition(); + } finally { + p.recycle(); + } + } + + /** + * Test that when the list is large, the data is successfully parceled + * and unparceled (the implementation will send pieces of the list in + * separate round-trips to avoid the IPC limit). + */ + public void testLargeList() throws Exception { + final int thresholdBytes = 256 * 1024; + final int objectCount = thresholdBytes / measureLargeObject(); + + List<LargeObject> list = new ArrayList<>(); + for (int i = 0; i < objectCount; i++) { + list.add(new LargeObject( + i * 5, + (i * 5) + 1, + (i * 5) + 2, + (i * 5) + 3, + (i * 5) + 4 + )); + } + + ParceledListSlice<LargeObject> slice; + + Parcel parcel = Parcel.obtain(); + try { + parcel.writeParcelable(new ParceledListSlice<>(list), 0); + parcel.setDataPosition(0); + slice = parcel.readParcelable(getClass().getClassLoader()); + } finally { + parcel.recycle(); + } + + assertNotNull(slice); + assertNotNull(slice.getList()); + assertEquals(objectCount, slice.getList().size()); + + for (int i = 0; i < objectCount; i++) { + assertEquals(i * 5, slice.getList().get(i).mFieldA); + assertEquals((i * 5) + 1, slice.getList().get(i).mFieldB); + assertEquals((i * 5) + 2, slice.getList().get(i).mFieldC); + assertEquals((i * 5) + 3, slice.getList().get(i).mFieldD); + assertEquals((i * 5) + 4, slice.getList().get(i).mFieldE); + } + } + + /** + * Test that only homogeneous elements may be unparceled. + */ + public void testHomogeneousElements() throws Exception { + List<BaseObject> list = new ArrayList<>(); + list.add(new LargeObject(0, 1, 2, 3, 4)); + list.add(new SmallObject(5, 6)); + list.add(new SmallObject(7, 8)); + + Parcel parcel = Parcel.obtain(); + try { + writeEvilParceledListSlice(parcel, list); + parcel.setDataPosition(0); + try { + ParceledListSlice.CREATOR.createFromParcel(parcel, getClass().getClassLoader()); + assertTrue("Unparceled heterogeneous ParceledListSlice", false); + } catch (IllegalArgumentException e) { + // Success, we're not allowed to process heterogeneous + // elements in a ParceledListSlice. + } + } finally { + parcel.recycle(); + } + } + + /** + * Write a ParcelableListSlice that uses the BaseObject base class as the Creator. + * This is dangerous, as it may affect how the data is unparceled, then later parceled + * by the system, leading to a self-modifying data security vulnerability. + */ + private static <T extends BaseObject> void writeEvilParceledListSlice(Parcel dest, List<T> list) { + final int listCount = list.size(); + + // Number of items. + dest.writeInt(listCount); + + // The type/creator to use when unparceling. Here we use the base class + // to simulate an attack on ParceledListSlice. + dest.writeString(BaseObject.class.getName()); + + for (int i = 0; i < listCount; i++) { + // 1 means the item is present. + dest.writeInt(1); + list.get(i).writeToParcel(dest, 0); + } + } + + public abstract static class BaseObject implements Parcelable { + protected static final int TYPE_SMALL = 0; + protected static final int TYPE_LARGE = 1; + + protected void writeToParcel(Parcel dest, int flags, int type) { + dest.writeInt(type); + } + + @Override + public int describeContents() { + return 0; + } + + /** + * This is *REALLY* bad, but we're doing it in the test to ensure that we handle + * the possible exploit when unparceling an object with the BaseObject written as + * Creator. + */ + public static final Creator<BaseObject> CREATOR = new Creator<BaseObject>() { + @Override + public BaseObject createFromParcel(Parcel source) { + switch (source.readInt()) { + case TYPE_SMALL: + return SmallObject.createFromParcelBody(source); + case TYPE_LARGE: + return LargeObject.createFromParcelBody(source); + default: + throw new IllegalArgumentException("Unknown type"); + } + } + + @Override + public BaseObject[] newArray(int size) { + return new BaseObject[size]; + } + }; + } + + public static class SmallObject extends BaseObject { + public int mFieldA; + public int mFieldB; + + public SmallObject(int a, int b) { + mFieldA = a; + mFieldB = b; + } + + @Override + public void writeToParcel(Parcel dest, int flags) { + super.writeToParcel(dest, flags, TYPE_SMALL); + dest.writeInt(mFieldA); + dest.writeInt(mFieldB); + } + + public static SmallObject createFromParcelBody(Parcel source) { + return new SmallObject(source.readInt(), source.readInt()); + } + + public static final Creator<SmallObject> CREATOR = new Creator<SmallObject>() { + @Override + public SmallObject createFromParcel(Parcel source) { + // Consume the type (as it is always written out). + source.readInt(); + return createFromParcelBody(source); + } + + @Override + public SmallObject[] newArray(int size) { + return new SmallObject[size]; + } + }; + } + + public static class LargeObject extends BaseObject { + public int mFieldA; + public int mFieldB; + public int mFieldC; + public int mFieldD; + public int mFieldE; + + public LargeObject(int a, int b, int c, int d, int e) { + mFieldA = a; + mFieldB = b; + mFieldC = c; + mFieldD = d; + mFieldE = e; + } + + @Override + public void writeToParcel(Parcel dest, int flags) { + super.writeToParcel(dest, flags, TYPE_LARGE); + dest.writeInt(mFieldA); + dest.writeInt(mFieldB); + dest.writeInt(mFieldC); + dest.writeInt(mFieldD); + dest.writeInt(mFieldE); + } + + public static LargeObject createFromParcelBody(Parcel source) { + return new LargeObject( + source.readInt(), + source.readInt(), + source.readInt(), + source.readInt(), + source.readInt() + ); + } + + public static final Creator<LargeObject> CREATOR = new Creator<LargeObject>() { + @Override + public LargeObject createFromParcel(Parcel source) { + // Consume the type (as it is always written out). + source.readInt(); + return createFromParcelBody(source); + } + + @Override + public LargeObject[] newArray(int size) { + return new LargeObject[size]; + } + }; + } +} diff --git a/core/tests/coretests/src/android/content/pm/SignatureTest.java b/core/tests/coretests/src/android/content/pm/SignatureTest.java new file mode 100644 index 000000000000..89d599742e90 --- /dev/null +++ b/core/tests/coretests/src/android/content/pm/SignatureTest.java @@ -0,0 +1,57 @@ +/* + * 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.content.pm; + +import junit.framework.TestCase; + +public class SignatureTest extends TestCase { + + /** Cert A with valid syntax */ + private static final Signature A = new Signature("308201D33082013CA0030201020219373565373461363A31336534333439623635343A2D38303030300D06092A864886F70D01010505003017311530130603550403130C6269736F6E416E64726F6964301E170D3133303432343232323134345A170D3338303432353232323134345A3017311530130603550403130C6269736F6E416E64726F696430819F300D06092A864886F70D010101050003818D00308189028181009214CE08563B77FF3128D3A303254287301263A842D19D5D4EAF024EBEDF864F3802C215B2F3EA85432F3EFF1DB8F591B0854FA7C1C6E4A8A85132FA762CC2D12A8EBD34D8B15C241A91716577F03BB3D2AFFC24367AB1E5E03C387891E34E646E47FAD75B178C1FD077B9199B3ABA6D48E2464801F6592E98245124046E51A90203010001A317301530130603551D25040C300A06082B06010505070303300D06092A864886F70D0101050500038181000B71581EDDC20E8C18C1C140BEE72501A97E04CA12030C51D4C38767B6A9FB5155CF4858C565EF77E5E2C22687C1AAB04BBA2B81C9A73CFB8DE118B624094AAE43D8FC2D585D90839DAFA5033AF7B8C0DE27E6ADAE44C40508CE493E9C80F1F5DA9EC87ECA1844BAB12C83CC8EB5937E1BE36A42CD22086A826E00FB763CD577"); + /** Cert A with malformed syntax */ + private static final Signature M = new Signature("308201D43082013CA0030201020219373565373461363A31336534333439623635343A2D38303030300D06092A864886F70D01010505003017311530130603550403130C6269736F6E416E64726F6964301E170D3133303432343232323134345A170D3338303432353232323134345A3017311530130603550403130C6269736F6E416E64726F696430819F300D06092A864886F70D010101050003818D00308189028181009214CE08563B77FF3128D3A303254287301263A842D19D5D4EAF024EBEDF864F3802C215B2F3EA85432F3EFF1DB8F591B0854FA7C1C6E4A8A85132FA762CC2D12A8EBD34D8B15C241A91716577F03BB3D2AFFC24367AB1E5E03C387891E34E646E47FAD75B178C1FD077B9199B3ABA6D48E2464801F6592E98245124046E51A90203010001A317301530130603551D25040C300A06082B06010505070303300D06092A864886F70D010105050003820081000B71581EDDC20E8C18C1C140BEE72501A97E04CA12030C51D4C38767B6A9FB5155CF4858C565EF77E5E2C22687C1AAB04BBA2B81C9A73CFB8DE118B624094AAE43D8FC2D585D90839DAFA5033AF7B8C0DE27E6ADAE44C40508CE493E9C80F1F5DA9EC87ECA1844BAB12C83CC8EB5937E1BE36A42CD22086A826E00FB763CD577"); + /** Cert B with valid syntax */ + private static final Signature B = new Signature("308204a830820390a003020102020900a1573d0f45bea193300d06092a864886f70d0101050500308194310b3009060355040613025553311330110603550408130a43616c69666f726e6961311630140603550407130d4d6f756e7461696e20566965773110300e060355040a1307416e64726f69643110300e060355040b1307416e64726f69643110300e06035504031307416e64726f69643122302006092a864886f70d0109011613616e64726f696440616e64726f69642e636f6d301e170d3131303931393138343232355a170d3339303230343138343232355a308194310b3009060355040613025553311330110603550408130a43616c69666f726e6961311630140603550407130d4d6f756e7461696e20566965773110300e060355040a1307416e64726f69643110300e060355040b1307416e64726f69643110300e06035504031307416e64726f69643122302006092a864886f70d0109011613616e64726f696440616e64726f69642e636f6d30820120300d06092a864886f70d01010105000382010d00308201080282010100de1b51336afc909d8bcca5920fcdc8940578ec5c253898930e985481cfdea75ba6fc54b1f7bb492a03d98db471ab4200103a8314e60ee25fef6c8b83bc1b2b45b084874cffef148fa2001bb25c672b6beba50b7ac026b546da762ea223829a22b80ef286131f059d2c9b4ca71d54e515a8a3fd6bf5f12a2493dfc2619b337b032a7cf8bbd34b833f2b93aeab3d325549a93272093943bb59dfc0197ae4861ff514e019b73f5cf10023ad1a032adb4b9bbaeb4debecb4941d6a02381f1165e1ac884c1fca9525c5854dce2ad8ec839b8ce78442c16367efc07778a337d3ca2cdf9792ac722b95d67c345f1c00976ec372f02bfcbef0262cc512a6845e71cfea0d020103a381fc3081f9301d0603551d0e0416041478a0fc4517fb70ff52210df33c8d32290a44b2bb3081c90603551d230481c13081be801478a0fc4517fb70ff52210df33c8d32290a44b2bba1819aa48197308194310b3009060355040613025553311330110603550408130a43616c69666f726e6961311630140603550407130d4d6f756e7461696e20566965773110300e060355040a1307416e64726f69643110300e060355040b1307416e64726f69643110300e06035504031307416e64726f69643122302006092a864886f70d0109011613616e64726f696440616e64726f69642e636f6d820900a1573d0f45bea193300c0603551d13040530030101ff300d06092a864886f70d01010505000382010100977302dfbf668d7c61841c9c78d2563bcda1b199e95e6275a799939981416909722713531157f3cdcfea94eea7bb79ca3ca972bd8058a36ad1919291df42d7190678d4ea47a4b9552c9dfb260e6d0d9129b44615cd641c1080580e8a990dd768c6ab500c3b964e185874e4105109d94c5bd8c405deb3cf0f7960a563bfab58169a956372167a7e2674a04c4f80015d8f7869a7a4139aecbbdca2abc294144ee01e4109f0e47a518363cf6e9bf41f7560e94bdd4a5d085234796b05c7a1389adfd489feec2a107955129d7991daa49afb3d327dc0dc4fe959789372b093a89c8dbfa41554f771c18015a6cb242a17e04d19d55d3b4664eae12caf2a11cd2b836e"); + + public void testExactlyEqual() throws Exception { + assertTrue(Signature.areExactMatch(asArray(A), asArray(A))); + assertTrue(Signature.areExactMatch(asArray(M), asArray(M))); + + assertFalse(Signature.areExactMatch(asArray(A), asArray(B))); + assertFalse(Signature.areExactMatch(asArray(A), asArray(M))); + assertFalse(Signature.areExactMatch(asArray(M), asArray(A))); + + assertTrue(Signature.areExactMatch(asArray(A, M), asArray(M, A))); + } + + public void testEffectiveMatch() throws Exception { + assertTrue(Signature.areEffectiveMatch(asArray(A), asArray(A))); + assertTrue(Signature.areEffectiveMatch(asArray(M), asArray(M))); + + assertFalse(Signature.areEffectiveMatch(asArray(A), asArray(B))); + assertTrue(Signature.areEffectiveMatch(asArray(A), asArray(M))); + assertTrue(Signature.areEffectiveMatch(asArray(M), asArray(A))); + + assertTrue(Signature.areEffectiveMatch(asArray(A, M), asArray(M, A))); + assertTrue(Signature.areEffectiveMatch(asArray(A, B), asArray(M, B))); + assertFalse(Signature.areEffectiveMatch(asArray(A, M), asArray(A, B))); + } + + private static Signature[] asArray(Signature... s) { + return s; + } +} diff --git a/docs/html/about/versions/android-5.0.jd b/docs/html/about/versions/android-5.0.jd index 756b75fdb97d..4caa3ad93ea4 100644 --- a/docs/html/about/versions/android-5.0.jd +++ b/docs/html/about/versions/android-5.0.jd @@ -141,14 +141,6 @@ highlights</a>.</p> the Android SDK</a>. Then use the <a href="{@docRoot}tools/help/sdk-manager.html">SDK Manager</a> to download the Android 5.0 SDK Platform and System Images.</p> -<p style=" - padding: 10px; - background: #eee; - width: 445px; - border: 1px solid #ccc; - margin-top: 20px; -">To test your apps on a real device, flash a Nexus 5 or Nexus 7 with the <br> -<a href="/preview/index.html#Start"><b>ANDROID PREVIEW SYSTEM IMAGE</b></a>.</p> <h3 id="ApiLevel">Update your target API level</h3> diff --git a/docs/html/about/versions/lollipop.jd b/docs/html/about/versions/lollipop.jd index 3ee0a8643169..458de4970c39 100644 --- a/docs/html/about/versions/lollipop.jd +++ b/docs/html/about/versions/lollipop.jd @@ -57,16 +57,6 @@ about Android 5.0 for consumers at -<p style=" - padding: 10px; - background: #eee; - width: 250px; - border: 1px solid #ccc; - margin-top: 20px; -">To test your apps on a real device, flash a Nexus 5 or Nexus 7 with the <br> -<a href="/preview/index.html#Start"><b>ANDROID PREVIEW SYSTEM IMAGE</b></a>.</p> - - <h2 id="Material">Material design</h2> <p>Android 5.0 brings <a href="http://www.google.com/design/spec">Material design</a> to Android and gives you an expanded UI toolkit for integrating the new design patterns easily in your apps. </p> diff --git a/docs/html/auto/images/assets/icons/auto_app_in_simulator.png b/docs/html/auto/images/assets/icons/auto_app_in_simulator.png Binary files differnew file mode 100644 index 000000000000..085b82b5aca6 --- /dev/null +++ b/docs/html/auto/images/assets/icons/auto_app_in_simulator.png diff --git a/docs/html/auto/images/assets/icons/gp-auto-quality.png.png b/docs/html/auto/images/assets/icons/gp-auto-quality.png.png Binary files differnew file mode 100644 index 000000000000..483f418c9e58 --- /dev/null +++ b/docs/html/auto/images/assets/icons/gp-auto-quality.png.png diff --git a/docs/html/auto/images/assets/icons/media_app_playback.png b/docs/html/auto/images/assets/icons/media_app_playback.png Binary files differnew file mode 100644 index 000000000000..3de04bf5f0f6 --- /dev/null +++ b/docs/html/auto/images/assets/icons/media_app_playback.png diff --git a/docs/html/auto/images/assets/icons/messaging_app_notifications.png b/docs/html/auto/images/assets/icons/messaging_app_notifications.png Binary files differnew file mode 100644 index 000000000000..3236fdff8942 --- /dev/null +++ b/docs/html/auto/images/assets/icons/messaging_app_notifications.png diff --git a/docs/html/auto/images/assets/landing/01.gif b/docs/html/auto/images/assets/landing/01.gif Binary files differnew file mode 100644 index 000000000000..34c9fa853485 --- /dev/null +++ b/docs/html/auto/images/assets/landing/01.gif diff --git a/docs/html/auto/images/assets/landing/02.gif b/docs/html/auto/images/assets/landing/02.gif Binary files differnew file mode 100644 index 000000000000..d50e06b355db --- /dev/null +++ b/docs/html/auto/images/assets/landing/02.gif diff --git a/docs/html/auto/images/assets/landing/03.gif b/docs/html/auto/images/assets/landing/03.gif Binary files differnew file mode 100644 index 000000000000..7992021074db --- /dev/null +++ b/docs/html/auto/images/assets/landing/03.gif diff --git a/docs/html/auto/images/assets/landing/04.png b/docs/html/auto/images/assets/landing/04.png Binary files differnew file mode 100644 index 000000000000..a0e75f3aae5f --- /dev/null +++ b/docs/html/auto/images/assets/landing/04.png diff --git a/docs/html/auto/images/assets/landing/05.png b/docs/html/auto/images/assets/landing/05.png Binary files differnew file mode 100644 index 000000000000..f3d2ab8bc8d4 --- /dev/null +++ b/docs/html/auto/images/assets/landing/05.png diff --git a/docs/html/auto/images/assets/landing/06.png b/docs/html/auto/images/assets/landing/06.png Binary files differnew file mode 100644 index 000000000000..b19a6bb7dc7b --- /dev/null +++ b/docs/html/auto/images/assets/landing/06.png diff --git a/docs/html/auto/images/assets/landing/07.png b/docs/html/auto/images/assets/landing/07.png Binary files differnew file mode 100644 index 000000000000..380e8da4440c --- /dev/null +++ b/docs/html/auto/images/assets/landing/07.png diff --git a/docs/html/auto/images/assets/landing/08.png b/docs/html/auto/images/assets/landing/08.png Binary files differnew file mode 100644 index 000000000000..9889b39e251c --- /dev/null +++ b/docs/html/auto/images/assets/landing/08.png diff --git a/docs/html/auto/images/assets/landing/FrameA.png b/docs/html/auto/images/assets/landing/FrameA.png Binary files differnew file mode 100644 index 000000000000..2a7838082192 --- /dev/null +++ b/docs/html/auto/images/assets/landing/FrameA.png diff --git a/docs/html/auto/images/assets/landing/FrameB.png b/docs/html/auto/images/assets/landing/FrameB.png Binary files differnew file mode 100644 index 000000000000..cb7a3c473751 --- /dev/null +++ b/docs/html/auto/images/assets/landing/FrameB.png diff --git a/docs/html/auto/images/logos/apps/kik.png b/docs/html/auto/images/logos/apps/kik.png Binary files differnew file mode 100644 index 000000000000..056ef7e576c1 --- /dev/null +++ b/docs/html/auto/images/logos/apps/kik.png diff --git a/docs/html/auto/images/logos/apps/npr.png b/docs/html/auto/images/logos/apps/npr.png Binary files differnew file mode 100644 index 000000000000..5234201ce385 --- /dev/null +++ b/docs/html/auto/images/logos/apps/npr.png diff --git a/docs/html/auto/images/logos/apps/textplus.png b/docs/html/auto/images/logos/apps/textplus.png Binary files differnew file mode 100644 index 000000000000..2a640c402a60 --- /dev/null +++ b/docs/html/auto/images/logos/apps/textplus.png diff --git a/docs/html/auto/images/logos/apps/whatsapp.png b/docs/html/auto/images/logos/apps/whatsapp.png Binary files differnew file mode 100644 index 000000000000..fb5866ed4e16 --- /dev/null +++ b/docs/html/auto/images/logos/apps/whatsapp.png diff --git a/docs/html/auto/images/ui/gearhead_custom_UI.png b/docs/html/auto/images/ui/gearhead_custom_UI.png Binary files differnew file mode 100644 index 000000000000..345db12d2045 --- /dev/null +++ b/docs/html/auto/images/ui/gearhead_custom_UI.png diff --git a/docs/html/auto/images/ui/gearhead_custom_user_actions.png b/docs/html/auto/images/ui/gearhead_custom_user_actions.png Binary files differnew file mode 100644 index 000000000000..6cc0dcb68da0 --- /dev/null +++ b/docs/html/auto/images/ui/gearhead_custom_user_actions.png diff --git a/docs/html/auto/images/ui/gearhead_day.png b/docs/html/auto/images/ui/gearhead_day.png Binary files differnew file mode 100644 index 000000000000..81ead75bc3c4 --- /dev/null +++ b/docs/html/auto/images/ui/gearhead_day.png diff --git a/docs/html/auto/images/ui/gearhead_drawer_generic.png b/docs/html/auto/images/ui/gearhead_drawer_generic.png Binary files differnew file mode 100644 index 000000000000..d203aede8bd9 --- /dev/null +++ b/docs/html/auto/images/ui/gearhead_drawer_generic.png diff --git a/docs/html/auto/images/ui/gearhead_drawers_customized.png b/docs/html/auto/images/ui/gearhead_drawers_customized.png Binary files differnew file mode 100644 index 000000000000..44915b5dfbe3 --- /dev/null +++ b/docs/html/auto/images/ui/gearhead_drawers_customized.png diff --git a/docs/html/auto/images/ui/gearhead_generic_UI.png b/docs/html/auto/images/ui/gearhead_generic_UI.png Binary files differnew file mode 100644 index 000000000000..beb0701cdfba --- /dev/null +++ b/docs/html/auto/images/ui/gearhead_generic_UI.png diff --git a/docs/html/auto/images/ui/gearhead_lens_switching.png b/docs/html/auto/images/ui/gearhead_lens_switching.png Binary files differnew file mode 100644 index 000000000000..9dbfe6c5892e --- /dev/null +++ b/docs/html/auto/images/ui/gearhead_lens_switching.png diff --git a/docs/html/auto/images/ui/gearhead_night.png b/docs/html/auto/images/ui/gearhead_night.png Binary files differnew file mode 100644 index 000000000000..3f8c593dcc9b --- /dev/null +++ b/docs/html/auto/images/ui/gearhead_night.png diff --git a/docs/html/auto/images/ui/gearhead_overview.png b/docs/html/auto/images/ui/gearhead_overview.png Binary files differnew file mode 100644 index 000000000000..4332ddf3b4cd --- /dev/null +++ b/docs/html/auto/images/ui/gearhead_overview.png diff --git a/docs/html/auto/index.jd b/docs/html/auto/index.jd index 63ac287231ff..ddb265be4dbd 100644 --- a/docs/html/auto/index.jd +++ b/docs/html/auto/index.jd @@ -77,17 +77,20 @@ page.type=about <div class="col-10"> <div class="landing-section-header"> <div class="landing-h1 hero">Android Auto</div> - <div class="landing-subhead hero">Entertainment and services on your dashboard</div> + <div class="landing-subhead hero">Audio entertainment and + messaging services in the car</div> <div class="landing-hero-description"> - <p style="width:450px">Display and control your Android app in vehicles. - Integrate your content with easy-to-use APIs and let Android Auto take - care of the rest.</p> + <p style="width:450px">Let drivers listen to and control + content in your music and other audio apps. Allow drivers to + hear and respond to your messaging service via the + car's controls and screen.</p> </div> <div class="landing-body"> - <a href="{@docRoot}auto/overview.html" class="landing-button landing-primary" + <a href="{@docRoot}training/auto/index.html" + class="landing-button landing-primary" style="margin-top:40px;"> - Developer Overview + Get Started </a> </div> </div> @@ -103,149 +106,114 @@ page.type=about </div> <!-- end .landing-section .landing-hero --> </div> <!-- end .landing-hero-container --> - <div class="landing-rest-of-page"> + <div class="landing-rest-of-page"> - <div class="landing-section landing-gray-background" id="android-in-car"> - <div class="wrap"> - <div class="landing-section-h1"> - <div class="landing-h1">Extending Android to Cars</div> - </div> - <div class="landing-body"> - <div class="landing-subhead">Android Auto brings the Android experience to - cars with apps like Google Now and Maps.</div> - <div class="cols"> - <div class="col-8"> - <div class="auto-img-container-cols"> - <img class="auto-img-frame-cols" src="{@docRoot}auto/images/assets/00_frame.png" /> - <img class="auto-img-shot-cols" src="{@docRoot}auto/images/assets/01_b_now.png" /> - </div> + <div class="landing-section landing-gray-background" id="android-in-car"> + <div class="wrap"> + <div class="landing-section-h1"> + <div class="landing-h1">Extending Android to Cars</div> + <div class="landing-subhead">Android Auto brings the Android + platform into the car with a user interface that's optimized for driving.</div> + </div> + + <div class="landing-body"> + <div class="cols"> + <div class="col-8"> + <div class="auto-img-container-cols"> + <img class="auto-img-frame-cols" src="/auto/images/assets/landing/FrameA.png" /> + <img class="auto-img-shot-cols" src="/auto/images/assets/landing/01.gif" /> </div> - <div class="col-8"> - <div class="auto-img-container-cols"> - <img class="auto-img-frame-cols" src="{@docRoot}auto/images/assets/00_frame.png" /> - <img class="auto-img-shot-cols" src="{@docRoot}auto/images/assets/01_a_maps.png" /> - </div> + </div> + <div class="col-8"> + <div class="auto-img-container-cols"> + <img class="auto-img-frame-cols" src="/auto/images/assets/landing/FrameA.png" /> + <img class="auto-img-shot-cols" src="/auto/images/assets/landing/02.gif" /> </div> </div> - - <p>When users connect their Android phones to compatible vehicles, Android Auto - shows a standard interface that lets them start enabled apps and services. - Android Auto locks the handheld device when connected, so drivers - interact with Auto by using the vehicle's input controls, touch display, and voice.</p> - </p> </div> - </div> <!-- end .wrap --> - </div> <!-- end .landing-section --> - + <p>Before you start building, check out the + <a href="http://youtu.be/ctiaVxgclsg" class="external-link">Introduction to Android Auto</a> video to understand how + users see and interact with your app in Android Auto. + </p> + </div> + </div> <!-- end .wrap --> + </div> <!-- end .landing-section --> - <div class="landing-section"> + <div class="landing-section"> <div class="wrap"> <div class="landing-section-header"> <div class="landing-h1">Build for One Platform</div> - <div class="landing-subhead">Create apps with the Android APIs you're familiar with - and extend them to cars with the Auto SDK. + <div class="landing-subhead">Create apps with the Android APIs + you’re familiar with and extend them to cars. </div> </div> <div class="landing-body"> - <div class="cols"> <div class="col-8"> <div class="auto-img-container-cols"> - <img class="auto-img-frame-cols" src="{@docRoot}auto/images/assets/00_frame.png" /> - <img class="auto-img-shot-cols" src="{@docRoot}auto/images/assets/02_b_switcher.gif" /> + <img class="auto-img-frame-cols" src="/auto/images/assets/landing/FrameA.png" /> + <img class="auto-img-shot-cols" src="/auto/images/assets/landing/05.png" /> </div> </div> <div class="col-8"> <div class="auto-img-container-cols"> - <img class="auto-img-frame-cols" src="{@docRoot}auto/images/assets/00_frame.png" /> - <img class="auto-img-shot-cols" src="{@docRoot}auto/images/assets/02_a_notif.gif" /> + <img class="auto-img-frame-cols" src="/auto/images/assets/landing/FrameA.png" /> + <img class="auto-img-shot-cols" src="/auto/images/assets/landing/06.png" /> </div> </div> </div> - <p>Write your apps without having - to worry about vehicle-specific hardware differences like screen resolution, software - interfaces, knobs, and touch controls. Your users get the same experience on any compatible - vehicle such as a consistent app launcher and system events such as notifications.</p> + <p>Write your apps without having to worry about vehicle-specific + hardware differences like screen resolution, software interfaces, + knobs, and touch controls. Your users get the same experience on any + compatible vehicle such as a consistent app launcher and system + events such as notifications.</p> </div> </div> <!-- end .wrap --> </div> <!-- end .landing-section --> - - <div class="landing-section landing-gray-background"> + <div class="landing-section" style="background-color:#f5f5f5" id="developing-for-auto"> <div class="wrap"> <div class="landing-section-header"> - <div class="landing-h1">Minimize Distraction</div> - <div class="landing-subhead"> - Android Auto displays different UIs for several app categories that let users focus on the road. - </div> + <div class="landing-pre-h1">Now Available</div> + <div class="landing-h1">Developing for Android Auto</div> + <div class="landing-subhead">The APIs for building Auto-enabled apps + are available now! When connected to compatible vehicles, apps on + handheld devices running Android 5.0 or higher can communicate + with Android Auto.</div> </div> + <div class="landing-body"> <div class="cols"> <div class="col-8"> <div class="auto-img-container-cols"> - <img class="auto-img-frame-cols" src="{@docRoot}auto/images/assets/00_frame.png" /> - <img class="auto-img-shot-cols" src="{@docRoot}auto/images/assets/03_b_voice.gif" /> + <img class="auto-img-frame-cols" src="/auto/images/assets/landing/FrameA.png" /> + <img class="auto-img-shot-cols" src="/auto/images/assets/landing/03.gif" /> </div> + <div class="landing-h3">Play Music on the Road from Your App</div> + <p class="landing-small" style="padding-left:0px; padding-top:15px;"> + Extend audio apps such as music, radio, and audiobook players + into the car. Build apps that let users browse and play their + music in the car.<br><a href="{@docRoot}training/auto/audio/index.html">Learn how to build audio apps</a> + </p> </div> <div class="col-8"> <div class="auto-img-container-cols"> - <img class="auto-img-frame-cols" src="{@docRoot}auto/images/assets/00_frame.png" /> - <img class="auto-img-shot-cols" src="{@docRoot}auto/images/assets/03_a_musict.png" /> + <img class="auto-img-frame-cols" src="/auto/images/assets/landing/FrameA.png" /> + <img class="auto-img-shot-cols" src="/auto/images/assets/landing/04.png" /> </div> - </div> - </div> - <p>Android Auto defines the user interaction model for all - apps and let you hook into a standard UI with touch and voice controls. The interface - is designed to reduce driver distraction while still letting you customize and brand them to properly deliver your content. - </p> - </div> - </div> <!-- end .wrap --> - </div> <!-- end .landing-section --> - - <div class="landing-section" style="background-color:#f5f5f5"> - <div class="wrap"> - <div class="landing-section-header"> - <div class="landing-pre-h1">Coming soon</div> - <div class="landing-h1">Android Auto SDK</div> - </div> - - <div class="landing-body"> - <p>In the coming months, we’ll be releasing the Android Auto SDK, which includes APIs - and tools to make your existing apps compatible with Android Auto. The first version - of the SDK will provide APIs for music, podcast, live radio, and audio - news apps, as well as limited voice actions.</p> - - <div class="cols" style="margin-top:40px"> - <div class="col-3-wide"> - <p class="sdk-link-title">Updates</p> - <p class="sdk-link-desc"> - Register to receive more information and be notified when the SDK is available. + <div class="landing-h3">Keep Users Connected with In-Vehicle Messaging</div> + <p class="landing-small" style="padding-left:0px; padding-top:15px;"> + Create messaging apps that receive incoming notifications, + read messages via text-to-speech, and let users reply by voice + input in the car.<br><a href="{@docRoot}training/auto/messaging/index.html">Learn how to build messaging apps</a> </p> - <a class="sdk-link" href="https://docs.google.com/a/google.com/forms/d/1ANgYOoYLkfyZ2JRPSU34Nep5yNaU-Ha2syXJ9b4xLrA/viewform">Sign up for updates</a> - </div> - <div class="col-3-wide"> - <p class="sdk-link-title">Google+ Community</p> - <p class="sdk-link-desc"> - Stay involved, get updates, and exchange experiences with other developers. - </p> - <a class="sdk-link" href="http://g.co/androidautodev">Discuss on Google+</a> - </div> - <div class="col-3-wide"> - <p class="sdk-link-title">Developer Overview</p> - <p class="sdk-link-desc"> - Learn more about developing apps for Android Auto when the SDK is available. - </p> - <a class="sdk-link" href="{@docRoot}auto/overview.html">Learn about the platform</a> </div> </div> </div> - </div> <!-- end .wrap --> </div> <!-- end .landing-section --> - - <div class="landing-section landing-gray-background" > <div class="wrap"> <div class="landing-section-header"> @@ -257,6 +225,25 @@ page.type=about <div class="cols"> <div class="col-4"> + <img src="/auto/images/logos/apps/kik.png" + width="120" height="120" class="img-logo" style="margin-top:20px"/> + </div> + <div class="col-4"> + <img src="/auto/images/logos/apps/textplus.png" + width="120" height="24" class="img-logo" style="margin-top:70px" /> + </div> + <div class="col-4"> + <img src="/auto/images/logos/apps/iheartradio.png" + width="160" height="160" class="img-logo" /> + </div> + <div class="col-4"> + <img src="/auto/images/logos/apps/spotify.png" + width="160" height="160" class="img-logo" /> + </div> + </div> + <div class="cols"> + + <div class="col-4"> <img src="{@docRoot}auto/images/logos/apps/joyride.png" width="160" height="160" class="img-logo" /> </div> @@ -293,22 +280,31 @@ page.type=about </div> <div class="cols" style="margin-top:40px"> <div class="col-4"> - <img src="{@docRoot}auto/images/logos/apps/iheartradio.png" - width="160" height="160" class="img-logo" /> + <img src="/auto/images/logos/apps/whatsapp.png" + width="120" height="120" class="img-logo" /> </div> - <div class="col-12"> + <div class="col-8"> <p><em> - "The Android Auto APIs provide an easy way to integrate the most important features and functionality of iHeartRadio’s robust music service into a safety-minded automotive infotainment solution. The process was seamless, utilizing a flexible construct that allowed us to quickly adapt our existing product without losing any of the core experience our listeners know and love."</em></p> + "We were able to get messaging functionality for text + implemented easily on Android Auto, with minimal development + effort. We're excited to participate in Android Auto which + provides a notification interface for the car that is both + user-friendly and highly safety-minded."</em></p> </div> </div> <div class="cols" style="margin-top:60px"> <div class="col-4"> - <img src="{@docRoot}auto/images/logos/apps/spotify.png" - width="160" height="160" class="img-logo" /> + <img src="/auto/images/logos/apps/npr.png" + width="100" height="128" class="img-logo" /> </div> - <div class="col-12"><p style="margin-top:20px"><em> - "Android Auto offers Spotify the exciting opportunity to easily enable safe access to millions of songs while driving. We were able to quickly develop for the platform using the new Android voice and media API extensions. As a result, Android users will soon be able to continue the Spotify experience in their cars, including being able to play any song, artist, album or playlist by voice.</em></p> + <div class="col-8"><p style="margin-top:0px"><em> + "Android Auto connects NPR One listeners to a personalized stream + of public radio news and stories to catch up on in the car. It's + an engaging and driver-safe user experience that was developed + using the media APIs provided in Android 5.0. The available + development tools made the integration and testing process simple + for launching in a short period of time."</em></p> </div> </div> </div> @@ -316,8 +312,6 @@ page.type=about </div> <!-- end .landing-section --> - - <div class="landing-section landing-white-background"> <div class="wrap"> <div class="landing-section-header"> @@ -456,24 +450,47 @@ page.type=about </div> </div> </div> - </div> <!-- end .landing-rest-of-page --> - <div class="content-footer wrap" itemscope="" itemtype="http://schema.org/SiteNavigationElement" - style="border-top: none;"> - <div class="layout-content-col col-16" style="padding-top:4px"> - <style>#___plusone_0 {float:right !important;}</style> - <div class="g-plusone" data-size="medium"></div> + + <div class="landing-section landing-red-background"> + <div class="wrap"> + <div class="landing-section-header"> + <div class="landing-h1 landing-align-left">Get Started with Android Auto</div> + + <div class="landing-subhead landing-subhead-red"> + <p> + Set up your development environment and start working with the APIs. + We’re excited about the experiences you'll create and can't + wait to see what you do next.</p> + </div> + </div> + <div class="landing-body"> + <a href="{@docRoot}training/auto/index.html" + class="landing-button landing-primary" style="margin-top: 20px;"> + Get Started + </a> + </div> + </div> </div> + </div> + <div class="content-footer wrap" itemscope="" itemtype="http://schema.org/SiteNavigationElement" + style="border-top: none;"> + + <div class="layout-content-col col-16" style="padding-top:4px"> + <style>#___plusone_0 {float:right !important;}</style> + <div class="g-plusone" data-size="medium"></div> </div> - <div id="footer" class="wrap" style="width:940px;position:relative;top:-35px;z-index:-1"> - <div id="copyright"> + </div> + + <div id="footer" class="wrap" style="width:940px;position:relative;top:-35px;z-index:-1"> + <div id="copyright"> Except as noted, this content is licensed under <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>. For details and restrictions, see the <a href="{@docRoot}license.html">Content License</a>. - </div> </div> - </div> <!-- end .landing-hero-container --> + </div> +</div> <!-- end .landing-hero-container --> <script> $("a.landing-down-arrow").on("click", function(e) { diff --git a/docs/html/auto/overview.jd b/docs/html/auto/overview.jd deleted file mode 100644 index ae1efecc064b..000000000000 --- a/docs/html/auto/overview.jd +++ /dev/null @@ -1,411 +0,0 @@ -fullpage=true -page.viewport_width=970 -no_footer_links=true -excludeFromSuggestions=true -page.metaDescription=Android Auto - -@jd:body - -<style> -.jd-descr { - height:auto; -} -#copyright { - margin-top:-35px; -} -.auto-img-container { - position:relative; -} -.auto-img-frame { - z-index:2; - position:relative; -} -.auto-img-shot { - position:absolute; - top:9px; - left:8px; - z-index:1; -} -.auto-img-container-cols { - position:relative; - margin-top:10px; -} -.auto-img-frame-cols { - width:380px; - z-index:2; - position:relative; -} -.auto-img-shot-cols { - width:369px; - position:absolute; - top:7px; - left:6px; - z-index:1; -} -.auto-col-2 { - width:380px; - display: inline; - float: left; - margin-left: 10px; - margin-right: 10px; -} -.auto-img-container-single { - width:380px; - margin:0 auto; - margin-top:20px; -} -</style> - -<div style="width:780px; margin:0 auto;"> - -<div id="qv-wrapper"> -<div id="qv"> -<h2>In this document</h2> -<ol> - <li><a href="#design">Design</a> - <ol> - <li><a href="#designprinciples">Design Principles</a></li> - <li><a href="#uioverview">UI Overview</a></li> - </ol> - </li> - <li><a href="#architecture">Architecture</a></li> - <li><a href="#ui">User Interface</a> - <ol> - <li><a href="#launchapp">Launch App</a></li> - <li><a href="#useractions">User Actions</a></li> - <li><a href="#drawertransitions">Drawer Transitions</a></li> - <li><a href="#daynighttransitions">Day and Night Transitions</a></li> - <li><a href="#customizeui">Customizing the UI</a></li> - </ol> - </li> - <li><a href="#devprocess">Development Process</a></li> - <li><a href="#emulator">Testing Your App</a></li> - <li><a href="#running">Running Your App</a></li> -</ol> -</div> -</div> - -<h1>Android Auto Developer Overview</h1> - -<p>Android Auto extends the Android platform into the car. When users connect -their Android handheld device to a compatible vehicle, Android Auto provides a car-optimized -Android experience on the vehicle's screen. Users interact with compatible apps and services -through voice actions and the vehicle's input controls.</p> - -<p>The Android Auto SDK lets you easily extend your existing apps to work in the car, without -having to worry about vehicle-specific hardware differences. You can use many Android APIs and -services you are already familiar with. Android Auto provides an easy to use UI model and -supports notifications and voice actions:</p> - -<dl> -<dt style="margin-bottom:10px"><strong>Media UI</strong></dt> -<dd style="margin-bottom:20px"> -Android Auto defines interaction models and car-specific UI patterns for apps. The -first version of Android Auto supports media apps, such as music, podcast, live radio, and -audio news apps. -</dd> -<dt style="margin-bottom:10px"><strong>Notifications</strong></dt> -<dd style="margin-bottom:20px"> -The platform will integrate with existing Android APIs for notifications. Users will get -car appropiate notifications from Android apps on the vehicle's screen.</dd> - -<dt style="margin-bottom:10px"><strong>Voice Actions</strong></dt> -<dd style="margin-bottom:20px"> -Android Auto supports a set of voice actions to interact with compatible apps and services. -Apps can respond to the voice actions they're interested in, such as playing a particular song -or taking a note.</dd> - -<dt style="margin-bottom:10px"><strong>Easy Development Workflow</strong></dt> -<dd style="margin-bottom:20px"> -To extend an existing Android app for Android Auto, you implement a set of interfaces and -services defined in the platform. You can reuse existing functionality and many Android APIs -you already know.</dd> -</dl> - -<p>We’ll release the Android Auto SDK in the coming months, which will let you test your -Android Auto experience on a regular Android device.</p> - - -<h2 id="design">Design</h2> - -<p>Android Auto extends users' digital ecosystem into their cars, allowing drivers to stay -connected to their virtual worlds while staying focused on the road ahead.</p> - -<p>Because driving is the primary activity in the car, any digital experiences should be designed -to complement and augment that activity. They should never demand the user's attention.</p> - -<p>Designing for cars is fundamentally different than designing for phones or tablets, and -requires rethinking how experiences unfold. Because attention is limited and not all tasks are -possible in the car, effective apps leverage the entire set of devices that drivers have, -leveraging the app experience on those devices, outside of the car, to set the stage for simple -experiences while driving.</p> - -<p>Android Auto experiences are:</p> - -<p><strong>Glanceable and simple</strong>. Driving requires users' full attention. In-car software -should not. Android Auto was designed to simplify not only the UI, but to optimize interactions -and require less thinking, induce lower cognitive load, and ultimately, be safer. Effective apps -provide just enough information in the minimum amount of time the user needs to glance at it and -return their attention back to the road. Apps should also reduce the number of features to only -those that are safe and drive-appropriate.</p> - -<p><strong>Predictive, yet predictable</strong>. Android Auto leverages rich, contextual awareness -to keep the driver informed about important situations during the drive. Rich, timely help is -combined with predictable functions. Effective apps make use of the patterns for common tasks and -show timely information only when relevant.</p> - -<p><strong>Connected</strong>. By leveraging the user's personal ecosystem of apps and services, -Android Auto promotes a continuous experience from phone to car to other devices. The user's -music, destinations, and virtual ecosystem are always available to augment the drive. Experiences -that leverage personal context and other devices are naturally part of Android Auto.</p> - -<p><strong>Naturally integrated</strong>. Android Auto blends the user's apps with the car, -creating a truly integrated experience that leverages what is unique about each car. By using -the screens, controls, and capabilities of the vehicle, Android Auto feels like an extension of -the car.</p> - - - - -<h2 id="architecture">Architecture</h2> - -<p>The Android Auto app shows your app's customized UI on the vehicle's screen. To communicate -with the Android Auto app, your media app implements a set of media interfaces.</p> - -<div style="width:750px;margin:0 auto"> -<img src="{@docRoot}auto/images/figure01.png" alt="" /> -<p class="img-caption"> - <strong>Figure 1</strong> - Architecture of Android Auto. -</p> -</div> - -<p>The architecture consists of the following components:</p> - -<p><strong>Media App</strong> - Runs a media service that exposes content through browsing and -playback APIs. The service provides content to the Android Auto app. This is your Android app.</p> - -<p><strong>Android Auto App</strong> - Creates the UI and handles user interactions. -This app uses a media client to request content from the media service running in the media -app. The client requests data from the media service and monitors service states.</p> - -<p><strong>Vehicle Display</strong> - Shows app content and supports user interaction via -on-screen soft buttons and other components, such as physical buttons or steering -wheel controls.</p> - -<p>Android media apps must implement binders to these APIs:</p> - -<ul> -<li><strong>Browsing</strong> - Enables a media client to browse a hierarchy of a user’s -media collection, presented as a virtual file system with containers (similar to directories) -and items (similar to files).</li> -<li><strong>Playback</strong> - Enables a media client to control media playback and monitor -playback state through callbacks.</li> -</ul> - - -<h2 id="ui">User Interface</h2> - -<p>The Android Auto app uses a car-specific UI model to display content and user interaction -opportunities. Android Auto provides you with a standard UI designed to minimize driver -distraction. You do not have to test a custom UI for driver distraction, which is a -lengthy and expensive process involving multiple legislations across the globe and different -standards for each vehicle OEM.</p> - -<p>The UI defines interfaces for browsing, searching, and listening to content from -media apps. You can customize the UI colors, action icons, background images, and more.</p> - -<h3 id="launchapp">Launcher</h3> - -<p>The launcher shows all the compatible media apps installed on the user’s -Android device and lets users select one of them from a scrollable list:</p> - -<div class="auto-img-container-single"> - <div class="auto-img-container"> - <img class="auto-img-frame-cols" src="/auto/images/assets/00_frame.png" /> - <img class="auto-img-shot-cols" src="/auto/images/assets/do_01_switcher.png" /> - </div> - <p class="img-caption" style="margin-top:0px"> - <strong>Figure 2.</strong> The launcher. - </p> -</div> - -<h3>Primary App UI</h3> - -<p>After the user selects a media app, the display shows the primary app UI. -You can customize this UI to show your own icons, app name, and -background images. Figure 3 shows an example of a customized UI:</p> - -<div class="cols"> -<div class="auto-col-2"> - <div class="auto-img-container-cols"> - <img class="auto-img-frame-cols" src="{@docRoot}auto/images/assets/00_frame.png" /> - <img class="auto-img-shot-cols" src="{@docRoot}auto/images/assets/do_05_template.png" /> - </div> -</div> -<div class="auto-col-2"> - <div class="auto-img-container-cols"> - <img class="auto-img-frame-cols" src="{@docRoot}auto/images/assets/00_frame.png" /> - <img class="auto-img-shot-cols" src="{@docRoot}auto/images/assets/do_02_music.png" /> - </div> -</div> -</div> -<p class="img-caption"> - <strong>Figure 3.</strong> A customized UI. -</p> - - - -<h3 id="useractions">User Actions</h3> - -<p>The primary app UI supports four main actions on the action bar, four auxiliary actions -on the overflow bar, and the <em>Return</em> action. You can use standard controls and customize -the actions and icons, as shown in Figure 4.</p> - -<div class="auto-img-container-single"> - <div class="auto-img-container"> - <img class="auto-img-frame-cols" src="/auto/images/assets/00_frame.png" /> - <img class="auto-img-shot-cols" src="/auto/images/assets/do_03_more.png" /> - </div> - <p class="img-caption" style="margin-top:0px"> - <strong>Figure 4.</strong> Custom extra actions. - </p> -</div> - -<h3 id="drawertransitions">Drawer Transitions</h3> - -<p>For browse actions, the display shows the drawer transition as shown in Figure 5.</p> - -<div class="cols"> -<div class="auto-col-2"> - <div class="auto-img-container-cols"> - <img class="auto-img-frame-cols" src="{@docRoot}auto/images/assets/00_frame.png" /> - <img class="auto-img-shot-cols" src="{@docRoot}auto/images/assets/do_06_gdrawer.png" /> - </div> -</div> -<div class="auto-col-2"> - <div class="auto-img-container-cols"> - <img class="auto-img-frame-cols" src="{@docRoot}auto/images/assets/00_frame.png" /> - <img class="auto-img-shot-cols" src="{@docRoot}auto/images/assets/do_04_mdrawer.png" /> - </div> -</div> -</div> -<p class="img-caption"> - <strong>Figure 5.</strong> Generic and customized drawers. -</p> - -<p>After the transition from the primary app UI to the drawer UI, the drawer -appears on the center. The customized drawer UI shows the media containers and -media files provided by the media service in your app. You can also customize drawers -with icons for list items.</p> - - -<h3 id="daynighttransitions">Day and Night Transitions</h3> - -<p>All the UIs support different color schemes for day and night. -The platform provides the state (day or night) and makes adjustments automatically.</p> - -<div class="cols"> -<div class="auto-col-2"> - <div class="auto-img-container-cols"> - <img class="auto-img-frame-cols" src="{@docRoot}auto/images/assets/00_frame.png" /> - <img class="auto-img-shot-cols" src="{@docRoot}auto/images/assets/do_02_music.png" /> - </div> -</div> -<div class="auto-col-2"> - <div class="auto-img-container-cols"> - <img class="auto-img-frame-cols" src="{@docRoot}auto/images/assets/00_frame.png" /> - <img class="auto-img-shot-cols" src="{@docRoot}auto/images/assets/do_02_music_night.png" /> - </div> -</div> -</div> -<p class="img-caption"> - <strong>Figure 6.</strong> Day and night modes. -</p> - -<h3 id="customizeui">Customizing UIs</h3> - -<p>To customize the UI, you provide the following app-specific resources and actions -to the Android Auto media client:</p> - -<ul> -<li><strong>Resources</strong> - App logo, app name, theme colors, and background images.</li> -<li><strong>Actions</strong> - Multiple custom actions; for example: <em>Thumbs Up/Down</em>, -<em>Favorite</em>, and <em>Bookmark</em>. These actions are app-specific.</li> -</ul> - -<p>If provided, the media client automatically uses them in the UI.</p> - - -<h2 id="devprocess">Development Process</h2> - -<p class="note"><strong>Note:</strong> When released, the Android Auto SDK will provide -media service interfaces, an APK for handheld devices that simulates the Android Auto -app, and other tools for Android Auto development.</p> - -<p>To create a media app for Android Auto, you include an Android service in your app -that implements the media service interfaces provided by the Android Auto SDK. These -interfaces define functionality for browsing and finding content, playing media, -customizing the UI, and performing app-specific actions.</p> - -<p>The media service interfaces present the content library as a navigable tree and enable -clients to play media, get album art, obtain theme resources for the UI, and -invoke app-specific actions.</p> - -<p>You don’t have to create a new app for Android Auto: you can extend your existing -Android app with implementations of the media service interfaces. Your service exposes -your app’s media content, theme resources, and app-specific actions using the methods and -data types specified by the media service interfaces. This simplifies the development -cycle because:</p> - -<ul> -<li>You do not have to maintain a separate project for Android Auto</li> -<li>You can reuse existing functionality from your Android app</li> -</ul> - -<p>The Android Auto client presents the customized UI to users and invokes the -functionality from your service as needed. This has two additional advantages:</p> - -<ul> -<li>Your app does not implement a UI for Android Auto</li> -<li>Your app does not manage user interactions directly</li> -</ul> - -<p>This also means that you do not have to worry about vehicle-specific hardware -differences such as screen resolutions, software interfaces, knobs and touch -controls.</p> - - -<h2 id="emulator">Testing Your App on an Android Device</h2> - -<p>The Android Auto SDK includes an APK with a media client implementation, which is -similar to those available in compatible vehicles. To test your app with this -client:</p> - -<ol> -<li>Get an Android device with a similar form factor to a dashboard screen (like a -Nexus 7).</li> -<li>Configure the device for Android development.</li> -<li>Install the APK for the media client from the Android Auto SDK on the device.</li> -<li>Install the APK for your app on the device.</li> -<li>Open the media client app from the Android Auto SDK on the device.</li> -<li>Select your app from the list of available services.</li> -</ol> - -<p>The customized UI for your app appears on the client. You can navigate the content -library and play media. If your app provides app-specific actions, these actions appear -in the UI controls.</p> - - -<h2 id="running">Running Your App on Android Auto</h2> - -<p>Media apps are available on the Google Play Store for compatible Android devices. -When users connect their Android device to a compatible vehicle, the -Android Auto media client shows a list of all the Android apps installed on the phone -that implement the media service interfaces.</p> - -<p>When users select one of these apps, the Android Auto media client uses the app’s -service to respond to user input and invoke the methods in the media service interfaces -to build the UI, navigate the content library, and play media.</p> - -<div style="margin-bottom:40px"> </div> -</div> diff --git a/docs/html/design/auto/index.jd b/docs/html/design/auto/index.jd index c970caca748e..e45bd366ef5f 100644 --- a/docs/html/design/auto/index.jd +++ b/docs/html/design/auto/index.jd @@ -1,35 +1,177 @@ -page.title=Android Auto +page.title=Designing for Auto +page.tags="design","Auto" @jd:body -<style> -.auto-img-container-cols { - position:relative; - margin-bottom:25px; - margin-top:25px; -} -.auto-img-frame-cols { - z-index:2; - position:relative; -} -.auto-img-shot-cols { - position:absolute; - top:5px; - left:2px; - z-index:1; -} -</style> - -<div class="auto-img-container-cols" style="float:right; margin:0 0 40px 40px;width:460px"> - <img class="auto-img-frame-cols" src="/auto/images/assets/00_frame.png"> - <img class="auto-img-shot-cols" src="/auto/images/assets/03_a_musict.png"> -</div> - -<p>Android Auto is <strong>coming soon</strong> and brings apps to the car, -integrating with the vehicle's input controls and display.</p> - -<p>The future design guidelines provide templates that define the user interaction model for all apps and let you hook into a standard UI with touch and voice controls. The templates meet international best practices for reducing driver distraction while still letting you customize and brand them to properly deliver your content.</p> - -<p><a href="{@docRoot}auto/index.html">Learn more about Android Auto</a>.</p> +<a class="notice-developers" href="{@docRoot}training/auto/index.html"> + <div> + <h3>Developer Docs</h3> + <p>Building Apps for Auto</p> + </div> +</a> + +<div class="sidebox-wrapper"> +<div class="sidebox"> + <h2><strong>UI Guidelines</strong></h2> + <ul> + <li><a href="{@docRoot}shareables/auto/AndroidAuto-media-apps.pdf"> + <strong>Auto Media Apps (PDF)</strong></a> + </li> + <li><a href="{@docRoot}shareables/auto/AndroidAuto-messaging-apps.pdf"> + <strong>Auto Messaging Apps (PDF)</strong></a> + </li> + <li><a href="{@docRoot}shareables/auto/AndroidAuto-custom-colors.pdf"> + <strong>Auto Color Customization (PDF)</strong></a> + </li> + </ul> +</div> +</div> + +<p>Android Auto provide a standardized user interface and user interaction +model that works across vehicles. As a designer, you do not +need to worry about vehicle-specific hardware differences. This page +describes some of the key screens that users will encounter in the +Auto user interface. To dive deeper into how to design for +the Auto user interface (UI), see the Auto UI guidelines in the sidebar.</p> + +<p class="note"><strong>Important:</strong> Google takes driver distraction +very seriously. There are specific design requirements your app must meet to +qualify as an Auto app on Google Play. By adhering to these +requirements, you can reduce the effort for building and testing your app. For +more information, see <a href="{@docRoot}distribute/essentials/quality/auto.html">Auto App Quality</a>.</p> + +<br> + +<h2 id="overview-screen">Overview Screen</h2> + +<p>When users first connect their Android device to the car, they are presented +with the Overview screen. This screen displays contextual cards based on the +user’s location, time of day, and so on. The user can also use this screen to view +notifications from their messaging apps and select a message to send a response +by voice input.</p> + +<div class="auto-img-container-single"> + <div class="auto-img-container"> + <img src="{@docRoot}auto/images/ui/gearhead_overview.png" alt="Overview screen" /> + </div> + <p class="img-caption" style="margin-top:0px"> + <strong>Figure 1.</strong> The Overview screen may show contextual cards and +new messages. + </p> +</div> + +<h2 id="launchapp">Audio App Launcher</h2> + +<p>Tapping on the headphones icon in the Activity Bar lets the + user see all audio apps installed on the user’s handheld device and select + one of them from a scrollable list.</p> + +<div class="auto-img-container-single"> + <div class="auto-img-container"> + <img src="{@docRoot}auto/images/ui/gearhead_lens_switching.png" alt="Launcher" /> + </div> + <p class="img-caption" style="margin-top:0px"> + <strong>Figure 2.</strong> The audio app launcher shows available audio apps. + </p> +</div> + +<h2>Primary App UI</h2> + +<p>After the user selects an audio app, the display shows the primary app UI. +Auto presents the app in a standardized UI, but you can customize +this UI to show your own icons, app name, and background images +(such as the album art).</p> + +<div class="auto-img-container-single"> + <div class="auto-img-container"> + <img src="{@docRoot}auto/images/ui/gearhead_generic_UI.png" alt="Generic audio app UI" /> + </div> + <p class="img-caption" style="margin-top:0px"> + <strong>Figure 3.</strong> Generic audio app UI. + </p> +</div> + +<div class="auto-img-container-single"> + <div class="auto-img-container"> + <img src="{@docRoot}auto/images/ui/gearhead_custom_UI.png" alt="Customized audio app UI" /> + </div> + <p class="img-caption" style="margin-top:0px"> + <strong>Figure 4.</strong> Example of the Google Play Music app UI. + </p> +</div> + +<h3 id="useractions">User Actions</h3> + +<p>The media control card in the primary app UI supports up to four main actions, +four auxiliary actions on the overflow bar, and the <em>Return</em> action. You can +use standard controls and customize the actions and icons.</p> + +<div class="auto-img-container-single"> + <div class="auto-img-container"> + <img src="{@docRoot}auto/images/ui/gearhead_custom_user_actions.png" alt="Customized user actions" /> + </div> + <p class="img-caption" style="margin-top:0px"> + <strong>Figure 5.</strong> Example of user actions in the Google Play Music app. + </p> +</div> + +<h3 id="drawerlist">Drawer List</h3> + +<p>For browse actions, the display shows the drawer transition. After the +transition from the primary app UI to the list UI, the drawer appears in the +center. The customized list UI shows the media containers and the audio files +provided by the media service in your app. You can also customize drawers with +icons for list items.</p> + +<div class="auto-img-container-single"> + <div class="auto-img-container"> + <img src="{@docRoot}auto/images/ui/gearhead_drawer_generic.png" + alt="Generic drawers" style="border:3px solid black" /> + </div> + <p class="img-caption" style="margin-top:0px"> + <strong>Figure 6.</strong> Example of the drawer layout template with generic list items. + </p> +</div> + +<div class="auto-img-container-single"> + <div class="auto-img-container"> + <img src="{@docRoot}auto/images/ui/gearhead_drawers_customized.png" + alt="Customized drawers" style="border:3px solid black" /> + </div> + <p class="img-caption" style="margin-top:0px"> + <strong>Figure 7.</strong> Example of the the drawer layout in the Google Play Music app. + </p> +</div> + + +<h2 id="daynighttransitions">Day and Night Transitions</h2> + +<p>All the UIs support different color schemes for day and night. The platform +provides the state (day or night) and makes adjustments automatically.</p> + +<div class="auto-img-container-single"> + <div class="auto-img-container"> + <img src="{@docRoot}auto/images/ui/gearhead_day.png" alt="Audio app in day mode" /> + </div> + <p class="img-caption" style="margin-top:0px"> + <strong>Figure 8.</strong> Example of the Google Play Music app in day mode. + </p> +</div> + +<div class="auto-img-container-single"> + <div class="auto-img-container"> + <img src="{@docRoot}auto/images/ui/gearhead_night.png" alt="Audio app in night mode" /> + </div> + <p class="img-caption" style="margin-top:0px"> + <strong>Figure 9.</strong> Example of the Google Play Music app in night mode. + </p> +</div> + +<h3 class="rel-resources clearfloat">Related resources</h3> + +<div class="resource-widget resource-flow-layout col-13" data-query= +"collection:design/auto/auto_ui_guidelines" +data-sortorder="-timestamp" data-cardsizes="6x3" data-maxresults="6"> +</div> diff --git a/docs/html/distribute/essentials/essentials_toc.cs b/docs/html/distribute/essentials/essentials_toc.cs index a1c9575ec9ad..985809a4dc79 100644 --- a/docs/html/distribute/essentials/essentials_toc.cs +++ b/docs/html/distribute/essentials/essentials_toc.cs @@ -22,6 +22,12 @@ </a> </div> </li> + <li class="nav-section"> + <div class="nav-section empty" style="font-weight:normal"><a href="<?cs var:toroot?>distribute/essentials/quality/auto.html"> + <span class="en">Auto App Quality</span> + </a> + </div> + </li> <li class="nav-section"> <div class="nav-section empty" style="font-weight:normal"><a href="<?cs var:toroot?>distribute/essentials/optimizing-your-app.html"> <span class="en">Optimize Your App</span> diff --git a/docs/html/distribute/essentials/quality/auto.jd b/docs/html/distribute/essentials/quality/auto.jd new file mode 100644 index 000000000000..55b02a01d76b --- /dev/null +++ b/docs/html/distribute/essentials/quality/auto.jd @@ -0,0 +1,411 @@ + +page.title=Auto App Quality +page.metaDescription=Auto apps integrate with the vehicle's input controls and display and minimize driver distraction to create a great experience. +page.image=/distribute/images/gp-auto-quality.png +@jd:body + +<div id="qv-wrapper"><div id="qv"> +<h2>Quality Criteria</h2> + <ol> + <li><a href="#core">Core App Quality</a></li> + <li><a href="#ux">Visual Design and Interaction</a></li> + <li><a href="#fn">Functionality</a></li> + <li><a href="#faq">Frequently Asked Questions</a></li> + </ol> + + <h2>You Should Also Read</h2> + <ol> + <li><a href="{@docRoot}distribute/essentials/quality/core.html"> + Core App Quality</a></li> + <li><a href="{@docRoot}distribute/essentials/optimizing-your-app.html"> + Optimize Your App</a></li> + <li><a href="{@docRoot}/shareables/auto/AndroidAuto-media-apps.pdf">Android Auto UX Guidelines + for Media Applications</a></li> + <li><a href="{@docRoot}/shareables/auto/AndroidAuto-messaging-apps.pdf">Android Auto UX Guidelines + for Messaging Applications</a></li> + </ol> +</div> +</div> + + + <img src="{@docRoot}distribute/images/gp-auto-quality.png" style="width:480px;"> + + +<p>When designing support for Android Auto in your app, avoid driver distraction above all else. + Apps that work with the Auto user interface should minimize distractions faced by the driver + through best practices such as voice commands and very simple visual design. +</p> + +<p> + Great auto experiences are predictive and predictable. Apps that support Android Auto + should show timely information to the driver only when it is relevant, and use + simple, predictable patterns for common tasks. +</p> + +<p class="caution"> + <strong>Important:</strong> The criteria listed in this page apply to your app's user interface + and behavior when running on devices connected to an Android Auto screen. Apps must meet these + criteria to qualify as an Android Auto app on Google Play. +</p> + + +<div class="headerLine"> + <h2 id="core"> + Core App Quality + </h2> + +<p> + In addition to the Auto-specific criteria listed below, Auto apps should meet all relevant core app + quality criteria for the Android platform, as detailed in the + <a href="{@docRoot}distribute/essentials/quality/core.html">Core App Quality</a> criteria. Test + your app against those criteria to ensure that they meet Android standards for navigation and + design. Then test your app against all Auto-specific criteria, keeping in mind + that, when running on a device connected to Android auto, your app must meet the requirements + listed in this page. + + + +<div class="headerLine"> + <h2 id="ux"> + Visual Design and User Interaction + </h2> + +</div> + +<p> + These criteria ensure that your app follows critical design and interaction patterns + to ensure a consistent, intuitive, and enjoyable user experience on Android Auto. Many elements, + such as the navigation drawer, card backgrounds, fonts and icon colors, are set and rendered by + the system. Your own app-specific design elements must meet the following criteria. +</p> + +<table> + +<tr> + <th style="width:2px;"> + Type + </th> + <th style="width:54px;"> + Test + </th> + <th> + Description + </th> +</tr> + +<tr> + <td rowspan="4" id="safety"> + Driver Attention + </td> + + <td id="AU-MV"> + AU-MV + </td> + <td> + <p style="margin-bottom:.5em;"> + App does not display on the Auto screen animated elements such as animated graphics, games, video, or + progress bars. + </p> + </td> +</tr> + +<tr> + <td id="AU-VA"> + AU-VA + </td> + <td> + <p style="margin-bottom:.5em;"> + App does not display any form of visual or text advertising on the Auto screen. Only audio + ads are acceptable. + </p> + </td> +</tr> + +<tr> + <td id="AU-IM"> + AU-IM + </td> + <td> + <p style="margin-bottom:.5em;"> + App elements do not display any images on the Auto screen. Exceptions include: app may display + a single static image for + content context in the background of the consumption screen, such as album art, and app may + display icons in the content navigation drawer. + </p> + </td> +</tr> + +<tr> + <td id="AU-DS"> + AU-DS + </td> + <td> + <p style="margin-bottom:.5em;"> + App does not include any features that distract the driver. + </p> + </td> +</tr> + + + +<tr> + <td rowspan="4" id="layout"> + Layout + </td> + +<tr> + <td id="AU-SC"> + AU-SC + </td> + <td> + <p style="margin-bottom:.5em;"> + App does not display automatically scrolling text. + </p> + </td> +</tr> + + +<tr> + <td id="AU-FT"> + AU-FT + </td> + <td> + <p style="margin-bottom:.5em;"> + App displays all strings using the default Roboto fonts in two approved sizes. + </p> + </td> +</tr> + +<tr> + <td id="AU-ST"> + AU-ST + </td> + <td> + <p style="margin-bottom:.5em;"> + App does not display any individual string longer than 120 characters. + </p> + </td> +</tr> + +<tr> + <td id="contrast"> + Visual Contrast + </td> + + <td id="AU-NM"> + AU-NM + </td> + <td> + <p style="margin-bottom:.5em;"> + App supports night mode, rendering light text and controls on a dark background. + </p> + </td> +</tr> + + +<tr> + <td rowspan="2" id="interaction"> + Interaction + </td> + + <td id="AU-VC"> + AU-VC + </td> + <td> + <p style="margin-bottom:.5em;"> + App must support voice commands. + </p> + </td> +</tr> + +<tr> + <td id="AU-AB"> + AU-AB + </td> + <td> + <p style="margin-bottom:.5em;"> + App-specific buttons respond to user actions with no more than a two-second delay. + </p> + </td> +</tr> + +</table> + + +<h3 class="rel-resources clearfloat">Related resources</h3> + +<div class="resource-widget resource-flow-layout col-13" data-query= +"collection:distribute/essentials/autoqualityguidelines/visualdesign" +data-sortorder="-timestamp" data-cardsizes="9x3" data-maxresults="6"> +</div> + + + +<div class="headerLine"> + <h2 id="fn"> + Functionality + </h2> + + +</div> + +<p> + These criteria ensure that your app is configured correctly and provides expected + functional behavior. +</p> + + +<table> +<tr> + <th style="width:2px;"> + Type + </th> + <th style="width:54px;"> + Test + </th> + <th> + Description + </th> +</tr> + +<tr> + <td rowspan="2" id="general"> + General + </td> + + <td id="AU-RL"> + AU-RL + </td> + <td> + <p style="margin-bottom:.5em;"> + When the app is relaunched from the home screen, the app restores the app state as closely as + possible to the previous state. + </p> + </td> +</tr> + + +</tr> + <td id="AU-SS"> + AU-SS + </td> + <td> + <p style="margin-bottom:.5em;"> + No tasks in the app take more than six steps to complete. + </p> + </td> +</tr> + + +<tr> + <td rowspan="2" id="media"> + Media + </td> + + + <td id="AU-PA"> + AU-PA + </td> + <td> + <p style="margin-bottom:.5em;"> + App has no more than four primary actions plus one optional action overflow toggle (or five if + no action overflow is used). For more information, see details on the media control card in the + <a href="{@docRoot}/shareables/auto/AndroidAuto-media-apps.pdf">Android Auto UX Guidelines + for Media Applications</a>. + </p> + </td> +</tr> + +<tr> + <td id="AU-SA"> + AU-SA + </td> + <td> + <p style="margin-bottom:.5em;"> + App has no more than four optional secondary actions plus one action overflow toggle. For more + information, see details on the media control card in the + <a href="{@docRoot}/shareables/auto/AndroidAuto-media-apps.pdf">Android Auto UX Guidelines + for Media Applications</a>. + </p> + </td> +</tr> + + +<tr> + <td rowspan="2" id="notifications"> + Notifications + </td> + + <td id="AU-NA"> + AU-NA + </td> + <td> + <p style="margin-bottom:.5em;"> + App does not present advertisements through notifications. + </p> + </td> +</tr> + +<tr> + <td id="AU-NT"> + AU-NT + </td> + <td> + <p style="margin-bottom:.5em;"> + App displays notifications only when relevant to the driver’s needs. + </p> + <p> + Examples:<br /> + Good: Notifying the user that a new message has arrived.<br /> + Bad: Notifying the user about a new album release. + </p> + </td> +</tr> + +</table> + +<!-- +<h3 class="rel-resources clearfloat">Related resources</h3> + +<div class="resource-widget resource-flow-layout col-13" data-query= +"collection:distribute/essentials/autoqualityguidelines/functionality" +data-sortorder="-timestamp" data-cardsizes="9x3" data-maxresults="6"> +</div> +--> + +<div class="headerLine"> + <h2 id="faq"> + Frequently Asked Questions + </h2> +</div> + +<p style="margin-top:30px;"> + <strong>After I submit my app, how will find out if my app does not meet all + the requirements for Android Auto?</strong> +</p> +<p>If you are planning to develop apps for Auto, you are encouraged to begin enabling and testing + your apps now. However, Auto-enabled apps cannot be published at this time. Join the + <a href="http://g.co/AndroidAutoDev" class="external-link">Auto + Developers Google+ community</a> for updates on when you will be able to submit + your Auto-enabled apps.</p> +</p> + + +<p style="margin-top:30px;"> + <strong>My app targets more than just Android Auto. If my app does not meet the Auto + requirements, will my new or updated app still appear on Google Play for phones and + tablets?</strong> +</p> +<p> + No. When Google begins the approval process, your auto app will undergo a driver safety + review, and will not be + available for distribution until the app is approved. Because this is the same APK as + for phones and tablets, your Play Store updates for those devices will not be available until the + Auto approval process is complete. +</p> + +<p class="caution"> + <strong>Important:</strong> Due to this restriction, you should not use your production APK + for Auto support prototyping. +</p> + diff --git a/docs/html/distribute/images/gp-auto-quality.png b/docs/html/distribute/images/gp-auto-quality.png Binary files differnew file mode 100644 index 000000000000..d322849126f4 --- /dev/null +++ b/docs/html/distribute/images/gp-auto-quality.png diff --git a/docs/html/google/gcm/ccs.jd b/docs/html/google/gcm/ccs.jd index 7db7a74c8abf..6332b8d9b1d7 100644 --- a/docs/html/google/gcm/ccs.jd +++ b/docs/html/google/gcm/ccs.jd @@ -263,6 +263,21 @@ message is "nack". A NACK message contains:</p> </message> </pre> +<p>Device Message Rate Exceeded:</p> + +<pre><message id="..."> + <gcm xmlns="google:mobile:data"> + { + "message_type":"nack", + "message_id":"msgId1", + "from":"REGID", + "error":"DEVICE_MESSAGE_RATE_EXCEEDED", + "error_description":"Downstream message rate exceeded for this registration id" + } + </gcm> +</message> +</pre> + <p>The following table lists NACK error codes. Unless otherwise indicated, a NACKed message should not be retried. Unexpected NACK error codes should be treated the same as {@code INTERNAL_SERVER_ERROR}.</p> @@ -303,8 +318,7 @@ message should be immediately retried over another connection.</td> <td>{@code DEVICE_MESSAGE_RATE_EXCEEDED}</td> <td>The rate of messages to a particular device is too high. You should reduce the number of messages sent to this device and should not immediately retry -sending to this device. This error code replaces {@code QUOTA_EXCEEDED}, -which has been deprecated.</td> +sending to this device. This error code is replacing {@code QUOTA_EXCEEDED}.</td> </tr> <tr> <td>{@code SERVICE_UNAVAILABLE}</td> diff --git a/docs/html/google/gcm/client.jd b/docs/html/google/gcm/client.jd index 70109c6f39db..d44ee3c6717c 100644 --- a/docs/html/google/gcm/client.jd +++ b/docs/html/google/gcm/client.jd @@ -452,6 +452,21 @@ private void storeRegistrationId(Context context, String regId) { editor.commit(); }</pre> +<h4 id="reg-errors">Handle registration errors</h4> + +<p>As stated above, an Android app must register with GCM servers and get a registration ID +(regID) before it can receive messages. A given regID is not guaranteed to last indefinitely, +so the first thing your app should always do is check to make sure it has a valid regID +(as shown in the code snippets above).</p> + +<p>In addition to confirming that it has a valid regID, your app should be prepared to handle +the registration error {@code TOO_MANY_REGISTRATIONS}. This error indicates that the device +has too many apps registered with GCM. The error only occurs in cases where there are +extreme numbers of apps, so it should not affect the average user. The remedy is to prompt +the user to delete some of the other GCM-enabled apps from the device to make +room for the new one.</p> + + <h3 id="sample-send">Send a message</h3> <p>When the user clicks the app's <strong>Send</strong> button, the app sends an upstream message using the diff --git a/docs/html/guide/components/intents-filters.jd b/docs/html/guide/components/intents-filters.jd index 2f8c4078f404..3dec216f459d 100644 --- a/docs/html/guide/components/intents-filters.jd +++ b/docs/html/guide/components/intents-filters.jd @@ -139,7 +139,9 @@ only with an explicit intent.</p> intent when starting a {@link android.app.Service} and do not declare intent filters for your services. Using an implicit intent to start a service is a security hazard because you cannot be certain what service will respond to the intent, -and the user cannot see which service starts.</p> +and the user cannot see which service starts. Beginning with Android 5.0 (API level 21), the system +throws an exception if you call {@link android.content.Context#bindService bindService()} +with an implicit intent.</p> @@ -424,18 +426,18 @@ android.content.Intent#createChooser createChooser()} and pass it to {@link android.app.Activity#startActivity startActivity()}. For example:</p> <pre> -Intent intent = new Intent(Intent.ACTION_SEND); +Intent sendIntent = new Intent(Intent.ACTION_SEND); ... // Always use string resources for UI text. // This says something like "Share this photo with" String title = getResources().getString(R.string.chooser_title); -// Create intent to show chooser -Intent chooser = Intent.createChooser(intent, title); +// Create intent to show the chooser dialog +Intent chooser = Intent.createChooser(sendIntent, title); -// Verify the intent will resolve to at least one activity +// Verify the original intent will resolve to at least one activity if (sendIntent.resolveActivity(getPackageManager()) != null) { - startActivity(sendIntent); + startActivity(chooser); } </pre> diff --git a/docs/html/jd_collections.js b/docs/html/jd_collections.js index a38b80bd61b2..a8433505ccdc 100644 --- a/docs/html/jd_collections.js +++ b/docs/html/jd_collections.js @@ -68,8 +68,8 @@ var RESOURCE_COLLECTIONS = { "distribute/essentials/quality/tablets.html", "distribute/essentials/quality/tv.html", "distribute/essentials/quality/wear.html", - "https://developers.google.com/edu/guidelines", - "distribute/essentials/optimizing-your-app.html" + "distribute/essentials/quality/auto.html", + "https://developers.google.com/edu/guidelines" ] }, "distribute/users": { @@ -348,6 +348,13 @@ var RESOURCE_COLLECTIONS = { "training/wearables/notifications/voice-input.html" ] }, + "distribute/essentials/autoqualityguidelines/visualdesign": { + "title": "", + "resources": [ + "training/auto/messaging/index.html", + "training/auto/start/index.html" + ] + }, "distribute/essentials/core/performance": { "title": "", "resources": [ @@ -787,6 +794,14 @@ var RESOURCE_COLLECTIONS = { "shareables/distribute/play_dev_guide_secrets_en.pdf" ] }, + "design/auto/auto_ui_guidelines": { + "title": "", + "resources": [ + "shareables/auto/AndroidAuto-media-apps.pdf", + "shareables/auto/AndroidAuto-messaging-apps.pdf", + "shareables/auto/AndroidAuto-custom-colors.pdf" + ] + }, "distribute/stories/games": { "title": "", "resources": [ diff --git a/docs/html/jd_extras.js b/docs/html/jd_extras.js index 36f26e8f1e47..a86ffeb92770 100644 --- a/docs/html/jd_extras.js +++ b/docs/html/jd_extras.js @@ -1407,5 +1407,44 @@ DISTRIBUTE_RESOURCES = DISTRIBUTE_RESOURCES.concat([ "keywords": ["distribute"], "type": "PDF DOWNLOAD (11MB)", "titleFriendly": "" + }, + { + "lang": "en", + "group": "", + "tags": [], + "url": "shareables/auto/AndroidAuto-media-apps.pdf", + "timestamp": null, + "image": "auto/images/assets/icons/media_app_playback.png", + "title": "Android Auto Media Apps UI Guidelines", + "summary": "Guidelines for designing audio apps that work with Auto. ", + "keywords": ["design", "Auto", "Automotive"], + "type": "PDF DOWNLOAD (1.1MB)", + "titleFriendly": "" + }, + { + "lang": "en", + "group": "", + "tags": [], + "url": "shareables/auto/AndroidAuto-messaging-apps.pdf", + "timestamp": null, + "image": "auto/images/assets/icons/messaging_app_notifications.png", + "title": "Android Auto Messaging Apps UI Guidelines", + "summary": "Guidelines for designing messaging apps that work with Auto. ", + "keywords": ["design", "Auto", "Automotive"], + "type": "PDF DOWNLOAD (628KB)", + "titleFriendly": "" + }, + { + "lang": "en", + "group": "", + "tags": [], + "url": "shareables/auto/AndroidAuto-custom-colors.pdf", + "timestamp": null, + "image": "auto/images/assets/icons/auto_app_in_simulator.png", + "title": "Android Auto Color Customization UI Guidelines", + "summary": "Guidelines for color-customizing apps that work with Auto. ", + "keywords": ["design", "Auto", "Automotive"], + "type": "PDF DOWNLOAD (779KB)", + "titleFriendly": "" } -]); +]);
\ No newline at end of file diff --git a/docs/html/preview/index.html b/docs/html/preview/index.html index ed78e4d1de91..4f7722cd116b 100644 --- a/docs/html/preview/index.html +++ b/docs/html/preview/index.html @@ -332,47 +332,11 @@ you should update now to test your apps and take advantage of new features.</p> to <code>"21"</code>, so you can upload your updated apps today.</li> </ul> - <p>Although the APIs for Android 5.0 are now final, the system image for end-users - is not available yet. So the following preview system images are available for you to - test your apps on a Nexus 5 or Nexus 7. These are non-final - builds and their use is governed by the <a href="/preview/license.html">Android L - Preview License Agreement</a>.</p> - - <table > - <tbody><tr> - <th scope="col">Device</th> - <th scope="col">Download</th> - <th scope="col">Checksum</th> - </tr> - <tr id="hammerhead"> - <td>Nexus 5 (GSM/LTE) <br>"hammerhead"</td> - <td><a href="#download" onclick="onDownload(this)">hammerhead-lpx13d-preview-f7596f51.tgz</a></td> - <td>MD5: <code>8d92596aa038203fc6c8ff40a0e8b560</code> - <br>SHA-1: <code>f7596f518a8a429f03de5bf8152fa90e738228dd</code></td> - </tr> - <tr id="razor"> - <td>Nexus 7 [2013] (Wi-Fi) <br>"razor"</td> - <td><a href="#download" onclick="onDownload(this)">razor-lpx13d-preview-ae4f461f.tgz</a></td> - <td>MD5: <code>b2c567518d203b487cb2ac28d25b0a54</code> - <br><nobr>SHA-1: <code>ae4f461fabae5ff92eae0c252c34bb26d877e528</code></nobr></td> - </tr> - </tbody></table> - </li> - - <p>For details about how to flash the system image to your device, see the - <a href="https://developers.google.com/android/nexus/images#instructions">flashing - instructions</a>.</p> - - <p>If you want to uninstall the preview system image and flash your device to factory - specifications, download the appropriate image from - <a href="http://developers.google.com/android/nexus/images">Factory Images for Nexus - Devices</a> and follow the instructions on that page.</p> - - <p class="note"><strong>Note:</strong> When the final Android 5.0 system image becomes - available, it will be posted on the + <p>If you previously flashed your Nexus 5 or Nexus 7 with a preview system image, you should + now update your device to the final factory system image. + Download the appropriate image from <a href="http://developers.google.com/android/nexus/images">Factory Images for Nexus - Devices</a> page. To continue development (and receive future system updates), - you should update your device with that image as soon as possible.</p> + Devices</a> and follow the flashing instructions on that page.</p> </div> <!-- end .wrap --> diff --git a/docs/html/preview/license.html b/docs/html/preview/license.html index ffda3ab5208b..deb16aa8b136 100644 --- a/docs/html/preview/license.html +++ b/docs/html/preview/license.html @@ -87,8 +87,8 @@ body,html, #qv {background-color:#e9e9e9} <div class="jd-descr" itemprop="articleBody"> <p> -If you are using the <a href="/preview/index.html">Android SDK -Preview</a>, you must agree to the following terms +If you are using the Android SDK +Preview, you must agree to the following terms and conditions. As described below, please note that the preview version of the Android SDK is subject to change, and that you use it at your own risk. The Android SDK Preview is not a stable release, and may contain errors and defects diff --git a/docs/html/samples/new/index.jd b/docs/html/samples/new/index.jd index 330caa309af0..ba75072843fd 100644 --- a/docs/html/samples/new/index.jd +++ b/docs/html/samples/new/index.jd @@ -12,116 +12,201 @@ for the L Developer Preview.</p> </p> -<h3 id="BasicManagedProfile">BasicManagedProfile</h3> -<div class="figure" style="width:220px"> - <img src="{@docRoot}samples/images/BasicManagedProfile.png" - srcset="{@docRoot}samples/images/BasicManagedProfile@2x.png 2x" - alt="" height="375" /> - <p class="img-caption"> - <strong>Figure 1.</strong> The BasicManagedProfile sample app. - </p> -</div> +<!-- NOTE TO EDITORS: add most recent samples first --> -<p>This sample demonstrates how to create a managed profile. You can also:</p> -<ul> - <li>Enable or disable other apps, and set restrictions on them.</li> - <li>Configure intents to be forwarded between the primary account and the - managed profile.</li> - <li>Wipe all the data associated with the managed profile.</li> -</ul> +<h3 id="MediaBrowserService">Media Browser Service</h3> -<p class="note"><strong>Note:</strong> There can be only one managed profile on - a device at a time.</p> +<p> +This sample is a simple audio media app that exposes its media +library and provides metadata and playback controls through the new +MediaBrowserService and MediaSession APIs from API 21. +The sample is compatible with Android Auto and also provides a basic UI +when not connected to a car. +</p> -<p><a href="http://github.com/googlesamples/android-BasicManagedProfile">Get it on GitHub</a></p> +<p class="note"> + <strong>Note:</strong> This sample is compatible with <a + href="http://android.com/auto">Android Auto</a>. +</p> -<h3 id="Camera2Basic">Camera2Basic</h3> +<p><a href="http://github.com/googlesamples/android-MediaBrowserService">Get it on GitHub</a></p> -<!-- -<div class="figure" style="width:220px"> - <img src="" srcset="@2x.png 2x" alt="" height="375" /> - <p class="img-caption"> - <strong>Figure n.</strong> Single sentence summarizing the figure. - </p> -</div> ---> -<p>This sample demonstrates the basic use of the Camera2 API. The sample code -demonstrates how you can display camera preview and take pictures.</p> +<h3 id="MessagingService">Messaging Service</h3> -<p><a href="http://github.com/googlesamples/android-Camera2Basic">Get it on GitHub</a></p> +<p> +This sample shows a simple service that sends notifications using +NotificationCompat. In addition to sending a notification, it also extends +the notification with a CarExtender to make it compatible with Android Auto. +Each unread conversation from a user is sent as a distinct notification. +</p> +<p class="note"> + <strong>Note:</strong> This sample is compatible with <a + href="http://android.com/auto">Android Auto</a>. +</p> -<h3 id="Camera2Video">Camera2Video</h3> -<!-- -<div class="figure" style="width:220px"> -<img src="" srcset="@2x.png 2x" alt="" height="375" /> - <p class="img-caption"> - <strong>Figure n.</strong> Single sentence summarizing the figure. - </p> -</div> ---> +<p><a href="http://github.com/googlesamples/android-MessagingService">Get it on GitHub</a></p> -<p>This sample demonstrates how to record video using the Camera2 API.</p> -<p><a href="http://github.com/googlesamples/android-Camera2Video">Get it on GitHub</a></p> +<h3 id="SpeedTracker">Speed Tracker (Wear)</h3> -<h3 id="ActivitySceneTransitionBasic">ActivitySceneTransitionBasic</h3> -<div class="figure" style="width:220px"> - <img src="{@docRoot}samples/images/ActivitySceneTransitionBasic.png" - srcset="{@docRoot}samples/images/ActivitySceneTransitionBasic@2x.png 2x" - alt="" height="375" /> - <p class="img-caption"> - <strong>Figure 2.</strong> The ActivitySceneTransitionBasic sample app. - </p> - </div> +<p> +This sample uses the FusedLocation APIs of Google Play Services on Android Wear +devices that have a hardware GPS built in. In those cases, this sample provides +a simple screen that shows the current speed of the wearable device. User can +set a speed limit and if the speed approaches that limit, it changes the color +to yellow and if it exceeds the limit, it turns red. User can also enable +recording of coordinates and when it pairs back with the phone, this data +is synced with the phone component of the app and user can see a track +made of those coordinates on a map on the phone. +</p> -<p> This sample demonstrates how to the use {@link android.app.Activity} scene -transitions when transitioning from one activity to another. Uses a combination -of <code>moveImage</code> and <code>changeBounds</code> to nicely transition -from a grid of images to an activity with a large image and detail text. </p> +<p><a href="http://github.com/googlesamples/android-SpeedTracker">Get it on GitHub</a></p> -<p><a href="http://github.com/googlesamples/android-ActivitySceneTransition">Get it on GitHub</a></p> -<h3 id="ElevationBasic">ElevationBasic</h3> -<!-- -<div class="figure" style="width:220px"> -<img src="" srcset="@2x.png 2x" alt="" height="375" /> - <p class="img-caption"> - <strong>Figure n.</strong> Single sentence summarizing the figure. - </p> -</div> ---> +<h3 id="AppRestrictionSchema">AppRestrictionSchema</h3> <p> -This sample demonstrates two alternative ways to move a view in the z-axis:</p> +This sample shows how to use app restrictions. This application has one boolean +restriction with a key "can_say_hello" that defines whether the only feature of this +app (press the button to show "Hello" message) is enabled or disabled. Use +AppRestrictionEnforcer sample to toggle the restriction. +</p> -<ul> - <li>With a fixed elevation, using XML.</li> - <li>Raising the elevation when the user taps on it, using - <code>setTranslationZ()</code>.</li> -</ul> +<p><a href="http://github.com/googlesamples/android-AppRestrictionSchema">Get it on GitHub</a></p> + + +<h3 id="AppRestrictionEnforcer">AppRestrictionEnforcer</h3> + +<p> +This sample demonstrates how to set restrictions to other apps as a profile owner. +Use AppRestrictionSchema sample as a app with available restrictions. +</p> + +<p><a href="http://github.com/googlesamples/android-AppRestrictionEnforcer">Get it on GitHub</a></p> + + +<h3 id="DocumentCentricRelinquishIdentity">DocumentCentricRelinquishIdentity</h3> + +<p> +This sample shows how to relinquish identity to activities above it in the task stack. +</p> + +<p><a href="http://github.com/googlesamples/android-DocumentCentricRelinquishIdentity">Get it on GitHub</a></p> + + +<h3 id="DocumentCentricApps">DocumentCentricApps</h3> + +<p> +This sample shows the basic usage of the new "Document Centric Apps" API. +It let's you create new documents in the system overview menu and persists its +state through reboots. If "Task per document" is checked a new task will be +created for every new document in the overview menu. +</p> + +<p><a href="http://github.com/googlesamples/android-DocumentCentricApps">Get it on GitHub</a></p> + + +<h3 id="HdrViewfinder">HdrViewfinder</h3> + +<p> +This demo implements a real-time high-dynamic-range camera viewfinder, by alternating +the sensor's exposure time between two exposure values on even and odd frames, and then +compositing together the latest two frames whenever a new frame is captured. +</p> + +<p><a href="http://github.com/googlesamples/android-HdrViewfinder">Get it on GitHub</a></p> + + +<h3 id="Interpolator">Interpolator</h3> + +<p> +This sample demonstrates the use of animation interpolators and path animations for +Material Design. It shows how an ObjectAnimator is used to animate two properties of a +view (scale X and Y) along a path. +</p> + +<p><a href="http://github.com/googlesamples/android-Interpolator">Get it on GitHub</a></p> + + +<h3 id="DrawableTinting">DrawableTinting</h3> + +<p>Sample that shows applying tinting and color filters to Drawables both programmatically +and as Drawable resources in XML.</p> +<p>Tinting is set on a nine-patch drawable through the "tint" and "tintMode" parameters. +A color state list is referenced as the tint color, which defines colors for different +states of a View (for example disabled/enabled, focused, pressed or selected).</p> +<p>Programmatically, tinting is applied to a Drawable through its "setColorFilter" method, +with a reference to a color and a PorterDuff blend mode. The color and blend mode can be +changed from the UI to see the effect of different options.</p> + +<p><a href="http://github.com/googlesamples/android-DrawableTinting">Get it on GitHub</a></p> + + +<h3 id="LNotifications">LNotifications</h3> + +<p> +This sample demonstrates how new features for notifications introduced in Android 5.0 +are used such as Heads-Up notifications, visibility, people, category and priority +metadata. </p> +<p><a href="http://github.com/googlesamples/android-LNotifications">Get it on GitHub</a></p> + + +<h3 id="CardView">CardView</h3> + +<p> +This sample demonstrates how to use the CardView UI widget introduced in Android 5.0, using the support library for backward compatibility. +</p> + +<p><a href="http://github.com/googlesamples/android-CardView">Get it on GitHub</a></p> + + +<h3 id="RecyclerView">RecyclerView</h3> + +<p> +Demonstration of using RecyclerView with a LayoutManager to create a vertical ListView. +</p> + +<p><a href="http://github.com/googlesamples/android-RecyclerView">Get it on GitHub</a></p> + + +<h3 id="RevealEffectBasic">RevealEffectBasic</h3> + +<p> +A sample demonstrating how to perform a reveal effect for UI elements within the Material Design framework. +</p> + +<p><a href="http://github.com/googlesamples/android-RevealEffectBasic">Get it on GitHub</a></p> + + +<h3 id="FloatingActionButtonBasic">FloatingActionButtonBasic</h3> + +<p> +This sample shows the two sizes of Floating Action Buttons and how to interact with +them. +</p> + +<p><a href="http://github.com/googlesamples/android-FloatingActionButtonBasic">Get it on GitHub</a></p> -<p><a href="http://github.com/googlesamples/android-ElevationBasic">Get it on GitHub</a></p> -<h3 id="ElevationDrag">ElevationDrag</h3> <!-- +<h3 id="">SampleName</h3> + <div class="figure" style="width:220px"> <img src="" srcset="@2x.png 2x" alt="" height="375" /> <p class="img-caption"> <strong>Figure n.</strong> Single sentence summarizing the figure. </p> </div> ---> -<p>This sample demonstrates a drag and drop action on different shapes. -Elevation and z-translation are used to render the shadows. The views are -clipped using different outlines.</p> - -<p><a href="http://github.com/googlesamples/android-ElevationDrag">Get it on GitHub</a></p> +<p> +**description** +</p> +--> -<h3 id="ClippingBasic">ClippingBasic</h3> +<h3 id="NavigationDrawerSample">NavigationDrawerSample</h3> <!-- <div class="figure" style="width:220px"> <img src="" srcset="@2x.png 2x" alt="" height="375" /> @@ -132,21 +217,24 @@ clipped using different outlines.</p> --> <p> -This sample demonstrates clipping on a {@link android.view.View}. +This sample illustrates a common usage of the Android support library's +{@link android.support.v4.widget.DrawerLayout} widget. </p> -<p><a href="http://github.com/googlesamples/android-ClippingBasic">Get it on GitHub</a></p> +<p><a href="http://github.com/googlesamples/android-NavigationDrawer">Get it on GitHub</a></p> -<div class="figure" style="width:220px"> - <img src="{@docRoot}samples/images/JobSchedulerSample.png" - srcset="{@docRoot}samples/images/JobSchedulerSample@2x.png 2x" - alt="" height="375" /> - <p class="img-caption"> - <strong>Figure 3.</strong> The JobSchedulerSample sample app. - </p> -</div> -<h3 id="GameControllerSample">GameControllerSample</h3> +<h3 id="JobSchedulerSample">JobSchedulerSample</h3> + +<p> +This sample app allows the user to schedule jobs through the UI, and shows +visual cues when the jobs are executed. +</p> + +<p><a href="http://github.com/googlesamples/android-JobScheduler">Get it on GitHub</a></p> + + +<h3 id="AndroidTVLeanbackSample">AndroidTVLeanbackSample</h3> <!-- <div class="figure" style="width:220px"> <img src="" srcset="@2x.png 2x" alt="" height="375" /> @@ -157,11 +245,10 @@ This sample demonstrates clipping on a {@link android.view.View}. --> <p> -This sample implements a multi-player game, demonstrating game controller input -handling. +This sample demonstrates use of the Android TV Leanback Support Library. </p> -<p><a href="http://github.com/googlesamples/androidtv-GameController">Get it on GitHub</a></p> +<p><a href="http://github.com/googlesamples/androidtv-Leanback">Get it on GitHub</a></p> <h3 id="Visual-Game-Controller">Visual-Game-Controller</h3> @@ -180,7 +267,8 @@ This sample displays events received from a game controller shown on the screen. <p><a href="http://github.com/googlesamples/androidtv-VisualGameController">Get it on GitHub</a></p> -<h3 id="AndroidTVLeanbackSample">AndroidTVLeanbackSample</h3> + +<h3 id="GameControllerSample">GameControllerSample</h3> <!-- <div class="figure" style="width:220px"> <img src="" srcset="@2x.png 2x" alt="" height="375" /> @@ -191,21 +279,14 @@ This sample displays events received from a game controller shown on the screen. --> <p> -This sample demonstrates use of the Android TV Leanback Support Library. +This sample implements a multi-player game, demonstrating game controller input +handling. </p> -<p><a href="http://github.com/googlesamples/androidtv-Leanback">Get it on GitHub</a></p> - -<h3 id="JobSchedulerSample">JobSchedulerSample</h3> - -<p> -This sample app allows the user to schedule jobs through the UI, and shows -visual cues when the jobs are executed. -</p> +<p><a href="http://github.com/googlesamples/androidtv-GameController">Get it on GitHub</a></p> -<p><a href="http://github.com/googlesamples/android-JobScheduler">Get it on GitHub</a></p> -<h3 id="NavigationDrawerSample">NavigationDrawerSample</h3> +<h3 id="ClippingBasic">ClippingBasic</h3> <!-- <div class="figure" style="width:220px"> <img src="" srcset="@2x.png 2x" alt="" height="375" /> @@ -216,150 +297,130 @@ visual cues when the jobs are executed. --> <p> -This sample illustrates a common usage of the Android support library's -{@link android.support.v4.widget.DrawerLayout} widget. +This sample demonstrates clipping on a {@link android.view.View}. </p> -<p><a href="http://github.com/googlesamples/android-NavigationDrawer">Get it on GitHub</a></p> -<!-- -<h3 id="">SampleName</h3> +<p><a href="http://github.com/googlesamples/android-ClippingBasic">Get it on GitHub</a></p> + +<div class="figure" style="width:220px"> + <img src="{@docRoot}samples/images/JobSchedulerSample.png" + srcset="{@docRoot}samples/images/JobSchedulerSample@2x.png 2x" + alt="" height="375" /> + <p class="img-caption"> + <strong>Figure 3.</strong> The JobSchedulerSample sample app. + </p> +</div> + +<h3 id="ElevationDrag">ElevationDrag</h3> +<!-- <div class="figure" style="width:220px"> <img src="" srcset="@2x.png 2x" alt="" height="375" /> <p class="img-caption"> <strong>Figure n.</strong> Single sentence summarizing the figure. </p> </div> - -<p> -**description** -</p> --> -<h3 id="FloatingActionButtonBasic">FloatingActionButtonBasic</h3> - -<p> -This sample shows the two sizes of Floating Action Buttons and how to interact with -them. -</p> - -<p><a href="http://github.com/googlesamples/android-FloatingActionButtonBasic">Get it on GitHub</a></p> - -<h3 id="RevealEffectBasic">RevealEffectBasic</h3> - -<p> -A sample demonstrating how to perform a reveal effect for UI elements within the Material Design framework. -</p> - -<p><a href="http://github.com/googlesamples/android-RevealEffectBasic">Get it on GitHub</a></p> - -<h3 id="RecyclerView">RecyclerView</h3> - -<p> -Demonstration of using RecyclerView with a LayoutManager to create a vertical ListView. -</p> - -<p><a href="http://github.com/googlesamples/android-RecyclerView">Get it on GitHub</a></p> - -<h3 id="CardView">CardView</h3> +<p>This sample demonstrates a drag and drop action on different shapes. +Elevation and z-translation are used to render the shadows. The views are +clipped using different outlines.</p> -<p> -This sample demonstrates how to use the CardView UI widget introduced in Android 5.0, using the support library for backward compatibility. -</p> +<p><a href="http://github.com/googlesamples/android-ElevationDrag">Get it on GitHub</a></p> -<p><a href="http://github.com/googlesamples/android-CardView">Get it on GitHub</a></p> -<h3 id="LNotifications">LNotifications</h3> +<h3 id="ElevationBasic">ElevationBasic</h3> +<!-- +<div class="figure" style="width:220px"> +<img src="" srcset="@2x.png 2x" alt="" height="375" /> + <p class="img-caption"> + <strong>Figure n.</strong> Single sentence summarizing the figure. + </p> +</div> +--> <p> -This sample demonstrates how new features for notifications introduced in Android 5.0 -are used such as Heads-Up notifications, visibility, people, category and priority -metadata. </p> -<p><a href="http://github.com/googlesamples/android-LNotifications">Get it on GitHub</a></p> - -<h3 id="DrawableTinting">DrawableTinting</h3> - -<p>Sample that shows applying tinting and color filters to Drawables both programmatically -and as Drawable resources in XML.</p> -<p>Tinting is set on a nine-patch drawable through the "tint" and "tintMode" parameters. -A color state list is referenced as the tint color, which defines colors for different -states of a View (for example disabled/enabled, focused, pressed or selected).</p> -<p>Programmatically, tinting is applied to a Drawable through its "setColorFilter" method, -with a reference to a color and a PorterDuff blend mode. The color and blend mode can be -changed from the UI to see the effect of different options.</p> - -<p><a href="http://github.com/googlesamples/android-DrawableTinting">Get it on GitHub</a></p> +This sample demonstrates two alternative ways to move a view in the z-axis:</p> -<h3 id="Interpolator">Interpolator</h3> +<ul> + <li>With a fixed elevation, using XML.</li> + <li>Raising the elevation when the user taps on it, using + <code>setTranslationZ()</code>.</li> +</ul> -<p> -This sample demonstrates the use of animation interpolators and path animations for -Material Design. It shows how an ObjectAnimator is used to animate two properties of a -view (scale X and Y) along a path. -</p> +<p><a href="http://github.com/googlesamples/android-ElevationBasic">Get it on GitHub</a></p> -<p><a href="http://github.com/googlesamples/android-Interpolator">Get it on GitHub</a></p> -<h3 id="HdrViewfinder">HdrViewfinder</h3> +<h3 id="ActivitySceneTransitionBasic">ActivitySceneTransitionBasic</h3> +<div class="figure" style="width:220px"> + <img src="{@docRoot}samples/images/ActivitySceneTransitionBasic.png" + srcset="{@docRoot}samples/images/ActivitySceneTransitionBasic@2x.png 2x" + alt="" height="375" /> + <p class="img-caption"> + <strong>Figure 2.</strong> The ActivitySceneTransitionBasic sample app. + </p> + </div> -<p> -This demo implements a real-time high-dynamic-range camera viewfinder, by alternating -the sensor's exposure time between two exposure values on even and odd frames, and then -compositing together the latest two frames whenever a new frame is captured. -</p> +<p> This sample demonstrates how to the use {@link android.app.Activity} scene +transitions when transitioning from one activity to another. Uses a combination +of <code>moveImage</code> and <code>changeBounds</code> to nicely transition +from a grid of images to an activity with a large image and detail text. </p> -<p><a href="http://github.com/googlesamples/android-HdrViewfinder">Get it on GitHub</a></p> +<p><a href="http://github.com/googlesamples/android-ActivitySceneTransition">Get it on GitHub</a></p> -<h3 id="DocumentCentricApps">DocumentCentricApps</h3> -<p> -This sample shows the basic usage of the new "Document Centric Apps" API. -It let's you create new documents in the system overview menu and persists its -state through reboots. If "Task per document" is checked a new task will be -created for every new document in the overview menu. -</p> +<h3 id="Camera2Video">Camera2Video</h3> +<!-- +<div class="figure" style="width:220px"> +<img src="" srcset="@2x.png 2x" alt="" height="375" /> + <p class="img-caption"> + <strong>Figure n.</strong> Single sentence summarizing the figure. + </p> +</div> +--> -<p><a href="http://github.com/googlesamples/android-DocumentCentricApps">Get it on GitHub</a></p> +<p>This sample demonstrates how to record video using the Camera2 API.</p> -<h3 id="DocumentCentricRelinquishIdentity">DocumentCentricRelinquishIdentity</h3> +<p><a href="http://github.com/googlesamples/android-Camera2Video">Get it on GitHub</a></p> -<p> -This sample shows how to relinquish identity to activities above it in the task stack. -</p> -<p><a href="http://github.com/googlesamples/android-DocumentCentricRelinquishIdentity">Get it on GitHub</a></p> +<h3 id="Camera2Basic">Camera2Basic</h3> -<h3 id="AppRestrictionEnforcer">AppRestrictionEnforcer</h3> +<!-- +<div class="figure" style="width:220px"> + <img src="" srcset="@2x.png 2x" alt="" height="375" /> + <p class="img-caption"> + <strong>Figure n.</strong> Single sentence summarizing the figure. + </p> +</div> +--> -<p> -This sample demonstrates how to set restrictions to other apps as a profile owner. -Use AppRestrictionSchema sample as a app with available restrictions. -</p> +<p>This sample demonstrates the basic use of the Camera2 API. The sample code +demonstrates how you can display camera preview and take pictures.</p> -<p><a href="http://github.com/googlesamples/android-AppRestrictionEnforcer">Get it on GitHub</a></p> +<p><a href="http://github.com/googlesamples/android-Camera2Basic">Get it on GitHub</a></p> -<h3 id="AppRestrictionSchema">AppRestrictionSchema</h3> -<p> -This sample shows how to use app restrictions. This application has one boolean -restriction with a key "can_say_hello" that defines whether the only feature of this -app (press the button to show "Hello" message) is enabled or disabled. Use -AppRestrictionEnforcer sample to toggle the restriction. -</p> +<h3 id="BasicManagedProfile">BasicManagedProfile</h3> +<div class="figure" style="width:220px"> + <img src="{@docRoot}samples/images/BasicManagedProfile.png" + srcset="{@docRoot}samples/images/BasicManagedProfile@2x.png 2x" + alt="" height="375" /> + <p class="img-caption"> + <strong>Figure 1.</strong> The BasicManagedProfile sample app. + </p> +</div> -<p><a href="http://github.com/googlesamples/android-AppRestrictionSchema">Get it on GitHub</a></p> +<p>This sample demonstrates how to create a managed profile. You can also:</p> +<ul> + <li>Enable or disable other apps, and set restrictions on them.</li> + <li>Configure intents to be forwarded between the primary account and the + managed profile.</li> + <li>Wipe all the data associated with the managed profile.</li> +</ul> -<h3 id="SpeedTracker">Speed Tracker (Wear)</h3> +<p class="note"><strong>Note:</strong> There can be only one managed profile on + a device at a time.</p> -<p> -This sample uses the FusedLocation APIs of Google Play Services on Android Wear -devices that have a hardware GPS built in. In those cases, this sample provides -a simple screen that shows the current speed of the wearable device. User can -set a speed limit and if the speed approaches that limit, it changes the color -to yellow and if it exceeds the limit, it turns red. User can also enable -recording of coordinates and when it pairs back with the phone, this data -is synced with the phone component of the app and user can see a track -made of those coordinates on a map on the phone. -</p> +<p><a href="http://github.com/googlesamples/android-BasicManagedProfile">Get it on GitHub</a></p> -<p><a href="http://github.com/googlesamples/android-SpeedTracker">Get it on GitHub</a></p> diff --git a/docs/html/samples/notification.jd b/docs/html/samples/notification.jd new file mode 100644 index 000000000000..bbcea9339a43 --- /dev/null +++ b/docs/html/samples/notification.jd @@ -0,0 +1,11 @@ +page.title=Notification +@jd:body + + +<div id="samples" class="notification"> +</div> + + +<script> + $(document).ready(showSamples); +</script> diff --git a/docs/html/sdk/installing/migrate.jd b/docs/html/sdk/installing/migrate.jd index db1b5dd8e151..b83f8d37c504 100644 --- a/docs/html/sdk/installing/migrate.jd +++ b/docs/html/sdk/installing/migrate.jd @@ -15,23 +15,7 @@ page.title=Migrating from Eclipse </div> <p>If you've previously developed for Android using Eclipse and would like to migrate -to Android Studio, you should export your projects from Eclipse in order to generate -Gradle build files. You can then import your project into Android Studio.</p> - - -<h2 id="Export">Export from Eclipse</h2> -<ol> -<li><a href="{@docRoot}tools/help/adt.html#Updating">Update your Eclipse ADT Plugin</a> - (you must have version 22.0 or higher).</li> -<li>In Eclipse, select <strong>File > Export</strong>.</li> -<li>In the window that appears, open <strong>Android</strong> and select <strong>Generate Gradle -build files</strong>.</li> -<li>Select the project you want to export for Android Studio and click -<strong>Finish</strong>.</li> -</ol> - -<p>Your selected project remains in the same location but now contains a {@code build.gradle} -file and is ready for Android Studio.</p> +to Android Studio, you can import your project into Android Studio.</p> <h2 id="Export">Import into Android Studio</h2> diff --git a/docs/html/training/auto/audio/index.jd b/docs/html/training/auto/audio/index.jd new file mode 100644 index 000000000000..2656b96a7bda --- /dev/null +++ b/docs/html/training/auto/audio/index.jd @@ -0,0 +1,476 @@ +page.title=Providing Audio Playback for Auto +page.tags="auto", "car", "automotive", "audio" +page.article=true + +@jd:body + +<div id="tb-wrapper"> +<div id="tb"> + <h2>Dependencies and Prerequisites</h2> + <ul> + <li>Android 5.0 (API level 21) or higher</li> + </ul> + + <h2>This class teaches you how to</h2> + + <ol> + <li><a href="#overview">Provide Audio Services</a></li> + <li><a href="#config_manifest">Configure Your Manifest</a></li> + <li><a href="#implement_browser">Build a Browser Service</a></li> + <li><a href="#implement_callback">Implement Play Controls</a></li> + </ol> + + <h2>Related Samples</h2> + + <ul> + <li><a href="{@docRoot}samples/MediaBrowserService/index.html"> + MediaBrowserService</a></li> + </ul> + + <h2>See Also</h2> + + <ul> + <li> + <a href="{@docRoot}shareables/auto/AndroidAuto-media-apps.pdf"> + User Experience Guidelines: Media Apps</a> + </li> + <li><a href="{@docRoot}training/managing-audio/index.html">Managing Audio + Playback</a></li> + <li><a href="{@docRoot}guide/topics/media/exoplayer.html">ExoPlayer</a> + </li> + </ul> + +</div> +</div> + +<a class="notice-developers-video wide" +href="https://www.youtube.com/watch?v=Q96Sw6v4ULg"> +<div> + <h3>Video</h3> + <p>Devbytes: Android Auto Audio</p> +</div> +</a> + +<p> + Drivers want to access their music and other audio content on the road. Audio books, podcasts, + sports commentary, and recorded talks can make a long trip educational, inspirational, and + enjoyable. The Android framework allows you to extend your audio app so users can listen to their + favorite tunes and audio content using a simpler, safer user interface. +</p> + +<p> + Apps running on mobile devices with Android 5.0 or higher can provide audio services for + dashboard systems running Android Auto. By configuring your app with a few settings and + implementing a service for accessing music tracks, you can enable Auto devices to discover your + app and provide a browse and playback interface for your app's audio content. +</p> + +<p> + This class assumes that you have built an app that plays audio through an Android device's + integrated speakers or connected headphones. It describes how to extend your app to allow Auto + devices to browse your content listings and play it through a car stereo system. +</p> + + +<h2 id="overview">Provide Audio Services</h2> + +<p> + Audio apps do not directly control a car dashboard device that runs Android Auto. When the user + connects an Android mobile device into a dashboard system, Android Auto discovers your app through + manifest entries that indicate what audio services your app can provide. The dashboard system + displays a launcher icon for your app as a music provider and the user can choose to use your + app's services. If the user launches your app, the Auto device queries your app to see what + content is available, displays your content items to the user, and sends requests to your app to + control playback with actions such as play, pause, or skip track. +</p> + +<p>To enable your app to provide audio content for Auto devices, you need to: +</p> + +<ul> + <li>Configure your app manifest to do the following:</li> + <ul> + <li>Declare that your app can provide audio content for Auto devices.</li> + <li>Define a service that provides a browsable list of your audio tracks.</li> + </ul> + </li> + <li>Build a service that provides audio track listing information extending + {@link android.service.media.MediaBrowserService}.</li> + <li>Register a {@link android.media.session.MediaSession} object and implement the + {@link android.media.session.MediaSession.Callback} object to enable playback controls.</li> +</ul> + + +<h2 id="config_manifest">Configure Your Manifest</h2> + +<p> + When a user plugs an Android mobile device into a dashboard device running Auto, the system + requests a list of installed apps that include <a href= + "{@docRoot}guide/topics/manifest/manifest-intro.html">app manifest</a> entries to indicate they + support services for Auto devices and how to access them. This section describes how to configure + your app manifest to indicate your app supports audio services for Auto devices, and allow + dashboard system to connect with your app. +</p> + + +<h3 id="manifest-car-app">Declare Auto audio support</h3> + +<p> + You indicate that your app supports cars capabilities using the following manifest entry: +</p> + +<pre> +<application> + ... + <meta-data android:name="com.google.android.gms.car.application" + android:resource="@xml/automotive_app_desc"/> + ... +<application> +</pre> + +<p> + This manifest entry refers to a secondary XML file, where you declare what Auto capabilities your + app supports. For an app that supports audio for cars, add an XML file to the {@code res/xml/} + resources directory as {@code automotive_app_desc.xml}, with the following content: +</p> + +<pre> +<automotiveApp> + <uses name="media"/> +</automotiveApp> +</pre> + +<p> + For more information about declaring capabilities for Auto devices, see <a href= + "{@docRoot}training/auto/start/index.html#auto-metadata">Getting Started with Auto</a>. +</p> + + +<h3 id="manifest-service">Declare your media browser service</h3> + +<p> + Auto devices expect to connect to a service in order to browse audio track + listings. You declare this service in your manifest to allow the dashboard system to discover + this service and connect to your app. +</p> + +<p>The following code example shows how to declare this listing browser service in your manifest:</p> + +<pre> +<application> + ... + <service android:name="<em>.MyMediaBrowserService</em>" + android:exported="true"> + <intent-filter> + <strong><action android:name=</strong> + <strong>"android.media.browse.MediaBrowserService"/></strong> + </intent-filter> + </service> + ... +<application> +</pre> + +<p> + The service your app provides for browsing audio tracks must extend the + {@link android.service.media.MediaBrowserService}. The implementation of this service is discussed + in the <a href="#implement_browser">Build a Browser Service</a> section. +</p> + +<p class="note"> + <strong>Note:</strong> Other clients can also contact your app's browser service aside from Auto + devices. These media clients might be other apps on a user's mobile device, or they might be other + remote clients. +</p> + +<h3 id="manifest-icon">Specify a notification icon</h3> + +<p> + The Auto user interface shows notifications about your audio app to the user during the course + of operation. For example, if the user has a navigation app running, and one song finishes + and a new song starts, the Auto device shows the user a notification to indicate the change with + an icon from your app. You can specify an icon that is used to represent your app for these + notifications using the following manifest declaration: +</p> + +<pre> +<application> + ... + <meta-data android:name="com.google.android.gms.car.notification.SmallIcon" + android:resource="@drawable/ic_notification" /> + ... +<application> +</pre> + +<p class="note"><strong>Note:</strong> The icon you provide should have transparency enabled, so the +icon's background gets filled in with the app's primary color.</p> + + +<h2 id="implement_browser">Build a Browser Service</h2> + +<p>Auto devices interact with your app by contacting its implementation of a + {@link android.service.media.MediaBrowserService}, which +you declare in your app manifest. This service allows Auto devices to find out what content your app +provides. Connected Auto devices can also query your app's media browser service to contact the +{@link android.media.session.MediaSession} provided by your app, which handles content playback +commands.</p> + +<p>You create a media browser service by extending the +{@link android.service.media.MediaBrowserService} class. +Connected Auto devices can contact your service to do the following:</p> + +<ul> + <li>Browse your app's content hierarchy, in order to present a menu to the + user</li> + <li>Get the token for your app's {@link android.media.session.MediaSession} + object, in order to control audio playback</li> +</ul> + + +<h3 id="browser_workflow">Media browser service workflow</h3> + +<ol> + +<li>When your app's audio services are requested by a user through a connected Auto device, the +dashboard system contacts your app's media browser service. +In your implementation of the {@link android.service.media.MediaBrowserService#onCreate() +onCreate()} method, you must create and register a {@link +android.media.session.MediaSession} object and its callback object.</li> + +<li>The Auto device calls the browser service's {@link +android.service.media.MediaBrowserService#onGetRoot onGetRoot()} method to get the top node of +your content hierarchy. The node retrieved by this call is not used as a menu item, it is only used +to retrieve its child nodes, which are subsequently displayed as the top menu items. +</li> + +<li>Auto invokes the {@link android.service.media.MediaBrowserService#onLoadChildren +onLoadChildren()} method to get the children of the root node, and uses this information to +present a menu to the user.</li> + +<li>If the user selects a submenu, Auto invokes +{@link android.service.media.MediaBrowserService#onLoadChildren +onLoadChildren()} again to retrieve the child nodes of the selected menu item.</li> + +<li>If the user begins playback, Auto invokes the appropriate media session +callback method to perform that action. For more information, see the section about how to +<a href="#implement_callback">Implement Playback Controls</a>. </li> + +</ol> + + +<h3 id="build_hierarchy">Building your content hierarchy</h3> + +<p>Auto devices acting as audio clients call your app's {@link +android.service.media.MediaBrowserService} to find out what content you have +available. You need to implement two methods in your browser service to support +this: {@link android.service.media.MediaBrowserService#onGetRoot +onGetRoot()} and {@link +android.service.media.MediaBrowserService#onLoadChildren +onLoadChildren()}.</p> + +<p>Each node in your content hierarchy is represented by a {@link +android.media.browse.MediaBrowser.MediaItem} object. Each of these objects is +identified by a unique ID string. The client treats these ID strings as +opaque tokens. When a client wants to browse to a submenu, or play a content +item, it passes the ID token. Your app is responsible for associating the ID +token with the appropriate menu node or content item.</p> + +<p class="note"><strong>Note:</strong> You should consider providing different content +hierarchies depending on what client is making the query. In particular, Auto +applications have strict limits on how large a menu they can display. This is +intended to prevent distracting the driver, and to make it easy for the driver +to operate the app via voice commands. For more information on the Auto user +experience restrictions, see the <a href="{@docRoot}shareables/auto/AndroidAuto-media-apps.pdf"> +Auto Media Apps</a> guidelines.</p> + +<p>Your implementation of {@link android.service.media.MediaBrowserService#onGetRoot +onGetRoot()} returns information about the root node of the menu +hierarchy. This root node is the parent of the top items your browse hierarchy. +The method is passed information about the calling client. You can use this +information to decide if the client should have access to your content at all. +For example, if you want to limit your app's content to a list of approved +clients, you can compare the passed {@code clientPackageName} to your whitelist. +If the caller isn't an approved package, you can return null to deny access to +your content.</p> + +<p>A typical implementation of {@link +android.service.media.MediaBrowserService#onGetRoot onGetRoot()} might +look like this:</p> + +<pre> +@Override +public BrowserRoot onGetRoot(String clientPackageName, int clientUid, + Bundle rootHints) { + + // Check the calling client to make sure it's one you approve. + // For example, to limit access to just Auto, the Auto emulator, + // and this app: + + if (!clientPackageName.equals("com.google.android.projection.gearhead") && + !clientPackageName.equals("com.example.android.media") && + !clientPackageName.equals(getApplication().getPackageName()) { + + // If the request comes from an untrusted package, return null. + // No further calls will be made to other media browsing methods. + return null; + } + + // Return a BrowserRoot. If you wish, you could have multiple BrowserRoot + // objects and return different ones depending on the calling client. + // In this example, there's just a single BrowserRoot. + return new BrowserRoot(MEDIA_BROWSER_ROOT, null); + } +</pre> + +<p> + The Auto device client builds the top-level menu by calling {@link + android.service.media.MediaBrowserService#onLoadChildren onLoadChildren()} with the root node + object and getting it's children. The client builds submenus by calling the same method with + other child nodes. The following example code shows a simple implementation of {@link + android.service.media.MediaBrowserService#onLoadChildren onLoadChildren()} method: +</p> + +<pre> +@Override +public void onLoadChildren(final String parentMediaId, + final Result<List<MediaItem>> result) { + + // Assume for example that the music catalog is already loaded/cached. + + List<MediaBrowser.MediaItem> mediaItems = new ArrayList<>(); + + // Check if this is the root menu: + if (MEDIA_BROWSER_ROOT.equals(parentMediaId)) { + + // build the MediaItem objects for the top level, + // and put them in the <result> list + } else { + + // examine the passed parentMediaId to see which submenu we're at, + // and put the children of that menu in the <result> list + } +} +</pre> + + +<h2 id="implement_callback">Enable Playback Control</h2> + +<p> + Auto devices use {@link android.media.session.MediaSession} objects to pass playback control + commands to an app that is providing audio services. Your audio app must create an instance of + this object to pass to the dashboard device and implement callback methods to enable remote + control of audio playback. +</p> + +<h3 id="registering_mediasession">Register a media session</h3> + +<p>An Auto device using your app as audio service needs to obtain a {@link +android.media.session.MediaSession} object from your app. The Auto device uses the session object +to send playback commands requested by the Auto user back to your app.</p> + +<p>When you initialize your browser service, you register that session object with your {@link +android.service.media.MediaBrowserService} by calling the {@link +android.service.media.MediaBrowserService#setSessionToken setSessionToken()} method. This step +allows clients such as an Auto device to retrieve that object by calling your browser service's +{@link android.service.media.MediaBrowserService#getSessionToken getSessionToken()} method.</p> + +<p>In your browser service's {@link +android.service.media.MediaBrowserService#onCreate() onCreate()} method, +create a {@link android.media.session.MediaSession}. You can then query +the {@link android.media.session.MediaSession} to get its token, and register +the token with your browser service:</p> + +<pre> +public void onCreate() { + super.onCreate(); + + ... + // Start a new MediaSession + MediaSession mSession = new MediaSession(this, "session tag"); + setSessionToken(mSession.getSessionToken()); + + // Set a callback object to handle play control requests, which + // implements MediaSession.Callback + mSession.setCallback(new MyMediaSessionCallback()); + + ... +</pre> + +<p> + When you create the media session object, you set a callback object that is used to handle + playback control requests. You create this callback object by providing an implementation of the + {@link android.media.session.MediaSession.Callback} class for your app. The next section + discusses how to implement this object. +</p> + + +<h3 id="playback-commands">Implement play commands</h3> + +<p>When an Auto device requests playback of an audio track from your app, it uses the +{@link android.media.session.MediaSession.Callback} class from your app's +{@link android.media.session.MediaSession} object, which it obtained from your app's +media browse service. When an Auto user wants to play content or control content playback, +such as pausing play or skipping to the next track, Auto invokes one +of the callback object's methods.</p> + +<p>To handle content playback, your app must extend the abstract {@link +android.media.session.MediaSession.Callback} class and implement the methods +that your app supports. The most important callback methods are as follows:</p> + +<dl> + +<dt>{@link android.media.session.MediaSession.Callback#onPlay onPlay()}</dt> +<dd>Invoked if the user chooses play without choosing a specific item. Your +app should play its default content. If playback was paused with +{@link android.media.session.MediaSession.Callback#onPause onPause()}, your +app should resume playback.</dd> + +<dt>{@link android.media.session.MediaSession.Callback#onPlayFromMediaId +onPlayFromMediaId()}</dt> +<dd>Invoked when the user chooses to play a specific item. The method is passed +the item's media ID, which you assigned to the item in the content +hierarchy.</dd> + +<dt>{@link android.media.session.MediaSession.Callback#onPlayFromSearch +onPlayFromSearch()}</dt> +<dd>Invoked when the user chooses to play from a search query. The app should +make an appropriate choice based on the passed search string.</dd> + +<dt>{@link android.media.session.MediaSession.Callback#onPause onPause()}</dt> +<dd>Pause playback.</dd> + +<dt>{@link android.media.session.MediaSession.Callback#onSkipToNext +onSkipToNext()}</dt> +<dd>Skip to the next item.</dd> + +<dt>{@link android.media.session.MediaSession.Callback#onSkipToPrevious +onSkipToPrevious()}</dt> +<dd>Skip to the previous item.</dd> + +<dt>{@link android.media.session.MediaSession.Callback#onStop onStop()}</dt> +<dd>Stop playback.</dd> + +</dl> + +<p>Your app should override these methods to provide any desired functionality. +In some cases you might not implement a method if it is not supported by your app. +For example, if your app plays a live stream (such as a sports +broadcast), the skip to next function might not make sense. In that case, you +could simply use the default implementation of +{@link android.media.session.MediaSession.Callback#onSkipToNext +onSkipToNext()}.</p> + +<p>When your app receives a request to play content, it should play audio the same way it +would in a non-Auto situation (as if the user was listening through a device speaker +or connected headphones). The audio content is automatically sent to the dashboard system +to be played over the car's speakers.</p> + +<p>For more information about playing audio content, see +<a href="{@docRoot}guide/topics/media/mediaplayer.html">Media Playback</a>, +<a href="{@docRoot}training/managing-audio/index.html">Managing Audio Playback</a>, and +<a href="{@docRoot}guide/topics/media/exoplayer.html">ExoPlayer</a>. + + +(for example, by using a {@link +android.media.MediaPlayer} or <a +href="{@docRoot}guide/topics/media/exoplayer.html">ExoPlayer</a>). If the phone +is connected to an Auto device, .</p> diff --git a/docs/html/training/auto/index.jd b/docs/html/training/auto/index.jd new file mode 100644 index 000000000000..26eee32df431 --- /dev/null +++ b/docs/html/training/auto/index.jd @@ -0,0 +1,9 @@ +page.title=Building Apps for Auto +page.trainingcourse=true +page.metaDescription=Starting point for building apps for Auto, with guidelines, information, and examples. +page.image=design/tv/images/focus.png +@jd:body + + + +<p>These classes teach you how to build and extend apps to work with Auto devices.</p>
\ No newline at end of file diff --git a/docs/html/training/auto/messaging/index.jd b/docs/html/training/auto/messaging/index.jd new file mode 100644 index 000000000000..c51ad7ee4318 --- /dev/null +++ b/docs/html/training/auto/messaging/index.jd @@ -0,0 +1,533 @@ +page.title=Providing Messaging for Auto +page.tags="auto", "car", "automotive", "messaging" +page.article=true + +@jd:body + +<div id="tb-wrapper"> +<div id="tb"> + <h2>Dependencies and Prerequisites</h2> + <ul> + <li>Android 5.0 (API level 21) or higher</li> + </ul> + + <h2>This class teaches you to:</h2> + + <ul> + <li><a href="#overview">Provide Messaging Services</a></li> + <li><a href="#manifest">Configure Your Manifest</a></li> + <li><a href="#support-lib">Import Support Library for Messaging</a></li> + <li><a href="#messaging">Notify Users of Messages</a></li> + <li><a href="#handle_actions">Handle User Actions</a></li> + </ul> + + <h2>Related Samples</h2> + + <ul> + <li><a href="{@docRoot}samples/MessagingService/index.html"> + MessagingService</a></li> + </ul> + + <h2>See Also</h2> + + <ul> + <li><a href="{@docRoot}shareables/auto/AndroidAuto-messaging-apps.pdf"> + User Experience Guidelines: Messaging Apps</a></li> + <li><a href="{@docRoot}guide/topics/ui/notifiers/notifications.html"> + Notifications</a></li> + </ul> +</div> +</div> + +<a class="notice-developers-video wide" + href="https://www.youtube.com/watch?v=gSVLuaOTIPk"> +<div> + <h3>Video</h3> + <p>DevBytes: Android Auto Messaging</p> +</div> +</a> + +<p> + Staying connected through text messages is important to many drivers. Chat apps can let users + know if a child need to be picked up, or if a dinner location has been changed. Apps that provide + sports information might tell the user who just won the big game, and let the user ask questions + about other games being played. The Android framework enables messaging apps to extend their + services into car dashboards using a standard user interface that lets drivers keep their eyes + on the road. +</p> + +<p> + Apps that support messaging can be extended to pass messaging notifications to Auto + dashboard systems, alerting them to new messages and allowing them to respond. You can configure + your messaging app to provide these services when an Android mobile device with your app + installed is connected to an Auto dashboard. Once connected, your app can provide text + information to users and allow them to respond. The Auto dashboard system handles displaying the + notification and the interface for replies. +</p> + +<p> + This lesson assumes that you have built an app that displays messages to the user and receive the + user's replies, such as a chat app. It shows you how to extend your app to hand those messages + off to an Auto device for display and replies. +</p> + + +<h2 id="overview">Provide Messaging Services</h2> + +<p> + Messaging apps do not run directly on the Android dashboard hardware. They are installed on + separate, Android mobile device. When the mobile device is plugged into a dashboard, + the installed messaging apps can offer services for viewing and responding to messages + through the Auto user interface. +</p> + +<p>To enable your app to provide messaging services for Auto devices:</p> + +<ul> + <li>Configure your app manifest to indicate that your app provides messaging services which are + compatible with Android Auto dashboard devices. + </li> + <li>Build and send a specific type of <a href= + "{@docRoot}guide/topics/ui/notifiers/notifications.html">notification</a> for display on Auto + devices. + </li> + <li>Configure your app to receive {@link android.content.Intent} objects that indicate a user + has read or replied to a message. +</ul> + + +<h2 id="#manifest">Configure Your Manifest</h2> + +<p> + You configure your app <a href="{@docRoot}guide/topics/manifest/manifest-intro.html">manifest</a> + to indicate that it supports messaging services for Auto devices and handle message actions. This + section describes what changes to make to your manifest to support messaging for Auto devices. +</p> + + +<h3 id="manifest-messaging">Declare Auto messaging support</h3> + +<p> + When a user connects a Android mobile device to a dashboard running Android, the dashboard + device looks for apps that declare support for vehicle services, such as messaging. You indicate + that your app supports cars capabilities using the following manifest entry: +</p> + +<pre> +<application> + ... + <meta-data android:name="com.google.android.gms.car.application" + android:resource="@xml/automotive_app_desc" /> + ... +<application> +</pre> + +<p> + This manifest entry refers to a secondary xml file, where you declare what Auto capabilities your + app supports. For an app that supports messaging for Auto devices, add an xml file to the {@code + res/xml/} your app's development project directory as {@code automotive_app_desc.xml}, with the + following content: +</p> + +<pre> +<automotiveApp> + <uses name="notification"/> +</automotiveApp> +</pre> + +<p> + For more information about declaring capabilities for Auto devices, see <a href= + "{@docRoot}training/auto/start/index.html#auto-metadata">Getting Started with Auto</a>. +</p> + + +<h3 id="manifest-intent">Define read and reply intent filters</h3> + +<p> + Auto devices use {@link android.content.Intent} objects that indicate a user has read or replied + to a message provided by your app. Your app defines intent types for reading and replying to + messages and adds this information to messaging notifications for Auto devices, so that the + dashboard system can notify your app when a user takes one of these actions. +</p> + +<p> + You define the read action and reply action intents types for your app and the {@code + android.content.BroadcastReceiver} classes that handle them in the manifest. The following code + example demonstrates how to declare these intents and thier associated receivers. +</p> + +<pre> +<application> + ... + <receiver android:name="<em>.MyMessageReadReceiver</em>"> + <intent-filter> + <action android:name="<em>com.myapp.messagingservice.ACTION_MESSAGE_HEARD</em>"/> + </intent-filter> + </receiver> + + <receiver android:name="<em>.MyMessageReplyReceiver</em>"> + <intent-filter> + <action android:name="<em>com.myapp.messagingservice.ACTION_MESSAGE_REPLY</em>"/> + </intent-filter> + </receiver> + ... +</application> +</pre> + +<p> + The definition of the {@code android.content.BroadcastReceiver} classes shown in this example + is discussed in <a href="#handle_actions">Handle User Actions</a>. +</p> + + +<h2 id="support-lib">Import Support Library for Messaging</h3> + +<p> + Building notifications for use with Auto devices requires classes from the + <a href="{@docRoot}tools/support-library/features.html#v4">v4 support library</a>. Use the + <a href="{@docRoot}tools/help/sdk-manager.html">Android SDK Manager</a> to update the + <em>Extras > Android Support Repository</em> to version 9 or higher and the + <em>Extras > Android Support Library</em> to version 21.1.0 or higher. +</p> + +<p> + After you have updated the support libraries, import them into your Android Studio development + project by adding this dependency to your + <a href="{@docRoot}sdk/installing/studio-build.html#configBuild">build.gradle</a> file: +</p> + +<pre> +dependencies { + ... + compile 'com.android.support:support-v4:21.1.+' +} +</pre> + +<p> + For information about importing the support library into development projects for other + development environments, see <a href="{@docRoot}tools/support-library/setup.html">Support + Library Setup</a>. +</p> + + + +<h2 id="messaging">Notify Users of Messages</h2> + +<p> + A messaging app provides messages to a connected Auto dashboard using the <a href= + "{@docRoot}guide/topics/ui/notifiers/notifications.html">notifications</a> framework. When your + messaging app has a message for a user, you build a specially configured notification that is + received by the dashboard system and presented to the user. The Auto device manages the + presentation on the dashboard screen and may play the message via text-to-speech. The dashboard + system also handles voice interaction if the user replies to a message using verbal input. +</p> + +<p> + The messaging user interface for Auto presents users with two levels of information about + messages. The first level of notification tells users what <em>conversations</em> are + available, and who they are with, but not the content of the messages. Typically, a + conversation is one or more messages from another user to the Auto user. +</p> + +<p> + The second level of the notification is the actual content of messages in the conversation. If a + user indicates they want to hear the messages in a conversation, the Auto user interface plays + the messages using text-to-speech. +</p> + +<p> + This section describes how to notify Auto users that conversations are available and + provide the content of messages in those conversations. +</p> + + +<h3 id="build_conversation">Build message conversations</h4> + +<p> + Messaging notifications for Auto organize messages into conversations using the {@code + NotificationCompat.CarExtender.UnreadConversation} class, that represents an unread or new + portion of a conversation from a particular sender. It contains a list of messages from the + sender. +</p> + +<p> + Use the {@code UnreadConversation.Builder} class to create an unread conversation object, + as shown in the following example code: +</p> + +<pre> +// Build a RemoteInput for receiving voice input in a Car Notification +RemoteInput remoteInput = new RemoteInput.Builder(EXTRA_VOICE_REPLY) + .setLabel(getApplicationContext().getString(R.string.notification_reply)) + .build(); + +// Create an unread conversation object to organize a group of messages +// from a particular sender. +UnreadConversation.Builder unreadConvBuilder = + new UnreadConversation.Builder(participantName) + .setReadPendingIntent(msgHeardPendingIntent) + .setReplyAction(replyPendingIntent, remoteInput); +</pre> + +<p> + This conversation object includes a {@link android.app.PendingIntent}, which allows the Auto + device to signal your app that the conversation has been read by the Auto user. The construction + of this intent is discussed in the <a href="#conversation-intents">Creating conversation read and + reply intents</a> section. +</p> + +<p> + If your app supports replying to a conversation, you must call the {@code setReplyAction()} + method and provide a pending intent to pass that user action back to your app. The {@code + UnreadConversation} object you create must also include a {@link + android.support.v4.app.RemoteInput} object. This object is required because the Auto user + receiving this conversation speaks a reply, a the remote input objects lets your app get a text + version of the voice reply. +</p> + + +<h4 id="conversation-messages">Associate messages with conversations</h4> + +<p> + Messages provided for Auto must be associated with a conversation using the {@code + NotificationCompat.CarExtender.UnreadConversation} class. The following code example shows how + to associate individual messages with a conversation object. +</p> + +<pre> +// Note: Add messages from oldest to newest to the UnreadConversation.Builder +for (Iterator<String> messages = conversation.getMessages().iterator(); + messages.hasNext(); ) { + String message = messages.next(); + unreadConvBuilder.addMessage(message); +} +</pre> + +<p> + When a new message arrives in a particular conversation, your app should check if there is + already a conversation object for that particular conversation. If there is, associate the new + message with the existing conversation instead of building a new one. +</p> + + +<h4 id="conversation-intents">Create conversation read and reply intents</h4> + +<p> + Unread conversation objects contain intents for reading and replying to a conversation. You + create a {@link android.app.PendingIntent} object for each of these actions, so the Auto device + can notify your app of action taken by the Auto user on a particular conversation. +</p> + +<p> + The following example code demonstrates how to define a {@link android.app.PendingIntent} to let + your app know if a conversation was listened to by the Auto user: +</p> + +<pre> +Intent msgHeardIntent = new Intent() + .addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES) + .setAction(<em>com.myapp.messagingservice.ACTION_MESSAGE_HEARD</em>) + .putExtra("conversation_id", conversationId); + +PendingIntent msgHeardPendingIntent = + PendingIntent.getBroadcast(getApplicationContext(), + conversationId, + msgHeardIntent, + PendingIntent.FLAG_UPDATE_CURRENT); +</pre> + +<p> + In this example, {@code conversationId} is an integer that identifies the current conversation. + The value of {@code setAction()} is an intent filter identifier for heard messages which is + defined in your app manifest, as shown in <a href="#manifest-intent">Define read and reply intent + filters</a>. +</p> + +<p> + If your app supports replying to conversations, you also create a {@link + android.app.PendingIntent} for each conversation to notify your app that the user has replied. + The following code example shows you how to build this intent for use with a particular + conversation: +</p> + +<pre> +Intent msgReplyIntent = new Intent() + .addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES) + .setAction(<em>com.myapp.messagingservice.ACTION_MESSAGE_REPLY</em>) + .putExtra("conversation_id", <em>conversationId</em>); + +PendingIntent msgReplyPendingIntent = PendingIntent.getBroadcast( + getApplicationContext(), + <em>conversationId</em>, + msgReplyIntent, + PendingIntent.FLAG_UPDATE_CURRENT); +</pre> + +<p> + Once again, {@code conversationId} is an integer that uniquely identifies this conversation. The + value of {@code setAction()} is an intent filter identifier for replies which is defined in your + app manifest, as shown in <a href="#manifest-intent">Define read and reply intent filters</a>. +</p> + + +<h3 id="sending_messages">Sending Messages</h4> + +<p> + When a message arrives for a conversation, you take the following steps to dispatch it as a + notification to Auto. +</p> + +<p>First, add the message to the <code>UnreadConversation.Builder</code> for +this conversation, and update its timestamp:</p> + +<pre> +unreadConvBuilder.addMessage(<em>messageString</em>) + .setLatestTimestamp(<em>currentTimestamp</em>); +</pre> + +<p>Then create a {@link android.support.v4.app.NotificationCompat.Builder} +object that you'll use to build the actual notification. You'll need to use the +pending intents you created in the previous step.</p> + +<pre> +NotificationCompat.Builder notificationBuilder = + new NotificationCompat.Builder(getApplicationContext()) + .setSmallIcon(R.drawable.<em>notification_icon</em>) + .setLargeIcon(<em>icon_bitmap</em>) + .setContentText(<em>messageString</em>) + .setWhen(<em>currentTimestamp</em>) + .setContentTitle(<em>participant_name</em>) + .setContentIntent(msgHeardPendingIntent); + +</pre> + +<p>You'll also need to extend the {@link +android.support.v4.app.NotificationCompat.Builder} with the +<code>CarExtender</code>. This is where you actually create the +<code>UnreadConversation</code> object using the builder you just +created, and attach it to the <code>CarExtender</code>:</p> + +<pre> +notificationBuilder.extend(new CarExtender() + .setUnreadConversation(unreadConvBuilder.build()); +</pre> + +<p>Once you've done all this, you use your app's {@link +android.support.v4.app.NotificationManagerCompat} to send the notification:</p> + +<pre> +mNotificationManager = NotificationManagerCompat.from(context); +mNotificationManager.notify(<em>notificationId</em>, notificationBuilder.build()); +</pre> + +<p>In this example, <em>msgNotificationManager</em> is a +{@link android.support.v4.app.NotificationManagerCompat} you created for your app.</p> + + +<h2 id="handle_actions">Handle User Actions</h2> + +<p> + When your create and dispatch a notification for messaging, you specify intents to be triggered + when the Auto user hears the message and when the user dictates a reply. Your app indicates to + the Android framework that it handles these intends by registering them through it's manifest, as + discussed in <a href="#manifest-intent">Define read and reply intent filters</a>. +</p> + +<p> + In addition to registering these intent filters, your app must provide code to handle these + actions. Your app can do this by providing a service or {@link android.content.BroadcastReceiver} + objects that handle these intents.</p> + +<p> + For more information about intents, see <a href= + "{@docRoot}guide/components/intents-filters.html">Intents and Intent Filters</a>. +</p> + + +<h3 id="handling_msg_heard">Handling a message heard action</h3> + +<p> + When a user listens to a messaging conversation through the Auto user interface, the dashboard + device sends a read intent based on how your app defined the messaging notification. Your app + catches that intent and invokes the broadcast receiver class associated with it, or the service + method set up to handle that action. +</p> + +<p> + The following code example shows how to define a {@link android.content.BroadcastReceiver} class + to handle a received message heard intent: +</p> + +<pre> +public class MessageHeardReceiver extends BroadcastReceiver { + + @Override + public void onReceive(Context context, Intent intent) { + + // If you set up the intent as described in + // "Create conversation read and reply intents", + // you can get the conversation ID by calling: + int conversationId = intent.getIntExtra("conversation_id", -1); + + // Remove the notification to indicate it has been read + // and update the list of unread conversations in your app. + } +} +</pre> + +<p> + Once a notification is read, your app can remove it by calling + {@link android.support.v4.app.NotificationManagerCompat#cancel} with the notification ID. + Within your app, you should mark the messages provided in the notification as read. +</p> + + +<p class="note"> + <strong>Note:</strong> An alternative to this implementation is to use a service in a + {@link android.app.PendingIntent}. +</p> + + +<h3 id="handling_reply">Handling a reply action</h3> + +<p> + When a user replies to a messaging conversation through the Auto user interface, the dashboard + system sends a reply intent based on how your app defined the messaging notification. Your app + catches that intent and invokes the broadcast receiver class associated with it, or the service + method set up to handle that action. +</p> + +<p> + The following code example shows how to define a {@link android.content.BroadcastReceiver} class + to handle a received message reply intent: +</p> + +<pre> + public class MessageReplyReceiver extends BroadcastReceiver { + + + @Override + public void onReceive(Context context, Intent intent) { + // If you set up the intent as described in + // "Create conversation read and reply intents", + // you can get the conversation ID by calling: + int conversationId = intent.getIntExtra("conversation_id", -1). + + } + + /** + * Get the message text from the intent. + * Note that you should call + * RemoteInput.getResultsFromIntent() to process + * the RemoteInput. + */ + private CharSequence getMessageText(Intent intent) { + Bundle remoteInput = + RemoteInput.getResultsFromIntent(intent); + if (remoteInput != null) { + return remoteInput.getCharSequence("extra_voice_reply"); + } + return null; + } + +}</pre> diff --git a/docs/html/training/auto/start/index.jd b/docs/html/training/auto/start/index.jd new file mode 100644 index 000000000000..b955cef75103 --- /dev/null +++ b/docs/html/training/auto/start/index.jd @@ -0,0 +1,210 @@ +page.title=Getting Started with Auto +page.tags="auto", "car", "automotive" +page.article=true +page.image=auto/images/assets/icons/auto_app_in_simulator.png + +@jd:body + +<div id="tb-wrapper"> +<div id="tb"> + <h2>Dependencies and Prerequisites</h2> + <ul> + <li>Android 5.0 (API level 21) or higher</li> + </ul> + + <h2>This class teaches you how to</h2> + <ol> + <li><a href="#dev-project">Set Up an Auto Project</a></li> + <li><a href="#build-it">Build Auto Apps</a></li> + <li><a href="#test-it">Run and Test Auto Apps</a></li> + </ol> + + <h2>You should also read</h2> + <ul> + <li><a href="{@docRoot}design/auto/index.html">Designing for Auto</a></li> + <li><a href="{@docRoot}training/auto/audio/index.html">Providing Audio Playback with Auto</a></li> + <li><a href="{@docRoot}training/auto/messaging/index.html">Providing Messaging for Auto</a></li> + </ul> +</div> +</div> + +<p>Android Auto extends the Android platform into the car. When users connect +their handheld devices running Android 5.0 or higher to a compatible vehicle, +the Auto user interface provides a car-optimized Android experience on the +vehicle's screen. Users interact with compatible apps and services through +voice actions and the vehicle's input controls (like a touchscreen or dashboard +buttons).</p> + +<p>Auto currently supports two types of apps:</p> + +<ul> +<li><em>Audio apps</em> that allow users to browse and play music and spoken +audio content in the car.</li> +<li><em>Messaging apps</em> that receive incoming notifications, read messages + aloud via text-to-speech, and send replies via voice input in the car.</li> +</ul> + +<p>You can enable your existing audio and messaging apps developed for +phones and tablets to work in the car, without having to worry about +vehicle-specific hardware differences. To enable your app for Auto, your +app must target Android 5.0 (API level 21) or higher. Your app’s manifest must +also declare the car capabilities that it uses, such as audio playback or +messaging services. </p> + +<p>This lesson describes how to start building apps for Auto, including +setting up your development environment and meeting the the minimum requirements +to enable an app to communicate with Auto.</p> + +<p class="note"><strong>Important:</strong> If you are planning to develop +apps for Auto, you are encouraged to begin enabling and testing your +apps now. However, Auto-enabled apps cannot be published at this time. +Join the +<a href="http://g.co/AndroidAutoDev" class="external-link">Auto +Developers Google+ community</a> for updates on when you will be able to submit +your Auto-enabled apps.</p> + +<h2 id="dev-project">Set Up an Auto Project</h2> +<p>This section describes how to create a new app or modify an existing app to +communicate with Auto.</p> + +<h3 id="prerequisites">Prerequisites</h3> +<p>Before you begin building apps for Auto, you must:</p> + +<ul> +<li><strong><a href="{@docRoot}sdk/installing/create-project.html">Create or +update your app project</a></strong> - Android 5.0 (API level 21) provides new +APIs for implementing audio playback and messaging that is compatible with Auto. +To access the new APIs, create a project or modify an existing project to target +Android 5.0 (API level 21) or higher. This means you must set the manifest +<a href="{@docRoot}topics/manifest/uses-sdk-element.html">{@code targetSdkVersion}</a> +to 21 or higher. +</li> +<li><strong><a href="{@docRoot}tools/support-library/setup.html">Install the +support library</a></strong> - If you are building messaging apps for Auto, you +need the {@code NotificationCompat.CarExtender} class contained in the +<a href="{@docRoot}tools/support-library/features.html#v4">v4 support library</a>. +This class allows you to create notifications that are compatible with Auto +devices.</li> +</ul> + +<h3 id="auto-metadata">Declare Auto capabilities</h3> +<p>The Auto features that your app can access are controlled +by the settings in your app manifest and a separate XML configuration file. +Before adding Auto features to your app, you must first define the Auto +XML configuration file and add a manifest entry referencing your XML file.</p> + +<h4 id="auto_xml">Define the Auto XML configuration file</h4> +<p>Specify the car capabilities that your app uses in an XML file that you +place in your project’s resources directory ({@code res/xml/}). For example, to +extend an audio application for Auto, create a file called +{@code automotive_app_desc.xml} and store it under your projects’s +{@code res/xml/} folder. The {@code automotive_app_desc.xml} file contains the +following metadata:</p> +<pre> +<automotiveApp> + <uses name="media" /> +</automotiveApp> +</pre> +<p>The {@code <uses>} element declares the Auto capability your app +intends to use. Multiple {@code <uses>} tags can be added if your +application uses multiple car capabilities. The {@code name} attribute indicates +the specific capability your app uses. The values supported are:</p> +<ul> +<li>{@code media} - The app uses the Android framework APIs to play music in +a vehicle. Set this value if you are enabling an audio app for Auto.</li> +<li>{@code notification} - The app displays message notifications in the car’s +Overview screen, allows users select a message to be read aloud, and lets them +respond through voice input. Set this value if you are enabling a messaging +app for Auto. +</ul> + +<h4 id="auto_xml">Add a manifest entry</h4> +<p>In your app’s manifest ({@code AndroidManifest.xml}), provide a reference to +the Auto XML configuration file you created in the previous section. Add a +{@code "com.google.android.gms.car.application"} metadata entry under the +<a href="{@docRoot}guide/topics/manifest/application-element.html">{@code <application>}</a> +element that references your Auto XML configuration file. Omit the {@code .xml} +file extension when specifying the configuration filename.</p> +<p>The following code snippet shows how to include this reference in your +manifest.</p> +<pre> +<application> + + ... + <meta-data android:name="com.google.android.gms.car.application" + android:resource="@xml/automotive_app_desc"/> + +</application> +</pre> + +<h2 id="build-it">Add Auto Features to Your Apps</h2> +<p>After you have completed the steps described above, you're ready to add Auto +features to your apps. See these additional topics to help you build apps for +Auto:</p> + +<ul> +<li><a href="{@docRoot}training/auto/audio/index.html">Providing Audio Playback for Auto</a> +- Create apps that let users browse and play music in the car.</li> +<li><a href="{@docRoot}training/auto/messaging/index.html">Providing Messaging for Auto</a> +- Enable users to receive and reply to messages in the car.</li> +</ul> + +<p class="caution"><strong>Important:</strong> Google takes driver distraction +very seriously. There are specific design requirements your app must meet to +qualify as an Auto app on Google Play. By adhering to these +requirements, you can reduce the effort for building and testing your app. For +more information, see +<a href="{@docRoot}distribute/essentials/quality/auto.html">Auto App Quality</a>.</p> + +<h2 id="test-it">Run and Test Auto Apps</h2> + +<p>As you prepare to publish your app, make sure that your app looks correct +when projected on the Auto user interface. Use the Android Media Browser +simulator and Android Messaging simulators to view and test your audio or +messaging apps in a screen that looks similar to what is projected on Auto.</p> + +<p>To get the simulators, open the +<a href="{@docRoot}tools/help/sdk-manager.html">SDK Manager</a> and download +them from <strong>Extras > Android Auto API Simulators</strong>.</p> + +<p>Before you begin testing, compile your app in your development environment. +Install your app and the Android simulator for the features you want to test +(that is, audio or messaging) on a physical or virtual device running Android +5.0 (API level 21) or higher. To check the version of Android on the device, go +to <strong>Settings > About > Android Version</strong>.</p> + +<h3 id="testing-audio-apps">Testing audio apps</h3> +<p>To run and test audio apps:</p> + +<ol> +<li>Install the Android Media Browser simulator +({@code media-browser-simulator.apk}) on the test device. You can do this using +the <a href="{@docRoot}tools/help/adb.html#move">adb</a> command line tool.</li> +<li>Enable <a href="{@docRoot}tools/device.html#device-developer-options"> +developer options</a> on the test device.</li> +<li>Install your app on the test device.</li> +<li>Launch the Android Media Browser simulator to see how your audio app +appears in Auto. If your app does not appear, stop the simulator from +<strong>Settings > Apps</strong> then restart it.</li> +</ol> + +<h3 id="testing-messaging-apps">Testing messaging apps</h3> +<p>To run and test messaging apps:</p> + +<ol> +<li>Install the Android Messaging simulator ({@code messaging-simulator.apk}) +on the test device. You can do this using the +<a href="{@docRoot}tools/help/adb.html#move">adb</a> command line tool.</li> +<li>Enable the simulator to read notifications posted on the system: +<ol type="a"> + <li>Enable <a href="{@docRoot}tools/device.html#device-developer-options"> +developer options</a> on the test device.</li> + <li>Click <strong>Settings > Sounds & Notifications > Notification + Access</strong> and check the box labeled + <strong>Messaging Simulator</strong>.</li> +</ol> +<li>Install your app on the test device.</li> +<li>Launch the Android Messaging Simulator to see how your messaging app appears +in Auto. If your app does not appear, stop the simulator from +<strong>Settings > Apps</strong> then restart it.</li> +</ol> diff --git a/docs/html/training/location/index.jd b/docs/html/training/location/index.jd index 249c42d34c9d..f0024e22f619 100644 --- a/docs/html/training/location/index.jd +++ b/docs/html/training/location/index.jd @@ -21,7 +21,8 @@ startpage=true <h2>You should also read</h2> <ul> <li> - <a href="{@docRoot}google/play-services/setup.html">Setup Google Play Services SDK</a> + <a href="{@docRoot}google/play-services/setup.html">Set Up Google Play + Services SDK</a> </li> </ul> @@ -29,68 +30,75 @@ startpage=true </div> <p> - One of the unique features of mobile applications is location awareness. Mobile users bring - their devices with them everywhere, and adding location awareness to your app offers users a - more contextual experience. The new Location Services API available in Google Play services - facilitates adding location awareness to your app with automated location tracking, - geofencing, and activity recognition. This API adds significant advantages over the plaform's - location API. + One of the unique features of mobile applications is location awareness. + Mobile users take their devices with them everywhere, and adding location + awareness to your app offers users a more contextual experience. The location + APIs available in Google Play services facilitate adding location awareness to + your app with automated location tracking, geofencing, and activity + recognition. </p> + +<p>The + <a href="{@docRoot}reference/com/google/android/gms/location/package-summary.html">Google + Play services location APIs</a> are preferred over the Android framework + location APIs + (<a href="{@docRoot}reference/android/location/package-summary.html">android.location</a>) + as a way of adding location awareness to your app. If you are currently using + the Android framework location APIs, you are strongly encouraged to switch to + the Google Play services location APIs as soon as possible. +</p> + <p> - This class shows you how to use Location Services in your app to get the current location, - get periodic location updates, look up addresses, create and monitor geofences, and - detect user activities. The class includes sample apps and code snippets that you can use as a - starting point for adding location awareness to your own app. + This class shows you how to use the Google Play services location APIs in your + app to get the current location, get periodic location updates, look up + addresses, create and monitor geofences, and detect user activities. The class + includes sample apps and code snippets that you can use as a starting point + for adding location awareness to your app. </p> + <p class="note"> - <strong>Note:</strong> Since this class is based on the Google Play services client library, - make sure you install the latest version before using the sample apps or code snippets. To learn - how to set up the client library with the latest version, see - <a href="{@docRoot}google/play-services/setup.html">Setup</a> in the Google Play services guide. + <strong>Note:</strong> Since this class is based on the Google Play services + client library, make sure you install the latest version before using the + sample apps or code snippets. To learn how to set up the client library with + the latest version, see + <a href="{@docRoot}google/play-services/setup.html">Setup</a> in the Google + Play services guide. </p> <h2>Lessons</h2> <dl> - <dt> - <b><a href="retrieve-current.html">Retrieving the Current Location</a></b> - </dt> - <dd> - Learn how to retrieve the user's current location. - </dd> - <dt> - <b><a href="receive-location-updates.html">Receiving Location Updates</a></b> - </dt> - <dd> - Learn how to request and receive periodic location updates. - </dd> - <dt> - <b><a href="display-address.html">Displaying a Location Address</a></b> - </dt> - <dd> - Learn how to convert a location's latitude and longitude into an address (reverse - geocoding). - </dd> - <dt> - <b> - <a href="geofencing.html">Creating and Monitoring Geofences</a> - </b> - </dt> - <dd> - Learn how to define one or more geographic areas as locations of interest, called geofences, - and detect when the user is close to or inside a geofence. - </dd> - <dt> - <b><a href="activity-recognition.html">Recognizing the User's Current Activity</a></b> - </dt> - <dd> - Learn how to recognize the user's current activity, such as walking, bicycling, - or driving a car, and how to use this information to modify your app's location strategy. - </dd> - <dt> - <b><a href="location-testing.html">Testing Using Mock Locations</a></b> - </dt> - <dd> - Learn how to test a location-aware app by injecting mock locations into Location - Services. In mock mode, Location Services sends out mock locations that you inject instead - of sensor-based locations. - </dd> + <dt> + <b><a href="retrieve-current.html">Retrieving the Current Location</a></b> + </dt> <dd> + Learn how to retrieve the user's current location. + </dd> <dt> + <b><a href="receive-location-updates.html">Receiving Location + Updates</a></b> + </dt> <dd> + Learn how to request and receive periodic location updates. + </dd> <dt> + <b><a href="display-address.html">Displaying a Location Address</a></b> + </dt> <dd> + Learn how to convert a location's latitude and longitude into an address + (reverse geocoding). + </dd> <dt> + <b> + <a href="geofencing.html">Creating and Monitoring Geofences</a> + </b> + </dt> <dd> + Learn how to define one or more geographic areas as locations of interest, + called geofences, and detect when the user is close to or inside a geofence. + </dd> <dt> + <b><a href="activity-recognition.html">Recognizing the User's Current + Activity</a></b> + </dt> <dd> + Learn how to recognize the user's current activity, such as walking, + bicycling, or driving a car, and how to use this information to modify your + app's location strategy. + </dd> <dt> + <b><a href="location-testing.html">Testing Using Mock Locations</a></b> + </dt> <dd> + Learn how to test a location-aware app by injecting mock locations into + Location Services. In mock mode, Location Services sends out mock locations + that you inject instead of sensor-based locations. + </dd> </dl> diff --git a/docs/html/training/training_toc.cs b/docs/html/training/training_toc.cs index 9f0666665c07..61a5e3c4dd35 100644 --- a/docs/html/training/training_toc.cs +++ b/docs/html/training/training_toc.cs @@ -939,6 +939,36 @@ include the action bar on devices running Android 2.1 or higher." <!-- End: Building for TV --> + <!-- Start: Building for Auto --> + <li class="nav-section"> + <div class="nav-section-header"> + <a href="<?cs var:toroot ?>training/auto/index.html"> + <span class="small">Building Apps for</span><br/> + Auto + </a> + </div> + <ul> + <li> + <a href="<?cs var:toroot ?>training/auto/start/index.html" + description="How to start building or extending apps that work + with Auto devices."> + Getting Started with Auto</a> + </li> + <li> + <a href="<?cs var:toroot ?>training/auto/audio/index.html" + description="How to extend audio apps to play content on Auto devices."> + Playing Audio for Auto</a> + </li> + <li> + <a href="<?cs var:toroot ?>training/auto/messaging/index.html" + description="How to extend text messaging apps to work with Auto devices."> + Messaging for Auto</a> + </li> + </ul> + </li> + <!-- End: Building for Auto --> + + <li class="nav-section"> <div class="nav-section-header"> <a href="<?cs var:toroot ?>training/best-ux.html"> diff --git a/graphics/java/android/graphics/Canvas.java b/graphics/java/android/graphics/Canvas.java index f45c0cb1b724..499608e45100 100644 --- a/graphics/java/android/graphics/Canvas.java +++ b/graphics/java/android/graphics/Canvas.java @@ -250,6 +250,15 @@ public class Canvas { public void insertInorderBarrier() {} /** + * Set a transfer mode that overrides any transfer modes + * in paints used for drawing. Pass null to disable this + * override. Only implemented in GLES20Canvas. + * + * @hide + */ + public void setOverrideXfermode(@Nullable PorterDuff.Mode xfermode) {} + + /** * Return true if the device that the current layer draws into is opaque * (i.e. does not support per-pixel alpha). * @@ -353,25 +362,51 @@ public class Canvas { @Retention(RetentionPolicy.SOURCE) public @interface Saveflags {} - /** restore the current matrix when restore() is called */ + /** + * Restore the current matrix when restore() is called. + */ public static final int MATRIX_SAVE_FLAG = 0x01; - /** restore the current clip when restore() is called */ + + /** + * Restore the current clip when restore() is called. + */ public static final int CLIP_SAVE_FLAG = 0x02; - /** the layer needs to per-pixel alpha */ + + /** + * The layer requires a per-pixel alpha channel. + */ public static final int HAS_ALPHA_LAYER_SAVE_FLAG = 0x04; - /** the layer needs to 8-bits per color component */ + + /** + * The layer requires full 8-bit precision for each color channel. + */ public static final int FULL_COLOR_LAYER_SAVE_FLAG = 0x08; - /** clip against the layer's bounds */ + + /** + * Clip drawing to the bounds of the offscreen layer, omit at your own peril. + * <p class="note"><strong>Note:</strong> it is strongly recommended to not + * omit this flag for any call to <code>saveLayer()</code> and + * <code>saveLayerAlpha()</code> variants. Not passing this flag generally + * triggers extremely poor performance with hardware accelerated rendering. + */ public static final int CLIP_TO_LAYER_SAVE_FLAG = 0x10; - /** restore everything when restore() is called */ + + /** + * Restore everything when restore() is called (standard save flags). + * <p class="note"><strong>Note:</strong> for performance reasons, it is + * strongly recommended to pass this - the complete set of flags - to any + * call to <code>saveLayer()</code> and <code>saveLayerAlpha()</code> + * variants. + */ public static final int ALL_SAVE_FLAG = 0x1F; /** - * Saves the current matrix and clip onto a private stack. Subsequent - * calls to translate,scale,rotate,skew,concat or clipRect,clipPath - * will all operate as usual, but when the balancing call to restore() - * is made, those calls will be forgotten, and the settings that existed - * before the save() will be reinstated. + * Saves the current matrix and clip onto a private stack. + * <p> + * Subsequent calls to translate,scale,rotate,skew,concat or clipRect, + * clipPath will all operate as usual, but when the balancing call to + * restore() is made, those calls will be forgotten, and the settings that + * existed before the save() will be reinstated. * * @return The value to pass to restoreToCount() to balance this save() */ @@ -381,10 +416,15 @@ public class Canvas { /** * Based on saveFlags, can save the current matrix and clip onto a private - * stack. Subsequent calls to translate,scale,rotate,skew,concat or - * clipRect,clipPath will all operate as usual, but when the balancing - * call to restore() is made, those calls will be forgotten, and the - * settings that existed before the save() will be reinstated. + * stack. + * <p class="note"><strong>Note:</strong> if possible, use the + * parameter-less save(). It is simpler and faster than individually + * disabling the saving of matrix or clip with this method. + * <p> + * Subsequent calls to translate,scale,rotate,skew,concat or clipRect, + * clipPath will all operate as usual, but when the balancing call to + * restore() is made, those calls will be forgotten, and the settings that + * existed before the save() will be reinstated. * * @param saveFlags flag bits that specify which parts of the Canvas state * to save/restore @@ -395,19 +435,33 @@ public class Canvas { } /** - * This behaves the same as save(), but in addition it allocates an - * offscreen bitmap. All drawing calls are directed there, and only when - * the balancing call to restore() is made is that offscreen transfered to - * the canvas (or the previous layer). Subsequent calls to translate, - * scale, rotate, skew, concat or clipRect, clipPath all operate on this - * copy. When the balancing call to restore() is made, this copy is - * deleted and the previous matrix/clip state is restored. + * This behaves the same as save(), but in addition it allocates and + * redirects drawing to an offscreen bitmap. + * <p class="note"><strong>Note:</strong> this method is very expensive, + * incurring more than double rendering cost for contained content. Avoid + * using this method, especially if the bounds provided are large, or if + * the {@link #CLIP_TO_LAYER_SAVE_FLAG} is omitted from the + * {@code saveFlags} parameter. It is recommended to use a + * {@link android.view.View#LAYER_TYPE_HARDWARE hardware layer} on a View + * to apply an xfermode, color filter, or alpha, as it will perform much + * better than this method. + * <p> + * All drawing calls are directed to a newly allocated offscreen bitmap. + * Only when the balancing call to restore() is made, is that offscreen + * buffer drawn back to the current target of the Canvas (either the + * screen, it's target Bitmap, or the previous layer). + * <p> + * Attributes of the Paint - {@link Paint#getAlpha() alpha}, + * {@link Paint#getXfermode() Xfermode}, and + * {@link Paint#getColorFilter() ColorFilter} are applied when the + * offscreen bitmap is drawn back when restore() is called. * * @param bounds May be null. The maximum size the offscreen bitmap * needs to be (in local coordinates) * @param paint This is copied, and is applied to the offscreen when * restore() is called. - * @param saveFlags see _SAVE_FLAG constants + * @param saveFlags see _SAVE_FLAG constants, generally {@link #ALL_SAVE_FLAG} is recommended + * for performance reasons. * @return value to pass to restoreToCount() to balance this save() */ public int saveLayer(@Nullable RectF bounds, @Nullable Paint paint, @Saveflags int saveFlags) { @@ -442,19 +496,31 @@ public class Canvas { } /** - * This behaves the same as save(), but in addition it allocates an - * offscreen bitmap. All drawing calls are directed there, and only when - * the balancing call to restore() is made is that offscreen transfered to - * the canvas (or the previous layer). Subsequent calls to translate, - * scale, rotate, skew, concat or clipRect, clipPath all operate on this - * copy. When the balancing call to restore() is made, this copy is - * deleted and the previous matrix/clip state is restored. + * This behaves the same as save(), but in addition it allocates and + * redirects drawing to an offscreen bitmap. + * <p class="note"><strong>Note:</strong> this method is very expensive, + * incurring more than double rendering cost for contained content. Avoid + * using this method, especially if the bounds provided are large, or if + * the {@link #CLIP_TO_LAYER_SAVE_FLAG} is omitted from the + * {@code saveFlags} parameter. It is recommended to use a + * {@link android.view.View#LAYER_TYPE_HARDWARE hardware layer} on a View + * to apply an xfermode, color filter, or alpha, as it will perform much + * better than this method. + * <p> + * All drawing calls are directed to a newly allocated offscreen bitmap. + * Only when the balancing call to restore() is made, is that offscreen + * buffer drawn back to the current target of the Canvas (either the + * screen, it's target Bitmap, or the previous layer). + * <p> + * The {@code alpha} parameter is applied when the offscreen bitmap is + * drawn back when restore() is called. * * @param bounds The maximum size the offscreen bitmap needs to be * (in local coordinates) * @param alpha The alpha to apply to the offscreen when when it is drawn during restore() - * @param saveFlags see _SAVE_FLAG constants + * @param saveFlags see _SAVE_FLAG constants, generally {@link #ALL_SAVE_FLAG} is recommended + * for performance reasons. * @return value to pass to restoreToCount() to balance this call */ public int saveLayerAlpha(@Nullable RectF bounds, int alpha, @Saveflags int saveFlags) { @@ -1644,6 +1710,9 @@ public class Canvas { */ public void drawText(@NonNull CharSequence text, int start, int end, float x, float y, @NonNull Paint paint) { + if ((start | end | (end - start) | (text.length() - end)) < 0) { + throw new IndexOutOfBoundsException(); + } if (text instanceof String || text instanceof SpannedString || text instanceof SpannableString) { native_drawText(mNativeCanvasWrapper, text.toString(), start, end, x, y, diff --git a/graphics/java/android/graphics/Outline.java b/graphics/java/android/graphics/Outline.java index 4bf0b71b6fc2..f76184fe77e1 100644 --- a/graphics/java/android/graphics/Outline.java +++ b/graphics/java/android/graphics/Outline.java @@ -221,4 +221,15 @@ public final class Outline { mRect = null; mRadius = -1.0f; } + + /** + * Offsets the Outline by (dx,dy) + */ + public void offset(int dx, int dy) { + if (mRect != null) { + mRect.offset(dx, dy); + } else if (mPath != null) { + mPath.offset(dx, dy); + } + } } diff --git a/graphics/java/android/graphics/Path.java b/graphics/java/android/graphics/Path.java index c40a66da174f..0e9823d1661f 100644 --- a/graphics/java/android/graphics/Path.java +++ b/graphics/java/android/graphics/Path.java @@ -678,7 +678,7 @@ public class Path { } /** - * Offset the path by (dx,dy), returning true on success + * Offset the path by (dx,dy) * * @param dx The amount in the X direction to offset the entire path * @param dy The amount in the Y direction to offset the entire path @@ -695,7 +695,7 @@ public class Path { } /** - * Offset the path by (dx,dy), returning true on success + * Offset the path by (dx,dy) * * @param dx The amount in the X direction to offset the entire path * @param dy The amount in the Y direction to offset the entire path diff --git a/graphics/java/android/graphics/drawable/AnimatedStateListDrawable.java b/graphics/java/android/graphics/drawable/AnimatedStateListDrawable.java index 84555c6b9eca..6d2363432823 100644 --- a/graphics/java/android/graphics/drawable/AnimatedStateListDrawable.java +++ b/graphics/java/android/graphics/drawable/AnimatedStateListDrawable.java @@ -142,12 +142,18 @@ public class AnimatedStateListDrawable extends StateListDrawable { // If we're not already at the target index, either attempt to find a // valid transition to it or jump directly there. final int targetIndex = mState.indexOfKeyframe(stateSet); - final boolean changedIndex = targetIndex != getCurrentIndex() + boolean changed = targetIndex != getCurrentIndex() && (selectTransition(targetIndex) || selectDrawable(targetIndex)); - // Always call super.onStateChanged() to propagate the state change to - // the current drawable. - return super.onStateChange(stateSet) || changedIndex; + // We need to propagate the state change to the current drawable, but + // we can't call StateListDrawable.onStateChange() without changing the + // current drawable. + final Drawable current = getCurrent(); + if (current != null) { + changed |= current.setState(stateSet); + } + + return changed; } private boolean selectTransition(int toIndex) { diff --git a/graphics/java/android/graphics/drawable/AnimatedVectorDrawable.java b/graphics/java/android/graphics/drawable/AnimatedVectorDrawable.java index e65dbaf077b6..d0edebaf4067 100644 --- a/graphics/java/android/graphics/drawable/AnimatedVectorDrawable.java +++ b/graphics/java/android/graphics/drawable/AnimatedVectorDrawable.java @@ -435,13 +435,16 @@ public class AnimatedVectorDrawable extends Drawable implements Animatable { @Override public void start() { + // If any one of the animator has not ended, do nothing. + if (isStarted()) { + return; + } + // Otherwise, kick off every animator. final ArrayList<Animator> animators = mAnimatedVectorState.mAnimators; final int size = animators.size(); for (int i = 0; i < size; i++) { final Animator animator = animators.get(i); - if (!animator.isStarted()) { - animator.start(); - } + animator.start(); } invalidateSelf(); } diff --git a/graphics/java/android/graphics/drawable/AnimationDrawable.java b/graphics/java/android/graphics/drawable/AnimationDrawable.java index a8b6c9438474..2ddf9df95179 100644 --- a/graphics/java/android/graphics/drawable/AnimationDrawable.java +++ b/graphics/java/android/graphics/drawable/AnimationDrawable.java @@ -285,7 +285,6 @@ public class AnimationDrawable extends DrawableContainer implements Runnable, An private void inflateChildElements(Resources r, XmlPullParser parser, AttributeSet attrs, Theme theme) throws XmlPullParserException, IOException { - TypedArray a; int type; final int innerDepth = parser.getDepth()+1; @@ -300,7 +299,8 @@ public class AnimationDrawable extends DrawableContainer implements Runnable, An continue; } - a = obtainAttributes(r, theme, attrs, R.styleable.AnimationDrawableItem); + final TypedArray a = obtainAttributes(r, theme, attrs, + R.styleable.AnimationDrawableItem); final int duration = a.getInt(R.styleable.AnimationDrawableItem_duration, -1); if (duration < 0) { @@ -308,14 +308,11 @@ public class AnimationDrawable extends DrawableContainer implements Runnable, An + ": <item> tag requires a 'duration' attribute"); } - final int drawableRes = a.getResourceId(R.styleable.AnimationDrawableItem_drawable, 0); + Drawable dr = a.getDrawable(R.styleable.AnimationDrawableItem_drawable); a.recycle(); - Drawable dr; - if (drawableRes != 0) { - dr = r.getDrawable(drawableRes, theme); - } else { + if (dr == null) { while ((type=parser.next()) == XmlPullParser.TEXT) { // Empty } diff --git a/graphics/java/android/graphics/drawable/RotateDrawable.java b/graphics/java/android/graphics/drawable/RotateDrawable.java index 3304b335ac45..1ee44fbe1f10 100644 --- a/graphics/java/android/graphics/drawable/RotateDrawable.java +++ b/graphics/java/android/graphics/drawable/RotateDrawable.java @@ -497,6 +497,7 @@ public class RotateDrawable extends Drawable implements Drawable.Callback { state.mFromDegrees = a.getFloat(R.styleable.RotateDrawable_fromDegrees, state.mFromDegrees); state.mToDegrees = a.getFloat(R.styleable.RotateDrawable_toDegrees, state.mToDegrees); + state.mCurrentDegrees = state.mFromDegrees; final Drawable dr = a.getDrawable(R.styleable.RotateDrawable_drawable); if (dr != null) { diff --git a/graphics/java/android/graphics/drawable/ScaleDrawable.java b/graphics/java/android/graphics/drawable/ScaleDrawable.java index 35ef76f81d0b..d6d4cb8265db 100644 --- a/graphics/java/android/graphics/drawable/ScaleDrawable.java +++ b/graphics/java/android/graphics/drawable/ScaleDrawable.java @@ -173,9 +173,9 @@ public class ScaleDrawable extends Drawable implements Drawable.Callback { a, R.styleable.ScaleDrawable_scaleWidth, state.mScaleWidth); state.mScaleHeight = getPercent( a, R.styleable.ScaleDrawable_scaleHeight, state.mScaleHeight); - state.mGravity = a.getInt(R.styleable.ScaleDrawable_scaleGravity, Gravity.LEFT); + state.mGravity = a.getInt(R.styleable.ScaleDrawable_scaleGravity, state.mGravity); state.mUseIntrinsicSizeAsMin = a.getBoolean( - R.styleable.ScaleDrawable_useIntrinsicSizeAsMinimum, false); + R.styleable.ScaleDrawable_useIntrinsicSizeAsMinimum, state.mUseIntrinsicSizeAsMin); final Drawable dr = a.getDrawable(R.styleable.ScaleDrawable_drawable); if (dr != null) { @@ -347,13 +347,16 @@ public class ScaleDrawable extends Drawable implements Drawable.Callback { } final static class ScaleState extends ConstantState { + /** Constant used to disable scaling for a particular dimension. */ + private static final float DO_NOT_SCALE = -1.0f; + int[] mThemeAttrs; int mChangingConfigurations; Drawable mDrawable; - float mScaleWidth = 1.0f; - float mScaleHeight = 1.0f; + float mScaleWidth = DO_NOT_SCALE; + float mScaleHeight = DO_NOT_SCALE; int mGravity = Gravity.LEFT; boolean mUseIntrinsicSizeAsMin = false; diff --git a/include/androidfw/AttributeFinder.h b/include/androidfw/AttributeFinder.h new file mode 100644 index 000000000000..a0ffeb3ebfbe --- /dev/null +++ b/include/androidfw/AttributeFinder.h @@ -0,0 +1,201 @@ +/* + * 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. + */ + +#ifndef H_ATTRIBUTE_FINDER +#define H_ATTRIBUTE_FINDER + +#include <stdint.h> +#include <utils/KeyedVector.h> + +namespace android { + +static inline uint32_t getPackage(uint32_t attr) { + return attr >> 24; +} + +/** + * A helper class to search linearly for the requested + * attribute, maintaining it's position and optimizing for + * the case that subsequent searches will involve an attribute with + * a higher attribute ID. + * + * In the case that a subsequent attribute has a different package ID, + * its resource ID may not be larger than the preceding search, so + * back tracking is supported for this case. This + * back tracking requirement is mainly for shared library + * resources, whose package IDs get assigned at runtime + * and thus attributes from a shared library may + * be out of order. + * + * We make two assumptions about the order of attributes: + * 1) The input has the same sorting rules applied to it as + * the attribute data contained by this class. + * 2) Attributes are grouped by package ID. + * 3) Among attributes with the same package ID, the attributes are + * sorted by increasing resource ID. + * + * Ex: 02010000, 02010001, 010100f4, 010100f5, 0x7f010001, 07f010003 + * + * The total order of attributes (including package ID) can not be linear + * as shared libraries get assigned dynamic package IDs at runtime, which + * may break the sort order established at build time. + */ +template <typename Derived, typename Iterator> +class BackTrackingAttributeFinder { +public: + BackTrackingAttributeFinder(const Iterator& begin, const Iterator& end); + + Iterator find(uint32_t attr); + +private: + void jumpToClosestAttribute(uint32_t packageId); + void markCurrentPackageId(uint32_t packageId); + + Iterator mBegin; + Iterator mEnd; + Iterator mCurrent; + Iterator mLargest; + uint32_t mLastPackageId; + uint32_t mCurrentAttr; + + // Package Offsets (best-case, fast look-up). + Iterator mFrameworkStart; + Iterator mAppStart; + + // Worst case, we have shared-library resources. + KeyedVector<uint32_t, Iterator> mPackageOffsets; +}; + +template <typename Derived, typename Iterator> inline +BackTrackingAttributeFinder<Derived, Iterator>::BackTrackingAttributeFinder(const Iterator& begin, const Iterator& end) + : mBegin(begin) + , mEnd(end) + , mCurrent(begin) + , mLargest(begin) + , mLastPackageId(0) + , mCurrentAttr(0) + , mFrameworkStart(end) + , mAppStart(end) { +} + +template <typename Derived, typename Iterator> +void BackTrackingAttributeFinder<Derived, Iterator>::jumpToClosestAttribute(const uint32_t packageId) { + switch (packageId) { + case 0x01: + mCurrent = mFrameworkStart; + break; + case 0x7f: + mCurrent = mAppStart; + break; + default: { + ssize_t idx = mPackageOffsets.indexOfKey(packageId); + if (idx >= 0) { + // We have seen this package ID before, so jump to the first + // attribute with this package ID. + mCurrent = mPackageOffsets[idx]; + } else { + mCurrent = mEnd; + } + break; + } + } + + // We have never seen this package ID yet, so jump to the + // latest/largest index we have processed so far. + if (mCurrent == mEnd) { + mCurrent = mLargest; + } + + if (mCurrent != mEnd) { + mCurrentAttr = static_cast<const Derived*>(this)->getAttribute(mCurrent); + } +} + +template <typename Derived, typename Iterator> +void BackTrackingAttributeFinder<Derived, Iterator>::markCurrentPackageId(const uint32_t packageId) { + switch (packageId) { + case 0x01: + mFrameworkStart = mCurrent; + break; + case 0x7f: + mAppStart = mCurrent; + break; + default: + mPackageOffsets.add(packageId, mCurrent); + break; + } +} + +template <typename Derived, typename Iterator> +Iterator BackTrackingAttributeFinder<Derived, Iterator>::find(uint32_t attr) { + if (!(mBegin < mEnd)) { + return mEnd; + } + + if (mCurrentAttr == 0) { + // One-time initialization. + mCurrentAttr = static_cast<const Derived*>(this)->getAttribute(mBegin); + mLastPackageId = getPackage(mCurrentAttr); + markCurrentPackageId(mLastPackageId); + } + + // Looking for the needle (attribute we're looking for) + // in the haystack (the attributes we're searching through) + const uint32_t needlePackageId = getPackage(attr); + if (mLastPackageId != needlePackageId) { + jumpToClosestAttribute(needlePackageId); + mLastPackageId = needlePackageId; + } + + // Walk through the xml attributes looking for the requested attribute. + while (mCurrent != mEnd) { + const uint32_t haystackPackageId = getPackage(mCurrentAttr); + if (needlePackageId == haystackPackageId && attr < mCurrentAttr) { + // The attribute we are looking was not found. + break; + } + const uint32_t prevAttr = mCurrentAttr; + + // Move to the next attribute in the XML. + ++mCurrent; + if (mCurrent != mEnd) { + mCurrentAttr = static_cast<const Derived*>(this)->getAttribute(mCurrent); + const uint32_t newHaystackPackageId = getPackage(mCurrentAttr); + if (haystackPackageId != newHaystackPackageId) { + // We've moved to the next group of attributes + // with a new package ID, so we should record + // the offset of this new package ID. + markCurrentPackageId(newHaystackPackageId); + } + } + + if (mCurrent > mLargest) { + // We've moved past the latest attribute we've + // seen. + mLargest = mCurrent; + } + + if (attr == prevAttr) { + // We found the attribute we were looking for. + return mCurrent - 1; + } + } + return mEnd; +} + +} // namespace android + +#endif // H_ATTRIBUTE_FINDER diff --git a/libs/androidfw/ResourceTypes.cpp b/libs/androidfw/ResourceTypes.cpp index 3cf1021dfc7c..6dfb4dc659f7 100644 --- a/libs/androidfw/ResourceTypes.cpp +++ b/libs/androidfw/ResourceTypes.cpp @@ -1185,7 +1185,11 @@ uint32_t ResXMLParser::getAttributeNameResID(size_t idx) const { int32_t id = getAttributeNameID(idx); if (id >= 0 && (size_t)id < mTree.mNumResIds) { - return dtohl(mTree.mResIds[id]); + uint32_t resId = dtohl(mTree.mResIds[id]); + if (mTree.mDynamicRefTable != NULL) { + mTree.mDynamicRefTable->lookupResourceId(&resId); + } + return resId; } return 0; } @@ -5977,11 +5981,11 @@ status_t DynamicRefTable::lookupResourceId(uint32_t* resId) const { // Do a proper lookup. uint8_t translatedId = mLookupTable[packageId]; if (translatedId == 0) { - ALOGE("DynamicRefTable(0x%02x): No mapping for build-time package ID 0x%02x.", + ALOGV("DynamicRefTable(0x%02x): No mapping for build-time package ID 0x%02x.", (uint8_t)mAssignedPackageId, (uint8_t)packageId); for (size_t i = 0; i < 256; i++) { if (mLookupTable[i] != 0) { - ALOGE("e[0x%02x] -> 0x%02x", (uint8_t)i, mLookupTable[i]); + ALOGV("e[0x%02x] -> 0x%02x", (uint8_t)i, mLookupTable[i]); } } return UNKNOWN_ERROR; diff --git a/libs/androidfw/tests/Android.mk b/libs/androidfw/tests/Android.mk index 2d7906f28ba3..c1014be1a74b 100644 --- a/libs/androidfw/tests/Android.mk +++ b/libs/androidfw/tests/Android.mk @@ -20,6 +20,7 @@ # ========================================================== LOCAL_PATH:= $(call my-dir) testFiles := \ + AttributeFinder_test.cpp \ ByteBucketArray_test.cpp \ Config_test.cpp \ ConfigLocale_test.cpp \ diff --git a/libs/androidfw/tests/AttributeFinder_test.cpp b/libs/androidfw/tests/AttributeFinder_test.cpp new file mode 100644 index 000000000000..664709c4ae8c --- /dev/null +++ b/libs/androidfw/tests/AttributeFinder_test.cpp @@ -0,0 +1,111 @@ +/* + * 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. + */ + +#include <androidfw/AttributeFinder.h> + +#include <gtest/gtest.h> + +using android::BackTrackingAttributeFinder; + +class MockAttributeFinder : public BackTrackingAttributeFinder<MockAttributeFinder, int> { +public: + MockAttributeFinder(const uint32_t* attrs, int len) + : BackTrackingAttributeFinder(0, len) { + mAttrs = new uint32_t[len]; + memcpy(mAttrs, attrs, sizeof(*attrs) * len); + } + + ~MockAttributeFinder() { + delete mAttrs; + } + + inline uint32_t getAttribute(const int index) const { + return mAttrs[index]; + } + +private: + uint32_t* mAttrs; +}; + +static const uint32_t sortedAttributes[] = { + 0x01010000, 0x01010001, 0x01010002, 0x01010004, + 0x02010001, 0x02010010, 0x7f010001 +}; + +static const uint32_t packageUnsortedAttributes[] = { + 0x02010001, 0x02010010, 0x01010000, 0x01010001, + 0x01010002, 0x01010004, 0x7f010001 +}; + +TEST(AttributeFinderTest, IteratesSequentially) { + const int end = sizeof(sortedAttributes) / sizeof(*sortedAttributes); + MockAttributeFinder finder(sortedAttributes, end); + + EXPECT_EQ(0, finder.find(0x01010000)); + EXPECT_EQ(1, finder.find(0x01010001)); + EXPECT_EQ(2, finder.find(0x01010002)); + EXPECT_EQ(3, finder.find(0x01010004)); + EXPECT_EQ(4, finder.find(0x02010001)); + EXPECT_EQ(5, finder.find(0x02010010)); + EXPECT_EQ(6, finder.find(0x7f010001)); + EXPECT_EQ(end, finder.find(0x7f010002)); +} + +TEST(AttributeFinderTest, PackagesAreOutOfOrder) { + const int end = sizeof(sortedAttributes) / sizeof(*sortedAttributes); + MockAttributeFinder finder(sortedAttributes, end); + + EXPECT_EQ(6, finder.find(0x7f010001)); + EXPECT_EQ(end, finder.find(0x7f010002)); + EXPECT_EQ(4, finder.find(0x02010001)); + EXPECT_EQ(5, finder.find(0x02010010)); + EXPECT_EQ(0, finder.find(0x01010000)); + EXPECT_EQ(1, finder.find(0x01010001)); + EXPECT_EQ(2, finder.find(0x01010002)); + EXPECT_EQ(3, finder.find(0x01010004)); +} + +TEST(AttributeFinderTest, SomeAttributesAreNotFound) { + const int end = sizeof(sortedAttributes) / sizeof(*sortedAttributes); + MockAttributeFinder finder(sortedAttributes, end); + + EXPECT_EQ(0, finder.find(0x01010000)); + EXPECT_EQ(1, finder.find(0x01010001)); + EXPECT_EQ(2, finder.find(0x01010002)); + EXPECT_EQ(end, finder.find(0x01010003)); + EXPECT_EQ(3, finder.find(0x01010004)); + EXPECT_EQ(end, finder.find(0x01010005)); + EXPECT_EQ(end, finder.find(0x01010006)); + EXPECT_EQ(4, finder.find(0x02010001)); + EXPECT_EQ(end, finder.find(0x02010002)); +} + +TEST(AttributeFinderTest, FindAttributesInPackageUnsortedAttributeList) { + const int end = sizeof(packageUnsortedAttributes) / sizeof(*packageUnsortedAttributes); + MockAttributeFinder finder(packageUnsortedAttributes, end); + + EXPECT_EQ(2, finder.find(0x01010000)); + EXPECT_EQ(3, finder.find(0x01010001)); + EXPECT_EQ(4, finder.find(0x01010002)); + EXPECT_EQ(end, finder.find(0x01010003)); + EXPECT_EQ(5, finder.find(0x01010004)); + EXPECT_EQ(end, finder.find(0x01010005)); + EXPECT_EQ(end, finder.find(0x01010006)); + EXPECT_EQ(0, finder.find(0x02010001)); + EXPECT_EQ(end, finder.find(0x02010002)); + EXPECT_EQ(1, finder.find(0x02010010)); + EXPECT_EQ(6, finder.find(0x7f010001)); +} diff --git a/libs/hwui/DisplayListRenderer.cpp b/libs/hwui/DisplayListRenderer.cpp index c2cb76ed8f12..3ec5e40f0f88 100644 --- a/libs/hwui/DisplayListRenderer.cpp +++ b/libs/hwui/DisplayListRenderer.cpp @@ -39,6 +39,7 @@ DisplayListRenderer::DisplayListRenderer() , mTranslateY(0.0f) , mDeferredBarrierType(kBarrier_None) , mHighContrastText(false) + , mOverrideXfermode(-1) , mRestoreSaveCount(-1) { } diff --git a/libs/hwui/DisplayListRenderer.h b/libs/hwui/DisplayListRenderer.h index 2cc2be36c74d..f93a798c417c 100644 --- a/libs/hwui/DisplayListRenderer.h +++ b/libs/hwui/DisplayListRenderer.h @@ -20,6 +20,7 @@ #include <SkMatrix.h> #include <SkPaint.h> #include <SkPath.h> +#include <SkPorterDuff.h> #include <cutils/compiler.h> #include "DisplayListLogBuffer.h" @@ -161,6 +162,15 @@ public: void setHighContrastText(bool highContrastText) { mHighContrastText = highContrastText; } + + void setOverrideXfermode(int xfermode) { + if (xfermode != -1) { + SkPorterDuff::Mode porterDuffMode = static_cast<SkPorterDuff::Mode>(xfermode); + xfermode = SkPorterDuff::ToXfermodeMode(porterDuffMode); + } + mOverrideXfermode = xfermode; + }; + private: enum DeferredBarrierType { kBarrier_None, @@ -220,18 +230,26 @@ private: inline const SkPaint* refPaint(const SkPaint* paint) { if (!paint) return NULL; - const SkPaint* paintCopy = mPaintMap.valueFor(paint); - if (paintCopy == NULL - || paintCopy->getGenerationID() != paint->getGenerationID() - // We can't compare shader pointers because that will always - // change as we do partial copying via wrapping. However, if the - // shader changes the paint generationID will have changed and - // so we don't hit this comparison anyway - || !(paint->getShader() && paintCopy->getShader() - && paint->getShader()->getGenerationID() == paintCopy->getShader()->getGenerationID())) { - paintCopy = copyPaint(paint); - // replaceValueFor() performs an add if the entry doesn't exist - mPaintMap.replaceValueFor(paint, paintCopy); + const SkPaint* paintCopy; + + if (mOverrideXfermode != -1) { + SkPaint* overriddenPaint = copyPaint(paint); + overriddenPaint->setXfermodeMode(static_cast<SkXfermode::Mode>(mOverrideXfermode)); + paintCopy = overriddenPaint; + } else { + paintCopy = mPaintMap.valueFor(paint); + if (paintCopy == NULL + || paintCopy->getGenerationID() != paint->getGenerationID() + // We can't compare shader pointers because that will always + // change as we do partial copying via wrapping. However, if the + // shader changes the paint generationID will have changed and + // so we don't hit this comparison anyway + || !(paint->getShader() && paintCopy->getShader() + && paint->getShader()->getGenerationID() == paintCopy->getShader()->getGenerationID())) { + paintCopy = copyPaint(paint); + // replaceValueFor() performs an add if the entry doesn't exist + mPaintMap.replaceValueFor(paint, paintCopy); + } } return paintCopy; @@ -304,6 +322,9 @@ private: DeferredBarrierType mDeferredBarrierType; bool mHighContrastText; + // -1 if unset, or SkXfermode::Mode value if set + int mOverrideXfermode; + int mRestoreSaveCount; friend class RenderNode; diff --git a/libs/hwui/SpotShadow.cpp b/libs/hwui/SpotShadow.cpp index e8f1b9aaa03a..b2dd8991ed23 100644 --- a/libs/hwui/SpotShadow.cpp +++ b/libs/hwui/SpotShadow.cpp @@ -677,11 +677,13 @@ inline int getClosestUmbraIndex(const Vector2& pivot, const Vector2* polygon, in return resultIndex; } +// Allow some epsilon here since the later ray intersection did allow for some small +// floating point error, when the intersection point is slightly outside the segment. inline bool sameDirections(bool isPositiveCross, float a, float b) { if (isPositiveCross) { - return a >= 0 && b >= 0; + return a >= -EPSILON && b >= -EPSILON; } else { - return a <= 0 && b <= 0; + return a <= EPSILON && b <= EPSILON; } } @@ -721,22 +723,23 @@ inline void genNewPenumbraAndPairWithUmbra(const Vector2* penumbra, int penumbra // For current penumbra vertex, starting from previousClosestUmbraIndex, // then check the next one until the distance increase. // The last one before the increase is the umbra vertex we need to pair with. - int currentUmbraIndex = previousClosestUmbraIndex; - float currentLengthSquared = (currentPenumbraVertex - umbra[currentUmbraIndex]).lengthSquared(); - int currentClosestUmbraIndex = -1; + float currentLengthSquared = + (currentPenumbraVertex - umbra[previousClosestUmbraIndex]).lengthSquared(); + int currentClosestUmbraIndex = previousClosestUmbraIndex; int indexDelta = 0; for (int j = 1; j < umbraLength; j++) { int newUmbraIndex = (previousClosestUmbraIndex + j) % umbraLength; float newLengthSquared = (currentPenumbraVertex - umbra[newUmbraIndex]).lengthSquared(); if (newLengthSquared > currentLengthSquared) { - currentClosestUmbraIndex = (previousClosestUmbraIndex + j - 1) % umbraLength; + // currentClosestUmbraIndex is the umbra vertex's index which has + // currently found smallest distance, so we can simply break here. break; } else { currentLengthSquared = newLengthSquared; indexDelta++; + currentClosestUmbraIndex = newUmbraIndex; } } - LOG_ALWAYS_FATAL_IF(currentClosestUmbraIndex == -1, "Can't find a closet umbra vertext at all"); if (indexDelta > 1) { // For those umbra don't have penumbra, generate new penumbra vertices by interpolation. @@ -810,6 +813,9 @@ inline bool genPolyToCentroid(const Vector2* poly2d, int polyLength, const Vector2& centroid, Vector2* polyToCentroid) { for (int j = 0; j < polyLength; j++) { polyToCentroid[j] = poly2d[j] - centroid; + // Normalize these vectors such that we can use epsilon comparison after + // computing their cross products with another normalized vector. + polyToCentroid[j].normalize(); } float refCrossProduct = 0; for (int j = 0; j < polyLength; j++) { diff --git a/media/java/android/media/AudioManager.java b/media/java/android/media/AudioManager.java index 8fc0b8e4a86d..645681a38de4 100644 --- a/media/java/android/media/AudioManager.java +++ b/media/java/android/media/AudioManager.java @@ -2201,6 +2201,8 @@ public class AudioManager { listener = findFocusListener((String)msg.obj); } if (listener != null) { + Log.d(TAG, "AudioManager dispatching onAudioFocusChange(" + + msg.what + ") for " + msg.obj); listener.onAudioFocusChange(msg.what); } } @@ -2270,6 +2272,14 @@ public class AudioManager { * A successful focus change request. */ public static final int AUDIOFOCUS_REQUEST_GRANTED = 1; + /** + * @hide + * A focus change request whose granting is delayed: the request was successful, but the + * requester will only be granted audio focus once the condition that prevented immediate + * granting has ended. + * See {@link #requestAudioFocus(OnAudioFocusChangeListener, AudioAttributes, int, int)} + */ + public static final int AUDIOFOCUS_REQUEST_DELAYED = 2; /** @@ -2291,18 +2301,87 @@ public class AudioManager { */ public int requestAudioFocus(OnAudioFocusChangeListener l, int streamType, int durationHint) { int status = AUDIOFOCUS_REQUEST_FAILED; + + try { + // status is guaranteed to be either AUDIOFOCUS_REQUEST_FAILED or + // AUDIOFOCUS_REQUEST_GRANTED as focus is requested without the + // AUDIOFOCUS_FLAG_DELAY_OK flag + status = requestAudioFocus(l, + new AudioAttributes.Builder() + .setInternalLegacyStreamType(streamType).build(), + durationHint, + 0 /* flags, legacy behavior */); + } catch (IllegalArgumentException e) { + Log.e(TAG, "Audio focus request denied due to ", e); + } + + return status; + } + + // when adding new flags, add them to AUDIOFOCUS_FLAGS_ALL + /** @hide */ + public static final int AUDIOFOCUS_FLAG_DELAY_OK = 0x1 << 0; + /** @hide */ + public static final int AUDIOFOCUS_FLAGS_ALL = AUDIOFOCUS_FLAG_DELAY_OK; + + /** + * @hide + * @param l the listener to be notified of audio focus changes. It is not allowed to be null + * when the request is flagged with {@link #AUDIOFOCUS_FLAG_DELAY_OK}. + * @param requestAttributes non null {@link AudioAttributes} describing the main reason for + * requesting audio focus. + * @param durationHint use {@link #AUDIOFOCUS_GAIN_TRANSIENT} to indicate this focus request + * is temporary, and focus will be abandonned shortly. Examples of transient requests are + * for the playback of driving directions, or notifications sounds. + * Use {@link #AUDIOFOCUS_GAIN_TRANSIENT_MAY_DUCK} to indicate also that it's ok for + * the previous focus owner to keep playing if it ducks its audio output. + * Alternatively use {@link #AUDIOFOCUS_GAIN_TRANSIENT_EXCLUSIVE} for a temporary request + * that benefits from the system not playing disruptive sounds like notifications, for + * usecases such as voice memo recording, or speech recognition. + * Use {@link #AUDIOFOCUS_GAIN} for a focus request of unknown duration such + * as the playback of a song or a video. + * @param flags use 0 when not using any flags for the request, which behaves like + * {@link #requestAudioFocus(OnAudioFocusChangeListener, int, int)}, where either audio + * focus is granted immediately, or the grant request fails because the system is in a + * state where focus cannot change (e.g. a phone call). + * Use {link #AUDIOFOCUS_FLAG_DELAY_OK} if it is ok for the requester to not be granted + * audio focus immediately (as indicated by {@link #AUDIOFOCUS_REQUEST_DELAYED}) when + * the system is in a state where focus cannot change, but be granted focus later when + * this condition ends. + * @return {@link #AUDIOFOCUS_REQUEST_FAILED}, {@link #AUDIOFOCUS_REQUEST_GRANTED} + * or {@link #AUDIOFOCUS_REQUEST_DELAYED}. + * The return value is never {@link #AUDIOFOCUS_REQUEST_DELAYED} when focus is requested + * without the {@link #AUDIOFOCUS_FLAG_DELAY_OK} flag. + * @throws IllegalArgumentException + */ + public int requestAudioFocus(OnAudioFocusChangeListener l, + AudioAttributes requestAttributes, + int durationHint, + int flags) throws IllegalArgumentException { + // parameter checking + if (requestAttributes == null) { + throw new IllegalArgumentException("Illegal null AudioAttributes argument"); + } if ((durationHint < AUDIOFOCUS_GAIN) || (durationHint > AUDIOFOCUS_GAIN_TRANSIENT_EXCLUSIVE)) { - Log.e(TAG, "Invalid duration hint, audio focus request denied"); - return status; + throw new IllegalArgumentException("Invalid duration hint"); + } + if (flags != (flags & AUDIOFOCUS_FLAGS_ALL)) { + throw new IllegalArgumentException("Illegal flags 0x" + + Integer.toHexString(flags).toUpperCase()); } + if (((flags & AUDIOFOCUS_FLAG_DELAY_OK) == AUDIOFOCUS_FLAG_DELAY_OK) && (l == null)) { + throw new IllegalArgumentException( + "Illegal null focus listener when flagged as accepting delayed focus grant"); + } + + int status = AUDIOFOCUS_REQUEST_FAILED; registerAudioFocusListener(l); - //TODO protect request by permission check? IAudioService service = getService(); try { - status = service.requestAudioFocus(streamType, durationHint, mICallBack, + status = service.requestAudioFocus(requestAttributes, durationHint, mICallBack, mAudioFocusDispatcher, getIdForAudioFocusListener(l), - mContext.getOpPackageName() /* package name */); + mContext.getOpPackageName() /* package name */, flags); } catch (RemoteException e) { Log.e(TAG, "Can't call requestAudioFocus() on AudioService due to "+e); } @@ -2322,9 +2401,11 @@ public class AudioManager { public void requestAudioFocusForCall(int streamType, int durationHint) { IAudioService service = getService(); try { - service.requestAudioFocus(streamType, durationHint, mICallBack, null, + service.requestAudioFocus(new AudioAttributes.Builder() + .setInternalLegacyStreamType(streamType).build(), + durationHint, mICallBack, null, MediaFocusControl.IN_VOICE_COMM_FOCUS_ID, - mContext.getOpPackageName()); + mContext.getOpPackageName(), 0 /* flags, legacy behavior*/ ); } catch (RemoteException e) { Log.e(TAG, "Can't call requestAudioFocusForCall() on AudioService due to "+e); } diff --git a/media/java/android/media/AudioService.java b/media/java/android/media/AudioService.java index 29d49307f8a7..a80b356455b1 100644 --- a/media/java/android/media/AudioService.java +++ b/media/java/android/media/AudioService.java @@ -5011,10 +5011,10 @@ public class AudioService extends IAudioService.Stub { //========================================================================================== // Audio Focus //========================================================================================== - public int requestAudioFocus(int mainStreamType, int durationHint, IBinder cb, - IAudioFocusDispatcher fd, String clientId, String callingPackageName) { - return mMediaFocusControl.requestAudioFocus(mainStreamType, durationHint, cb, fd, - clientId, callingPackageName); + public int requestAudioFocus(AudioAttributes aa, int durationHint, IBinder cb, + IAudioFocusDispatcher fd, String clientId, String callingPackageName, int flags) { + return mMediaFocusControl.requestAudioFocus(aa, durationHint, cb, fd, + clientId, callingPackageName, flags); } public int abandonAudioFocus(IAudioFocusDispatcher fd, String clientId) { diff --git a/media/java/android/media/FocusRequester.java b/media/java/android/media/FocusRequester.java index 9a39994bae70..682d54c82deb 100644 --- a/media/java/android/media/FocusRequester.java +++ b/media/java/android/media/FocusRequester.java @@ -45,19 +45,24 @@ class FocusRequester { */ private final int mFocusGainRequest; /** + * the flags associated with the gain request that qualify the type of grant (e.g. accepting + * delay vs grant must be immediate) + */ + private final int mGrantFlags; + /** * the audio focus loss received my mFocusDispatcher, is AudioManager.AUDIOFOCUS_NONE if * it never lost focus. */ private int mFocusLossReceived; /** - * the stream type associated with the focus request + * the audio attributes associated with the focus request */ - private final int mStreamType; + private final AudioAttributes mAttributes; - FocusRequester(int streamType, int focusRequest, + FocusRequester(AudioAttributes aa, int focusRequest, int grantFlags, IAudioFocusDispatcher afl, IBinder source, String id, AudioFocusDeathHandler hdlr, String pn, int uid) { - mStreamType = streamType; + mAttributes = aa; mFocusDispatcher = afl; mSourceRef = source; mClientId = id; @@ -65,6 +70,7 @@ class FocusRequester { mPackageName = pn; mCallingUid = uid; mFocusGainRequest = focusRequest; + mGrantFlags = grantFlags; mFocusLossReceived = AudioManager.AUDIOFOCUS_NONE; } @@ -98,8 +104,12 @@ class FocusRequester { return mFocusGainRequest; } - int getStreamType() { - return mStreamType; + int getGrantFlags() { + return mGrantFlags; + } + + AudioAttributes getAudioAttributes() { + return mAttributes; } @@ -139,9 +149,10 @@ class FocusRequester { + " -- pack: " + mPackageName + " -- client: " + mClientId + " -- gain: " + focusGainToString() + + " -- grant: " + mGrantFlags + " -- loss: " + focusLossToString() + " -- uid: " + mCallingUid - + " -- stream: " + mStreamType); + + " -- attr: " + mAttributes); } diff --git a/media/java/android/media/IAudioService.aidl b/media/java/android/media/IAudioService.aidl index 317cc212c463..47a52919514b 100644 --- a/media/java/android/media/IAudioService.aidl +++ b/media/java/android/media/IAudioService.aidl @@ -19,6 +19,7 @@ package android.media; import android.app.PendingIntent; import android.bluetooth.BluetoothDevice; import android.content.ComponentName; +import android.media.AudioAttributes; import android.media.AudioRoutesInfo; import android.media.IAudioFocusDispatcher; import android.media.IAudioRoutesObserver; @@ -116,8 +117,8 @@ interface IAudioService { boolean isBluetoothA2dpOn(); - int requestAudioFocus(int mainStreamType, int durationHint, IBinder cb, - IAudioFocusDispatcher fd, String clientId, String callingPackageName); + int requestAudioFocus(in AudioAttributes aa, int durationHint, IBinder cb, + IAudioFocusDispatcher fd, String clientId, String callingPackageName, int flags); int abandonAudioFocus(IAudioFocusDispatcher fd, String clientId); diff --git a/media/java/android/media/MediaFocusControl.java b/media/java/android/media/MediaFocusControl.java index c67e3979ec6e..c495106ddd1b 100644 --- a/media/java/android/media/MediaFocusControl.java +++ b/media/java/android/media/MediaFocusControl.java @@ -538,16 +538,54 @@ public class MediaFocusControl implements OnFinished { /** * Helper function: * Returns true if the system is in a state where the focus can be reevaluated, false otherwise. + * The implementation guarantees that a state where focus cannot be immediately reassigned + * implies that an "exclusive" focus owner is at the top of the focus stack. + * Modifications to the implementation that break this assumption will cause focus requests to + * misbehave when honoring the AudioManager.AUDIOFOCUS_FLAG_DELAY_OK flag. */ private boolean canReassignAudioFocus() { // focus requests are rejected during a phone call or when the phone is ringing // this is equivalent to IN_VOICE_COMM_FOCUS_ID having the focus - if (!mFocusStack.isEmpty() && mFocusStack.peek().hasSameClient(IN_VOICE_COMM_FOCUS_ID)) { + if (!mFocusStack.isEmpty() && isExclusiveFocusOwner(mFocusStack.peek())) { return false; } return true; } + private boolean isExclusiveFocusOwner(FocusRequester fr) { + return fr.hasSameClient(IN_VOICE_COMM_FOCUS_ID); + } + + /** + * Helper function + * Pre-conditions: focus stack is not empty, there is one or more exclusive focus owner + * at the top of the focus stack + * Push the focus requester onto the audio focus stack at the first position immediately + * following the exclusive focus owners. + * @return {@link AudioManager#AUDIOFOCUS_REQUEST_GRANTED} or + * {@link AudioManager#AUDIOFOCUS_REQUEST_DELAYED} + */ + private int pushBelowExclusiveFocusOwners(FocusRequester nfr) { + int lastExclusiveFocusOwnerIndex = mFocusStack.size(); + for (int index = mFocusStack.size()-1; index >= 0; index--) { + if (isExclusiveFocusOwner(mFocusStack.elementAt(index))) { + lastExclusiveFocusOwnerIndex = index; + } + } + if (lastExclusiveFocusOwnerIndex == mFocusStack.size()) { + // this should not happen, but handle it and log an error + Log.e(TAG, "No exclusive focus owner found in propagateFocusLossFromGain_syncAf()", + new Exception()); + // no exclusive owner, push at top of stack, focus is granted, propagate change + propagateFocusLossFromGain_syncAf(nfr.getGainRequest()); + mFocusStack.push(nfr); + return AudioManager.AUDIOFOCUS_REQUEST_GRANTED; + } else { + mFocusStack.insertElementAt(nfr, lastExclusiveFocusOwnerIndex); + return AudioManager.AUDIOFOCUS_REQUEST_DELAYED; + } + } + /** * Inner class to monitor audio focus client deaths, and remove them from the audio focus * stack if necessary. @@ -581,10 +619,11 @@ public class MediaFocusControl implements OnFinished { } } - /** @see AudioManager#requestAudioFocus(AudioManager.OnAudioFocusChangeListener, int, int) */ - protected int requestAudioFocus(int mainStreamType, int focusChangeHint, IBinder cb, - IAudioFocusDispatcher fd, String clientId, String callingPackageName) { - Log.i(TAG, " AudioFocus requestAudioFocus() from " + clientId); + /** @see AudioManager#requestAudioFocus(AudioManager.OnAudioFocusChangeListener, int, int, int) */ + protected int requestAudioFocus(AudioAttributes aa, int focusChangeHint, IBinder cb, + IAudioFocusDispatcher fd, String clientId, String callingPackageName, int flags) { + Log.i(TAG, " AudioFocus requestAudioFocus() from " + clientId + " req=" + focusChangeHint + + "flags=0x" + Integer.toHexString(flags)); // we need a valid binder callback for clients if (!cb.pingBinder()) { Log.e(TAG, " AudioFocus DOA client for requestAudioFocus(), aborting."); @@ -597,8 +636,16 @@ public class MediaFocusControl implements OnFinished { } synchronized(mAudioFocusLock) { + boolean focusGrantDelayed = false; if (!canReassignAudioFocus()) { - return AudioManager.AUDIOFOCUS_REQUEST_FAILED; + if ((flags & AudioManager.AUDIOFOCUS_FLAG_DELAY_OK) == 0) { + return AudioManager.AUDIOFOCUS_REQUEST_FAILED; + } else { + // request has AUDIOFOCUS_FLAG_DELAY_OK: focus can't be + // granted right now, so the requester will be inserted in the focus stack + // to receive focus later + focusGrantDelayed = true; + } } // handle the potential premature death of the new holder of the focus @@ -616,7 +663,8 @@ public class MediaFocusControl implements OnFinished { if (!mFocusStack.empty() && mFocusStack.peek().hasSameClient(clientId)) { // if focus is already owned by this client and the reason for acquiring the focus // hasn't changed, don't do anything - if (mFocusStack.peek().getGainRequest() == focusChangeHint) { + final FocusRequester fr = mFocusStack.peek(); + if (fr.getGainRequest() == focusChangeHint && fr.getGrantFlags() == flags) { // unlink death handler so it can be gc'ed. // linkToDeath() creates a JNI global reference preventing collection. cb.unlinkToDeath(afdh, 0); @@ -624,21 +672,31 @@ public class MediaFocusControl implements OnFinished { } // the reason for the audio focus request has changed: remove the current top of // stack and respond as if we had a new focus owner - FocusRequester fr = mFocusStack.pop(); - fr.release(); + if (!focusGrantDelayed) { + mFocusStack.pop(); + // the entry that was "popped" is the same that was "peeked" above + fr.release(); + } } // focus requester might already be somewhere below in the stack, remove it removeFocusStackEntry(clientId, false /* signal */); - // propagate the focus change through the stack - if (!mFocusStack.empty()) { - propagateFocusLossFromGain_syncAf(focusChangeHint); - } + final FocusRequester nfr = new FocusRequester(aa, focusChangeHint, flags, fd, cb, + clientId, afdh, callingPackageName, Binder.getCallingUid()); + if (focusGrantDelayed) { + // focusGrantDelayed being true implies we can't reassign focus right now + // which implies the focus stack is not empty. + return pushBelowExclusiveFocusOwners(nfr); + } else { + // propagate the focus change through the stack + if (!mFocusStack.empty()) { + propagateFocusLossFromGain_syncAf(focusChangeHint); + } - // push focus requester at the top of the audio focus stack - mFocusStack.push(new FocusRequester(mainStreamType, focusChangeHint, fd, cb, - clientId, afdh, callingPackageName, Binder.getCallingUid())); + // push focus requester at the top of the audio focus stack + mFocusStack.push(nfr); + } }//synchronized(mAudioFocusLock) diff --git a/media/java/android/media/MediaPlayer.java b/media/java/android/media/MediaPlayer.java index afa0b6e8ce21..91b1018d9ce2 100644 --- a/media/java/android/media/MediaPlayer.java +++ b/media/java/android/media/MediaPlayer.java @@ -37,6 +37,7 @@ import android.os.Process; import android.os.PowerManager; import android.os.RemoteException; import android.os.ServiceManager; +import android.provider.Settings; import android.system.ErrnoException; import android.system.OsConstants; import android.util.Log; @@ -968,11 +969,16 @@ public class MediaPlayer implements SubtitleController.Listener * @throws IllegalStateException if it is called in an invalid state */ public void setDataSource(Context context, Uri uri, Map<String, String> headers) - throws IOException, IllegalArgumentException, SecurityException, IllegalStateException { - String scheme = uri.getScheme(); - if(scheme == null || scheme.equals("file")) { + throws IOException, IllegalArgumentException, SecurityException, IllegalStateException { + final String scheme = uri.getScheme(); + if (ContentResolver.SCHEME_FILE.equals(scheme)) { setDataSource(uri.getPath()); return; + } else if (ContentResolver.SCHEME_CONTENT.equals(scheme) + && Settings.AUTHORITY.equals(uri.getAuthority())) { + // Redirect ringtones to go directly to underlying provider + uri = RingtoneManager.getActualDefaultRingtoneUri(context, + RingtoneManager.getDefaultType(uri)); } AssetFileDescriptor fd = null; diff --git a/media/jni/android_mtp_MtpDatabase.cpp b/media/jni/android_mtp_MtpDatabase.cpp index 62b4a3693a37..b8e850a32bbb 100644 --- a/media/jni/android_mtp_MtpDatabase.cpp +++ b/media/jni/android_mtp_MtpDatabase.cpp @@ -469,6 +469,63 @@ out: return result; } +static bool readLongValue(int type, MtpDataPacket& packet, jlong& longValue) { + switch (type) { + case MTP_TYPE_INT8: { + int8_t temp; + if (!packet.getInt8(temp)) return false; + longValue = temp; + break; + } + case MTP_TYPE_UINT8: { + uint8_t temp; + if (!packet.getUInt8(temp)) return false; + longValue = temp; + break; + } + case MTP_TYPE_INT16: { + int16_t temp; + if (!packet.getInt16(temp)) return false; + longValue = temp; + break; + } + case MTP_TYPE_UINT16: { + uint16_t temp; + if (!packet.getUInt16(temp)) return false; + longValue = temp; + break; + } + case MTP_TYPE_INT32: { + int32_t temp; + if (!packet.getInt32(temp)) return false; + longValue = temp; + break; + } + case MTP_TYPE_UINT32: { + uint32_t temp; + if (!packet.getUInt32(temp)) return false; + longValue = temp; + break; + } + case MTP_TYPE_INT64: { + int64_t temp; + if (!packet.getInt64(temp)) return false; + longValue = temp; + break; + } + case MTP_TYPE_UINT64: { + uint64_t temp; + if (!packet.getUInt64(temp)) return false; + longValue = temp; + break; + } + default: + ALOGE("unsupported type in readLongValue"); + return false; + } + return true; +} + MtpResponseCode MyMtpDatabase::setObjectPropertyValue(MtpObjectHandle handle, MtpObjectProperty property, MtpDataPacket& packet) { @@ -480,49 +537,22 @@ MtpResponseCode MyMtpDatabase::setObjectPropertyValue(MtpObjectHandle handle, JNIEnv* env = AndroidRuntime::getJNIEnv(); jlong longValue = 0; jstring stringValue = NULL; + MtpResponseCode result = MTP_RESPONSE_INVALID_OBJECT_PROP_FORMAT; - switch (type) { - case MTP_TYPE_INT8: - longValue = packet.getInt8(); - break; - case MTP_TYPE_UINT8: - longValue = packet.getUInt8(); - break; - case MTP_TYPE_INT16: - longValue = packet.getInt16(); - break; - case MTP_TYPE_UINT16: - longValue = packet.getUInt16(); - break; - case MTP_TYPE_INT32: - longValue = packet.getInt32(); - break; - case MTP_TYPE_UINT32: - longValue = packet.getUInt32(); - break; - case MTP_TYPE_INT64: - longValue = packet.getInt64(); - break; - case MTP_TYPE_UINT64: - longValue = packet.getUInt64(); - break; - case MTP_TYPE_STR: - { - MtpStringBuffer buffer; - packet.getString(buffer); - stringValue = env->NewStringUTF((const char *)buffer); - break; - } - default: - ALOGE("unsupported type in setObjectPropertyValue\n"); - return MTP_RESPONSE_INVALID_OBJECT_PROP_FORMAT; + if (type == MTP_TYPE_STR) { + MtpStringBuffer buffer; + if (!packet.getString(buffer)) goto fail; + stringValue = env->NewStringUTF((const char *)buffer); + } else { + if (!readLongValue(type, packet, longValue)) goto fail; } - jint result = env->CallIntMethod(mDatabase, method_setObjectProperty, + result = env->CallIntMethod(mDatabase, method_setObjectProperty, (jint)handle, (jint)property, longValue, stringValue); if (stringValue) env->DeleteLocalRef(stringValue); +fail: checkAndClearExceptionFromCallback(env, __FUNCTION__); return result; } @@ -610,49 +640,22 @@ MtpResponseCode MyMtpDatabase::setDevicePropertyValue(MtpDeviceProperty property JNIEnv* env = AndroidRuntime::getJNIEnv(); jlong longValue = 0; jstring stringValue = NULL; + MtpResponseCode result = MTP_RESPONSE_INVALID_DEVICE_PROP_FORMAT; - switch (type) { - case MTP_TYPE_INT8: - longValue = packet.getInt8(); - break; - case MTP_TYPE_UINT8: - longValue = packet.getUInt8(); - break; - case MTP_TYPE_INT16: - longValue = packet.getInt16(); - break; - case MTP_TYPE_UINT16: - longValue = packet.getUInt16(); - break; - case MTP_TYPE_INT32: - longValue = packet.getInt32(); - break; - case MTP_TYPE_UINT32: - longValue = packet.getUInt32(); - break; - case MTP_TYPE_INT64: - longValue = packet.getInt64(); - break; - case MTP_TYPE_UINT64: - longValue = packet.getUInt64(); - break; - case MTP_TYPE_STR: - { - MtpStringBuffer buffer; - packet.getString(buffer); - stringValue = env->NewStringUTF((const char *)buffer); - break; - } - default: - ALOGE("unsupported type in setDevicePropertyValue\n"); - return MTP_RESPONSE_INVALID_OBJECT_PROP_FORMAT; + if (type == MTP_TYPE_STR) { + MtpStringBuffer buffer; + if (!packet.getString(buffer)) goto fail; + stringValue = env->NewStringUTF((const char *)buffer); + } else { + if (!readLongValue(type, packet, longValue)) goto fail; } - jint result = env->CallIntMethod(mDatabase, method_setDeviceProperty, + result = env->CallIntMethod(mDatabase, method_setDeviceProperty, (jint)property, longValue, stringValue); if (stringValue) env->DeleteLocalRef(stringValue); +fail: checkAndClearExceptionFromCallback(env, __FUNCTION__); return result; } diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java index 34e57bcae4a6..6828301cf2d9 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java @@ -37,13 +37,11 @@ import android.content.Intent; import android.content.IntentFilter; import android.content.pm.PackageManager; import android.content.pm.UserInfo; -import android.content.res.AssetFileDescriptor; import android.database.AbstractCursor; import android.database.Cursor; import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteException; import android.database.sqlite.SQLiteQueryBuilder; -import android.media.RingtoneManager; import android.net.Uri; import android.os.Binder; import android.os.Bundle; @@ -54,7 +52,6 @@ import android.os.Process; import android.os.SystemProperties; import android.os.UserHandle; import android.os.UserManager; -import android.provider.MediaStore; import android.provider.Settings; import android.provider.Settings.Secure; import android.text.TextUtils; @@ -1228,77 +1225,8 @@ public class SettingsProvider extends ContentProvider { @Override public ParcelFileDescriptor openFile(Uri uri, String mode) throws FileNotFoundException { - - /* - * When a client attempts to openFile the default ringtone or - * notification setting Uri, we will proxy the call to the current - * default ringtone's Uri (if it is in the media provider). - */ - int ringtoneType = RingtoneManager.getDefaultType(uri); - // Above call returns -1 if the Uri doesn't match a default type - if (ringtoneType != -1) { - Context context = getContext(); - - // Get the current value for the default sound - Uri soundUri = RingtoneManager.getActualDefaultRingtoneUri(context, ringtoneType); - - if (soundUri != null) { - // Proxy the openFile call to media provider - String authority = soundUri.getAuthority(); - if (authority.equals(MediaStore.AUTHORITY)) { - return context.getContentResolver().openFileDescriptor(soundUri, mode); - } - } - } - - return super.openFile(uri, mode); - } - - @Override - public AssetFileDescriptor openAssetFile(Uri uri, String mode) throws FileNotFoundException { - - /* - * When a client attempts to openFile the default ringtone or - * notification setting Uri, we will proxy the call to the current - * default ringtone's Uri (if it is in the media provider). - */ - int ringtoneType = RingtoneManager.getDefaultType(uri); - // Above call returns -1 if the Uri doesn't match a default type - if (ringtoneType != -1) { - Context context = getContext(); - - // Get the current value for the default sound - Uri soundUri = RingtoneManager.getActualDefaultRingtoneUri(context, ringtoneType); - - if (soundUri != null) { - // Proxy the openFile call to media provider - String authority = soundUri.getAuthority(); - if (authority.equals(MediaStore.AUTHORITY)) { - ParcelFileDescriptor pfd = null; - try { - pfd = context.getContentResolver().openFileDescriptor(soundUri, mode); - return new AssetFileDescriptor(pfd, 0, -1); - } catch (FileNotFoundException ex) { - // fall through and open the fallback ringtone below - } - } - - try { - return super.openAssetFile(soundUri, mode); - } catch (FileNotFoundException ex) { - // Since a non-null Uri was specified, but couldn't be opened, - // fall back to the built-in ringtone. - return context.getResources().openRawResourceFd( - com.android.internal.R.raw.fallbackring); - } - } - // no need to fall through and have openFile() try again, since we - // already know that will fail. - throw new FileNotFoundException(); // or return null ? - } - - // Note that this will end up calling openFile() above. - return super.openAssetFile(uri, mode); + throw new FileNotFoundException("Direct file access no longer supported; " + + "ringtone playback is available through android.media.Ringtone"); } /** diff --git a/packages/SystemUI/AndroidManifest.xml b/packages/SystemUI/AndroidManifest.xml index b3e60d1dae05..0cbbf8755267 100644 --- a/packages/SystemUI/AndroidManifest.xml +++ b/packages/SystemUI/AndroidManifest.xml @@ -55,6 +55,7 @@ <uses-permission android:name="android.permission.MANAGE_NETWORK_POLICY" /> <uses-permission android:name="android.permission.CONNECTIVITY_INTERNAL" /> <uses-permission android:name="android.permission.READ_NETWORK_USAGE_HISTORY" /> + <uses-permission android:name="android.permission.CONTROL_VPN" /> <!-- Physical hardware --> <uses-permission android:name="android.permission.MANAGE_USB" /> @@ -210,7 +211,7 @@ <activity android:name=".usb.UsbConfirmActivity" android:exported="true" android:permission="android.permission.MANAGE_USB" - android:theme="@*android:style/Theme.DeviceDefault.Light.Dialog.Alert" + android:theme="@style/Theme.SystemUI.Dialog.Alert" android:finishOnCloseSystemDialogs="true" android:excludeFromRecents="true"> </activity> @@ -219,7 +220,7 @@ <activity android:name=".usb.UsbPermissionActivity" android:exported="true" android:permission="android.permission.MANAGE_USB" - android:theme="@*android:style/Theme.DeviceDefault.Light.Dialog.Alert" + android:theme="@style/Theme.SystemUI.Dialog.Alert" android:finishOnCloseSystemDialogs="true" android:excludeFromRecents="true"> </activity> @@ -228,7 +229,7 @@ <activity android:name=".usb.UsbResolverActivity" android:exported="true" android:permission="android.permission.MANAGE_USB" - android:theme="@*android:style/Theme.DeviceDefault.Light.Dialog.Alert" + android:theme="@style/Theme.SystemUI.Dialog.Alert" android:finishOnCloseSystemDialogs="true" android:excludeFromRecents="true"> </activity> @@ -237,7 +238,7 @@ <activity android:name=".usb.UsbAccessoryUriActivity" android:exported="true" android:permission="android.permission.MANAGE_USB" - android:theme="@*android:style/Theme.DeviceDefault.Light.Dialog.Alert" + android:theme="@style/Theme.SystemUI.Dialog.Alert" android:finishOnCloseSystemDialogs="true" android:excludeFromRecents="true"> </activity> @@ -245,7 +246,7 @@ <!-- started from UsbDebuggingManager --> <activity android:name=".usb.UsbDebuggingActivity" android:permission="android.permission.MANAGE_USB" - android:theme="@*android:style/Theme.DeviceDefault.Light.Dialog.Alert" + android:theme="@style/Theme.SystemUI.Dialog.Alert" android:finishOnCloseSystemDialogs="true" android:excludeFromRecents="true"> </activity> @@ -265,7 +266,7 @@ <activity android:name=".media.MediaProjectionPermissionActivity" android:exported="true" - android:theme="@*android:style/Theme.DeviceDefault.Light.Dialog.Alert" + android:theme="@style/Theme.SystemUI.Dialog.Alert" android:finishOnCloseSystemDialogs="true" android:launchMode="singleTop" android:excludeFromRecents="true" /> diff --git a/packages/SystemUI/res/drawable-hdpi/ic_sysbar_back.png b/packages/SystemUI/res/drawable-hdpi/ic_sysbar_back.png Binary files differindex 5be74ec28748..d2760bb912e2 100644 --- a/packages/SystemUI/res/drawable-hdpi/ic_sysbar_back.png +++ b/packages/SystemUI/res/drawable-hdpi/ic_sysbar_back.png diff --git a/packages/SystemUI/res/drawable-hdpi/ic_sysbar_back_ime.png b/packages/SystemUI/res/drawable-hdpi/ic_sysbar_back_ime.png Binary files differindex 305c9fb04646..5cbf41848172 100644 --- a/packages/SystemUI/res/drawable-hdpi/ic_sysbar_back_ime.png +++ b/packages/SystemUI/res/drawable-hdpi/ic_sysbar_back_ime.png diff --git a/packages/SystemUI/res/drawable-hdpi/ic_sysbar_back_land.png b/packages/SystemUI/res/drawable-hdpi/ic_sysbar_back_land.png Binary files differindex 3e676ab962a0..d6e206594bda 100644 --- a/packages/SystemUI/res/drawable-hdpi/ic_sysbar_back_land.png +++ b/packages/SystemUI/res/drawable-hdpi/ic_sysbar_back_land.png diff --git a/packages/SystemUI/res/drawable-hdpi/ic_sysbar_home.png b/packages/SystemUI/res/drawable-hdpi/ic_sysbar_home.png Binary files differindex d3e1f7af7b05..df43e21b47d1 100644 --- a/packages/SystemUI/res/drawable-hdpi/ic_sysbar_home.png +++ b/packages/SystemUI/res/drawable-hdpi/ic_sysbar_home.png diff --git a/packages/SystemUI/res/drawable-hdpi/ic_sysbar_home_land.png b/packages/SystemUI/res/drawable-hdpi/ic_sysbar_home_land.png Binary files differindex d632600ffc5b..6be416158660 100644 --- a/packages/SystemUI/res/drawable-hdpi/ic_sysbar_home_land.png +++ b/packages/SystemUI/res/drawable-hdpi/ic_sysbar_home_land.png diff --git a/packages/SystemUI/res/drawable-hdpi/ic_sysbar_lights_out_dot_large.png b/packages/SystemUI/res/drawable-hdpi/ic_sysbar_lights_out_dot_large.png Binary files differindex 1233fca180de..552a3d1ff43a 100644 --- a/packages/SystemUI/res/drawable-hdpi/ic_sysbar_lights_out_dot_large.png +++ b/packages/SystemUI/res/drawable-hdpi/ic_sysbar_lights_out_dot_large.png diff --git a/packages/SystemUI/res/drawable-hdpi/ic_sysbar_lights_out_dot_small.png b/packages/SystemUI/res/drawable-hdpi/ic_sysbar_lights_out_dot_small.png Binary files differindex 6768c1f153af..6016ac4b9495 100644 --- a/packages/SystemUI/res/drawable-hdpi/ic_sysbar_lights_out_dot_small.png +++ b/packages/SystemUI/res/drawable-hdpi/ic_sysbar_lights_out_dot_small.png diff --git a/packages/SystemUI/res/drawable-hdpi/ic_sysbar_menu.png b/packages/SystemUI/res/drawable-hdpi/ic_sysbar_menu.png Binary files differindex 8984a49d28da..72b2b21772ea 100644 --- a/packages/SystemUI/res/drawable-hdpi/ic_sysbar_menu.png +++ b/packages/SystemUI/res/drawable-hdpi/ic_sysbar_menu.png diff --git a/packages/SystemUI/res/drawable-hdpi/ic_sysbar_menu_land.png b/packages/SystemUI/res/drawable-hdpi/ic_sysbar_menu_land.png Binary files differindex 2e8f8f0eea07..bcb203e40f06 100644 --- a/packages/SystemUI/res/drawable-hdpi/ic_sysbar_menu_land.png +++ b/packages/SystemUI/res/drawable-hdpi/ic_sysbar_menu_land.png diff --git a/packages/SystemUI/res/drawable-hdpi/ic_sysbar_recent.png b/packages/SystemUI/res/drawable-hdpi/ic_sysbar_recent.png Binary files differindex ec499d46af9d..6fab1d645dff 100644 --- a/packages/SystemUI/res/drawable-hdpi/ic_sysbar_recent.png +++ b/packages/SystemUI/res/drawable-hdpi/ic_sysbar_recent.png diff --git a/packages/SystemUI/res/drawable-hdpi/ic_sysbar_recent_land.png b/packages/SystemUI/res/drawable-hdpi/ic_sysbar_recent_land.png Binary files differindex 13e8a4f38f16..b03127328dc5 100644 --- a/packages/SystemUI/res/drawable-hdpi/ic_sysbar_recent_land.png +++ b/packages/SystemUI/res/drawable-hdpi/ic_sysbar_recent_land.png diff --git a/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_sysbar_back.png b/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_sysbar_back.png Binary files differindex c697da7c0ada..2fcfdde08164 100644 --- a/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_sysbar_back.png +++ b/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_sysbar_back.png diff --git a/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_sysbar_back_land.png b/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_sysbar_back_land.png Binary files differindex 94404dfdb181..2f4dbbee5741 100644 --- a/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_sysbar_back_land.png +++ b/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_sysbar_back_land.png diff --git a/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_sysbar_back.png b/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_sysbar_back.png Binary files differindex 9d0014d9b0ec..48708a5099a8 100644 --- a/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_sysbar_back.png +++ b/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_sysbar_back.png diff --git a/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_sysbar_back_land.png b/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_sysbar_back_land.png Binary files differindex 9a8b0e94eb6d..d04d84f5d76b 100644 --- a/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_sysbar_back_land.png +++ b/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_sysbar_back_land.png diff --git a/packages/SystemUI/res/drawable-ldrtl-sw600dp-hdpi/ic_sysbar_back.png b/packages/SystemUI/res/drawable-ldrtl-sw600dp-hdpi/ic_sysbar_back.png Binary files differdeleted file mode 100644 index 80d60af0bc13..000000000000 --- a/packages/SystemUI/res/drawable-ldrtl-sw600dp-hdpi/ic_sysbar_back.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-ldrtl-sw600dp-hdpi/ic_sysbar_back_land.png b/packages/SystemUI/res/drawable-ldrtl-sw600dp-hdpi/ic_sysbar_back_land.png Binary files differdeleted file mode 100644 index 2dfe964452e7..000000000000 --- a/packages/SystemUI/res/drawable-ldrtl-sw600dp-hdpi/ic_sysbar_back_land.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-ldrtl-sw600dp-mdpi/ic_sysbar_back.png b/packages/SystemUI/res/drawable-ldrtl-sw600dp-mdpi/ic_sysbar_back.png Binary files differdeleted file mode 100644 index fd1cc2764011..000000000000 --- a/packages/SystemUI/res/drawable-ldrtl-sw600dp-mdpi/ic_sysbar_back.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-ldrtl-sw600dp-mdpi/ic_sysbar_back_land.png b/packages/SystemUI/res/drawable-ldrtl-sw600dp-mdpi/ic_sysbar_back_land.png Binary files differdeleted file mode 100644 index 183aa0d314f8..000000000000 --- a/packages/SystemUI/res/drawable-ldrtl-sw600dp-mdpi/ic_sysbar_back_land.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-ldrtl-sw600dp-xhdpi/ic_sysbar_back.png b/packages/SystemUI/res/drawable-ldrtl-sw600dp-xhdpi/ic_sysbar_back.png Binary files differdeleted file mode 100644 index 6f763a4a60c6..000000000000 --- a/packages/SystemUI/res/drawable-ldrtl-sw600dp-xhdpi/ic_sysbar_back.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-ldrtl-sw600dp-xhdpi/ic_sysbar_back_land.png b/packages/SystemUI/res/drawable-ldrtl-sw600dp-xhdpi/ic_sysbar_back_land.png Binary files differdeleted file mode 100644 index 3dc75a3f1871..000000000000 --- a/packages/SystemUI/res/drawable-ldrtl-sw600dp-xhdpi/ic_sysbar_back_land.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-ldrtl-sw600dp-xxhdpi/ic_sysbar_back.png b/packages/SystemUI/res/drawable-ldrtl-sw600dp-xxhdpi/ic_sysbar_back.png Binary files differdeleted file mode 100644 index 83040fd0ee82..000000000000 --- a/packages/SystemUI/res/drawable-ldrtl-sw600dp-xxhdpi/ic_sysbar_back.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-ldrtl-sw600dp-xxhdpi/ic_sysbar_back_land.png b/packages/SystemUI/res/drawable-ldrtl-sw600dp-xxhdpi/ic_sysbar_back_land.png Binary files differdeleted file mode 100644 index 9917be446a11..000000000000 --- a/packages/SystemUI/res/drawable-ldrtl-sw600dp-xxhdpi/ic_sysbar_back_land.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_sysbar_back.png b/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_sysbar_back.png Binary files differindex c116bbe7058b..3d731840a93f 100644 --- a/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_sysbar_back.png +++ b/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_sysbar_back.png diff --git a/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_sysbar_back_land.png b/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_sysbar_back_land.png Binary files differindex 1446850fef9f..1500ae58969b 100644 --- a/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_sysbar_back_land.png +++ b/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_sysbar_back_land.png diff --git a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_sysbar_back.png b/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_sysbar_back.png Binary files differindex 83040fd0ee82..786935d5d185 100644 --- a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_sysbar_back.png +++ b/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_sysbar_back.png diff --git a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_sysbar_back_land.png b/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_sysbar_back_land.png Binary files differindex 9917be446a11..a7fec49f76a1 100644 --- a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_sysbar_back_land.png +++ b/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_sysbar_back_land.png diff --git a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_back.png b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_back.png Binary files differindex 447c655eb2e0..1d8c3af17716 100644 --- a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_back.png +++ b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_back.png diff --git a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_back_ime.png b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_back_ime.png Binary files differindex d5ca622ac796..47c6ebd5e764 100644 --- a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_back_ime.png +++ b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_back_ime.png diff --git a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_back_land.png b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_back_land.png Binary files differindex 47985de2583f..12ceb9043880 100644 --- a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_back_land.png +++ b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_back_land.png diff --git a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_home.png b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_home.png Binary files differindex 7b5fe8b3ce25..66de0ec75ec9 100644 --- a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_home.png +++ b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_home.png diff --git a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_home_land.png b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_home_land.png Binary files differindex 9fcb705f778c..dc8809ea09bd 100644 --- a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_home_land.png +++ b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_home_land.png diff --git a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_lights_out_dot_large.png b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_lights_out_dot_large.png Binary files differindex 4d9c21c14ec1..48b96d810a0a 100644 --- a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_lights_out_dot_large.png +++ b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_lights_out_dot_large.png diff --git a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_lights_out_dot_small.png b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_lights_out_dot_small.png Binary files differindex 9f0570af922f..9bdc305ee69c 100644 --- a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_lights_out_dot_small.png +++ b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_lights_out_dot_small.png diff --git a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_menu.png b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_menu.png Binary files differindex 23c24ba88a9e..35e7af450332 100644 --- a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_menu.png +++ b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_menu.png diff --git a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_menu_land.png b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_menu_land.png Binary files differindex 41c1acba49e5..94c9743f293f 100644 --- a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_menu_land.png +++ b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_menu_land.png diff --git a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_recent.png b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_recent.png Binary files differindex 11a92f0431d5..30c65f51a128 100644 --- a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_recent.png +++ b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_recent.png diff --git a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_recent_land.png b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_recent_land.png Binary files differindex 7fb14a8e29bb..5178ac561876 100644 --- a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_recent_land.png +++ b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_recent_land.png diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_back.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_back.png Binary files differdeleted file mode 100644 index eaac305e6981..000000000000 --- a/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_back.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_back_ime.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_back_ime.png Binary files differdeleted file mode 100644 index b5d3739bfa56..000000000000 --- a/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_back_ime.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_back_land.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_back_land.png Binary files differdeleted file mode 100644 index 99152602986b..000000000000 --- a/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_back_land.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_home.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_home.png Binary files differdeleted file mode 100644 index 4a349e225b00..000000000000 --- a/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_home.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_home_land.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_home_land.png Binary files differdeleted file mode 100644 index d14da80c2ec3..000000000000 --- a/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_home_land.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_lights_out_dot_large.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_lights_out_dot_large.png Binary files differindex 11e3b65541c4..23ec6dbde642 100644 --- a/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_lights_out_dot_large.png +++ b/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_lights_out_dot_large.png diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_lights_out_dot_small.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_lights_out_dot_small.png Binary files differindex afcc48729a17..91a4d2d39aac 100644 --- a/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_lights_out_dot_small.png +++ b/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_lights_out_dot_small.png diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_menu.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_menu.png Binary files differdeleted file mode 100644 index 4f5e72381ff1..000000000000 --- a/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_menu.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_menu_land.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_menu_land.png Binary files differdeleted file mode 100644 index 05b9b44e7120..000000000000 --- a/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_menu_land.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_recent.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_recent.png Binary files differdeleted file mode 100644 index 2035323221ee..000000000000 --- a/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_recent.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_recent_land.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_recent_land.png Binary files differdeleted file mode 100644 index 69b541b94665..000000000000 --- a/packages/SystemUI/res/drawable-sw600dp-hdpi/ic_sysbar_recent_land.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_back.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_back.png Binary files differdeleted file mode 100644 index 3f2b8b46e7f8..000000000000 --- a/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_back.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_back_ime.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_back_ime.png Binary files differdeleted file mode 100644 index 23e5e8ff18bf..000000000000 --- a/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_back_ime.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_back_land.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_back_land.png Binary files differdeleted file mode 100644 index 4b7f3acab47d..000000000000 --- a/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_back_land.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_home.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_home.png Binary files differdeleted file mode 100644 index 41054f6e59d9..000000000000 --- a/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_home.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_home_land.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_home_land.png Binary files differdeleted file mode 100644 index e4a7181352dc..000000000000 --- a/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_home_land.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_lights_out_dot_large.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_lights_out_dot_large.png Binary files differindex 244423436f59..e4500587e5b5 100644 --- a/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_lights_out_dot_large.png +++ b/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_lights_out_dot_large.png diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_lights_out_dot_small.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_lights_out_dot_small.png Binary files differindex a3e32f4c0e8c..edd53aa25f87 100644 --- a/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_lights_out_dot_small.png +++ b/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_lights_out_dot_small.png diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_menu.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_menu.png Binary files differdeleted file mode 100644 index be678e089d2b..000000000000 --- a/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_menu.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_menu_land.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_menu_land.png Binary files differdeleted file mode 100644 index 24d37e0da622..000000000000 --- a/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_menu_land.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_recent.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_recent.png Binary files differdeleted file mode 100644 index 9443656d1214..000000000000 --- a/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_recent.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_recent_land.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_recent_land.png Binary files differdeleted file mode 100644 index c3c64f488f40..000000000000 --- a/packages/SystemUI/res/drawable-sw600dp-mdpi/ic_sysbar_recent_land.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_back.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_back.png Binary files differdeleted file mode 100644 index 0ab43ce412e4..000000000000 --- a/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_back.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_back_ime.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_back_ime.png Binary files differdeleted file mode 100644 index 3c5821174fc0..000000000000 --- a/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_back_ime.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_back_land.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_back_land.png Binary files differdeleted file mode 100644 index 14ff6d30a960..000000000000 --- a/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_back_land.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_home.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_home.png Binary files differdeleted file mode 100644 index eb74d0d599ef..000000000000 --- a/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_home.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_home_land.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_home_land.png Binary files differdeleted file mode 100644 index e29c9d0fe7ea..000000000000 --- a/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_home_land.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_lights_out_dot_large.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_lights_out_dot_large.png Binary files differindex 298b62fac0e0..d18e41906f57 100644 --- a/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_lights_out_dot_large.png +++ b/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_lights_out_dot_large.png diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_lights_out_dot_small.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_lights_out_dot_small.png Binary files differindex 41f4b42eb4a3..cb5478071d80 100644 --- a/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_lights_out_dot_small.png +++ b/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_lights_out_dot_small.png diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_menu.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_menu.png Binary files differdeleted file mode 100644 index cfecdcf6711d..000000000000 --- a/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_menu.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_menu_land.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_menu_land.png Binary files differdeleted file mode 100644 index d98208a97620..000000000000 --- a/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_menu_land.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_recent.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_recent.png Binary files differdeleted file mode 100644 index 71cc61b67685..000000000000 --- a/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_recent.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_recent_land.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_recent_land.png Binary files differdeleted file mode 100644 index bdecf0683062..000000000000 --- a/packages/SystemUI/res/drawable-sw600dp-xhdpi/ic_sysbar_recent_land.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-sw600dp-xxhdpi/ic_sysbar_back.png b/packages/SystemUI/res/drawable-sw600dp-xxhdpi/ic_sysbar_back.png Binary files differdeleted file mode 100644 index 01edd86311e3..000000000000 --- a/packages/SystemUI/res/drawable-sw600dp-xxhdpi/ic_sysbar_back.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-sw600dp-xxhdpi/ic_sysbar_back_ime.png b/packages/SystemUI/res/drawable-sw600dp-xxhdpi/ic_sysbar_back_ime.png Binary files differdeleted file mode 100644 index 52bd6e86b509..000000000000 --- a/packages/SystemUI/res/drawable-sw600dp-xxhdpi/ic_sysbar_back_ime.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-sw600dp-xxhdpi/ic_sysbar_back_land.png b/packages/SystemUI/res/drawable-sw600dp-xxhdpi/ic_sysbar_back_land.png Binary files differdeleted file mode 100644 index b0dd0f0ff5f4..000000000000 --- a/packages/SystemUI/res/drawable-sw600dp-xxhdpi/ic_sysbar_back_land.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-sw600dp-xxhdpi/ic_sysbar_home.png b/packages/SystemUI/res/drawable-sw600dp-xxhdpi/ic_sysbar_home.png Binary files differdeleted file mode 100644 index b5c189dfadae..000000000000 --- a/packages/SystemUI/res/drawable-sw600dp-xxhdpi/ic_sysbar_home.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-sw600dp-xxhdpi/ic_sysbar_home_land.png b/packages/SystemUI/res/drawable-sw600dp-xxhdpi/ic_sysbar_home_land.png Binary files differdeleted file mode 100644 index 42e9e31b9a6a..000000000000 --- a/packages/SystemUI/res/drawable-sw600dp-xxhdpi/ic_sysbar_home_land.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-sw600dp-xxhdpi/ic_sysbar_lights_out_dot_large.png b/packages/SystemUI/res/drawable-sw600dp-xxhdpi/ic_sysbar_lights_out_dot_large.png Binary files differindex 5ef7798d7741..00a751cfe3a4 100644 --- a/packages/SystemUI/res/drawable-sw600dp-xxhdpi/ic_sysbar_lights_out_dot_large.png +++ b/packages/SystemUI/res/drawable-sw600dp-xxhdpi/ic_sysbar_lights_out_dot_large.png diff --git a/packages/SystemUI/res/drawable-sw600dp-xxhdpi/ic_sysbar_lights_out_dot_small.png b/packages/SystemUI/res/drawable-sw600dp-xxhdpi/ic_sysbar_lights_out_dot_small.png Binary files differindex 4a98e3157349..dfc8f96196ad 100644 --- a/packages/SystemUI/res/drawable-sw600dp-xxhdpi/ic_sysbar_lights_out_dot_small.png +++ b/packages/SystemUI/res/drawable-sw600dp-xxhdpi/ic_sysbar_lights_out_dot_small.png diff --git a/packages/SystemUI/res/drawable-sw600dp-xxhdpi/ic_sysbar_menu.png b/packages/SystemUI/res/drawable-sw600dp-xxhdpi/ic_sysbar_menu.png Binary files differdeleted file mode 100644 index 669d8ba4036a..000000000000 --- a/packages/SystemUI/res/drawable-sw600dp-xxhdpi/ic_sysbar_menu.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-sw600dp-xxhdpi/ic_sysbar_menu_land.png b/packages/SystemUI/res/drawable-sw600dp-xxhdpi/ic_sysbar_menu_land.png Binary files differdeleted file mode 100644 index 0fbf1f67678c..000000000000 --- a/packages/SystemUI/res/drawable-sw600dp-xxhdpi/ic_sysbar_menu_land.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-sw600dp-xxhdpi/ic_sysbar_recent.png b/packages/SystemUI/res/drawable-sw600dp-xxhdpi/ic_sysbar_recent.png Binary files differdeleted file mode 100644 index 023b94cbe7e9..000000000000 --- a/packages/SystemUI/res/drawable-sw600dp-xxhdpi/ic_sysbar_recent.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-sw600dp-xxhdpi/ic_sysbar_recent_land.png b/packages/SystemUI/res/drawable-sw600dp-xxhdpi/ic_sysbar_recent_land.png Binary files differdeleted file mode 100644 index 5884492165e0..000000000000 --- a/packages/SystemUI/res/drawable-sw600dp-xxhdpi/ic_sysbar_recent_land.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_back.png b/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_back.png Binary files differindex 4956aadc94c8..a3562850ef9c 100644 --- a/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_back.png +++ b/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_back.png diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_back_ime.png b/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_back_ime.png Binary files differindex e9a6223966e1..42893ff340b1 100644 --- a/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_back_ime.png +++ b/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_back_ime.png diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_back_land.png b/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_back_land.png Binary files differindex e9767a18fa9b..98be526fb825 100644 --- a/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_back_land.png +++ b/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_back_land.png diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_home.png b/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_home.png Binary files differindex acaf32ddfbd5..ba2d0b2642ce 100644 --- a/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_home.png +++ b/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_home.png diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_home_land.png b/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_home_land.png Binary files differindex 20cb1012896b..eed3f54ce8d1 100644 --- a/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_home_land.png +++ b/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_home_land.png diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_lights_out_dot_large.png b/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_lights_out_dot_large.png Binary files differindex e62decea2d2e..e49db340dcfe 100644 --- a/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_lights_out_dot_large.png +++ b/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_lights_out_dot_large.png diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_lights_out_dot_small.png b/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_lights_out_dot_small.png Binary files differindex 958b2fe0efad..0b755586761c 100644 --- a/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_lights_out_dot_small.png +++ b/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_lights_out_dot_small.png diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_menu.png b/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_menu.png Binary files differindex cc620a24f4bd..69a018d190e3 100644 --- a/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_menu.png +++ b/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_menu.png diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_menu_land.png b/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_menu_land.png Binary files differindex aa8a60e8c389..8a7ac4f9ab31 100644 --- a/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_menu_land.png +++ b/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_menu_land.png diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_recent.png b/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_recent.png Binary files differindex 88d6a413d0e2..94a74b189abf 100644 --- a/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_recent.png +++ b/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_recent.png diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_recent_land.png b/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_recent_land.png Binary files differindex 8acdd3c5bd94..22ae09d9bb83 100644 --- a/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_recent_land.png +++ b/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_recent_land.png diff --git a/packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_back.png b/packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_back.png Binary files differindex 01edd86311e3..29da099f6d82 100644 --- a/packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_back.png +++ b/packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_back.png diff --git a/packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_back_ime.png b/packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_back_ime.png Binary files differindex 52bd6e86b509..ada2879c7b3b 100644 --- a/packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_back_ime.png +++ b/packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_back_ime.png diff --git a/packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_back_land.png b/packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_back_land.png Binary files differindex b0dd0f0ff5f4..c81954566ca0 100644 --- a/packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_back_land.png +++ b/packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_back_land.png diff --git a/packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_home.png b/packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_home.png Binary files differindex b5c189dfadae..59b32f2dd178 100644 --- a/packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_home.png +++ b/packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_home.png diff --git a/packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_home_land.png b/packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_home_land.png Binary files differindex 42e9e31b9a6a..6075caf41ea6 100644 --- a/packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_home_land.png +++ b/packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_home_land.png diff --git a/packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_lights_out_dot_large.png b/packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_lights_out_dot_large.png Binary files differindex 55a266fc2c40..b91704a928ab 100644 --- a/packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_lights_out_dot_large.png +++ b/packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_lights_out_dot_large.png diff --git a/packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_lights_out_dot_small.png b/packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_lights_out_dot_small.png Binary files differindex 97d1fbc34e94..d83d2852aaa4 100644 --- a/packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_lights_out_dot_small.png +++ b/packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_lights_out_dot_small.png diff --git a/packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_menu.png b/packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_menu.png Binary files differindex 669d8ba4036a..a37ca5d7daf5 100644 --- a/packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_menu.png +++ b/packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_menu.png diff --git a/packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_menu_land.png b/packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_menu_land.png Binary files differindex 0fbf1f67678c..62f44e892858 100644 --- a/packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_menu_land.png +++ b/packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_menu_land.png diff --git a/packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_recent.png b/packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_recent.png Binary files differindex 023b94cbe7e9..ba66d27f1199 100644 --- a/packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_recent.png +++ b/packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_recent.png diff --git a/packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_recent_land.png b/packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_recent_land.png Binary files differindex 5884492165e0..bccda1b8aca6 100644 --- a/packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_recent_land.png +++ b/packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_recent_land.png diff --git a/packages/SystemUI/res/layout-land/status_bar_recent_panel.xml b/packages/SystemUI/res/layout-land/status_bar_recent_panel.xml index 0c0be29bdbe4..b5d2f867fbec 100644 --- a/packages/SystemUI/res/layout-land/status_bar_recent_panel.xml +++ b/packages/SystemUI/res/layout-land/status_bar_recent_panel.xml @@ -20,7 +20,7 @@ <com.android.systemui.recent.RecentsPanelView xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:systemui="http://schemas.android.com/apk/res/com.android.systemui" + xmlns:systemui="http://schemas.android.com/apk/res-auto" android:id="@+id/recents_root" android:layout_height="match_parent" android:layout_width="match_parent" diff --git a/packages/SystemUI/res/layout-sw600dp/navigation_bar.xml b/packages/SystemUI/res/layout-sw600dp/navigation_bar.xml index c2733fb0aff2..5c776e6cda50 100644 --- a/packages/SystemUI/res/layout-sw600dp/navigation_bar.xml +++ b/packages/SystemUI/res/layout-sw600dp/navigation_bar.xml @@ -19,7 +19,7 @@ <!-- navigation bar for sw600dp (small tablets) --> <com.android.systemui.statusbar.phone.NavigationBarView xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:systemui="http://schemas.android.com/apk/res/com.android.systemui" + xmlns:systemui="http://schemas.android.com/apk/res-auto" android:layout_height="match_parent" android:layout_width="match_parent" android:background="@drawable/system_bar_background" diff --git a/packages/SystemUI/res/layout/navigation_bar.xml b/packages/SystemUI/res/layout/navigation_bar.xml index 2e38b2026112..898389d5c0a0 100644 --- a/packages/SystemUI/res/layout/navigation_bar.xml +++ b/packages/SystemUI/res/layout/navigation_bar.xml @@ -20,7 +20,7 @@ <com.android.systemui.statusbar.phone.NavigationBarView xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:systemui="http://schemas.android.com/apk/res/com.android.systemui" + xmlns:systemui="http://schemas.android.com/apk/res-auto" android:layout_height="match_parent" android:layout_width="match_parent" android:background="@drawable/system_bar_background" @@ -98,6 +98,7 @@ android:contentDescription="@string/accessibility_menu" android:src="@drawable/ic_sysbar_menu" android:visibility="invisible" + android:scaleType="centerInside" android:layout_gravity="end" systemui:keyCode="82" /> @@ -210,6 +211,7 @@ android:layout_height="40dp" android:contentDescription="@string/accessibility_menu" android:src="@drawable/ic_sysbar_menu_land" + android:scaleType="centerInside" android:layout_gravity="top" android:visibility="invisible" systemui:keyCode="82" /> diff --git a/packages/SystemUI/res/layout/qs_detail_item.xml b/packages/SystemUI/res/layout/qs_detail_item.xml index 55139fb0c38f..ea2e1e1c3c8a 100644 --- a/packages/SystemUI/res/layout/qs_detail_item.xml +++ b/packages/SystemUI/res/layout/qs_detail_item.xml @@ -31,7 +31,7 @@ <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_marginStart="20dp" + android:layout_marginStart="12dp" android:layout_weight="1" android:orientation="vertical" > diff --git a/packages/SystemUI/res/layout/quick_settings_brightness_dialog.xml b/packages/SystemUI/res/layout/quick_settings_brightness_dialog.xml index f776a874a6e0..a9962607d696 100644 --- a/packages/SystemUI/res/layout/quick_settings_brightness_dialog.xml +++ b/packages/SystemUI/res/layout/quick_settings_brightness_dialog.xml @@ -14,7 +14,7 @@ limitations under the License. --> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:systemui="http://schemas.android.com/apk/res/com.android.systemui" + xmlns:systemui="http://schemas.android.com/apk/res-auto" android:paddingLeft="16dp" android:paddingRight="16dp" style="@style/BrightnessDialogContainer"> diff --git a/packages/SystemUI/res/layout/remember_permission_checkbox.xml b/packages/SystemUI/res/layout/remember_permission_checkbox.xml index a21acb32b7cd..4985ff5a72ad 100644 --- a/packages/SystemUI/res/layout/remember_permission_checkbox.xml +++ b/packages/SystemUI/res/layout/remember_permission_checkbox.xml @@ -20,9 +20,9 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="wrap_content" - android:paddingStart="8dp" - android:paddingEnd="8dp" - android:paddingTop="8dp"> + android:paddingStart="16dp" + android:paddingEnd="16dp" + android:paddingTop="16dp"> <CheckBox android:id="@+id/remember" diff --git a/packages/SystemUI/res/layout/status_bar_expanded_header.xml b/packages/SystemUI/res/layout/status_bar_expanded_header.xml index 7ea91454d175..2fb7cdbf408a 100644 --- a/packages/SystemUI/res/layout/status_bar_expanded_header.xml +++ b/packages/SystemUI/res/layout/status_bar_expanded_header.xml @@ -18,7 +18,7 @@ <!-- Extends RelativeLayout --> <com.android.systemui.statusbar.phone.StatusBarHeaderView xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:systemui="http://schemas.android.com/apk/res/com.android.systemui" + xmlns:systemui="http://schemas.android.com/apk/res-auto" android:id="@+id/header" android:layout_width="@dimen/notification_panel_width" android:layout_height="@dimen/status_bar_header_height" @@ -38,8 +38,8 @@ android:layout_alignParentEnd="true" android:background="@drawable/ripple_drawable" > <ImageView android:id="@+id/multi_user_avatar" - android:layout_width="24dp" - android:layout_height="24dp" + android:layout_width="@dimen/multi_user_avatar_expanded_size" + android:layout_height="@dimen/multi_user_avatar_expanded_size" android:layout_gravity="center" android:scaleType="centerInside"/> </com.android.systemui.statusbar.phone.MultiUserSwitch> diff --git a/packages/SystemUI/res/layout/status_bar_recent_panel.xml b/packages/SystemUI/res/layout/status_bar_recent_panel.xml index 2f3968dff662..588873a71298 100644 --- a/packages/SystemUI/res/layout/status_bar_recent_panel.xml +++ b/packages/SystemUI/res/layout/status_bar_recent_panel.xml @@ -20,7 +20,7 @@ <com.android.systemui.recent.RecentsPanelView xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:systemui="http://schemas.android.com/apk/res/com.android.systemui" + xmlns:systemui="http://schemas.android.com/apk/res-auto" android:id="@+id/recents_root" android:layout_height="match_parent" android:layout_width="match_parent" diff --git a/packages/SystemUI/res/values-af/strings.xml b/packages/SystemUI/res/values-af/strings.xml index 9f9f7216f9dd..000570c142ff 100644 --- a/packages/SystemUI/res/values-af/strings.xml +++ b/packages/SystemUI/res/values-af/strings.xml @@ -352,22 +352,13 @@ <string name="hidden_notifications_text" msgid="2326409389088668981">"Sien hulle voordat jy ontsluit"</string> <string name="hidden_notifications_cancel" msgid="3690709735122344913">"Nee dankie"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"Stel op"</string> - <string name="muted_by" msgid="6147073845094180001">"Gedemp deur <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> - <!-- no translation found for screen_pinning_title (3273740381976175811) --> - <skip /> - <!-- no translation found for screen_pinning_description (1346522416878235405) --> - <skip /> - <!-- no translation found for screen_pinning_description_accessible (8518446209564202557) --> - <skip /> - <!-- no translation found for screen_pinning_positive (3783985798366751226) --> - <skip /> - <!-- no translation found for screen_pinning_negative (3741602308343880268) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_title (748792586749897883) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_message (2235970126803317374) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_button (2660339101868367515) --> - <skip /> + <string name="screen_pinning_title" msgid="3273740381976175811">"Skerm is vasgespeld"</string> + <string name="screen_pinning_description" msgid="1346522416878235405">"Dit hou dit in sig totdat jy dit ontspeld. Raak en hou Terug en Oorsig op dieselfde tyd om te ontspeld."</string> + <string name="screen_pinning_description_accessible" msgid="8518446209564202557">"Dit hou dit in sig totdat jy ontspeld. Raak en hou Oorsig om te ontspeld."</string> + <string name="screen_pinning_positive" msgid="3783985798366751226">"Het dit"</string> + <string name="screen_pinning_negative" msgid="3741602308343880268">"Nee, dankie"</string> + <string name="quick_settings_reset_confirmation_title" msgid="748792586749897883">"Versteek <xliff:g id="TILE_LABEL">%1$s</xliff:g>?"</string> + <string name="quick_settings_reset_confirmation_message" msgid="2235970126803317374">"Dit sal verskyn die volgende keer wanneer jy dit in instellings aanskakel."</string> + <string name="quick_settings_reset_confirmation_button" msgid="2660339101868367515">"Versteek"</string> </resources> diff --git a/packages/SystemUI/res/values-am/strings.xml b/packages/SystemUI/res/values-am/strings.xml index 800c273a2e5a..584c30f1bb9c 100644 --- a/packages/SystemUI/res/values-am/strings.xml +++ b/packages/SystemUI/res/values-am/strings.xml @@ -352,22 +352,13 @@ <string name="hidden_notifications_text" msgid="2326409389088668981">"ከመክፈትዎ በፊት ይመልከቷቸው"</string> <string name="hidden_notifications_cancel" msgid="3690709735122344913">"አይ፣ አመሰግናለሁ"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"አዋቅር"</string> - <string name="muted_by" msgid="6147073845094180001">"ድምጽ በ<xliff:g id="THIRD_PARTY">%1$s</xliff:g> ተዘግቷል"</string> <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>። <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> - <!-- no translation found for screen_pinning_title (3273740381976175811) --> - <skip /> - <!-- no translation found for screen_pinning_description (1346522416878235405) --> - <skip /> - <!-- no translation found for screen_pinning_description_accessible (8518446209564202557) --> - <skip /> - <!-- no translation found for screen_pinning_positive (3783985798366751226) --> - <skip /> - <!-- no translation found for screen_pinning_negative (3741602308343880268) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_title (748792586749897883) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_message (2235970126803317374) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_button (2660339101868367515) --> - <skip /> + <string name="screen_pinning_title" msgid="3273740381976175811">"ማያ ገጽ ተሰክቷል"</string> + <string name="screen_pinning_description" msgid="1346522416878235405">"ይህ እስከሚነቅሉት ድረስ ድረስ በዕይታ ውስጥ እንዲቆይ ያደርገዋል። ለመንቀል በተመሳሳይ ጊዜ ተመለስን እና አጠቃላይ ዕይታን አንድ ላይ ነክተው ይያዙ።"</string> + <string name="screen_pinning_description_accessible" msgid="8518446209564202557">"ይህ እስከሚነቅሉት ድረስ በዕይታ ውስጥ ያቆየዋል። እንዲነቀል ለማድረግ አጠቃላይ ዕይታን ነካ አድርገው ይያዙት።"</string> + <string name="screen_pinning_positive" msgid="3783985798366751226">"ገባኝ"</string> + <string name="screen_pinning_negative" msgid="3741602308343880268">"አይ፣ አመሰግናለሁ"</string> + <string name="quick_settings_reset_confirmation_title" msgid="748792586749897883">"<xliff:g id="TILE_LABEL">%1$s</xliff:g> ይደበቅ?"</string> + <string name="quick_settings_reset_confirmation_message" msgid="2235970126803317374">"በቅንብሮች ውስጥ በሚቀጥለው ጊዜ እንዲበራ በሚያደርጉበት ጊዜ ዳግመኛ ብቅ ይላል።"</string> + <string name="quick_settings_reset_confirmation_button" msgid="2660339101868367515">"ደብቅ"</string> </resources> diff --git a/packages/SystemUI/res/values-ar/strings.xml b/packages/SystemUI/res/values-ar/strings.xml index f86ee4c3d746..1794dbd3f737 100644 --- a/packages/SystemUI/res/values-ar/strings.xml +++ b/packages/SystemUI/res/values-ar/strings.xml @@ -352,7 +352,6 @@ <string name="hidden_notifications_text" msgid="2326409389088668981">"الاطلاع عليها قبل إلغاء القفل"</string> <string name="hidden_notifications_cancel" msgid="3690709735122344913">"لا، شكرًا"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"إعداد"</string> - <string name="muted_by" msgid="6147073845094180001">"تم كتم الصوت بواسطة <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> <string name="screen_pinning_title" msgid="3273740381976175811">"تم تثبيت الشاشة"</string> <string name="screen_pinning_description" msgid="1346522416878235405">"يساعد هذا على استمرار العرض حتى يتم إلغاء التثبيت. ويمكنك لمس \"رجوع\" و\"عرض عام\" مع الاستمرار في وقت واحد لإلغاء التثبيت."</string> diff --git a/packages/SystemUI/res/values-bg/strings.xml b/packages/SystemUI/res/values-bg/strings.xml index eb80be2212fc..616ad651c724 100644 --- a/packages/SystemUI/res/values-bg/strings.xml +++ b/packages/SystemUI/res/values-bg/strings.xml @@ -352,22 +352,13 @@ <string name="hidden_notifications_text" msgid="2326409389088668981">"Вижте известията, преди да отключите"</string> <string name="hidden_notifications_cancel" msgid="3690709735122344913">"Няма нужда"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"Настройване"</string> - <string name="muted_by" msgid="6147073845094180001">"Заглушено от <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> - <!-- no translation found for screen_pinning_title (3273740381976175811) --> - <skip /> - <!-- no translation found for screen_pinning_description (1346522416878235405) --> - <skip /> - <!-- no translation found for screen_pinning_description_accessible (8518446209564202557) --> - <skip /> - <!-- no translation found for screen_pinning_positive (3783985798366751226) --> - <skip /> - <!-- no translation found for screen_pinning_negative (3741602308343880268) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_title (748792586749897883) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_message (2235970126803317374) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_button (2660339101868367515) --> - <skip /> + <string name="screen_pinning_title" msgid="3273740381976175811">"Екранът е фиксиран"</string> + <string name="screen_pinning_description" msgid="1346522416878235405">"Така екранът ще се показва, докато не го освободите. За да направите това, докоснете и задръжте бутона за връщане назад и този за общ преглед едновременно."</string> + <string name="screen_pinning_description_accessible" msgid="8518446209564202557">"Така екранът ще се показва, докато не го освободите. За да направите това, докоснете и задръжте бутона за общ преглед."</string> + <string name="screen_pinning_positive" msgid="3783985798366751226">"Разбрах"</string> + <string name="screen_pinning_negative" msgid="3741602308343880268">"Не, благодаря"</string> + <string name="quick_settings_reset_confirmation_title" msgid="748792586749897883">"Да се скрие ли „<xliff:g id="TILE_LABEL">%1$s</xliff:g>“?"</string> + <string name="quick_settings_reset_confirmation_message" msgid="2235970126803317374">"Бързите настройки ще се покажат отново следващия път, когато ги включите от „Настройки“."</string> + <string name="quick_settings_reset_confirmation_button" msgid="2660339101868367515">"Скриване"</string> </resources> diff --git a/packages/SystemUI/res/values-bn-rBD/strings.xml b/packages/SystemUI/res/values-bn-rBD/strings.xml index 84eb83661987..d214086d3239 100644 --- a/packages/SystemUI/res/values-bn-rBD/strings.xml +++ b/packages/SystemUI/res/values-bn-rBD/strings.xml @@ -352,22 +352,13 @@ <string name="hidden_notifications_text" msgid="2326409389088668981">"আপনি আনলক করার আগে ওগুলো দেখুন"</string> <string name="hidden_notifications_cancel" msgid="3690709735122344913">"না থাক"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"সেট আপ"</string> - <string name="muted_by" msgid="6147073845094180001">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> দ্বারা নিঃশব্দ করা হয়েছে"</string> <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> - <!-- no translation found for screen_pinning_title (3273740381976175811) --> - <skip /> - <!-- no translation found for screen_pinning_description (1346522416878235405) --> - <skip /> - <!-- no translation found for screen_pinning_description_accessible (8518446209564202557) --> - <skip /> - <!-- no translation found for screen_pinning_positive (3783985798366751226) --> - <skip /> - <!-- no translation found for screen_pinning_negative (3741602308343880268) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_title (748792586749897883) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_message (2235970126803317374) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_button (2660339101868367515) --> - <skip /> + <string name="screen_pinning_title" msgid="3273740381976175811">"স্ক্রীন পিন করা হয়েছে"</string> + <string name="screen_pinning_description" msgid="1346522416878235405">"এটি আপনার আনপিন না করা পর্যন্ত এটিকে দর্শনে রাখে৷ আনপিন করতে একই সময়ে ফিরুন এবং ওভারভিউ এ স্পর্শ করে ধরে রাখুন৷"</string> + <string name="screen_pinning_description_accessible" msgid="8518446209564202557">"এটি আপনার আনপিন না করা পর্যন্ত এটিকে দর্শনে রাখে৷ আনপিন করতে ওভারভিউ এ স্পর্শ করে ধরে রাখুন৷"</string> + <string name="screen_pinning_positive" msgid="3783985798366751226">"বুঝেছি"</string> + <string name="screen_pinning_negative" msgid="3741602308343880268">"না থাক"</string> + <string name="quick_settings_reset_confirmation_title" msgid="748792586749897883">"<xliff:g id="TILE_LABEL">%1$s</xliff:g> লুকাবেন?"</string> + <string name="quick_settings_reset_confirmation_message" msgid="2235970126803317374">"আপনি পরের বার সেটিংস-এ এটি চালু করলে এটি উপস্থিত হবে"</string> + <string name="quick_settings_reset_confirmation_button" msgid="2660339101868367515">"লুকান"</string> </resources> diff --git a/packages/SystemUI/res/values-ca/strings.xml b/packages/SystemUI/res/values-ca/strings.xml index e7ccba7f62f3..f4090b15be91 100644 --- a/packages/SystemUI/res/values-ca/strings.xml +++ b/packages/SystemUI/res/values-ca/strings.xml @@ -354,22 +354,13 @@ <string name="hidden_notifications_text" msgid="2326409389088668981">"Mostra-les abans de desbloquejar"</string> <string name="hidden_notifications_cancel" msgid="3690709735122344913">"No"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"Configura"</string> - <string name="muted_by" msgid="6147073845094180001">"Silenciat per <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> - <!-- no translation found for screen_pinning_title (3273740381976175811) --> - <skip /> - <!-- no translation found for screen_pinning_description (1346522416878235405) --> - <skip /> - <!-- no translation found for screen_pinning_description_accessible (8518446209564202557) --> - <skip /> - <!-- no translation found for screen_pinning_positive (3783985798366751226) --> - <skip /> - <!-- no translation found for screen_pinning_negative (3741602308343880268) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_title (748792586749897883) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_message (2235970126803317374) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_button (2660339101868367515) --> - <skip /> + <string name="screen_pinning_title" msgid="3273740381976175811">"La pantalla està fixada"</string> + <string name="screen_pinning_description" msgid="1346522416878235405">"Continuarà a la visualització fins que n\'anul·lis la fixació. Per fer-ho, toca i mantén premuts els botons Enrere i Visió general a la vegada."</string> + <string name="screen_pinning_description_accessible" msgid="8518446209564202557">"Continuarà a la visualització fins que n\'anul·lis la fixació. Per fer-ho, toca i mantén premut el botó Visió general."</string> + <string name="screen_pinning_positive" msgid="3783985798366751226">"D\'acord"</string> + <string name="screen_pinning_negative" msgid="3741602308343880268">"No, gràcies"</string> + <string name="quick_settings_reset_confirmation_title" msgid="748792586749897883">"Vols amagar <xliff:g id="TILE_LABEL">%1$s</xliff:g>?"</string> + <string name="quick_settings_reset_confirmation_message" msgid="2235970126803317374">"Tornarà a mostrar-se la propera vegada que l\'activis a la configuració."</string> + <string name="quick_settings_reset_confirmation_button" msgid="2660339101868367515">"Amaga"</string> </resources> diff --git a/packages/SystemUI/res/values-cs/strings.xml b/packages/SystemUI/res/values-cs/strings.xml index db1cdc00b1bb..badc9e49ce5f 100644 --- a/packages/SystemUI/res/values-cs/strings.xml +++ b/packages/SystemUI/res/values-cs/strings.xml @@ -354,22 +354,13 @@ <string name="hidden_notifications_text" msgid="2326409389088668981">"Můžete si je přečíst před odemčením obrazovky."</string> <string name="hidden_notifications_cancel" msgid="3690709735122344913">"Ne, děkuji"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"Nastavit"</string> - <string name="muted_by" msgid="6147073845094180001">"Ignorováno stranou <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> - <!-- no translation found for screen_pinning_title (3273740381976175811) --> - <skip /> - <!-- no translation found for screen_pinning_description (1346522416878235405) --> - <skip /> - <!-- no translation found for screen_pinning_description_accessible (8518446209564202557) --> - <skip /> - <!-- no translation found for screen_pinning_positive (3783985798366751226) --> - <skip /> - <!-- no translation found for screen_pinning_negative (3741602308343880268) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_title (748792586749897883) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_message (2235970126803317374) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_button (2660339101868367515) --> - <skip /> + <string name="screen_pinning_title" msgid="3273740381976175811">"Obrazovka je připnuta"</string> + <string name="screen_pinning_description" msgid="1346522416878235405">"Obsah bude připnut v zobrazení, dokud jej neuvolníte. Chcete-li jej uvolnit, stiskněte a podržte současně tlačítka Zpět a Přehled."</string> + <string name="screen_pinning_description_accessible" msgid="8518446209564202557">"Obsah bude připnut v zobrazení, dokud jej neuvolníte. Uvolníte jej stisknutím a podržením tlačítka Přehled."</string> + <string name="screen_pinning_positive" msgid="3783985798366751226">"Rozumím"</string> + <string name="screen_pinning_negative" msgid="3741602308343880268">"Ne, děkuji"</string> + <string name="quick_settings_reset_confirmation_title" msgid="748792586749897883">"Skrýt <xliff:g id="TILE_LABEL">%1$s</xliff:g>?"</string> + <string name="quick_settings_reset_confirmation_message" msgid="2235970126803317374">"Tato položka se znovu zobrazí, až ji v nastavení znovu zapnete."</string> + <string name="quick_settings_reset_confirmation_button" msgid="2660339101868367515">"Skrýt"</string> </resources> diff --git a/packages/SystemUI/res/values-da/strings.xml b/packages/SystemUI/res/values-da/strings.xml index 50f58280df03..4f54bb315244 100644 --- a/packages/SystemUI/res/values-da/strings.xml +++ b/packages/SystemUI/res/values-da/strings.xml @@ -352,22 +352,13 @@ <string name="hidden_notifications_text" msgid="2326409389088668981">"Se dem, før du låser op"</string> <string name="hidden_notifications_cancel" msgid="3690709735122344913">"Nej tak"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"Konfigurer"</string> - <string name="muted_by" msgid="6147073845094180001">"Lyden blev afbrudt af <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> - <!-- no translation found for screen_pinning_title (3273740381976175811) --> - <skip /> - <!-- no translation found for screen_pinning_description (1346522416878235405) --> - <skip /> - <!-- no translation found for screen_pinning_description_accessible (8518446209564202557) --> - <skip /> - <!-- no translation found for screen_pinning_positive (3783985798366751226) --> - <skip /> - <!-- no translation found for screen_pinning_negative (3741602308343880268) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_title (748792586749897883) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_message (2235970126803317374) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_button (2660339101868367515) --> - <skip /> + <string name="screen_pinning_title" msgid="3273740381976175811">"Skærmen er fastgjort"</string> + <string name="screen_pinning_description" msgid="1346522416878235405">"Dette fastholder den i visningen, indtil du frigør den. Tryk på Tilbage og Oversigt på samme tid, og hold dem nede for at frigøre denne skærm."</string> + <string name="screen_pinning_description_accessible" msgid="8518446209564202557">"Dette fastholder den i visningen, indtil du frigør den. Tryk på Oversigt, og hold den nede for at frigøre denne skærm."</string> + <string name="screen_pinning_positive" msgid="3783985798366751226">"OK, det er forstået"</string> + <string name="screen_pinning_negative" msgid="3741602308343880268">"Nej tak"</string> + <string name="quick_settings_reset_confirmation_title" msgid="748792586749897883">"Vil du skjule <xliff:g id="TILE_LABEL">%1$s</xliff:g>?"</string> + <string name="quick_settings_reset_confirmation_message" msgid="2235970126803317374">"Den vises igen, næste gang du aktiverer den i indstillingerne."</string> + <string name="quick_settings_reset_confirmation_button" msgid="2660339101868367515">"Skjul"</string> </resources> diff --git a/packages/SystemUI/res/values-de/strings.xml b/packages/SystemUI/res/values-de/strings.xml index 380df1454136..a7a22d1c3c30 100644 --- a/packages/SystemUI/res/values-de/strings.xml +++ b/packages/SystemUI/res/values-de/strings.xml @@ -354,22 +354,13 @@ <string name="hidden_notifications_text" msgid="2326409389088668981">"Vor dem Entsperren anzeigen"</string> <string name="hidden_notifications_cancel" msgid="3690709735122344913">"Nein danke"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"Einrichten"</string> - <string name="muted_by" msgid="6147073845094180001">"Stummgeschaltet durch <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> - <!-- no translation found for screen_pinning_title (3273740381976175811) --> - <skip /> - <!-- no translation found for screen_pinning_description (1346522416878235405) --> - <skip /> - <!-- no translation found for screen_pinning_description_accessible (8518446209564202557) --> - <skip /> - <!-- no translation found for screen_pinning_positive (3783985798366751226) --> - <skip /> - <!-- no translation found for screen_pinning_negative (3741602308343880268) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_title (748792586749897883) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_message (2235970126803317374) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_button (2660339101868367515) --> - <skip /> + <string name="screen_pinning_title" msgid="3273740381976175811">"Bildschirm ist fixiert"</string> + <string name="screen_pinning_description" msgid="1346522416878235405">"Hiermit wird sie angezeigt, bis Sie die Fixierung aufheben. Berühren und halten Sie \"Zurück\" und \"Übersicht\" gleichzeitig, um die Fixierung aufzuheben."</string> + <string name="screen_pinning_description_accessible" msgid="8518446209564202557">"Hiermit wird sie angezeigt, bis Sie die Fixierung aufheben. Berühren und halten Sie \"Übersicht\", um die Fixierung aufzuheben."</string> + <string name="screen_pinning_positive" msgid="3783985798366751226">"OK"</string> + <string name="screen_pinning_negative" msgid="3741602308343880268">"Nein danke"</string> + <string name="quick_settings_reset_confirmation_title" msgid="748792586749897883">"<xliff:g id="TILE_LABEL">%1$s</xliff:g> ausblenden?"</string> + <string name="quick_settings_reset_confirmation_message" msgid="2235970126803317374">"Sie wird wieder eingeblendet, wenn Sie sie in den Einstellungen erneut aktivieren."</string> + <string name="quick_settings_reset_confirmation_button" msgid="2660339101868367515">"Ausblenden"</string> </resources> diff --git a/packages/SystemUI/res/values-el/strings.xml b/packages/SystemUI/res/values-el/strings.xml index 456733cdcecd..84a951725d87 100644 --- a/packages/SystemUI/res/values-el/strings.xml +++ b/packages/SystemUI/res/values-el/strings.xml @@ -354,22 +354,13 @@ <string name="hidden_notifications_text" msgid="2326409389088668981">"Εμφάνιση πριν το ξεκλείδωμα"</string> <string name="hidden_notifications_cancel" msgid="3690709735122344913">"Όχι"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"Ρύθμιση"</string> - <string name="muted_by" msgid="6147073845094180001">"Σίγαση από <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> - <!-- no translation found for screen_pinning_title (3273740381976175811) --> - <skip /> - <!-- no translation found for screen_pinning_description (1346522416878235405) --> - <skip /> - <!-- no translation found for screen_pinning_description_accessible (8518446209564202557) --> - <skip /> - <!-- no translation found for screen_pinning_positive (3783985798366751226) --> - <skip /> - <!-- no translation found for screen_pinning_negative (3741602308343880268) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_title (748792586749897883) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_message (2235970126803317374) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_button (2660339101868367515) --> - <skip /> + <string name="screen_pinning_title" msgid="3273740381976175811">"Η οθόνη καρφιτσώθηκε"</string> + <string name="screen_pinning_description" msgid="1346522416878235405">"Με αυτόν τον τρόπο παραμένει σε προβολή έως ότου την ξεκαρφιτσώσετε. Αγγίξτε παρατεταμένα \"Επιστροφή\" και \"Επισκόπηση\" ταυτόχρονα για ξεκαρφίτσωμα."</string> + <string name="screen_pinning_description_accessible" msgid="8518446209564202557">"Με αυτόν τον τρόπο παραμένει σε προβολή έως ότου την ξεκαρφιτσώσετε. Αγγίξτε παρατεταμένα \"Επισκόπηση\" για ξεκαρφίτσωμα."</string> + <string name="screen_pinning_positive" msgid="3783985798366751226">"Το κατάλαβα"</string> + <string name="screen_pinning_negative" msgid="3741602308343880268">"Όχι"</string> + <string name="quick_settings_reset_confirmation_title" msgid="748792586749897883">"Απόκρυψη <xliff:g id="TILE_LABEL">%1$s</xliff:g>;"</string> + <string name="quick_settings_reset_confirmation_message" msgid="2235970126803317374">"Θα εμφανιστεί ξανά την επόμενη φορά που θα το ενεργοποιήσετε στις ρυθμίσεις."</string> + <string name="quick_settings_reset_confirmation_button" msgid="2660339101868367515">"Απόκρυψη"</string> </resources> diff --git a/packages/SystemUI/res/values-en-rGB/strings.xml b/packages/SystemUI/res/values-en-rGB/strings.xml index c51460cbae6d..ac5707551462 100644 --- a/packages/SystemUI/res/values-en-rGB/strings.xml +++ b/packages/SystemUI/res/values-en-rGB/strings.xml @@ -352,7 +352,6 @@ <string name="hidden_notifications_text" msgid="2326409389088668981">"See them before you unlock"</string> <string name="hidden_notifications_cancel" msgid="3690709735122344913">"No, thanks"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"Setup"</string> - <string name="muted_by" msgid="6147073845094180001">"Muted by <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> <string name="screen_pinning_title" msgid="3273740381976175811">"Screen is pinned"</string> <string name="screen_pinning_description" msgid="1346522416878235405">"This keeps it in view until you unpin. Touch and hold Back and Overview at the same time to unpin."</string> diff --git a/packages/SystemUI/res/values-en-rIN/strings.xml b/packages/SystemUI/res/values-en-rIN/strings.xml index c51460cbae6d..ac5707551462 100644 --- a/packages/SystemUI/res/values-en-rIN/strings.xml +++ b/packages/SystemUI/res/values-en-rIN/strings.xml @@ -352,7 +352,6 @@ <string name="hidden_notifications_text" msgid="2326409389088668981">"See them before you unlock"</string> <string name="hidden_notifications_cancel" msgid="3690709735122344913">"No, thanks"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"Setup"</string> - <string name="muted_by" msgid="6147073845094180001">"Muted by <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> <string name="screen_pinning_title" msgid="3273740381976175811">"Screen is pinned"</string> <string name="screen_pinning_description" msgid="1346522416878235405">"This keeps it in view until you unpin. Touch and hold Back and Overview at the same time to unpin."</string> diff --git a/packages/SystemUI/res/values-es-rUS/strings.xml b/packages/SystemUI/res/values-es-rUS/strings.xml index 24214cfbf5c3..01836071c886 100644 --- a/packages/SystemUI/res/values-es-rUS/strings.xml +++ b/packages/SystemUI/res/values-es-rUS/strings.xml @@ -354,22 +354,13 @@ <string name="hidden_notifications_text" msgid="2326409389088668981">"Ver antes de desbloquear"</string> <string name="hidden_notifications_cancel" msgid="3690709735122344913">"No"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"Configurar"</string> - <string name="muted_by" msgid="6147073845094180001">"Silenciados por <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> - <!-- no translation found for screen_pinning_title (3273740381976175811) --> - <skip /> - <!-- no translation found for screen_pinning_description (1346522416878235405) --> - <skip /> - <!-- no translation found for screen_pinning_description_accessible (8518446209564202557) --> - <skip /> - <!-- no translation found for screen_pinning_positive (3783985798366751226) --> - <skip /> - <!-- no translation found for screen_pinning_negative (3741602308343880268) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_title (748792586749897883) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_message (2235970126803317374) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_button (2660339101868367515) --> - <skip /> + <string name="screen_pinning_title" msgid="3273740381976175811">"Pantalla fija"</string> + <string name="screen_pinning_description" msgid="1346522416878235405">"Esta función mantiene fija la vista de la pantalla hasta que la desactivas. Mantén presionados los botones Atrás y Recientes al mismo tiempo para anular la fijación."</string> + <string name="screen_pinning_description_accessible" msgid="8518446209564202557">"Esta función mantiene fija la vista de la pantalla hasta que la desactivas. Mantén presionado el botón Recientes para anular la fijación."</string> + <string name="screen_pinning_positive" msgid="3783985798366751226">"Entendido"</string> + <string name="screen_pinning_negative" msgid="3741602308343880268">"No, gracias"</string> + <string name="quick_settings_reset_confirmation_title" msgid="748792586749897883">"¿Ocultar <xliff:g id="TILE_LABEL">%1$s</xliff:g>?"</string> + <string name="quick_settings_reset_confirmation_message" msgid="2235970126803317374">"Volverá a aparecer la próxima vez que se active en la configuración."</string> + <string name="quick_settings_reset_confirmation_button" msgid="2660339101868367515">"Ocultar"</string> </resources> diff --git a/packages/SystemUI/res/values-es/strings.xml b/packages/SystemUI/res/values-es/strings.xml index 26f9930601ce..e81b26ef478e 100644 --- a/packages/SystemUI/res/values-es/strings.xml +++ b/packages/SystemUI/res/values-es/strings.xml @@ -352,22 +352,13 @@ <string name="hidden_notifications_text" msgid="2326409389088668981">"Ver antes de desbloquear"</string> <string name="hidden_notifications_cancel" msgid="3690709735122344913">"No, gracias"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"Configurar"</string> - <string name="muted_by" msgid="6147073845094180001">"Silenciado por <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> - <!-- no translation found for screen_pinning_title (3273740381976175811) --> - <skip /> - <!-- no translation found for screen_pinning_description (1346522416878235405) --> - <skip /> - <!-- no translation found for screen_pinning_description_accessible (8518446209564202557) --> - <skip /> - <!-- no translation found for screen_pinning_positive (3783985798366751226) --> - <skip /> - <!-- no translation found for screen_pinning_negative (3741602308343880268) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_title (748792586749897883) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_message (2235970126803317374) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_button (2660339101868367515) --> - <skip /> + <string name="screen_pinning_title" msgid="3273740381976175811">"Pantalla fijada"</string> + <string name="screen_pinning_description" msgid="1346522416878235405">"La pantalla se mantendrá visible hasta que dejes de fijarla. Para ello, mantén pulsados los botones de retroceso e información general."</string> + <string name="screen_pinning_description_accessible" msgid="8518446209564202557">"La pantalla se mantendrá visible hasta que dejes de fijarla. Para ello, mantén pulsado el botón de información general."</string> + <string name="screen_pinning_positive" msgid="3783985798366751226">"Entendido"</string> + <string name="screen_pinning_negative" msgid="3741602308343880268">"No, gracias"</string> + <string name="quick_settings_reset_confirmation_title" msgid="748792586749897883">"¿Ocultar <xliff:g id="TILE_LABEL">%1$s</xliff:g>?"</string> + <string name="quick_settings_reset_confirmation_message" msgid="2235970126803317374">"Volverá a aparecer la próxima vez que actives esta opción en Ajustes."</string> + <string name="quick_settings_reset_confirmation_button" msgid="2660339101868367515">"Ocultar"</string> </resources> diff --git a/packages/SystemUI/res/values-et-rEE/strings.xml b/packages/SystemUI/res/values-et-rEE/strings.xml index 5dca252a2046..af03e0f3fbca 100644 --- a/packages/SystemUI/res/values-et-rEE/strings.xml +++ b/packages/SystemUI/res/values-et-rEE/strings.xml @@ -352,22 +352,13 @@ <string name="hidden_notifications_text" msgid="2326409389088668981">"Näete neid enne avamist"</string> <string name="hidden_notifications_cancel" msgid="3690709735122344913">"Tänan, ei"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"Seadistus"</string> - <string name="muted_by" msgid="6147073845094180001">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> vaigistas"</string> <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> - <!-- no translation found for screen_pinning_title (3273740381976175811) --> - <skip /> - <!-- no translation found for screen_pinning_description (1346522416878235405) --> - <skip /> - <!-- no translation found for screen_pinning_description_accessible (8518446209564202557) --> - <skip /> - <!-- no translation found for screen_pinning_positive (3783985798366751226) --> - <skip /> - <!-- no translation found for screen_pinning_negative (3741602308343880268) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_title (748792586749897883) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_message (2235970126803317374) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_button (2660339101868367515) --> - <skip /> + <string name="screen_pinning_title" msgid="3273740381976175811">"Ekraan on kinnitatud"</string> + <string name="screen_pinning_description" msgid="1346522416878235405">"See hoiab selle kuval, kuni selle vabastate. Vabastamiseks puudutage ning hoidke korraga all nuppe Tagasi ja Ülevaade."</string> + <string name="screen_pinning_description_accessible" msgid="8518446209564202557">"See hoiab selle kuval, kuni selle vabastate. Vabastamiseks puudutage ja hoidke all nuppu Ülevaade."</string> + <string name="screen_pinning_positive" msgid="3783985798366751226">"Selge"</string> + <string name="screen_pinning_negative" msgid="3741602308343880268">"Tänan, ei"</string> + <string name="quick_settings_reset_confirmation_title" msgid="748792586749897883">"Kas peita <xliff:g id="TILE_LABEL">%1$s</xliff:g>?"</string> + <string name="quick_settings_reset_confirmation_message" msgid="2235970126803317374">"See kuvatakse uuesti järgmisel korral, kui selle seadetes sisse lülitate."</string> + <string name="quick_settings_reset_confirmation_button" msgid="2660339101868367515">"Peida"</string> </resources> diff --git a/packages/SystemUI/res/values-eu-rES/strings.xml b/packages/SystemUI/res/values-eu-rES/strings.xml index e3c3c8877191..e2152edd8915 100644 --- a/packages/SystemUI/res/values-eu-rES/strings.xml +++ b/packages/SystemUI/res/values-eu-rES/strings.xml @@ -352,22 +352,13 @@ <string name="hidden_notifications_text" msgid="2326409389088668981">"Ikusi desblokeatu baino lehen"</string> <string name="hidden_notifications_cancel" msgid="3690709735122344913">"Ez, eskerrik asko"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"Konfiguratu"</string> - <string name="muted_by" msgid="6147073845094180001">"Audioa desaktibatu da (<xliff:g id="THIRD_PARTY">%1$s</xliff:g>)"</string> <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> - <!-- no translation found for screen_pinning_title (3273740381976175811) --> - <skip /> - <!-- no translation found for screen_pinning_description (1346522416878235405) --> - <skip /> - <!-- no translation found for screen_pinning_description_accessible (8518446209564202557) --> - <skip /> - <!-- no translation found for screen_pinning_positive (3783985798366751226) --> - <skip /> - <!-- no translation found for screen_pinning_negative (3741602308343880268) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_title (748792586749897883) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_message (2235970126803317374) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_button (2660339101868367515) --> - <skip /> + <string name="screen_pinning_title" msgid="3273740381976175811">"Pantaila ainguratuta dago"</string> + <string name="screen_pinning_description" msgid="1346522416878235405">"Horrela, ikusgai mantenduko da aingura kendu arte. Aingura kentzeko, eduki ukituta aldi berean \"Atzera\" eta \"Ikuspegi orokorra\" botoiak."</string> + <string name="screen_pinning_description_accessible" msgid="8518446209564202557">"Horrela, ikusgai mantenduko da, aingura kendu arte. Aingura kentzeko, eduki ukituta \"Ikuspegi orokorra\" botoia."</string> + <string name="screen_pinning_positive" msgid="3783985798366751226">"Ados"</string> + <string name="screen_pinning_negative" msgid="3741602308343880268">"Ez, eskerrik asko"</string> + <string name="quick_settings_reset_confirmation_title" msgid="748792586749897883">"<xliff:g id="TILE_LABEL">%1$s</xliff:g> ezkutatu nahi duzu?"</string> + <string name="quick_settings_reset_confirmation_message" msgid="2235970126803317374">"Ezarpenetan aktibatzen duzun hurrengoan agertuko da berriro."</string> + <string name="quick_settings_reset_confirmation_button" msgid="2660339101868367515">"Ezkutatu"</string> </resources> diff --git a/packages/SystemUI/res/values-fa/strings.xml b/packages/SystemUI/res/values-fa/strings.xml index 0f99deb4d2bf..6c2f9ff40130 100644 --- a/packages/SystemUI/res/values-fa/strings.xml +++ b/packages/SystemUI/res/values-fa/strings.xml @@ -352,22 +352,13 @@ <string name="hidden_notifications_text" msgid="2326409389088668981">"قبل از باز کردن قفل آنها را مشاهده کنید"</string> <string name="hidden_notifications_cancel" msgid="3690709735122344913">"خیر، سپاسگزارم"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"راهاندازی"</string> - <string name="muted_by" msgid="6147073845094180001">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> آن را بیصدا کرد"</string> <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> - <!-- no translation found for screen_pinning_title (3273740381976175811) --> - <skip /> - <!-- no translation found for screen_pinning_description (1346522416878235405) --> - <skip /> - <!-- no translation found for screen_pinning_description_accessible (8518446209564202557) --> - <skip /> - <!-- no translation found for screen_pinning_positive (3783985798366751226) --> - <skip /> - <!-- no translation found for screen_pinning_negative (3741602308343880268) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_title (748792586749897883) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_message (2235970126803317374) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_button (2660339101868367515) --> - <skip /> + <string name="screen_pinning_title" msgid="3273740381976175811">"صفحه نمایش پین شد"</string> + <string name="screen_pinning_description" msgid="1346522416878235405">"تا زمانی که پین را بردارید، در نما نگهداشته میشود. برای برداشتن پین، برگشت و نمای کلی را به صورت همزمان لمس کنید و نگهدارید."</string> + <string name="screen_pinning_description_accessible" msgid="8518446209564202557">"تا زمانی که پین را بردارید، در نما نگهداشته میشود. برای برداشتن پین، نمای کلی را لمس کنید و نگهدارید."</string> + <string name="screen_pinning_positive" msgid="3783985798366751226">"متوجه شدم"</string> + <string name="screen_pinning_negative" msgid="3741602308343880268">"خیر متشکرم"</string> + <string name="quick_settings_reset_confirmation_title" msgid="748792586749897883">"<xliff:g id="TILE_LABEL">%1$s</xliff:g> مخفی شود؟"</string> + <string name="quick_settings_reset_confirmation_message" msgid="2235970126803317374">"دفعه بعد که آن را روشن کنید، در تنظیمات نشان داده میشود."</string> + <string name="quick_settings_reset_confirmation_button" msgid="2660339101868367515">"پنهان کردن"</string> </resources> diff --git a/packages/SystemUI/res/values-fi/strings.xml b/packages/SystemUI/res/values-fi/strings.xml index 82cb6903587a..af3d4175fd1f 100644 --- a/packages/SystemUI/res/values-fi/strings.xml +++ b/packages/SystemUI/res/values-fi/strings.xml @@ -352,22 +352,13 @@ <string name="hidden_notifications_text" msgid="2326409389088668981">"Näytä ennen lukituksen avaamista"</string> <string name="hidden_notifications_cancel" msgid="3690709735122344913">"Ei kiitos"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"Määritä asetukset"</string> - <string name="muted_by" msgid="6147073845094180001">"Mykistänyt <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> - <!-- no translation found for screen_pinning_title (3273740381976175811) --> - <skip /> - <!-- no translation found for screen_pinning_description (1346522416878235405) --> - <skip /> - <!-- no translation found for screen_pinning_description_accessible (8518446209564202557) --> - <skip /> - <!-- no translation found for screen_pinning_positive (3783985798366751226) --> - <skip /> - <!-- no translation found for screen_pinning_negative (3741602308343880268) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_title (748792586749897883) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_message (2235970126803317374) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_button (2660339101868367515) --> - <skip /> + <string name="screen_pinning_title" msgid="3273740381976175811">"Näyttö on kiinnitetty"</string> + <string name="screen_pinning_description" msgid="1346522416878235405">"Tämä pitää sen näkyvissä, kunnes poistat kiinnityksen. Kosketa Edellinen- ja Viimeisimmät-kohtaa samanaikaisesti pitkään kiinnityksen poistamiseksi."</string> + <string name="screen_pinning_description_accessible" msgid="8518446209564202557">"Tämä pitää sen näkyvissä, kunnes poistat kiinnityksen. Kosketa Viimeisimmät-kohtaa pitkään kiinnityksen poistamiseksi."</string> + <string name="screen_pinning_positive" msgid="3783985798366751226">"Selvä"</string> + <string name="screen_pinning_negative" msgid="3741602308343880268">"Ei kiitos"</string> + <string name="quick_settings_reset_confirmation_title" msgid="748792586749897883">"Piilotetaanko <xliff:g id="TILE_LABEL">%1$s</xliff:g>?"</string> + <string name="quick_settings_reset_confirmation_message" msgid="2235970126803317374">"Se tulee takaisin näkyviin, kun seuraavan kerran otat sen käyttöön asetuksissa."</string> + <string name="quick_settings_reset_confirmation_button" msgid="2660339101868367515">"Piilota"</string> </resources> diff --git a/packages/SystemUI/res/values-fr-rCA/strings.xml b/packages/SystemUI/res/values-fr-rCA/strings.xml index 64bd3ecb6ccc..a73ab99e2a3a 100644 --- a/packages/SystemUI/res/values-fr-rCA/strings.xml +++ b/packages/SystemUI/res/values-fr-rCA/strings.xml @@ -303,7 +303,7 @@ <string name="interruption_level_none" msgid="3831278883136066646">"Aucun"</string> <string name="interruption_level_priority" msgid="6517366750688942030">"Priorité"</string> <string name="interruption_level_all" msgid="1330581184930945764">"Tous"</string> - <string name="keyguard_indication_charging_time" msgid="1757251776872835768">"Charge en cours... (chargée à 100 % dans <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g>)"</string> + <string name="keyguard_indication_charging_time" msgid="1757251776872835768">"Charge en cours... (chargée à 100 %% dans <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g>)"</string> <string name="accessibility_multi_user_switch_switcher" msgid="7305948938141024937">"Changer d\'utilisateur"</string> <string name="accessibility_multi_user_switch_switcher_with_current" msgid="8434880595284601601">"Changer d\'utilisateur (utilisateur actuel <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>)"</string> <string name="accessibility_multi_user_switch_quick_contact" msgid="3020367729287990475">"Afficher le profil"</string> @@ -354,22 +354,13 @@ <string name="hidden_notifications_text" msgid="2326409389088668981">"Afficher les notifications avant de déverrouiller l\'appareil"</string> <string name="hidden_notifications_cancel" msgid="3690709735122344913">"Non, merci"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"Configurer"</string> - <string name="muted_by" msgid="6147073845094180001">"Mis en sourdine par <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> - <!-- no translation found for screen_pinning_title (3273740381976175811) --> - <skip /> - <!-- no translation found for screen_pinning_description (1346522416878235405) --> - <skip /> - <!-- no translation found for screen_pinning_description_accessible (8518446209564202557) --> - <skip /> - <!-- no translation found for screen_pinning_positive (3783985798366751226) --> - <skip /> - <!-- no translation found for screen_pinning_negative (3741602308343880268) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_title (748792586749897883) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_message (2235970126803317374) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_button (2660339101868367515) --> - <skip /> + <string name="screen_pinning_title" msgid="3273740381976175811">"L\'écran est épinglé"</string> + <string name="screen_pinning_description" msgid="1346522416878235405">"Cet écran est épinglé jusqu\'à ce que vous annuliez l\'opération. Pour annuler l\'épinglage, maintenez un doigt simultanément sur « Retour » et « Aperçu »."</string> + <string name="screen_pinning_description_accessible" msgid="8518446209564202557">"Cet écran est épinglé jusqu\'à ce que vous annuliez l\'opération. Pour annuler l\'épinglage, maintenez le doigt sur « Aperçu »."</string> + <string name="screen_pinning_positive" msgid="3783985798366751226">"OK"</string> + <string name="screen_pinning_negative" msgid="3741602308343880268">"Non, merci"</string> + <string name="quick_settings_reset_confirmation_title" msgid="748792586749897883">"Masquer <xliff:g id="TILE_LABEL">%1$s</xliff:g>?"</string> + <string name="quick_settings_reset_confirmation_message" msgid="2235970126803317374">"Cet élément réapparaîtra la prochaine fois que vous l\'activerez dans les paramètres."</string> + <string name="quick_settings_reset_confirmation_button" msgid="2660339101868367515">"Masquer"</string> </resources> diff --git a/packages/SystemUI/res/values-fr/strings.xml b/packages/SystemUI/res/values-fr/strings.xml index 9f19c8821082..ccbad3493b84 100644 --- a/packages/SystemUI/res/values-fr/strings.xml +++ b/packages/SystemUI/res/values-fr/strings.xml @@ -354,22 +354,13 @@ <string name="hidden_notifications_text" msgid="2326409389088668981">"Afficher les notifications avant de déverrouiller l\'appareil"</string> <string name="hidden_notifications_cancel" msgid="3690709735122344913">"Non, merci"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"Configurer"</string> - <string name="muted_by" msgid="6147073845094180001">"Son coupé par : <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> - <!-- no translation found for screen_pinning_title (3273740381976175811) --> - <skip /> - <!-- no translation found for screen_pinning_description (1346522416878235405) --> - <skip /> - <!-- no translation found for screen_pinning_description_accessible (8518446209564202557) --> - <skip /> - <!-- no translation found for screen_pinning_positive (3783985798366751226) --> - <skip /> - <!-- no translation found for screen_pinning_negative (3741602308343880268) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_title (748792586749897883) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_message (2235970126803317374) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_button (2660339101868367515) --> - <skip /> + <string name="screen_pinning_title" msgid="3273740381976175811">"Écran épinglé"</string> + <string name="screen_pinning_description" msgid="1346522416878235405">"Cet écran est épinglé jusqu\'à annulation de l\'opération. Pour annuler l\'épinglage, appuyez simultanément sur \"Retour\" et \"Aperçu\" de manière prolongée."</string> + <string name="screen_pinning_description_accessible" msgid="8518446209564202557">"Cet écran est épinglé jusqu\'à annulation de l\'opération. Pour annuler l\'épinglage, appuyez de manière prolongée sur \"Aperçu\"."</string> + <string name="screen_pinning_positive" msgid="3783985798366751226">"OK"</string> + <string name="screen_pinning_negative" msgid="3741602308343880268">"Non, merci"</string> + <string name="quick_settings_reset_confirmation_title" msgid="748792586749897883">"Masquer <xliff:g id="TILE_LABEL">%1$s</xliff:g> ?"</string> + <string name="quick_settings_reset_confirmation_message" msgid="2235970126803317374">"Cet élément réapparaîtra la prochaine fois que vous l\'activerez dans les paramètres."</string> + <string name="quick_settings_reset_confirmation_button" msgid="2660339101868367515">"Masquer"</string> </resources> diff --git a/packages/SystemUI/res/values-gl-rES/strings.xml b/packages/SystemUI/res/values-gl-rES/strings.xml index ffc0044bd401..6b5b5cd5e3a2 100644 --- a/packages/SystemUI/res/values-gl-rES/strings.xml +++ b/packages/SystemUI/res/values-gl-rES/strings.xml @@ -354,22 +354,13 @@ <string name="hidden_notifications_text" msgid="2326409389088668981">"Consúltaas antes de desbloquear"</string> <string name="hidden_notifications_cancel" msgid="3690709735122344913">"Non grazas"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"Configurar"</string> - <string name="muted_by" msgid="6147073845094180001">"Silenciado por <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> - <!-- no translation found for screen_pinning_title (3273740381976175811) --> - <skip /> - <!-- no translation found for screen_pinning_description (1346522416878235405) --> - <skip /> - <!-- no translation found for screen_pinning_description_accessible (8518446209564202557) --> - <skip /> - <!-- no translation found for screen_pinning_positive (3783985798366751226) --> - <skip /> - <!-- no translation found for screen_pinning_negative (3741602308343880268) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_title (748792586749897883) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_message (2235970126803317374) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_button (2660339101868367515) --> - <skip /> + <string name="screen_pinning_title" msgid="3273740381976175811">"A pantalla está fixada"</string> + <string name="screen_pinning_description" msgid="1346522416878235405">"A pantalla manterase visible ata que anules a fixación. Para facelo, mantén premido Atrás e Visión xeral ao mesmo tempo."</string> + <string name="screen_pinning_description_accessible" msgid="8518446209564202557">"A pantalla manterase visible ata que anules a fixación. Para facelo, mantén premido Visión xeral."</string> + <string name="screen_pinning_positive" msgid="3783985798366751226">"De acordo"</string> + <string name="screen_pinning_negative" msgid="3741602308343880268">"Non, grazas"</string> + <string name="quick_settings_reset_confirmation_title" msgid="748792586749897883">"Queres ocultar <xliff:g id="TILE_LABEL">%1$s</xliff:g>?"</string> + <string name="quick_settings_reset_confirmation_message" msgid="2235970126803317374">"Volverá aparecer a próxima vez que se active na configuración."</string> + <string name="quick_settings_reset_confirmation_button" msgid="2660339101868367515">"Ocultar"</string> </resources> diff --git a/packages/SystemUI/res/values-hi/strings.xml b/packages/SystemUI/res/values-hi/strings.xml index 0c1778638f5e..3426ed96bdf3 100644 --- a/packages/SystemUI/res/values-hi/strings.xml +++ b/packages/SystemUI/res/values-hi/strings.xml @@ -352,22 +352,13 @@ <string name="hidden_notifications_text" msgid="2326409389088668981">"आपके द्वारा उन्हें अनलॉक किए जाने से पहले देखें"</string> <string name="hidden_notifications_cancel" msgid="3690709735122344913">"नहीं धन्यवाद"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"सेट करें"</string> - <string name="muted_by" msgid="6147073845094180001">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> द्वारा म्यूट किया गया"</string> <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> - <!-- no translation found for screen_pinning_title (3273740381976175811) --> - <skip /> - <!-- no translation found for screen_pinning_description (1346522416878235405) --> - <skip /> - <!-- no translation found for screen_pinning_description_accessible (8518446209564202557) --> - <skip /> - <!-- no translation found for screen_pinning_positive (3783985798366751226) --> - <skip /> - <!-- no translation found for screen_pinning_negative (3741602308343880268) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_title (748792586749897883) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_message (2235970126803317374) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_button (2660339101868367515) --> - <skip /> + <string name="screen_pinning_title" msgid="3273740381976175811">"स्क्रीन पिन कर दी गई है"</string> + <string name="screen_pinning_description" msgid="1346522416878235405">"इससे वह तब तक दृश्य में रहता है जब तक कि आप उसे अनपिन नहीं कर देते. अनपिन करने के लिए वापस जाएं और अवलोकन करें को एक ही समय पर स्पर्श करके रखें."</string> + <string name="screen_pinning_description_accessible" msgid="8518446209564202557">"इससे वह तब तक दृश्य में बना रहता है जब तक कि आप उसे अनपिन नहीं कर देते. अनपिन करने के लिए अवलोकन करें को स्पर्श करके रखें."</string> + <string name="screen_pinning_positive" msgid="3783985798366751226">"समझ लिया"</string> + <string name="screen_pinning_negative" msgid="3741602308343880268">"नहीं, रहने दें"</string> + <string name="quick_settings_reset_confirmation_title" msgid="748792586749897883">"<xliff:g id="TILE_LABEL">%1$s</xliff:g> को छिपाएं?"</string> + <string name="quick_settings_reset_confirmation_message" msgid="2235970126803317374">"जब आप उसे अगली बार सेटिंग में चालू करेंगे तो वह फिर से दिखाई देगी."</string> + <string name="quick_settings_reset_confirmation_button" msgid="2660339101868367515">"छिपाएं"</string> </resources> diff --git a/packages/SystemUI/res/values-hr/strings.xml b/packages/SystemUI/res/values-hr/strings.xml index 5b9eee8ba77b..043eaacbdb40 100644 --- a/packages/SystemUI/res/values-hr/strings.xml +++ b/packages/SystemUI/res/values-hr/strings.xml @@ -352,22 +352,13 @@ <string name="hidden_notifications_text" msgid="2326409389088668981">"Pogledajte ih prije otključavanja"</string> <string name="hidden_notifications_cancel" msgid="3690709735122344913">"Ne, hvala"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"Postavi"</string> - <string name="muted_by" msgid="6147073845094180001">"Zvuk je isklj. treća strana <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> - <!-- no translation found for screen_pinning_title (3273740381976175811) --> - <skip /> - <!-- no translation found for screen_pinning_description (1346522416878235405) --> - <skip /> - <!-- no translation found for screen_pinning_description_accessible (8518446209564202557) --> - <skip /> - <!-- no translation found for screen_pinning_positive (3783985798366751226) --> - <skip /> - <!-- no translation found for screen_pinning_negative (3741602308343880268) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_title (748792586749897883) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_message (2235970126803317374) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_button (2660339101868367515) --> - <skip /> + <string name="screen_pinning_title" msgid="3273740381976175811">"Zaslon je prikvačen"</string> + <string name="screen_pinning_description" msgid="1346522416878235405">"Zaslon će tako ostati u prvom planu dok ga ne otkvačite. Istovremeno dodirnite i držite Natrag i Pregled da biste ga otkvačili."</string> + <string name="screen_pinning_description_accessible" msgid="8518446209564202557">"Zaslon će tako ostati u prvom planu dok ga ne otkvačite. Dodirnite i držite Pregled da biste ga otkvačili."</string> + <string name="screen_pinning_positive" msgid="3783985798366751226">"Shvaćam"</string> + <string name="screen_pinning_negative" msgid="3741602308343880268">"Ne, hvala"</string> + <string name="quick_settings_reset_confirmation_title" msgid="748792586749897883">"Želite li sakriti pločicu <xliff:g id="TILE_LABEL">%1$s</xliff:g>?"</string> + <string name="quick_settings_reset_confirmation_message" msgid="2235970126803317374">"Ponovo će se pojaviti kada je sljedeći put uključite u postavkama."</string> + <string name="quick_settings_reset_confirmation_button" msgid="2660339101868367515">"Sakrij"</string> </resources> diff --git a/packages/SystemUI/res/values-hu/strings.xml b/packages/SystemUI/res/values-hu/strings.xml index e4911b6e5e8b..016c993b7f98 100644 --- a/packages/SystemUI/res/values-hu/strings.xml +++ b/packages/SystemUI/res/values-hu/strings.xml @@ -352,22 +352,13 @@ <string name="hidden_notifications_text" msgid="2326409389088668981">"Már a képernyőzár feloldása előtt megtekintheti őket"</string> <string name="hidden_notifications_cancel" msgid="3690709735122344913">"Nem, köszönöm"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"Beállítás"</string> - <string name="muted_by" msgid="6147073845094180001">"A(z) <xliff:g id="THIRD_PARTY">%1$s</xliff:g> elnémította"</string> <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> - <!-- no translation found for screen_pinning_title (3273740381976175811) --> - <skip /> - <!-- no translation found for screen_pinning_description (1346522416878235405) --> - <skip /> - <!-- no translation found for screen_pinning_description_accessible (8518446209564202557) --> - <skip /> - <!-- no translation found for screen_pinning_positive (3783985798366751226) --> - <skip /> - <!-- no translation found for screen_pinning_negative (3741602308343880268) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_title (748792586749897883) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_message (2235970126803317374) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_button (2660339101868367515) --> - <skip /> + <string name="screen_pinning_title" msgid="3273740381976175811">"A képernyő rögzítve van"</string> + <string name="screen_pinning_description" msgid="1346522416878235405">"Megjelenítve tartja addig, amíg Ön fel nem oldja fel a rögzítést. A rögzítés feloldásához tartsa egyszerre lenyomva a Vissza és az Áttekintés lehetőséget."</string> + <string name="screen_pinning_description_accessible" msgid="8518446209564202557">"Megjelenítve tartja addig, amíg Ön fel nem oldja a rögzítést. A feloldáshoz tartsa lenyomva az Áttekintés lehetőséget."</string> + <string name="screen_pinning_positive" msgid="3783985798366751226">"Értem"</string> + <string name="screen_pinning_negative" msgid="3741602308343880268">"Nem, köszönöm"</string> + <string name="quick_settings_reset_confirmation_title" msgid="748792586749897883">"Elrejti ezt: <xliff:g id="TILE_LABEL">%1$s</xliff:g>?"</string> + <string name="quick_settings_reset_confirmation_message" msgid="2235970126803317374">"Újból megjelenik majd, amikor ismét engedélyezi a beállítások között."</string> + <string name="quick_settings_reset_confirmation_button" msgid="2660339101868367515">"Elrejtés"</string> </resources> diff --git a/packages/SystemUI/res/values-hy-rAM/strings.xml b/packages/SystemUI/res/values-hy-rAM/strings.xml index d0099ee3ebab..e49d94139cf9 100644 --- a/packages/SystemUI/res/values-hy-rAM/strings.xml +++ b/packages/SystemUI/res/values-hy-rAM/strings.xml @@ -352,14 +352,13 @@ <string name="hidden_notifications_text" msgid="2326409389088668981">"Տեսեք դրանք մինչև ապակողպելը"</string> <string name="hidden_notifications_cancel" msgid="3690709735122344913">"Ոչ, շնորհակալություն"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"Կարգավորել"</string> - <string name="muted_by" msgid="6147073845094180001">"Համրեցվել է <xliff:g id="THIRD_PARTY">%1$s</xliff:g>-ի կողմից"</string> <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> <string name="screen_pinning_title" msgid="3273740381976175811">"Էկրանն ամրացված է"</string> - <string name="screen_pinning_description" msgid="1346522416878235405">"Էկրանը կմնա տեսադաշտում մինչև այն ապամրացնելը: Միաժամանակ հպեք և պահեք Համատեսքի և Հետ կոճակները՝ ապամրացնելու համար:"</string> - <string name="screen_pinning_description_accessible" msgid="8518446209564202557">"Էկրանը կմնա տեսադաշտում մինչև այն ապամրացնելը: Հպեք և պահեք Համատեսքի կոճակին՝ ապամրացնելու համար:"</string> + <string name="screen_pinning_description" msgid="1346522416878235405">"Էկրանը կմնա տեսադաշտում, մինչև այն ապամրացնեք: Ապամրացնելու համար միաժամանակ հպեք և պահեք Համատեսքի և Հետ կոճակները:"</string> + <string name="screen_pinning_description_accessible" msgid="8518446209564202557">"Էկրանը կմնա տեսադաշտում, մինչև այն ապամրացնեք: Ապամրացնելու համար հպեք և պահեք Համատեսքի կոճակը:"</string> <string name="screen_pinning_positive" msgid="3783985798366751226">"Հասկանալի է"</string> <string name="screen_pinning_negative" msgid="3741602308343880268">"Ոչ, շնորհակալություն"</string> <string name="quick_settings_reset_confirmation_title" msgid="748792586749897883">"Թաքցնե՞լ <xliff:g id="TILE_LABEL">%1$s</xliff:g>-ը:"</string> - <string name="quick_settings_reset_confirmation_message" msgid="2235970126803317374">"Այն դարձյալ կհայտնվի, հենց որ նորից միացնեք կարգավորումներից:"</string> + <string name="quick_settings_reset_confirmation_message" msgid="2235970126803317374">"Այն դարձյալ կհայտնվի, երբ նորից միացնեք կարգավորումներում:"</string> <string name="quick_settings_reset_confirmation_button" msgid="2660339101868367515">"Թաքցնել"</string> </resources> diff --git a/packages/SystemUI/res/values-in/strings.xml b/packages/SystemUI/res/values-in/strings.xml index 1563f1120ede..2234edc8a664 100644 --- a/packages/SystemUI/res/values-in/strings.xml +++ b/packages/SystemUI/res/values-in/strings.xml @@ -352,22 +352,13 @@ <string name="hidden_notifications_text" msgid="2326409389088668981">"Lihat sebelum membuka kunci"</string> <string name="hidden_notifications_cancel" msgid="3690709735122344913">"Tidak"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"Siapkan"</string> - <string name="muted_by" msgid="6147073845094180001">"Dinonaktifkan oleh <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> - <!-- no translation found for screen_pinning_title (3273740381976175811) --> - <skip /> - <!-- no translation found for screen_pinning_description (1346522416878235405) --> - <skip /> - <!-- no translation found for screen_pinning_description_accessible (8518446209564202557) --> - <skip /> - <!-- no translation found for screen_pinning_positive (3783985798366751226) --> - <skip /> - <!-- no translation found for screen_pinning_negative (3741602308343880268) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_title (748792586749897883) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_message (2235970126803317374) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_button (2660339101868367515) --> - <skip /> + <string name="screen_pinning_title" msgid="3273740381976175811">"Layar dipasangi pin"</string> + <string name="screen_pinning_description" msgid="1346522416878235405">"Ini akan terus ditampilkan sampai Anda melepas pin. Sentuh dan tahan tombol Kembali dan Ringkasan secara bersamaan untuk melepas pin."</string> + <string name="screen_pinning_description_accessible" msgid="8518446209564202557">"Ini akan terus ditampilkan sampai Anda melepas pin. Sentuh dan tahan tombol Ringkasan untuk melepas pin."</string> + <string name="screen_pinning_positive" msgid="3783985798366751226">"Mengerti"</string> + <string name="screen_pinning_negative" msgid="3741602308343880268">"Tidak, terima kasih"</string> + <string name="quick_settings_reset_confirmation_title" msgid="748792586749897883">"Sembunyikan <xliff:g id="TILE_LABEL">%1$s</xliff:g>?"</string> + <string name="quick_settings_reset_confirmation_message" msgid="2235970126803317374">"Ini akan muncul kembali saat Anda mengaktifkannya dalam setelan."</string> + <string name="quick_settings_reset_confirmation_button" msgid="2660339101868367515">"Sembunyikan"</string> </resources> diff --git a/packages/SystemUI/res/values-is-rIS/strings.xml b/packages/SystemUI/res/values-is-rIS/strings.xml index 6acc2ec21020..455a9f06cbdf 100644 --- a/packages/SystemUI/res/values-is-rIS/strings.xml +++ b/packages/SystemUI/res/values-is-rIS/strings.xml @@ -352,22 +352,13 @@ <string name="hidden_notifications_text" msgid="2326409389088668981">"Sjáðu þær áður en þú opnar"</string> <string name="hidden_notifications_cancel" msgid="3690709735122344913">"Nei, takk"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"Setja upp"</string> - <string name="muted_by" msgid="6147073845094180001">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> tók hljóðið af"</string> <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> - <!-- no translation found for screen_pinning_title (3273740381976175811) --> - <skip /> - <!-- no translation found for screen_pinning_description (1346522416878235405) --> - <skip /> - <!-- no translation found for screen_pinning_description_accessible (8518446209564202557) --> - <skip /> - <!-- no translation found for screen_pinning_positive (3783985798366751226) --> - <skip /> - <!-- no translation found for screen_pinning_negative (3741602308343880268) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_title (748792586749897883) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_message (2235970126803317374) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_button (2660339101868367515) --> - <skip /> + <string name="screen_pinning_title" msgid="3273740381976175811">"Skjárinn er festur"</string> + <string name="screen_pinning_description" msgid="1346522416878235405">"Þetta heldur þessu opnu þangað til þú losar. Haltu bakk- og yfirlitshnöppunum inni á sama tíma til að losa."</string> + <string name="screen_pinning_description_accessible" msgid="8518446209564202557">"Þetta heldur þessu opnu þangað til þú losar. Haltu yfirlitshnappinum inni til að losa."</string> + <string name="screen_pinning_positive" msgid="3783985798366751226">"Ég skil"</string> + <string name="screen_pinning_negative" msgid="3741602308343880268">"Nei, takk"</string> + <string name="quick_settings_reset_confirmation_title" msgid="748792586749897883">"Fela <xliff:g id="TILE_LABEL">%1$s</xliff:g>?"</string> + <string name="quick_settings_reset_confirmation_message" msgid="2235970126803317374">"Þetta birtist aftur næst þegar þú kveikir á því í stillingunum."</string> + <string name="quick_settings_reset_confirmation_button" msgid="2660339101868367515">"Fela"</string> </resources> diff --git a/packages/SystemUI/res/values-it/strings.xml b/packages/SystemUI/res/values-it/strings.xml index 2672c54638b8..c140933f2de3 100644 --- a/packages/SystemUI/res/values-it/strings.xml +++ b/packages/SystemUI/res/values-it/strings.xml @@ -354,22 +354,13 @@ <string name="hidden_notifications_text" msgid="2326409389088668981">"Visualizza prima di sbloccare"</string> <string name="hidden_notifications_cancel" msgid="3690709735122344913">"No, grazie"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"Configura"</string> - <string name="muted_by" msgid="6147073845094180001">"Audio disattivato da <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> - <!-- no translation found for screen_pinning_title (3273740381976175811) --> - <skip /> - <!-- no translation found for screen_pinning_description (1346522416878235405) --> - <skip /> - <!-- no translation found for screen_pinning_description_accessible (8518446209564202557) --> - <skip /> - <!-- no translation found for screen_pinning_positive (3783985798366751226) --> - <skip /> - <!-- no translation found for screen_pinning_negative (3741602308343880268) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_title (748792586749897883) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_message (2235970126803317374) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_button (2660339101868367515) --> - <skip /> + <string name="screen_pinning_title" msgid="3273740381976175811">"La schermata è bloccata"</string> + <string name="screen_pinning_description" msgid="1346522416878235405">"La schermata rimane visibile finché la sblocchi. Tocca e tieni premuti contemporaneamente Indietro e Panoramica per sbloccare."</string> + <string name="screen_pinning_description_accessible" msgid="8518446209564202557">"La schermata rimane visibile finché la sblocchi. Tocca Panoramica e tieni premuto per sbloccare."</string> + <string name="screen_pinning_positive" msgid="3783985798366751226">"OK"</string> + <string name="screen_pinning_negative" msgid="3741602308343880268">"No, grazie"</string> + <string name="quick_settings_reset_confirmation_title" msgid="748792586749897883">"Nascondere <xliff:g id="TILE_LABEL">%1$s</xliff:g>?"</string> + <string name="quick_settings_reset_confirmation_message" msgid="2235970126803317374">"Verranno visualizzate di nuovo quando le riattiverai nelle impostazioni."</string> + <string name="quick_settings_reset_confirmation_button" msgid="2660339101868367515">"Nascondi"</string> </resources> diff --git a/packages/SystemUI/res/values-iw/strings.xml b/packages/SystemUI/res/values-iw/strings.xml index 3d1b2dca2d64..d08579a4a1e1 100644 --- a/packages/SystemUI/res/values-iw/strings.xml +++ b/packages/SystemUI/res/values-iw/strings.xml @@ -352,22 +352,13 @@ <string name="hidden_notifications_text" msgid="2326409389088668981">"צפה בהן לפני שתבטל נעילה"</string> <string name="hidden_notifications_cancel" msgid="3690709735122344913">"לא, תודה"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"הגדר"</string> - <string name="muted_by" msgid="6147073845094180001">"הושתק על ידי <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> - <!-- no translation found for screen_pinning_title (3273740381976175811) --> - <skip /> - <!-- no translation found for screen_pinning_description (1346522416878235405) --> - <skip /> - <!-- no translation found for screen_pinning_description_accessible (8518446209564202557) --> - <skip /> - <!-- no translation found for screen_pinning_positive (3783985798366751226) --> - <skip /> - <!-- no translation found for screen_pinning_negative (3741602308343880268) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_title (748792586749897883) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_message (2235970126803317374) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_button (2660339101868367515) --> - <skip /> + <string name="screen_pinning_title" msgid="3273740381976175811">"המסך מוצמד"</string> + <string name="screen_pinning_description" msgid="1346522416878235405">"שומר בתצוגה עד לביטול ההצמדה. גע והחזק בו-זמנית ב\'הקודם\' ו\'סקירה\' כדי לבטל הצמדה."</string> + <string name="screen_pinning_description_accessible" msgid="8518446209564202557">"שומר בתצוגה עד לביטול ההצמדה. גע והחזק בו-זמנית ב\'הקודם\' ו\'סקירה\' כדי לבטל הצמדה."</string> + <string name="screen_pinning_positive" msgid="3783985798366751226">"הבנתי"</string> + <string name="screen_pinning_negative" msgid="3741602308343880268">"לא, תודה"</string> + <string name="quick_settings_reset_confirmation_title" msgid="748792586749897883">"להסתיר<xliff:g id="TILE_LABEL">%1$s</xliff:g>?"</string> + <string name="quick_settings_reset_confirmation_message" msgid="2235970126803317374">"יופיע מחדש בפעם הבאה שתפעיל את האפשרות בהגדרות."</string> + <string name="quick_settings_reset_confirmation_button" msgid="2660339101868367515">"הסתר"</string> </resources> diff --git a/packages/SystemUI/res/values-ja/strings.xml b/packages/SystemUI/res/values-ja/strings.xml index aaead1efdfbb..33b3545f2456 100644 --- a/packages/SystemUI/res/values-ja/strings.xml +++ b/packages/SystemUI/res/values-ja/strings.xml @@ -354,22 +354,13 @@ <string name="hidden_notifications_text" msgid="2326409389088668981">"ロックを解除する前にご確認ください"</string> <string name="hidden_notifications_cancel" msgid="3690709735122344913">"キャンセル"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"設定"</string> - <string name="muted_by" msgid="6147073845094180001">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g>によりミュートになっています"</string> <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>。<xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> - <!-- no translation found for screen_pinning_title (3273740381976175811) --> - <skip /> - <!-- no translation found for screen_pinning_description (1346522416878235405) --> - <skip /> - <!-- no translation found for screen_pinning_description_accessible (8518446209564202557) --> - <skip /> - <!-- no translation found for screen_pinning_positive (3783985798366751226) --> - <skip /> - <!-- no translation found for screen_pinning_negative (3741602308343880268) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_title (748792586749897883) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_message (2235970126803317374) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_button (2660339101868367515) --> - <skip /> + <string name="screen_pinning_title" msgid="3273740381976175811">"画面が固定されました"</string> + <string name="screen_pinning_description" msgid="1346522416878235405">"固定を解除するまで画面が常に表示されるようになります。[戻る]と[最近]を同時に押し続けると固定が解除されます。"</string> + <string name="screen_pinning_description_accessible" msgid="8518446209564202557">"固定を解除するまで画面が常に表示されるようになります。[最近]を押し続けると固定が解除されます。"</string> + <string name="screen_pinning_positive" msgid="3783985798366751226">"はい"</string> + <string name="screen_pinning_negative" msgid="3741602308343880268">"いいえ"</string> + <string name="quick_settings_reset_confirmation_title" msgid="748792586749897883">"<xliff:g id="TILE_LABEL">%1$s</xliff:g>を非表示にしますか？"</string> + <string name="quick_settings_reset_confirmation_message" msgid="2235970126803317374">"次回、設定でONにすると再表示されます。"</string> + <string name="quick_settings_reset_confirmation_button" msgid="2660339101868367515">"非表示"</string> </resources> diff --git a/packages/SystemUI/res/values-ka-rGE/strings.xml b/packages/SystemUI/res/values-ka-rGE/strings.xml index 3330ba5766c9..9babc8174d49 100644 --- a/packages/SystemUI/res/values-ka-rGE/strings.xml +++ b/packages/SystemUI/res/values-ka-rGE/strings.xml @@ -352,22 +352,13 @@ <string name="hidden_notifications_text" msgid="2326409389088668981">"იხილეთ განბლოკვამდე"</string> <string name="hidden_notifications_cancel" msgid="3690709735122344913">"არა, გმადლობთ"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"დაყენება"</string> - <string name="muted_by" msgid="6147073845094180001">"დადუმებულია <xliff:g id="THIRD_PARTY">%1$s</xliff:g>-ის მიერ"</string> <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> - <!-- no translation found for screen_pinning_title (3273740381976175811) --> - <skip /> - <!-- no translation found for screen_pinning_description (1346522416878235405) --> - <skip /> - <!-- no translation found for screen_pinning_description_accessible (8518446209564202557) --> - <skip /> - <!-- no translation found for screen_pinning_positive (3783985798366751226) --> - <skip /> - <!-- no translation found for screen_pinning_negative (3741602308343880268) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_title (748792586749897883) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_message (2235970126803317374) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_button (2660339101868367515) --> - <skip /> + <string name="screen_pinning_title" msgid="3273740381976175811">"ეკრანი ჩამაგრებულია"</string> + <string name="screen_pinning_description" msgid="1346522416878235405">"ამით ის ხედში დარჩება, სანამ ჩამაგრებას არ გააუქმებთ. ჩამაგრების გასაუქმებლად შეეხეთ და დააყოვნეთ „დაბრუნება“-ზე და „მიმოხილვა“-ზე ერთდროულად."</string> + <string name="screen_pinning_description_accessible" msgid="8518446209564202557">"ამით ის ხედში დარჩება, სანამ ჩამაგრებას არ გააუქმებთ. ჩამაგრების გასაუქმებლად შეეხეთ და დააყოვნეთ „მიმოხილვა“-ზე."</string> + <string name="screen_pinning_positive" msgid="3783985798366751226">"გასაგებია"</string> + <string name="screen_pinning_negative" msgid="3741602308343880268">"არა, გმადლობთ"</string> + <string name="quick_settings_reset_confirmation_title" msgid="748792586749897883">"დაიმალოს <xliff:g id="TILE_LABEL">%1$s</xliff:g>?"</string> + <string name="quick_settings_reset_confirmation_message" msgid="2235970126803317374">"ის კვლავ გამოჩნდება, როდესაც პარამეტრებში ჩართავთ"</string> + <string name="quick_settings_reset_confirmation_button" msgid="2660339101868367515">"დამალვა"</string> </resources> diff --git a/packages/SystemUI/res/values-kk-rKZ/strings.xml b/packages/SystemUI/res/values-kk-rKZ/strings.xml index 0314ede648a2..2758579cd3de 100644 --- a/packages/SystemUI/res/values-kk-rKZ/strings.xml +++ b/packages/SystemUI/res/values-kk-rKZ/strings.xml @@ -352,22 +352,13 @@ <string name="hidden_notifications_text" msgid="2326409389088668981">"Бекітпесін ашу алдында оларды көру"</string> <string name="hidden_notifications_cancel" msgid="3690709735122344913">"Жоқ, рақмет"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"Реттеу"</string> - <string name="muted_by" msgid="6147073845094180001">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> үнін өшірген"</string> <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> - <!-- no translation found for screen_pinning_title (3273740381976175811) --> - <skip /> - <!-- no translation found for screen_pinning_description (1346522416878235405) --> - <skip /> - <!-- no translation found for screen_pinning_description_accessible (8518446209564202557) --> - <skip /> - <!-- no translation found for screen_pinning_positive (3783985798366751226) --> - <skip /> - <!-- no translation found for screen_pinning_negative (3741602308343880268) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_title (748792586749897883) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_message (2235970126803317374) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_button (2660339101868367515) --> - <skip /> + <string name="screen_pinning_title" msgid="3273740381976175811">"Экран түйрелді"</string> + <string name="screen_pinning_description" msgid="1346522416878235405">"Бұл сіз оны босатқанша оны көрсетіп тұрады. Босату үшін «Кері» және «Шолу» түймелерін бір уақытта басып тұрыңыз."</string> + <string name="screen_pinning_description_accessible" msgid="8518446209564202557">"Бұл сіз оны босатқанша оны көрсетіп тұрады. Босату үшін «Шолу» түймесін бір уақытта басып тұрыңыз."</string> + <string name="screen_pinning_positive" msgid="3783985798366751226">"Түсіндім"</string> + <string name="screen_pinning_negative" msgid="3741602308343880268">"Жоқ, рақмет"</string> + <string name="quick_settings_reset_confirmation_title" msgid="748792586749897883">"<xliff:g id="TILE_LABEL">%1$s</xliff:g> жасыру керек пе?"</string> + <string name="quick_settings_reset_confirmation_message" msgid="2235970126803317374">"Ол сіз оны параметрлерде келесі қосқанда қайта пайда болады."</string> + <string name="quick_settings_reset_confirmation_button" msgid="2660339101868367515">"Жасыру"</string> </resources> diff --git a/packages/SystemUI/res/values-km-rKH/strings.xml b/packages/SystemUI/res/values-km-rKH/strings.xml index 9e49a05c5cee..00db743efac7 100644 --- a/packages/SystemUI/res/values-km-rKH/strings.xml +++ b/packages/SystemUI/res/values-km-rKH/strings.xml @@ -352,7 +352,6 @@ <string name="hidden_notifications_text" msgid="2326409389088668981">"ឃើញពួកវាមុនពេលដោះសោ"</string> <string name="hidden_notifications_cancel" msgid="3690709735122344913">"ទេ អរគុណ!"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"រៀបចំ"</string> - <string name="muted_by" msgid="6147073845094180001">"បានបិទសំឡេងដោយ <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> <string name="screen_pinning_title" msgid="3273740381976175811">"អេក្រង់ត្រូវបានភ្ជាប់"</string> <string name="screen_pinning_description" msgid="1346522416878235405">"រក្សាទុកវាក្នុងទិដ្ឋភាពរហូតដល់អ្នកផ្ដាច់។ ប៉ះ ហើយសង្កត់ថយក្រោយ និងទិដ្ឋភាពនៅពេលតែមួយដើម្បីផ្ដាច់។"</string> diff --git a/packages/SystemUI/res/values-kn-rIN/strings.xml b/packages/SystemUI/res/values-kn-rIN/strings.xml index 250e805a4763..c10f9d5d6641 100644 --- a/packages/SystemUI/res/values-kn-rIN/strings.xml +++ b/packages/SystemUI/res/values-kn-rIN/strings.xml @@ -352,22 +352,13 @@ <string name="hidden_notifications_text" msgid="2326409389088668981">"ನೀವು ಅನ್ಲಾಕ್ ಮಾಡುವ ಮೊದಲೇ ಅವುಗಳನ್ನು ನೋಡಿ"</string> <string name="hidden_notifications_cancel" msgid="3690709735122344913">"ಬೇಡ ಧನ್ಯವಾದಗಳು"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"ಹೊಂದಿಸು"</string> - <string name="muted_by" msgid="6147073845094180001">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> ಅವರಿಂದ ಮ್ಯೂಟ್ ಮಾಡಲಾಗಿದೆ"</string> <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> - <!-- no translation found for screen_pinning_title (3273740381976175811) --> - <skip /> - <!-- no translation found for screen_pinning_description (1346522416878235405) --> - <skip /> - <!-- no translation found for screen_pinning_description_accessible (8518446209564202557) --> - <skip /> - <!-- no translation found for screen_pinning_positive (3783985798366751226) --> - <skip /> - <!-- no translation found for screen_pinning_negative (3741602308343880268) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_title (748792586749897883) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_message (2235970126803317374) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_button (2660339101868367515) --> - <skip /> + <string name="screen_pinning_title" msgid="3273740381976175811">"ಪರದೆಯನ್ನು ಪಿನ್ ಮಾಡಲಾಗಿದೆ"</string> + <string name="screen_pinning_description" msgid="1346522416878235405">"ನೀವು ಅನ್ಪಿನ್ ಮಾಡುವವರೆಗೆ ಅದನ್ನು ವೀಕ್ಷಣೆಯಲ್ಲಿಡುತ್ತದೆ. ಅನ್ಪಿನ್ ಮಾಡಲು ಒಂದೇ ಸಮಯದಲ್ಲಿ ಸ್ಪರ್ಶಿಸಿ ಮತ್ತು ಒತ್ತಿ ಹಿಡಿದುಕೊಳ್ಳಿ ಹಾಗೂ ಅವಲೋಕಿಸಿ."</string> + <string name="screen_pinning_description_accessible" msgid="8518446209564202557">"ನೀವು ಅನ್ಪಿನ್ ಮಾಡುವವರೆಗೆ ಅದನ್ನು ವೀಕ್ಷಣೆಯಲ್ಲಿಡುತ್ತದೆ. ಅನ್ಪಿನ್ ಮಾಡಲು ಅವಲೋಕನವನ್ನು ಸ್ಪರ್ಶಿಸಿ ಮತ್ತು ಹಿಡಿದುಕೊಳ್ಳಿ."</string> + <string name="screen_pinning_positive" msgid="3783985798366751226">"ತಿಳಿಯಿತು"</string> + <string name="screen_pinning_negative" msgid="3741602308343880268">"ಬೇಡ ಧನ್ಯವಾದಗಳು"</string> + <string name="quick_settings_reset_confirmation_title" msgid="748792586749897883">"<xliff:g id="TILE_LABEL">%1$s</xliff:g> ಮರೆಮಾಡುವುದೇ?"</string> + <string name="quick_settings_reset_confirmation_message" msgid="2235970126803317374">"ನೀವು ಸೆಟ್ಟಿಂಗ್ಗಳಲ್ಲಿ ಅದನ್ನು ಆನ್ ಮಾಡಿದಾಗ ಅದು ಮರುಕಾಣಿಸಿಕೊಳ್ಳುತ್ತದೆ."</string> + <string name="quick_settings_reset_confirmation_button" msgid="2660339101868367515">"ಮರೆಮಾಡಿ"</string> </resources> diff --git a/packages/SystemUI/res/values-ko/strings.xml b/packages/SystemUI/res/values-ko/strings.xml index 5a1ab51e318d..edf5971940a0 100644 --- a/packages/SystemUI/res/values-ko/strings.xml +++ b/packages/SystemUI/res/values-ko/strings.xml @@ -352,22 +352,13 @@ <string name="hidden_notifications_text" msgid="2326409389088668981">"잠금 해제하기 전에 알림을 봅니다."</string> <string name="hidden_notifications_cancel" msgid="3690709735122344913">"사용 안함"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"설정"</string> - <string name="muted_by" msgid="6147073845094180001">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g>에서 알림음 음소거"</string> <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> - <!-- no translation found for screen_pinning_title (3273740381976175811) --> - <skip /> - <!-- no translation found for screen_pinning_description (1346522416878235405) --> - <skip /> - <!-- no translation found for screen_pinning_description_accessible (8518446209564202557) --> - <skip /> - <!-- no translation found for screen_pinning_positive (3783985798366751226) --> - <skip /> - <!-- no translation found for screen_pinning_negative (3741602308343880268) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_title (748792586749897883) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_message (2235970126803317374) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_button (2660339101868367515) --> - <skip /> + <string name="screen_pinning_title" msgid="3273740381976175811">"화면 고정됨"</string> + <string name="screen_pinning_description" msgid="1346522416878235405">"고정 해제하기 전까지 계속 표시됩니다. 고정 해제하려면 뒤로와 개요를 동시에 길게 터치합니다."</string> + <string name="screen_pinning_description_accessible" msgid="8518446209564202557">"고정 해제하기 전까지 계속 표시됩니다. 고정 해제하려면 개요를 길게 터치합니다."</string> + <string name="screen_pinning_positive" msgid="3783985798366751226">"확인"</string> + <string name="screen_pinning_negative" msgid="3741602308343880268">"거부"</string> + <string name="quick_settings_reset_confirmation_title" msgid="748792586749897883">"<xliff:g id="TILE_LABEL">%1$s</xliff:g>을(를) 숨기시겠습니까?"</string> + <string name="quick_settings_reset_confirmation_message" msgid="2235970126803317374">"다음번에 설정에서 사용 설정하면 다시 표시됩니다."</string> + <string name="quick_settings_reset_confirmation_button" msgid="2660339101868367515">"숨기기"</string> </resources> diff --git a/packages/SystemUI/res/values-ky-rKG/strings.xml b/packages/SystemUI/res/values-ky-rKG/strings.xml index 524f0ec8598e..0ec20b25a469 100644 --- a/packages/SystemUI/res/values-ky-rKG/strings.xml +++ b/packages/SystemUI/res/values-ky-rKG/strings.xml @@ -377,22 +377,13 @@ <string name="hidden_notifications_text" msgid="2326409389088668981">"Аларды кулпудан чыгараардан мурун көрүңүз"</string> <string name="hidden_notifications_cancel" msgid="3690709735122344913">"Жок, рахмат"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"Орнотуу"</string> - <string name="muted_by" msgid="6147073845094180001">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> тарабынан үнсүздөлдү"</string> <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> - <!-- no translation found for screen_pinning_title (3273740381976175811) --> - <skip /> - <!-- no translation found for screen_pinning_description (1346522416878235405) --> - <skip /> - <!-- no translation found for screen_pinning_description_accessible (8518446209564202557) --> - <skip /> - <!-- no translation found for screen_pinning_positive (3783985798366751226) --> - <skip /> - <!-- no translation found for screen_pinning_negative (3741602308343880268) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_title (748792586749897883) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_message (2235970126803317374) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_button (2660339101868367515) --> - <skip /> + <string name="screen_pinning_title" msgid="3273740381976175811">"Экран кадалган"</string> + <string name="screen_pinning_description" msgid="1346522416878235405">"Бул бошотулмайынча көрүнө берет. Бошотуу үчүн, бир убакта Артка жана Карап чыгууну коё бербей басып туруңуз."</string> + <string name="screen_pinning_description_accessible" msgid="8518446209564202557">"Бул бошотулмайынча көрүнө берет. Бошотуу үчүн, Карап чыгууну коё бербей басып туруңуз."</string> + <string name="screen_pinning_positive" msgid="3783985798366751226">"Түшүндүм"</string> + <string name="screen_pinning_negative" msgid="3741602308343880268">"Жок, рахмат"</string> + <string name="quick_settings_reset_confirmation_title" msgid="748792586749897883">"<xliff:g id="TILE_LABEL">%1$s</xliff:g> жашырылсынбы?"</string> + <string name="quick_settings_reset_confirmation_message" msgid="2235970126803317374">"Бул кийинки жолу жөндөөлөрдөн күйгүзүлгөндө кайра көрүнөт."</string> + <string name="quick_settings_reset_confirmation_button" msgid="2660339101868367515">"Жашыруу"</string> </resources> diff --git a/packages/SystemUI/res/values-lo-rLA/strings.xml b/packages/SystemUI/res/values-lo-rLA/strings.xml index e7cce7ad416e..039fa04c2096 100644 --- a/packages/SystemUI/res/values-lo-rLA/strings.xml +++ b/packages/SystemUI/res/values-lo-rLA/strings.xml @@ -352,7 +352,6 @@ <string name="hidden_notifications_text" msgid="2326409389088668981">"ເບິ່ງພວກມັນກ່ອນທ່ານຈະປົດລັອກ"</string> <string name="hidden_notifications_cancel" msgid="3690709735122344913">"ບໍ່, ຂອບໃຈ"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"ຕັ້ງຄ່າ"</string> - <string name="muted_by" msgid="6147073845094180001">"ຖືກປິດສຽງໂດຍ <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> <string name="screen_pinning_title" msgid="3273740381976175811">"ປັກໝຸດໜ້າຈໍແລ້ວ"</string> <string name="screen_pinning_description" msgid="1346522416878235405">"ມັນຈະຮັກສາໜ້າຈໍໄວ້ໃນມຸມມອງຂອງທ່ານຈົນກວ່າທ່ານຈະຖອດໝຸດ. ສຳຜັດປຸ່ມ ກັບຄືນ ແລະ ພາບຮວມ ຄ້າງໄວ້ພ້ອມກັນເພື່ອຖອດໝຸດ."</string> diff --git a/packages/SystemUI/res/values-lt/strings.xml b/packages/SystemUI/res/values-lt/strings.xml index 877f5b1831d4..d5ccca2b8d04 100644 --- a/packages/SystemUI/res/values-lt/strings.xml +++ b/packages/SystemUI/res/values-lt/strings.xml @@ -352,7 +352,6 @@ <string name="hidden_notifications_text" msgid="2326409389088668981">"Peržiūrėti prieš atrakinant"</string> <string name="hidden_notifications_cancel" msgid="3690709735122344913">"Ne, ačiū"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"Nustatyti"</string> - <string name="muted_by" msgid="6147073845094180001">"Nutildė <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> <string name="screen_pinning_title" msgid="3273740381976175811">"Ekranas prisegtas"</string> <string name="screen_pinning_description" msgid="1346522416878235405">"Tai bus rodoma, kol atsegsite. Kad atsegtumėte, tuo pačiu metu palieskite ir laikykite „Atgal“ ir „Apžvalga“."</string> diff --git a/packages/SystemUI/res/values-lv/strings.xml b/packages/SystemUI/res/values-lv/strings.xml index 9afc7f7dfb81..4c5fada2ae96 100644 --- a/packages/SystemUI/res/values-lv/strings.xml +++ b/packages/SystemUI/res/values-lv/strings.xml @@ -352,22 +352,13 @@ <string name="hidden_notifications_text" msgid="2326409389088668981">"Skatiet tos pirms atbloķēšanas."</string> <string name="hidden_notifications_cancel" msgid="3690709735122344913">"Nē"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"Iestatīt"</string> - <string name="muted_by" msgid="6147073845094180001">"Skaņu izslēdza <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> - <!-- no translation found for screen_pinning_title (3273740381976175811) --> - <skip /> - <!-- no translation found for screen_pinning_description (1346522416878235405) --> - <skip /> - <!-- no translation found for screen_pinning_description_accessible (8518446209564202557) --> - <skip /> - <!-- no translation found for screen_pinning_positive (3783985798366751226) --> - <skip /> - <!-- no translation found for screen_pinning_negative (3741602308343880268) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_title (748792586749897883) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_message (2235970126803317374) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_button (2660339101868367515) --> - <skip /> + <string name="screen_pinning_title" msgid="3273740381976175811">"Ekrāns ir piesprausts"</string> + <string name="screen_pinning_description" msgid="1346522416878235405">"Šādi tas būs redzams līdz brīdim, kad to atspraudīsiet. Lai atspraustu, vienlaikus pieskarieties vienumiem “Atpakaļ” un “Pārskats” un turiet tos nospiestus."</string> + <string name="screen_pinning_description_accessible" msgid="8518446209564202557">"Šādi tas būs redzams līdz brīdim, kad to atspraudīsiet. Lai atspraustu, pieskarieties vienumam “Pārskats” un turiet to nospiestu."</string> + <string name="screen_pinning_positive" msgid="3783985798366751226">"Sapratu!"</string> + <string name="screen_pinning_negative" msgid="3741602308343880268">"Nē, paldies"</string> + <string name="quick_settings_reset_confirmation_title" msgid="748792586749897883">"Vai paslēpt vienumu <xliff:g id="TILE_LABEL">%1$s</xliff:g>?"</string> + <string name="quick_settings_reset_confirmation_message" msgid="2235970126803317374">"Tas tiks atkārtoti parādīts, kad nākamreiz ieslēgsiet to iestatījumos."</string> + <string name="quick_settings_reset_confirmation_button" msgid="2660339101868367515">"Paslēpt"</string> </resources> diff --git a/packages/SystemUI/res/values-mk-rMK/strings.xml b/packages/SystemUI/res/values-mk-rMK/strings.xml index 7f2ed37a3d3d..9926711aa8ba 100644 --- a/packages/SystemUI/res/values-mk-rMK/strings.xml +++ b/packages/SystemUI/res/values-mk-rMK/strings.xml @@ -354,22 +354,13 @@ <string name="hidden_notifications_text" msgid="2326409389088668981">"Видете ги пред да отклучите"</string> <string name="hidden_notifications_cancel" msgid="3690709735122344913">"Не, фала"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"Постави"</string> - <string name="muted_by" msgid="6147073845094180001">"Звукот го исклучи <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> - <!-- no translation found for screen_pinning_title (3273740381976175811) --> - <skip /> - <!-- no translation found for screen_pinning_description (1346522416878235405) --> - <skip /> - <!-- no translation found for screen_pinning_description_accessible (8518446209564202557) --> - <skip /> - <!-- no translation found for screen_pinning_positive (3783985798366751226) --> - <skip /> - <!-- no translation found for screen_pinning_negative (3741602308343880268) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_title (748792586749897883) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_message (2235970126803317374) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_button (2660339101868367515) --> - <skip /> + <string name="screen_pinning_title" msgid="3273740381976175811">"Екранот е прикачен"</string> + <string name="screen_pinning_description" msgid="1346522416878235405">"Ќе се гледа сè додека не го откачите. Допрете и држете Назад и Краток преглед истовремено за откачување."</string> + <string name="screen_pinning_description_accessible" msgid="8518446209564202557">"Ќе се гледа сè додека не го откачите. Допрете и држете Краток преглед за откачување."</string> + <string name="screen_pinning_positive" msgid="3783985798366751226">"Сфатив"</string> + <string name="screen_pinning_negative" msgid="3741602308343880268">"Не, фала"</string> + <string name="quick_settings_reset_confirmation_title" msgid="748792586749897883">"Сокриј <xliff:g id="TILE_LABEL">%1$s</xliff:g>?"</string> + <string name="quick_settings_reset_confirmation_message" msgid="2235970126803317374">"Ќе се појави повторно следниот пат кога ќе го вклучите во поставки."</string> + <string name="quick_settings_reset_confirmation_button" msgid="2660339101868367515">"Сокриј"</string> </resources> diff --git a/packages/SystemUI/res/values-ml-rIN/strings.xml b/packages/SystemUI/res/values-ml-rIN/strings.xml index 23009ea283f1..8be5b89c8dc5 100644 --- a/packages/SystemUI/res/values-ml-rIN/strings.xml +++ b/packages/SystemUI/res/values-ml-rIN/strings.xml @@ -352,22 +352,13 @@ <string name="hidden_notifications_text" msgid="2326409389088668981">"അൺലോക്കുചെയ്യുന്നതിന് മുമ്പ് അവ കാണുക"</string> <string name="hidden_notifications_cancel" msgid="3690709735122344913">"വേണ്ട, നന്ദി"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"സജ്ജീകരിക്കുക"</string> - <string name="muted_by" msgid="6147073845094180001">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g>, മ്യൂട്ടുചെയ്തു"</string> <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> - <!-- no translation found for screen_pinning_title (3273740381976175811) --> - <skip /> - <!-- no translation found for screen_pinning_description (1346522416878235405) --> - <skip /> - <!-- no translation found for screen_pinning_description_accessible (8518446209564202557) --> - <skip /> - <!-- no translation found for screen_pinning_positive (3783985798366751226) --> - <skip /> - <!-- no translation found for screen_pinning_negative (3741602308343880268) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_title (748792586749897883) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_message (2235970126803317374) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_button (2660339101868367515) --> - <skip /> + <string name="screen_pinning_title" msgid="3273740381976175811">"സ്ക്രീൻ പിൻ ചെയ്തു"</string> + <string name="screen_pinning_description" msgid="1346522416878235405">"നിങ്ങൾ അൺപിൻ ചെയ്യുന്നതുവരെ ഇത് കാണുന്ന വിധത്തിൽ നിലനിർത്തുന്നു. അൺപിൻ ചെയ്യാൻ \'മടങ്ങുക\', \'ചുരുക്കവിവരണം\' എന്നിവ ഒരേ സമയം സ്പർശിച്ച് പിടിക്കുക."</string> + <string name="screen_pinning_description_accessible" msgid="8518446209564202557">"നിങ്ങൾ അൺപിൻ ചെയ്യുന്നതുവരെ ഇത് കാണുന്ന വിധത്തിൽ നിലനിർത്തുന്നു. അൺപിൻ ചെയ്യുന്നതിന് \'ചുരുക്കവിവരണം\' സ്പർശിച്ചുപിടിക്കുക."</string> + <string name="screen_pinning_positive" msgid="3783985798366751226">"മനസ്സിലായി"</string> + <string name="screen_pinning_negative" msgid="3741602308343880268">"വേണ്ട, നന്ദി"</string> + <string name="quick_settings_reset_confirmation_title" msgid="748792586749897883">"<xliff:g id="TILE_LABEL">%1$s</xliff:g> എന്നത് മറയ്ക്കണോ?"</string> + <string name="quick_settings_reset_confirmation_message" msgid="2235970126803317374">"അടുത്ത തവണ നിങ്ങൾ അത് ക്രമീകരണങ്ങളിൽ ഓണാക്കുമ്പോൾ അത് വീണ്ടും ദൃശ്യമാകും."</string> + <string name="quick_settings_reset_confirmation_button" msgid="2660339101868367515">"മറയ്ക്കുക"</string> </resources> diff --git a/packages/SystemUI/res/values-mn-rMN/strings.xml b/packages/SystemUI/res/values-mn-rMN/strings.xml index 21c74b04887d..021ce7fc6b95 100644 --- a/packages/SystemUI/res/values-mn-rMN/strings.xml +++ b/packages/SystemUI/res/values-mn-rMN/strings.xml @@ -352,22 +352,13 @@ <string name="hidden_notifications_text" msgid="2326409389088668981">"Түгжээг тайлахын өмнө үзнэ үү"</string> <string name="hidden_notifications_cancel" msgid="3690709735122344913">"Үгүй"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"Тохируулах"</string> - <string name="muted_by" msgid="6147073845094180001">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g>-с хаасан"</string> <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> - <!-- no translation found for screen_pinning_title (3273740381976175811) --> - <skip /> - <!-- no translation found for screen_pinning_description (1346522416878235405) --> - <skip /> - <!-- no translation found for screen_pinning_description_accessible (8518446209564202557) --> - <skip /> - <!-- no translation found for screen_pinning_positive (3783985798366751226) --> - <skip /> - <!-- no translation found for screen_pinning_negative (3741602308343880268) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_title (748792586749897883) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_message (2235970126803317374) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_button (2660339101868367515) --> - <skip /> + <string name="screen_pinning_title" msgid="3273740381976175811">"Дэлгэц эхэнд байрлуулагдсан"</string> + <string name="screen_pinning_description" msgid="1346522416878235405">"Таныг эхэнд нээхийг болиулах хүртэл харагдана. Хүрээд, Back дээр удаан дараад хаахдаа Overview-ийг дар"</string> + <string name="screen_pinning_description_accessible" msgid="8518446209564202557">"Таныг эхэнд нээхийг болиулах хүртэл харагдана. Хаахын тулд хүрээдOverview-ийг дар"</string> + <string name="screen_pinning_positive" msgid="3783985798366751226">"Ойлголоо"</string> + <string name="screen_pinning_negative" msgid="3741602308343880268">"Үгүй"</string> + <string name="quick_settings_reset_confirmation_title" msgid="748792586749897883">"<xliff:g id="TILE_LABEL">%1$s</xliff:g>-ийг нуух уу?"</string> + <string name="quick_settings_reset_confirmation_message" msgid="2235970126803317374">"Тохируулгын хэсэгт үүнийг асаахад энэ дахин харагдана."</string> + <string name="quick_settings_reset_confirmation_button" msgid="2660339101868367515">"Нуух"</string> </resources> diff --git a/packages/SystemUI/res/values-mr-rIN/strings.xml b/packages/SystemUI/res/values-mr-rIN/strings.xml index 4eaf87e19506..3800da850e46 100644 --- a/packages/SystemUI/res/values-mr-rIN/strings.xml +++ b/packages/SystemUI/res/values-mr-rIN/strings.xml @@ -352,22 +352,13 @@ <string name="hidden_notifications_text" msgid="2326409389088668981">"आपण अनलॉक करण्यापूर्वी त्यांना पहा"</string> <string name="hidden_notifications_cancel" msgid="3690709735122344913">"नाही धन्यवाद"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"सेट अप"</string> - <string name="muted_by" msgid="6147073845094180001">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> द्वारे नि:शब्द केले"</string> <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> - <!-- no translation found for screen_pinning_title (3273740381976175811) --> - <skip /> - <!-- no translation found for screen_pinning_description (1346522416878235405) --> - <skip /> - <!-- no translation found for screen_pinning_description_accessible (8518446209564202557) --> - <skip /> - <!-- no translation found for screen_pinning_positive (3783985798366751226) --> - <skip /> - <!-- no translation found for screen_pinning_negative (3741602308343880268) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_title (748792586749897883) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_message (2235970126803317374) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_button (2660339101868367515) --> - <skip /> + <string name="screen_pinning_title" msgid="3273740381976175811">"स्क्रीन पिन केलेली आहे"</string> + <string name="screen_pinning_description" msgid="1346522416878235405">"हे आपण अनपिन करेपर्यंत दृश्यामध्ये ते ठेवते. अनपिन करण्यासाठी एकाच वेळी परत आणि अलीकडील ला स्पर्श करा आणि धरून ठेवा आणि विहंगावलोकन करा."</string> + <string name="screen_pinning_description_accessible" msgid="8518446209564202557">"हे आपण अनपिन करेपर्यंत दृश्यामध्ये ते ठेवते. अनपिन करण्यासाठी स्पर्श करा आणि धरून ठेवा."</string> + <string name="screen_pinning_positive" msgid="3783985798366751226">"समजले"</string> + <string name="screen_pinning_negative" msgid="3741602308343880268">"नाही धन्यवाद"</string> + <string name="quick_settings_reset_confirmation_title" msgid="748792586749897883">"<xliff:g id="TILE_LABEL">%1$s</xliff:g> लपवायचे?"</string> + <string name="quick_settings_reset_confirmation_message" msgid="2235970126803317374">"आपण सेटिंग्जमध्ये ते पुढील वेळी चालू कराल तेव्हा ते पुन्हा दिसेल."</string> + <string name="quick_settings_reset_confirmation_button" msgid="2660339101868367515">"लपवा"</string> </resources> diff --git a/packages/SystemUI/res/values-ms-rMY/strings.xml b/packages/SystemUI/res/values-ms-rMY/strings.xml index e397c02d8171..1274ff1f95c0 100644 --- a/packages/SystemUI/res/values-ms-rMY/strings.xml +++ b/packages/SystemUI/res/values-ms-rMY/strings.xml @@ -352,22 +352,13 @@ <string name="hidden_notifications_text" msgid="2326409389088668981">"Lihat sebelum anda membuka kunci"</string> <string name="hidden_notifications_cancel" msgid="3690709735122344913">"Tidak"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"Sediakan"</string> - <string name="muted_by" msgid="6147073845094180001">"Diredam oleh <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> - <!-- no translation found for screen_pinning_title (3273740381976175811) --> - <skip /> - <!-- no translation found for screen_pinning_description (1346522416878235405) --> - <skip /> - <!-- no translation found for screen_pinning_description_accessible (8518446209564202557) --> - <skip /> - <!-- no translation found for screen_pinning_positive (3783985798366751226) --> - <skip /> - <!-- no translation found for screen_pinning_negative (3741602308343880268) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_title (748792586749897883) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_message (2235970126803317374) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_button (2660339101868367515) --> - <skip /> + <string name="screen_pinning_title" msgid="3273740381976175811">"Skrin telah disemat"</string> + <string name="screen_pinning_description" msgid="1346522416878235405">"Ini akan memastikan skrin kelihatan sehingga anda menyahsemat. Sentuh dan tahan Kembali dan Gambaran Keseluruhan pada masa yang sama untuk menyahsemat."</string> + <string name="screen_pinning_description_accessible" msgid="8518446209564202557">"Ini akan memastikan skrin kelihatan sehingga anda menyahsemat. Sentuh dan tahan Gambaran Keseluruhan untuk menyahsemat."</string> + <string name="screen_pinning_positive" msgid="3783985798366751226">"Faham"</string> + <string name="screen_pinning_negative" msgid="3741602308343880268">"Tidak"</string> + <string name="quick_settings_reset_confirmation_title" msgid="748792586749897883">"Sembunyikan <xliff:g id="TILE_LABEL">%1$s</xliff:g>?"</string> + <string name="quick_settings_reset_confirmation_message" msgid="2235970126803317374">"Mesej itu akan terpapar semula pada kali seterusnya anda menghidupkan apl dalam tetapan."</string> + <string name="quick_settings_reset_confirmation_button" msgid="2660339101868367515">"Sembunyikan"</string> </resources> diff --git a/packages/SystemUI/res/values-my-rMM/strings.xml b/packages/SystemUI/res/values-my-rMM/strings.xml index bc337a4dbeb5..4f1e74e69123 100644 --- a/packages/SystemUI/res/values-my-rMM/strings.xml +++ b/packages/SystemUI/res/values-my-rMM/strings.xml @@ -352,22 +352,13 @@ <string name="hidden_notifications_text" msgid="2326409389088668981">"မဖွင့်ခင် ၎င်းတို့ကို ကြည့်ပါ"</string> <string name="hidden_notifications_cancel" msgid="3690709735122344913">"မလိုအပ်ပါ"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"သတ်မှတ်ရန်"</string> - <string name="muted_by" msgid="6147073845094180001">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> အသံပိတ်သည်"</string> <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>။ <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> - <!-- no translation found for screen_pinning_title (3273740381976175811) --> - <skip /> - <!-- no translation found for screen_pinning_description (1346522416878235405) --> - <skip /> - <!-- no translation found for screen_pinning_description_accessible (8518446209564202557) --> - <skip /> - <!-- no translation found for screen_pinning_positive (3783985798366751226) --> - <skip /> - <!-- no translation found for screen_pinning_negative (3741602308343880268) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_title (748792586749897883) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_message (2235970126803317374) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_button (2660339101868367515) --> - <skip /> + <string name="screen_pinning_title" msgid="3273740381976175811">"မျက်နှာပြင် ပင်ထိုးပြီးပါပြီ"</string> + <string name="screen_pinning_description" msgid="1346522416878235405">"သင်ပင်ဖြုတ်သည့် တိုင်အောင် ၎င်းအား မြင်ကွင်းတွင် ထားရှိပါမည်။ ပင်ဖြုတ်ရန် အနောက်နှင့် ခြုံငုံကြည့်ခြင်းကို ဖိ၍ နှိပ်ထားနိုင်သည်။"</string> + <string name="screen_pinning_description_accessible" msgid="8518446209564202557">"သင်ပင်ဖြုတ်သည့် တိုင်အောင် ၎င်းအား မြင်ကွင်းတွင် ထားရှိပါမည်။ ပင်ဖြုတ်ရန် ခြုံငုံကြည့်ခြင်းကို ဖိ၍ နှိပ်ထားနိုင်သည်။"</string> + <string name="screen_pinning_positive" msgid="3783985798366751226">"အဲဒါ ရပြီ"</string> + <string name="screen_pinning_negative" msgid="3741602308343880268">"မလို ကျေးဇူးပဲ"</string> + <string name="quick_settings_reset_confirmation_title" msgid="748792586749897883">"<xliff:g id="TILE_LABEL">%1$s</xliff:g> ဝှက်မည်လား?"</string> + <string name="quick_settings_reset_confirmation_message" msgid="2235970126803317374">"နောက်တစ်ကြိမ်သင် ချိန်ညှိချက်များဖွင့်လျှင် ၎င်းပေါ်လာပါမည်။"</string> + <string name="quick_settings_reset_confirmation_button" msgid="2660339101868367515">"ဖျောက်ထားမည်"</string> </resources> diff --git a/packages/SystemUI/res/values-nb/strings.xml b/packages/SystemUI/res/values-nb/strings.xml index a64106ac6113..d6ec10195efc 100644 --- a/packages/SystemUI/res/values-nb/strings.xml +++ b/packages/SystemUI/res/values-nb/strings.xml @@ -352,22 +352,13 @@ <string name="hidden_notifications_text" msgid="2326409389088668981">"Se dem før du låser opp"</string> <string name="hidden_notifications_cancel" msgid="3690709735122344913">"Nei takk"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"Konfigurer"</string> - <string name="muted_by" msgid="6147073845094180001">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> har kuttet lyden"</string> <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> - <!-- no translation found for screen_pinning_title (3273740381976175811) --> - <skip /> - <!-- no translation found for screen_pinning_description (1346522416878235405) --> - <skip /> - <!-- no translation found for screen_pinning_description_accessible (8518446209564202557) --> - <skip /> - <!-- no translation found for screen_pinning_positive (3783985798366751226) --> - <skip /> - <!-- no translation found for screen_pinning_negative (3741602308343880268) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_title (748792586749897883) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_message (2235970126803317374) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_button (2660339101868367515) --> - <skip /> + <string name="screen_pinning_title" msgid="3273740381976175811">"Skjermen er låst"</string> + <string name="screen_pinning_description" msgid="1346522416878235405">"På denne måten blir skjermen synlig frem til du låser den opp. Trykk på og hold inne Tilbake og Oversikt samtidig for å låse opp."</string> + <string name="screen_pinning_description_accessible" msgid="8518446209564202557">"På denne måten blir skjermen synlig frem til du låser den opp. Trykk på og hold inne Tilbake og Oversikt for å låse opp."</string> + <string name="screen_pinning_positive" msgid="3783985798366751226">"Skjønner"</string> + <string name="screen_pinning_negative" msgid="3741602308343880268">"Nei takk"</string> + <string name="quick_settings_reset_confirmation_title" msgid="748792586749897883">"Vil du skjule <xliff:g id="TILE_LABEL">%1$s</xliff:g>?"</string> + <string name="quick_settings_reset_confirmation_message" msgid="2235970126803317374">"Den vises igjen neste gang du slår den på i innstillingene."</string> + <string name="quick_settings_reset_confirmation_button" msgid="2660339101868367515">"Skjul"</string> </resources> diff --git a/packages/SystemUI/res/values-ne-rNP/strings.xml b/packages/SystemUI/res/values-ne-rNP/strings.xml index a1abb1f6d08c..7fd8b9e5e4a1 100644 --- a/packages/SystemUI/res/values-ne-rNP/strings.xml +++ b/packages/SystemUI/res/values-ne-rNP/strings.xml @@ -352,22 +352,13 @@ <string name="hidden_notifications_text" msgid="2326409389088668981">"तपाईँले अनलक गर्नअघि तिनीहरूलाई हेर्नुहोस्"</string> <string name="hidden_notifications_cancel" msgid="3690709735122344913">"धन्यवाद पर्दैन"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"सेटअप गर्नुहोस्"</string> - <string name="muted_by" msgid="6147073845094180001">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> द्वारा मौन गरिएको"</string> <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> - <!-- no translation found for screen_pinning_title (3273740381976175811) --> - <skip /> - <!-- no translation found for screen_pinning_description (1346522416878235405) --> - <skip /> - <!-- no translation found for screen_pinning_description_accessible (8518446209564202557) --> - <skip /> - <!-- no translation found for screen_pinning_positive (3783985798366751226) --> - <skip /> - <!-- no translation found for screen_pinning_negative (3741602308343880268) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_title (748792586749897883) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_message (2235970126803317374) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_button (2660339101868367515) --> - <skip /> + <string name="screen_pinning_title" msgid="3273740381976175811">"पर्दा राखेका छ"</string> + <string name="screen_pinning_description" msgid="1346522416878235405">"तपाईं अनपिन सम्म यो दृश्य मा राख्छ। छुनुहोस् र अनपिन फिर्ता र सिंहावलोकन नै समय मा पकड।"</string> + <string name="screen_pinning_description_accessible" msgid="8518446209564202557">"तपाईं अनपिन सम्म यो दृश्य मा राख्छ। छुनुहोस् र अनपिन गर्न सिंहावलोकन पकड।"</string> + <string name="screen_pinning_positive" msgid="3783985798366751226">"बुझेँ"</string> + <string name="screen_pinning_negative" msgid="3741602308343880268">"धन्यवाद पर्दैन"</string> + <string name="quick_settings_reset_confirmation_title" msgid="748792586749897883">"लुकाउनुहुन्छ <xliff:g id="TILE_LABEL">%1$s</xliff:g>?"</string> + <string name="quick_settings_reset_confirmation_message" msgid="2235970126803317374">"यो तपाईं सेटिङ् मा यो बारी अर्को समय देखापर्नेछ।"</string> + <string name="quick_settings_reset_confirmation_button" msgid="2660339101868367515">"लुकाउनुहोस्"</string> </resources> diff --git a/packages/SystemUI/res/values-nl/strings.xml b/packages/SystemUI/res/values-nl/strings.xml index 8da6709060e6..e598429bff26 100644 --- a/packages/SystemUI/res/values-nl/strings.xml +++ b/packages/SystemUI/res/values-nl/strings.xml @@ -352,22 +352,13 @@ <string name="hidden_notifications_text" msgid="2326409389088668981">"Weergeven voordat u ontgrendelt"</string> <string name="hidden_notifications_cancel" msgid="3690709735122344913">"Nee, bedankt"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"Configureren"</string> - <string name="muted_by" msgid="6147073845094180001">"Gedempt door <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> - <!-- no translation found for screen_pinning_title (3273740381976175811) --> - <skip /> - <!-- no translation found for screen_pinning_description (1346522416878235405) --> - <skip /> - <!-- no translation found for screen_pinning_description_accessible (8518446209564202557) --> - <skip /> - <!-- no translation found for screen_pinning_positive (3783985798366751226) --> - <skip /> - <!-- no translation found for screen_pinning_negative (3741602308343880268) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_title (748792586749897883) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_message (2235970126803317374) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_button (2660339101868367515) --> - <skip /> + <string name="screen_pinning_title" msgid="3273740381976175811">"Scherm is vastgezet"</string> + <string name="screen_pinning_description" msgid="1346522416878235405">"Het scherm blijft zichtbaar totdat u het u losmaakt. Houd \'Terug\' en \'Overzicht\' tegelijkertijd aangeraakt om het los te maken."</string> + <string name="screen_pinning_description_accessible" msgid="8518446209564202557">"Het scherm blijft zichtbaar totdat u het u losmaakt. Houd \'Overzicht\' aangeraakt om het los te maken."</string> + <string name="screen_pinning_positive" msgid="3783985798366751226">"Ik snap het"</string> + <string name="screen_pinning_negative" msgid="3741602308343880268">"Nee, bedankt"</string> + <string name="quick_settings_reset_confirmation_title" msgid="748792586749897883">"<xliff:g id="TILE_LABEL">%1$s</xliff:g> verbergen?"</string> + <string name="quick_settings_reset_confirmation_message" msgid="2235970126803317374">"Deze wordt opnieuw weergegeven zodra u de instelling weer inschakelt."</string> + <string name="quick_settings_reset_confirmation_button" msgid="2660339101868367515">"Verbergen"</string> </resources> diff --git a/packages/SystemUI/res/values-pl/strings.xml b/packages/SystemUI/res/values-pl/strings.xml index 28cf52cb4c01..4e7fd6750b3b 100644 --- a/packages/SystemUI/res/values-pl/strings.xml +++ b/packages/SystemUI/res/values-pl/strings.xml @@ -32,7 +32,7 @@ <string name="status_bar_no_notifications_title" msgid="4755261167193833213">"Brak powiadomień"</string> <string name="status_bar_ongoing_events_title" msgid="1682504513316879202">"Bieżące"</string> <string name="status_bar_latest_events_title" msgid="6594767438577593172">"Powiadomienia"</string> - <string name="battery_low_title" msgid="6456385927409742437">"Bateria jest słaba"</string> + <string name="battery_low_title" msgid="6456385927409742437">"Niski poziom baterii"</string> <string name="battery_low_percent_format" msgid="2900940511201380775">"Pozostało <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> <string name="battery_low_percent_format_saver_started" msgid="6859235584035338833">"Pozostało <xliff:g id="PERCENTAGE">%s</xliff:g>. Oszczędzanie baterii jest włączone."</string> <string name="invalid_charger" msgid="4549105996740522523">"Ładowanie przy użyciu złącza USB nie jest obsługiwane.\nNależy używać tylko dołączonej ładowarki."</string> @@ -279,7 +279,7 @@ <string name="recents_search_bar_label" msgid="8074997400187836677">"szukaj"</string> <string name="recents_launch_error_message" msgid="2969287838120550506">"Nie udało się uruchomić aplikacji <xliff:g id="APP">%s</xliff:g>."</string> <string name="expanded_header_battery_charged" msgid="5945855970267657951">"Naładowana"</string> - <string name="expanded_header_battery_charging" msgid="205623198487189724">"Ładuje się"</string> + <string name="expanded_header_battery_charging" msgid="205623198487189724">"Ładowanie"</string> <string name="expanded_header_battery_charging_with_time" msgid="457559884275395376">"<xliff:g id="CHARGING_TIME">%s</xliff:g> do pełnego naładowania"</string> <string name="expanded_header_battery_not_charging" msgid="4798147152367049732">"Nie ładuje"</string> <string name="ssl_ca_cert_warning" msgid="9005954106902053641">"Sieć może być\nmonitorowana"</string> @@ -352,22 +352,13 @@ <string name="hidden_notifications_text" msgid="2326409389088668981">"Zobacz powiadomienia, jeszcze zanim odblokujesz ekran"</string> <string name="hidden_notifications_cancel" msgid="3690709735122344913">"Nie, dziękuję"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"Skonfiguruj"</string> - <string name="muted_by" msgid="6147073845094180001">"Ściszone przez: <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> - <!-- no translation found for screen_pinning_title (3273740381976175811) --> - <skip /> - <!-- no translation found for screen_pinning_description (1346522416878235405) --> - <skip /> - <!-- no translation found for screen_pinning_description_accessible (8518446209564202557) --> - <skip /> - <!-- no translation found for screen_pinning_positive (3783985798366751226) --> - <skip /> - <!-- no translation found for screen_pinning_negative (3741602308343880268) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_title (748792586749897883) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_message (2235970126803317374) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_button (2660339101868367515) --> - <skip /> + <string name="screen_pinning_title" msgid="3273740381976175811">"Ekran jest przypięty"</string> + <string name="screen_pinning_description" msgid="1346522416878235405">"Ekran będzie widoczny, dopóki go nie odepniesz. Aby to zrobić, kliknij i przytrzymaj jednocześnie Wstecz i Przegląd."</string> + <string name="screen_pinning_description_accessible" msgid="8518446209564202557">"Ekran będzie widoczny, dopóki go nie odepniesz. Aby to zrobić, kliknij i przytrzymaj Przegląd."</string> + <string name="screen_pinning_positive" msgid="3783985798366751226">"OK"</string> + <string name="screen_pinning_negative" msgid="3741602308343880268">"Nie, dziękuję"</string> + <string name="quick_settings_reset_confirmation_title" msgid="748792586749897883">"Ukryć <xliff:g id="TILE_LABEL">%1$s</xliff:g>?"</string> + <string name="quick_settings_reset_confirmation_message" msgid="2235970126803317374">"Pojawi się ponownie, gdy następnym włączysz go w ustawieniach."</string> + <string name="quick_settings_reset_confirmation_button" msgid="2660339101868367515">"Ukryj"</string> </resources> diff --git a/packages/SystemUI/res/values-pt-rPT/strings.xml b/packages/SystemUI/res/values-pt-rPT/strings.xml index fee7222e3ff1..5d144576e253 100644 --- a/packages/SystemUI/res/values-pt-rPT/strings.xml +++ b/packages/SystemUI/res/values-pt-rPT/strings.xml @@ -352,22 +352,13 @@ <string name="hidden_notifications_text" msgid="2326409389088668981">"Ver antes de desbloquear"</string> <string name="hidden_notifications_cancel" msgid="3690709735122344913">"Não, obrigado"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"Configurar"</string> - <string name="muted_by" msgid="6147073845094180001">"Som desativado por <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> - <!-- no translation found for screen_pinning_title (3273740381976175811) --> - <skip /> - <!-- no translation found for screen_pinning_description (1346522416878235405) --> - <skip /> - <!-- no translation found for screen_pinning_description_accessible (8518446209564202557) --> - <skip /> - <!-- no translation found for screen_pinning_positive (3783985798366751226) --> - <skip /> - <!-- no translation found for screen_pinning_negative (3741602308343880268) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_title (748792586749897883) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_message (2235970126803317374) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_button (2660339101868367515) --> - <skip /> + <string name="screen_pinning_title" msgid="3273740381976175811">"O ecrã está fixado"</string> + <string name="screen_pinning_description" msgid="1346522416878235405">"Será mantido na vista até soltar. Toque sem soltar em Anterior e Vista geral em simultâneo para soltar."</string> + <string name="screen_pinning_description_accessible" msgid="8518446209564202557">"Será mantido na vista até soltar. Toque sem soltar em Vista geral para soltar."</string> + <string name="screen_pinning_positive" msgid="3783985798366751226">"Compreendi"</string> + <string name="screen_pinning_negative" msgid="3741602308343880268">"Não, obrigado"</string> + <string name="quick_settings_reset_confirmation_title" msgid="748792586749897883">"Pretende ocultar <xliff:g id="TILE_LABEL">%1$s</xliff:g>?"</string> + <string name="quick_settings_reset_confirmation_message" msgid="2235970126803317374">"Reaparecerá da próxima vez que a funcionalidade for ativada nas definições."</string> + <string name="quick_settings_reset_confirmation_button" msgid="2660339101868367515">"Ocultar"</string> </resources> diff --git a/packages/SystemUI/res/values-pt/strings.xml b/packages/SystemUI/res/values-pt/strings.xml index 411563344f3a..38367a50f979 100644 --- a/packages/SystemUI/res/values-pt/strings.xml +++ b/packages/SystemUI/res/values-pt/strings.xml @@ -354,22 +354,13 @@ <string name="hidden_notifications_text" msgid="2326409389088668981">"Veja-as antes de desbloquear"</string> <string name="hidden_notifications_cancel" msgid="3690709735122344913">"Não, obrigado"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"Configurar"</string> - <string name="muted_by" msgid="6147073845094180001">"Som desativado por <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> - <!-- no translation found for screen_pinning_title (3273740381976175811) --> - <skip /> - <!-- no translation found for screen_pinning_description (1346522416878235405) --> - <skip /> - <!-- no translation found for screen_pinning_description_accessible (8518446209564202557) --> - <skip /> - <!-- no translation found for screen_pinning_positive (3783985798366751226) --> - <skip /> - <!-- no translation found for screen_pinning_negative (3741602308343880268) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_title (748792586749897883) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_message (2235970126803317374) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_button (2660339101868367515) --> - <skip /> + <string name="screen_pinning_title" msgid="3273740381976175811">"A tela está fixada"</string> + <string name="screen_pinning_description" msgid="1346522416878235405">"Ela é mantida à vista até que seja liberada. Toque em \"Voltar\" e \"Visão Geral\" e mantenha essas opções pressionadas ao mesmo tempo para liberar."</string> + <string name="screen_pinning_description_accessible" msgid="8518446209564202557">"Ela é mantida à vista até que seja liberada. Toque em \"Visão geral\" e mantenha essa opção pressionada para liberar."</string> + <string name="screen_pinning_positive" msgid="3783985798366751226">"Entendi"</string> + <string name="screen_pinning_negative" msgid="3741602308343880268">"Não, obrigado"</string> + <string name="quick_settings_reset_confirmation_title" msgid="748792586749897883">"Esconder <xliff:g id="TILE_LABEL">%1$s</xliff:g>?"</string> + <string name="quick_settings_reset_confirmation_message" msgid="2235970126803317374">"Ela reaparecerá na próxima vez que você ativá-la nas configurações."</string> + <string name="quick_settings_reset_confirmation_button" msgid="2660339101868367515">"Ocultar"</string> </resources> diff --git a/packages/SystemUI/res/values-ro/strings.xml b/packages/SystemUI/res/values-ro/strings.xml index c638e76c9cfa..1cf5f7a236bb 100644 --- a/packages/SystemUI/res/values-ro/strings.xml +++ b/packages/SystemUI/res/values-ro/strings.xml @@ -352,22 +352,13 @@ <string name="hidden_notifications_text" msgid="2326409389088668981">"Doresc să se afișeze înainte de deblocare"</string> <string name="hidden_notifications_cancel" msgid="3690709735122344913">"Nu, mulț."</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"Config."</string> - <string name="muted_by" msgid="6147073845094180001">"Dezactivate de <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> - <!-- no translation found for screen_pinning_title (3273740381976175811) --> - <skip /> - <!-- no translation found for screen_pinning_description (1346522416878235405) --> - <skip /> - <!-- no translation found for screen_pinning_description_accessible (8518446209564202557) --> - <skip /> - <!-- no translation found for screen_pinning_positive (3783985798366751226) --> - <skip /> - <!-- no translation found for screen_pinning_negative (3741602308343880268) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_title (748792586749897883) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_message (2235970126803317374) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_button (2660339101868367515) --> - <skip /> + <string name="screen_pinning_title" msgid="3273740381976175811">"Ecranul este fixat"</string> + <string name="screen_pinning_description" msgid="1346522416878235405">"Ecranul este afișat până anulați fixarea. Apăsați lung pe Înapoi și pe Vizualizare generală simultan pentru a anula fixarea."</string> + <string name="screen_pinning_description_accessible" msgid="8518446209564202557">"Ecranul este afișat până anulați fixarea. Apăsați lung pe Vizualizare generală pentru a anula fixarea."</string> + <string name="screen_pinning_positive" msgid="3783985798366751226">"Am înțeles"</string> + <string name="screen_pinning_negative" msgid="3741602308343880268">"Nu, mulțumesc"</string> + <string name="quick_settings_reset_confirmation_title" msgid="748792586749897883">"Ascundeți <xliff:g id="TILE_LABEL">%1$s</xliff:g>?"</string> + <string name="quick_settings_reset_confirmation_message" msgid="2235970126803317374">"Va reapărea la următoarea activare în setări."</string> + <string name="quick_settings_reset_confirmation_button" msgid="2660339101868367515">"Ascundeți"</string> </resources> diff --git a/packages/SystemUI/res/values-ru/strings.xml b/packages/SystemUI/res/values-ru/strings.xml index 00c82b4af7d5..12571ef9516d 100644 --- a/packages/SystemUI/res/values-ru/strings.xml +++ b/packages/SystemUI/res/values-ru/strings.xml @@ -354,22 +354,13 @@ <string name="hidden_notifications_text" msgid="2326409389088668981">"Просматривайте уведомления на заблокированном экране."</string> <string name="hidden_notifications_cancel" msgid="3690709735122344913">"Закрыть"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"Настроить"</string> - <string name="muted_by" msgid="6147073845094180001">"Звук отключен приложением \"<xliff:g id="THIRD_PARTY">%1$s</xliff:g>\""</string> <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>."</string> - <!-- no translation found for screen_pinning_title (3273740381976175811) --> - <skip /> - <!-- no translation found for screen_pinning_description (1346522416878235405) --> - <skip /> - <!-- no translation found for screen_pinning_description_accessible (8518446209564202557) --> - <skip /> - <!-- no translation found for screen_pinning_positive (3783985798366751226) --> - <skip /> - <!-- no translation found for screen_pinning_negative (3741602308343880268) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_title (748792586749897883) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_message (2235970126803317374) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_button (2660339101868367515) --> - <skip /> + <string name="screen_pinning_title" msgid="3273740381976175811">"Блокировка в приложении включена"</string> + <string name="screen_pinning_description" msgid="1346522416878235405">"Это приложение останется активным, пока вы не отмените блокировку, одновременно нажав кнопки \"Назад\" и \"Обзор\"."</string> + <string name="screen_pinning_description_accessible" msgid="8518446209564202557">"Приложение останется активным, пока вы не отмените блокировку, одновременно нажав кнопки Назад и Обзор."</string> + <string name="screen_pinning_positive" msgid="3783985798366751226">"ОК"</string> + <string name="screen_pinning_negative" msgid="3741602308343880268">"Нет, спасибо"</string> + <string name="quick_settings_reset_confirmation_title" msgid="748792586749897883">"Скрыть параметр \"<xliff:g id="TILE_LABEL">%1$s</xliff:g>\"?"</string> + <string name="quick_settings_reset_confirmation_message" msgid="2235970126803317374">"Этот параметр появится в следующий раз, когда вы включите его."</string> + <string name="quick_settings_reset_confirmation_button" msgid="2660339101868367515">"Скрыть"</string> </resources> diff --git a/packages/SystemUI/res/values-si-rLK/strings.xml b/packages/SystemUI/res/values-si-rLK/strings.xml index 2ce64d9ed650..3df06f318b7f 100644 --- a/packages/SystemUI/res/values-si-rLK/strings.xml +++ b/packages/SystemUI/res/values-si-rLK/strings.xml @@ -352,22 +352,13 @@ <string name="hidden_notifications_text" msgid="2326409389088668981">"ඔබ අඟුළු හැරීමට කලින් ඒවා බලන්න"</string> <string name="hidden_notifications_cancel" msgid="3690709735122344913">"එපා ස්තූතියි"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"සකසන්න"</string> - <string name="muted_by" msgid="6147073845094180001">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> විසින් නිශ්ශබ්ද කරන ලදි"</string> <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> - <!-- no translation found for screen_pinning_title (3273740381976175811) --> - <skip /> - <!-- no translation found for screen_pinning_description (1346522416878235405) --> - <skip /> - <!-- no translation found for screen_pinning_description_accessible (8518446209564202557) --> - <skip /> - <!-- no translation found for screen_pinning_positive (3783985798366751226) --> - <skip /> - <!-- no translation found for screen_pinning_negative (3741602308343880268) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_title (748792586749897883) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_message (2235970126803317374) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_button (2660339101868367515) --> - <skip /> + <string name="screen_pinning_title" msgid="3273740381976175811">"තීරය අමුණන ලදි"</string> + <string name="screen_pinning_description" msgid="1346522416878235405">"ඔබ ගලවන තෙක් එය දර්ශනය තුළ මෙය තබයි. ගැලවීමට ආපසු සහ දළ විශ්ලේෂණය එකම වේලාවක ස්පර්ෂ කර අල්ලා සිටින්න."</string> + <string name="screen_pinning_description_accessible" msgid="8518446209564202557">"ඔබ ගලවන තෙක් එය දර්ශනය තුළ මෙය තබයි. ගැලවීමට දළ විශ්ලේෂණය ස්පර්ෂ කර අල්ලා සිටින්න."</string> + <string name="screen_pinning_positive" msgid="3783985798366751226">"හරි, තේරුණා"</string> + <string name="screen_pinning_negative" msgid="3741602308343880268">"එපා ස්තූතියි"</string> + <string name="quick_settings_reset_confirmation_title" msgid="748792586749897883">"<xliff:g id="TILE_LABEL">%1$s</xliff:g> සඟවන්නද?"</string> + <string name="quick_settings_reset_confirmation_message" msgid="2235970126803317374">"ඊළඟ අවස්ථාවේ සැකසීම් තුළ ඔබ එය සක්රිය කළ විට එය නැවත දිසිවේ."</string> + <string name="quick_settings_reset_confirmation_button" msgid="2660339101868367515">"සඟවන්න"</string> </resources> diff --git a/packages/SystemUI/res/values-sk/strings.xml b/packages/SystemUI/res/values-sk/strings.xml index f9345522915b..bec94027f6b9 100644 --- a/packages/SystemUI/res/values-sk/strings.xml +++ b/packages/SystemUI/res/values-sk/strings.xml @@ -354,22 +354,13 @@ <string name="hidden_notifications_text" msgid="2326409389088668981">"Zobraziť pred odomknutím"</string> <string name="hidden_notifications_cancel" msgid="3690709735122344913">"Nie, vďaka"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"Nastaviť"</string> - <string name="muted_by" msgid="6147073845094180001">"Stlmené aplikáciou <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> - <!-- no translation found for screen_pinning_title (3273740381976175811) --> - <skip /> - <!-- no translation found for screen_pinning_description (1346522416878235405) --> - <skip /> - <!-- no translation found for screen_pinning_description_accessible (8518446209564202557) --> - <skip /> - <!-- no translation found for screen_pinning_positive (3783985798366751226) --> - <skip /> - <!-- no translation found for screen_pinning_negative (3741602308343880268) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_title (748792586749897883) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_message (2235970126803317374) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_button (2660339101868367515) --> - <skip /> + <string name="screen_pinning_title" msgid="3273740381976175811">"Obrazovka je pripnutá"</string> + <string name="screen_pinning_description" msgid="1346522416878235405">"Obsah bude pripnutý v zobrazení, dokým ho neuvoľníte. Ak ho chcete uvoľniť, stlačte a podržte súčasne tlačidlá Späť a Prehľad."</string> + <string name="screen_pinning_description_accessible" msgid="8518446209564202557">"Obsah bude pripnutý v zobrazení, dokým ho neuvoľníte. Uvoľníte ho stlačením a podržaním tlačidla Prehľad."</string> + <string name="screen_pinning_positive" msgid="3783985798366751226">"Rozumiem"</string> + <string name="screen_pinning_negative" msgid="3741602308343880268">"Nie, vďaka"</string> + <string name="quick_settings_reset_confirmation_title" msgid="748792586749897883">"Skryť <xliff:g id="TILE_LABEL">%1$s</xliff:g>?"</string> + <string name="quick_settings_reset_confirmation_message" msgid="2235970126803317374">"Táto položka sa znova zobrazí, keď ju v nastaveniach opätovne zapnete."</string> + <string name="quick_settings_reset_confirmation_button" msgid="2660339101868367515">"Skryť"</string> </resources> diff --git a/packages/SystemUI/res/values-sl/strings.xml b/packages/SystemUI/res/values-sl/strings.xml index ef79001452ec..6de01983d903 100644 --- a/packages/SystemUI/res/values-sl/strings.xml +++ b/packages/SystemUI/res/values-sl/strings.xml @@ -352,22 +352,13 @@ <string name="hidden_notifications_text" msgid="2326409389088668981">"Oglejte si jih pred odklepanjem"</string> <string name="hidden_notifications_cancel" msgid="3690709735122344913">"Ne, hvala"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"Nastavitev"</string> - <string name="muted_by" msgid="6147073845094180001">"Izklop zvoka: <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> - <!-- no translation found for screen_pinning_title (3273740381976175811) --> - <skip /> - <!-- no translation found for screen_pinning_description (1346522416878235405) --> - <skip /> - <!-- no translation found for screen_pinning_description_accessible (8518446209564202557) --> - <skip /> - <!-- no translation found for screen_pinning_positive (3783985798366751226) --> - <skip /> - <!-- no translation found for screen_pinning_negative (3741602308343880268) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_title (748792586749897883) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_message (2235970126803317374) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_button (2660339101868367515) --> - <skip /> + <string name="screen_pinning_title" msgid="3273740381976175811">"Zaslon je pripet"</string> + <string name="screen_pinning_description" msgid="1346522416878235405">"S tem ostane zaslon v pogledu, dokler ga ne odpnete. Hkrati pridržite tipko za nazaj in tipko za pregled, če ga želite odpeti."</string> + <string name="screen_pinning_description_accessible" msgid="8518446209564202557">"S tem ostane zaslon v pogledu, dokler ga ne odpnete. Pridržite tipko za pregled, če ga želite odpeti."</string> + <string name="screen_pinning_positive" msgid="3783985798366751226">"Razumem"</string> + <string name="screen_pinning_negative" msgid="3741602308343880268">"Ne, hvala"</string> + <string name="quick_settings_reset_confirmation_title" msgid="748792586749897883">"Želite skriti <xliff:g id="TILE_LABEL">%1$s</xliff:g>?"</string> + <string name="quick_settings_reset_confirmation_message" msgid="2235970126803317374">"Znova se bo pojavila, ko jo naslednjič vklopite v nastavitvah."</string> + <string name="quick_settings_reset_confirmation_button" msgid="2660339101868367515">"Skrij"</string> </resources> diff --git a/packages/SystemUI/res/values-sr/strings.xml b/packages/SystemUI/res/values-sr/strings.xml index 2798ac593bfe..5fd939b84121 100644 --- a/packages/SystemUI/res/values-sr/strings.xml +++ b/packages/SystemUI/res/values-sr/strings.xml @@ -352,22 +352,13 @@ <string name="hidden_notifications_text" msgid="2326409389088668981">"Прегледајте их пре откључавања"</string> <string name="hidden_notifications_cancel" msgid="3690709735122344913">"Не, хвала"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"Подеси"</string> - <string name="muted_by" msgid="6147073845094180001">"Звук је искључио/ла <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> - <!-- no translation found for screen_pinning_title (3273740381976175811) --> - <skip /> - <!-- no translation found for screen_pinning_description (1346522416878235405) --> - <skip /> - <!-- no translation found for screen_pinning_description_accessible (8518446209564202557) --> - <skip /> - <!-- no translation found for screen_pinning_positive (3783985798366751226) --> - <skip /> - <!-- no translation found for screen_pinning_negative (3741602308343880268) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_title (748792586749897883) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_message (2235970126803317374) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_button (2660339101868367515) --> - <skip /> + <string name="screen_pinning_title" msgid="3273740381976175811">"Екран је закачен"</string> + <string name="screen_pinning_description" msgid="1346522416878235405">"На овај начин ово остаје приказано док га не откачите. Истовремено додирните и задржите Назад и Преглед да бисте га откачили."</string> + <string name="screen_pinning_description_accessible" msgid="8518446209564202557">"На овај начин ово остаје приказано док га не откачите. Додирните и задржите Преглед да бисте га откачили."</string> + <string name="screen_pinning_positive" msgid="3783985798366751226">"Важи"</string> + <string name="screen_pinning_negative" msgid="3741602308343880268">"Не, хвала"</string> + <string name="quick_settings_reset_confirmation_title" msgid="748792586749897883">"Желите ли да сакријете <xliff:g id="TILE_LABEL">%1$s</xliff:g>?"</string> + <string name="quick_settings_reset_confirmation_message" msgid="2235970126803317374">"Ово ће се поново појавити када га следећи пут будете укључили у подешавањима."</string> + <string name="quick_settings_reset_confirmation_button" msgid="2660339101868367515">"Сакриј"</string> </resources> diff --git a/packages/SystemUI/res/values-sv/strings.xml b/packages/SystemUI/res/values-sv/strings.xml index 8abba040f855..f22db78232cf 100644 --- a/packages/SystemUI/res/values-sv/strings.xml +++ b/packages/SystemUI/res/values-sv/strings.xml @@ -352,7 +352,6 @@ <string name="hidden_notifications_text" msgid="2326409389088668981">"Visa dem innan du låser upp"</string> <string name="hidden_notifications_cancel" msgid="3690709735122344913">"Nej tack"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"Konfig."</string> - <string name="muted_by" msgid="6147073845094180001">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> har stängt av ljudet"</string> <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> <string name="screen_pinning_title" msgid="3273740381976175811">"Skärmen har fästs"</string> <string name="screen_pinning_description" msgid="1346522416878235405">"Detta visar skärmen tills du lossar den. Tryck länge på bakåtknappen och Översikt samtidigt om du vill lossa skärmen."</string> diff --git a/packages/SystemUI/res/values-sw/strings.xml b/packages/SystemUI/res/values-sw/strings.xml index 80d5f77a69d5..611d596ba9bc 100644 --- a/packages/SystemUI/res/values-sw/strings.xml +++ b/packages/SystemUI/res/values-sw/strings.xml @@ -352,22 +352,13 @@ <string name="hidden_notifications_text" msgid="2326409389088668981">"Zitazame kabla hujafungua"</string> <string name="hidden_notifications_cancel" msgid="3690709735122344913">"Hapana, asante"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"Sanidi"</string> - <string name="muted_by" msgid="6147073845094180001">"Sauti imezimwa na <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> - <!-- no translation found for screen_pinning_title (3273740381976175811) --> - <skip /> - <!-- no translation found for screen_pinning_description (1346522416878235405) --> - <skip /> - <!-- no translation found for screen_pinning_description_accessible (8518446209564202557) --> - <skip /> - <!-- no translation found for screen_pinning_positive (3783985798366751226) --> - <skip /> - <!-- no translation found for screen_pinning_negative (3741602308343880268) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_title (748792586749897883) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_message (2235970126803317374) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_button (2660339101868367515) --> - <skip /> + <string name="screen_pinning_title" msgid="3273740381976175811">"Skrini imebandikwa"</string> + <string name="screen_pinning_description" msgid="1346522416878235405">"Hii itaendelea kuonyesha hadi ubandue. Gusa na ushikilie Nyuma na Muhtasari kwa wakati mmoja ili ubandue."</string> + <string name="screen_pinning_description_accessible" msgid="8518446209564202557">"Hii itaendelea kuonyesha hadi uibandue. Gusa na ushikilie Muhtasari ili ubandue."</string> + <string name="screen_pinning_positive" msgid="3783985798366751226">"Nimeelewa"</string> + <string name="screen_pinning_negative" msgid="3741602308343880268">"Hapana, asante"</string> + <string name="quick_settings_reset_confirmation_title" msgid="748792586749897883">"Ungependa kuficha <xliff:g id="TILE_LABEL">%1$s</xliff:g>?"</string> + <string name="quick_settings_reset_confirmation_message" msgid="2235970126803317374">"Itaonekana tena wakati mwingine utakapoiwasha katika mipangilio."</string> + <string name="quick_settings_reset_confirmation_button" msgid="2660339101868367515">"Ficha"</string> </resources> diff --git a/packages/SystemUI/res/values-ta-rIN/strings.xml b/packages/SystemUI/res/values-ta-rIN/strings.xml index 4a3df3811402..b6063c6f8d34 100644 --- a/packages/SystemUI/res/values-ta-rIN/strings.xml +++ b/packages/SystemUI/res/values-ta-rIN/strings.xml @@ -352,22 +352,13 @@ <string name="hidden_notifications_text" msgid="2326409389088668981">"திறக்கும் முன் அவற்றைப் பார்க்கவும்"</string> <string name="hidden_notifications_cancel" msgid="3690709735122344913">"வேண்டாம்"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"அமை"</string> - <string name="muted_by" msgid="6147073845094180001">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> ஒலியடக்கினார்"</string> <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> - <!-- no translation found for screen_pinning_title (3273740381976175811) --> - <skip /> - <!-- no translation found for screen_pinning_description (1346522416878235405) --> - <skip /> - <!-- no translation found for screen_pinning_description_accessible (8518446209564202557) --> - <skip /> - <!-- no translation found for screen_pinning_positive (3783985798366751226) --> - <skip /> - <!-- no translation found for screen_pinning_negative (3741602308343880268) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_title (748792586749897883) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_message (2235970126803317374) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_button (2660339101868367515) --> - <skip /> + <string name="screen_pinning_title" msgid="3273740381976175811">"திரை பொருத்தப்பட்டது"</string> + <string name="screen_pinning_description" msgid="1346522416878235405">"பொருத்தியதை விலக்கும்வரை இதைக் காட்சியில் வைக்கும். விலக்க, பின் மற்றும் மேலோட்டப் பார்வையை ஒரே நேரத்தில் தொட்டுப் பிடிக்கவும்."</string> + <string name="screen_pinning_description_accessible" msgid="8518446209564202557">"பொருத்தியதை விலக்கும்வரை இதைக் காட்சியில் வைக்கும். விலக்க, மேலோட்டப் பார்வையைத் தொட்டுப் பிடிக்கவும்."</string> + <string name="screen_pinning_positive" msgid="3783985798366751226">"புரிந்தது"</string> + <string name="screen_pinning_negative" msgid="3741602308343880268">"வேண்டாம்"</string> + <string name="quick_settings_reset_confirmation_title" msgid="748792586749897883">"<xliff:g id="TILE_LABEL">%1$s</xliff:g>ஐ மறைக்கவா?"</string> + <string name="quick_settings_reset_confirmation_message" msgid="2235970126803317374">"அடுத்த முறை அமைப்புகளில் மீண்டும் இயக்கும்போது, இது மீண்டும் தோன்றும்."</string> + <string name="quick_settings_reset_confirmation_button" msgid="2660339101868367515">"மறை"</string> </resources> diff --git a/packages/SystemUI/res/values-te-rIN/strings.xml b/packages/SystemUI/res/values-te-rIN/strings.xml index d49aa1e2b625..6be1c27565b2 100644 --- a/packages/SystemUI/res/values-te-rIN/strings.xml +++ b/packages/SystemUI/res/values-te-rIN/strings.xml @@ -352,22 +352,13 @@ <string name="hidden_notifications_text" msgid="2326409389088668981">"వీటిని మీరు అన్లాక్ చేయకముందే చూడండి"</string> <string name="hidden_notifications_cancel" msgid="3690709735122344913">"వద్దు, ధన్యవాదాలు"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"సెటప్ చేయి"</string> - <string name="muted_by" msgid="6147073845094180001">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> ద్వారా మ్యూట్ చేయబడింది"</string> <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> - <!-- no translation found for screen_pinning_title (3273740381976175811) --> - <skip /> - <!-- no translation found for screen_pinning_description (1346522416878235405) --> - <skip /> - <!-- no translation found for screen_pinning_description_accessible (8518446209564202557) --> - <skip /> - <!-- no translation found for screen_pinning_positive (3783985798366751226) --> - <skip /> - <!-- no translation found for screen_pinning_negative (3741602308343880268) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_title (748792586749897883) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_message (2235970126803317374) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_button (2660339101868367515) --> - <skip /> + <string name="screen_pinning_title" msgid="3273740381976175811">"స్క్రీన్ పిన్ చేయబడింది"</string> + <string name="screen_pinning_description" msgid="1346522416878235405">"ఇది మీరు అన్పిన్ చేసే వరకు దీన్ని వీక్షణలో ఉంచుతుంది. అన్పిన్ చేయడానికి వెనుకకు మరియు స్థూలదృష్టిని ఒకేసారి తాకి, ఉంచండి."</string> + <string name="screen_pinning_description_accessible" msgid="8518446209564202557">"ఇది మీరు అన్పిన్ చేసే వరకు దీన్ని వీక్షణలో ఉంచుతుంది. అన్పిన్ చేయడానికి స్థూలదృష్టిని తాకి, ఉంచండి."</string> + <string name="screen_pinning_positive" msgid="3783985798366751226">"అర్థమైంది"</string> + <string name="screen_pinning_negative" msgid="3741602308343880268">"వద్దు, ధన్యవాదాలు"</string> + <string name="quick_settings_reset_confirmation_title" msgid="748792586749897883">"<xliff:g id="TILE_LABEL">%1$s</xliff:g>ని దాచాలా?"</string> + <string name="quick_settings_reset_confirmation_message" msgid="2235970126803317374">"మీరు సెట్టింగ్ల్లో దీన్ని ఆన్ చేసిన తదుపరిసారి ఇది కనిపిస్తుంది."</string> + <string name="quick_settings_reset_confirmation_button" msgid="2660339101868367515">"దాచు"</string> </resources> diff --git a/packages/SystemUI/res/values-television/styles.xml b/packages/SystemUI/res/values-television/styles.xml new file mode 100644 index 000000000000..53dc4aa03a12 --- /dev/null +++ b/packages/SystemUI/res/values-television/styles.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2006 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<resources xmlns:android="http://schemas.android.com/apk/res/android"> + <style name="Theme.SystemUI.Dialog.Alert" parent="@*android:style/Theme.DeviceDefault.Dialog.Alert" /> +</resources> diff --git a/packages/SystemUI/res/values-th/strings.xml b/packages/SystemUI/res/values-th/strings.xml index 831840534355..02d12af0d66e 100644 --- a/packages/SystemUI/res/values-th/strings.xml +++ b/packages/SystemUI/res/values-th/strings.xml @@ -352,22 +352,13 @@ <string name="hidden_notifications_text" msgid="2326409389088668981">"ดูก่อนปลดล็อก"</string> <string name="hidden_notifications_cancel" msgid="3690709735122344913">"ไม่เป็นไร"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"ตั้งค่า"</string> - <string name="muted_by" msgid="6147073845094180001">"ปิดเสียงโดย <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g> <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> - <!-- no translation found for screen_pinning_title (3273740381976175811) --> - <skip /> - <!-- no translation found for screen_pinning_description (1346522416878235405) --> - <skip /> - <!-- no translation found for screen_pinning_description_accessible (8518446209564202557) --> - <skip /> - <!-- no translation found for screen_pinning_positive (3783985798366751226) --> - <skip /> - <!-- no translation found for screen_pinning_negative (3741602308343880268) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_title (748792586749897883) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_message (2235970126803317374) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_button (2660339101868367515) --> - <skip /> + <string name="screen_pinning_title" msgid="3273740381976175811">"ตรึงหน้าจอแล้ว"</string> + <string name="screen_pinning_description" msgid="1346522416878235405">"การดำเนินการนี้จะเปิดหน้าจอนี้ไว้เสมอจนกว่าคุณจะเลิกตรึง แตะ \"กลับ\" และ \"ภาพรวม\" พร้อมกันค้างไว้เพื่อเลิกตรึง"</string> + <string name="screen_pinning_description_accessible" msgid="8518446209564202557">"การดำเนินการนี้จะเปิดหน้าจอนี้ไว้เสมอจนกว่าคุณจะเลิกตรึง แตะ \"ภาพรวม\" ค้างไว้เพื่อเลิกตรึง"</string> + <string name="screen_pinning_positive" msgid="3783985798366751226">"รับทราบ"</string> + <string name="screen_pinning_negative" msgid="3741602308343880268">"ไม่เป็นไร ขอบคุณ"</string> + <string name="quick_settings_reset_confirmation_title" msgid="748792586749897883">"ซ่อน <xliff:g id="TILE_LABEL">%1$s</xliff:g> ไหม"</string> + <string name="quick_settings_reset_confirmation_message" msgid="2235970126803317374">"จะปรากฏอีกครั้งเมื่อคุณเปิดใช้ในการตั้งค่าครั้งถัดไป"</string> + <string name="quick_settings_reset_confirmation_button" msgid="2660339101868367515">"ซ่อน"</string> </resources> diff --git a/packages/SystemUI/res/values-tl/strings.xml b/packages/SystemUI/res/values-tl/strings.xml index d19742f2afa7..47a43d02989d 100644 --- a/packages/SystemUI/res/values-tl/strings.xml +++ b/packages/SystemUI/res/values-tl/strings.xml @@ -352,22 +352,13 @@ <string name="hidden_notifications_text" msgid="2326409389088668981">"Tingnan ang mga ito bago ka mag-unlock"</string> <string name="hidden_notifications_cancel" msgid="3690709735122344913">"Hindi"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"I-set up"</string> - <string name="muted_by" msgid="6147073845094180001">"Na-mute ng <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> - <!-- no translation found for screen_pinning_title (3273740381976175811) --> - <skip /> - <!-- no translation found for screen_pinning_description (1346522416878235405) --> - <skip /> - <!-- no translation found for screen_pinning_description_accessible (8518446209564202557) --> - <skip /> - <!-- no translation found for screen_pinning_positive (3783985798366751226) --> - <skip /> - <!-- no translation found for screen_pinning_negative (3741602308343880268) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_title (748792586749897883) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_message (2235970126803317374) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_button (2660339101868367515) --> - <skip /> + <string name="screen_pinning_title" msgid="3273740381976175811">"Naka-pin ang screen"</string> + <string name="screen_pinning_description" msgid="1346522416878235405">"Pinapanatili nitong nasa view ito hanggang sa mag-unpin ka. Pindutin nang matagal ang Bumalik at Pangkalahatang-ideya nang sabay upang mag-unpin."</string> + <string name="screen_pinning_description_accessible" msgid="8518446209564202557">"Pinapanatili nitong nasa view ito hanggang sa mag-unpin ka. Pindutin nang matagal ang Pangkalahatang-ideya upang mag-unpin."</string> + <string name="screen_pinning_positive" msgid="3783985798366751226">"Nakuha ko"</string> + <string name="screen_pinning_negative" msgid="3741602308343880268">"Hindi, salamat na lang"</string> + <string name="quick_settings_reset_confirmation_title" msgid="748792586749897883">"Itago ang <xliff:g id="TILE_LABEL">%1$s</xliff:g>?"</string> + <string name="quick_settings_reset_confirmation_message" msgid="2235970126803317374">"Lalabas itong muli sa susunod na pagkakataon na i-on mo ito sa mga setting."</string> + <string name="quick_settings_reset_confirmation_button" msgid="2660339101868367515">"Itago"</string> </resources> diff --git a/packages/SystemUI/res/values-tr/strings.xml b/packages/SystemUI/res/values-tr/strings.xml index 4d7014b0c1b5..b9c3ba2d6a5e 100644 --- a/packages/SystemUI/res/values-tr/strings.xml +++ b/packages/SystemUI/res/values-tr/strings.xml @@ -352,22 +352,13 @@ <string name="hidden_notifications_text" msgid="2326409389088668981">"Kilidi açmadan bildirimleri görün"</string> <string name="hidden_notifications_cancel" msgid="3690709735122344913">"Hayır, teşekkürler"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"Kur"</string> - <string name="muted_by" msgid="6147073845094180001">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> tarafından kapatıldı"</string> <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> - <!-- no translation found for screen_pinning_title (3273740381976175811) --> - <skip /> - <!-- no translation found for screen_pinning_description (1346522416878235405) --> - <skip /> - <!-- no translation found for screen_pinning_description_accessible (8518446209564202557) --> - <skip /> - <!-- no translation found for screen_pinning_positive (3783985798366751226) --> - <skip /> - <!-- no translation found for screen_pinning_negative (3741602308343880268) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_title (748792586749897883) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_message (2235970126803317374) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_button (2660339101868367515) --> - <skip /> + <string name="screen_pinning_title" msgid="3273740381976175811">"Ekran sabitlendi"</string> + <string name="screen_pinning_description" msgid="1346522416878235405">"Böylece siz sabitlemesini kaldırana kadar görüntülenmeye devam eder. Sabitlemeyi kaldırmak için Geri ve Genel Bakış öğesine aynı anda dokunun ve basılı tutun."</string> + <string name="screen_pinning_description_accessible" msgid="8518446209564202557">"Böylece siz sabitlemesini kaldırana kadar görüntülenmeye devam eder. Sabitlemeyi kaldırmak için Genel Bakış\'a dokunun ve basılı tutun."</string> + <string name="screen_pinning_positive" msgid="3783985798366751226">"Anladım"</string> + <string name="screen_pinning_negative" msgid="3741602308343880268">"Hayır, teşekkürler"</string> + <string name="quick_settings_reset_confirmation_title" msgid="748792586749897883">"<xliff:g id="TILE_LABEL">%1$s</xliff:g> gizlensin mi?"</string> + <string name="quick_settings_reset_confirmation_message" msgid="2235970126803317374">"Ayarlardan etkinleştirdiğiniz bir sonraki sefer tekrar görünür."</string> + <string name="quick_settings_reset_confirmation_button" msgid="2660339101868367515">"Gizle"</string> </resources> diff --git a/packages/SystemUI/res/values-uk/strings.xml b/packages/SystemUI/res/values-uk/strings.xml index 7a7e2f716d43..14020f0ac832 100644 --- a/packages/SystemUI/res/values-uk/strings.xml +++ b/packages/SystemUI/res/values-uk/strings.xml @@ -352,22 +352,13 @@ <string name="hidden_notifications_text" msgid="2326409389088668981">"Переглядайте сповіщення, перш ніж розблокувати екран"</string> <string name="hidden_notifications_cancel" msgid="3690709735122344913">"Ні, дякую"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"Налаштув."</string> - <string name="muted_by" msgid="6147073845094180001">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> вимикає звук"</string> <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> - <!-- no translation found for screen_pinning_title (3273740381976175811) --> - <skip /> - <!-- no translation found for screen_pinning_description (1346522416878235405) --> - <skip /> - <!-- no translation found for screen_pinning_description_accessible (8518446209564202557) --> - <skip /> - <!-- no translation found for screen_pinning_positive (3783985798366751226) --> - <skip /> - <!-- no translation found for screen_pinning_negative (3741602308343880268) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_title (748792586749897883) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_message (2235970126803317374) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_button (2660339101868367515) --> - <skip /> + <string name="screen_pinning_title" msgid="3273740381976175811">"Екран закріплено"</string> + <string name="screen_pinning_description" msgid="1346522416878235405">"Закріпить екран, щоб ви могли постійно його бачити, доки не відкріпите. Щоб відкріпити, одночасно натисніть і втримуйте кнопки \"Назад\" і \"Огляд\"."</string> + <string name="screen_pinning_description_accessible" msgid="8518446209564202557">"Закріпить екран, щоб ви могли постійно його бачити, доки не відкріпите. Щоб відкріпити, натисніть і втримуйте кнопку \"Огляд\"."</string> + <string name="screen_pinning_positive" msgid="3783985798366751226">"Зрозуміло"</string> + <string name="screen_pinning_negative" msgid="3741602308343880268">"Ні, дякую"</string> + <string name="quick_settings_reset_confirmation_title" msgid="748792586749897883">"Сховати <xliff:g id="TILE_LABEL">%1$s</xliff:g>?"</string> + <string name="quick_settings_reset_confirmation_message" msgid="2235970126803317374">"З’явиться знову, коли ви ввімкнете його в налаштуваннях."</string> + <string name="quick_settings_reset_confirmation_button" msgid="2660339101868367515">"Сховати"</string> </resources> diff --git a/packages/SystemUI/res/values-ur-rPK/strings.xml b/packages/SystemUI/res/values-ur-rPK/strings.xml index 38e152cee591..64b6f8484fb7 100644 --- a/packages/SystemUI/res/values-ur-rPK/strings.xml +++ b/packages/SystemUI/res/values-ur-rPK/strings.xml @@ -352,22 +352,13 @@ <string name="hidden_notifications_text" msgid="2326409389088668981">"غیر مقفل کرنے سے پہلے انہیں دیکھیں"</string> <string name="hidden_notifications_cancel" msgid="3690709735122344913">"نہیں شکریہ"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"ترتیب دیں"</string> - <string name="muted_by" msgid="6147073845094180001">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> کے ذریعے خاموش کردہ"</string> <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>۔ <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> - <!-- no translation found for screen_pinning_title (3273740381976175811) --> - <skip /> - <!-- no translation found for screen_pinning_description (1346522416878235405) --> - <skip /> - <!-- no translation found for screen_pinning_description_accessible (8518446209564202557) --> - <skip /> - <!-- no translation found for screen_pinning_positive (3783985798366751226) --> - <skip /> - <!-- no translation found for screen_pinning_negative (3741602308343880268) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_title (748792586749897883) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_message (2235970126803317374) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_button (2660339101868367515) --> - <skip /> + <string name="screen_pinning_title" msgid="3273740381976175811">"اسکرین پن کردہ ہے"</string> + <string name="screen_pinning_description" msgid="1346522416878235405">"یہ اس کو اس وقت تک منظر میں رکھتا ہے جب تک آپ اس سے پن نہیں ہٹا دیتے۔ پن ہٹانے کیلئے واپس اور عمومی جائزہ کو ایک ساتھ ٹچ کریں اور پکڑ کر رکھیں۔"</string> + <string name="screen_pinning_description_accessible" msgid="8518446209564202557">"یہ اس کو اس وقت تک منظر میں رکھتا ہے جب تک آپ اس سے پن نہیں ہٹا دیتے۔ پن ہٹانے کیلئے عمومی جائزہ کو ٹچ کریں اور پکڑ کر رکھیں۔"</string> + <string name="screen_pinning_positive" msgid="3783985798366751226">"سمجھ آ گئی"</string> + <string name="screen_pinning_negative" msgid="3741602308343880268">"نہیں شکریہ"</string> + <string name="quick_settings_reset_confirmation_title" msgid="748792586749897883">"<xliff:g id="TILE_LABEL">%1$s</xliff:g> کو چھپائیں؟"</string> + <string name="quick_settings_reset_confirmation_message" msgid="2235970126803317374">"اگلی بار جب آپ اسے ترتیبات میں آن کریں گے تو یہ ظاہر ہوگی۔"</string> + <string name="quick_settings_reset_confirmation_button" msgid="2660339101868367515">"چھپائیں"</string> </resources> diff --git a/packages/SystemUI/res/values-uz-rUZ/strings.xml b/packages/SystemUI/res/values-uz-rUZ/strings.xml index 11bd4fdd857e..9d147d3fa190 100644 --- a/packages/SystemUI/res/values-uz-rUZ/strings.xml +++ b/packages/SystemUI/res/values-uz-rUZ/strings.xml @@ -352,22 +352,13 @@ <string name="hidden_notifications_text" msgid="2326409389088668981">"Ularni qulfdan chiqarishdan oldin ko‘ring"</string> <string name="hidden_notifications_cancel" msgid="3690709735122344913">"Yo‘q, kerak emas"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"Sozlash"</string> - <string name="muted_by" msgid="6147073845094180001">"“<xliff:g id="THIRD_PARTY">%1$s</xliff:g>” tomonidan ovozsiz qilingan"</string> <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> - <!-- no translation found for screen_pinning_title (3273740381976175811) --> - <skip /> - <!-- no translation found for screen_pinning_description (1346522416878235405) --> - <skip /> - <!-- no translation found for screen_pinning_description_accessible (8518446209564202557) --> - <skip /> - <!-- no translation found for screen_pinning_positive (3783985798366751226) --> - <skip /> - <!-- no translation found for screen_pinning_negative (3741602308343880268) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_title (748792586749897883) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_message (2235970126803317374) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_button (2660339101868367515) --> - <skip /> + <string name="screen_pinning_title" msgid="3273740381976175811">"Ekran qadaldi"</string> + <string name="screen_pinning_description" msgid="1346522416878235405">"Ekran yechilmaguncha u qadalgan holatda qoladi. Uni yechish uchun “Orqaga” va “Umumiy nazar” tugmalarini bir vaqtda bosing va ushlab turing."</string> + <string name="screen_pinning_description_accessible" msgid="8518446209564202557">"Ekran yechilmaguncha u qadalgan holatda qoladi. Uni yechish uchun “Umumiy nazar” tugmasini bosing va ushlab turing."</string> + <string name="screen_pinning_positive" msgid="3783985798366751226">"OK"</string> + <string name="screen_pinning_negative" msgid="3741602308343880268">"Yo‘q, kerakmas"</string> + <string name="quick_settings_reset_confirmation_title" msgid="748792586749897883">"<xliff:g id="TILE_LABEL">%1$s</xliff:g> berkitilsinmi?"</string> + <string name="quick_settings_reset_confirmation_message" msgid="2235970126803317374">"Keyingi safar sozlamalardan yoqilgan paydo bo‘ladi."</string> + <string name="quick_settings_reset_confirmation_button" msgid="2660339101868367515">"Berkitish"</string> </resources> diff --git a/packages/SystemUI/res/values-vi/strings.xml b/packages/SystemUI/res/values-vi/strings.xml index be9ac9ea6b9b..e31dc664fec9 100644 --- a/packages/SystemUI/res/values-vi/strings.xml +++ b/packages/SystemUI/res/values-vi/strings.xml @@ -352,22 +352,13 @@ <string name="hidden_notifications_text" msgid="2326409389088668981">"Xem thông báo trước khi bạn mở khóa"</string> <string name="hidden_notifications_cancel" msgid="3690709735122344913">"Ko, cảm ơn"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"Thiết lập"</string> - <string name="muted_by" msgid="6147073845094180001">"Do <xliff:g id="THIRD_PARTY">%1$s</xliff:g> tắt tiếng"</string> <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> - <!-- no translation found for screen_pinning_title (3273740381976175811) --> - <skip /> - <!-- no translation found for screen_pinning_description (1346522416878235405) --> - <skip /> - <!-- no translation found for screen_pinning_description_accessible (8518446209564202557) --> - <skip /> - <!-- no translation found for screen_pinning_positive (3783985798366751226) --> - <skip /> - <!-- no translation found for screen_pinning_negative (3741602308343880268) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_title (748792586749897883) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_message (2235970126803317374) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_button (2660339101868367515) --> - <skip /> + <string name="screen_pinning_title" msgid="3273740381976175811">"Màn hình được ghim"</string> + <string name="screen_pinning_description" msgid="1346522416878235405">"Thao tác này sẽ duy trì hiển thị màn hình cho đến khi bạn bỏ ghim. Chạm và giữ nút Quay lại và Tổng quan cùng một lúc để bỏ ghim."</string> + <string name="screen_pinning_description_accessible" msgid="8518446209564202557">"Thao tác này sẽ duy trì hiển thị màn hình cho đến khi bạn bỏ ghim. Chạm và giữ nút Quay lại để bỏ ghim."</string> + <string name="screen_pinning_positive" msgid="3783985798366751226">"Ok"</string> + <string name="screen_pinning_negative" msgid="3741602308343880268">"Không, cảm ơn"</string> + <string name="quick_settings_reset_confirmation_title" msgid="748792586749897883">"Ẩn <xliff:g id="TILE_LABEL">%1$s</xliff:g>?"</string> + <string name="quick_settings_reset_confirmation_message" msgid="2235970126803317374">"Thông báo này sẽ xuất hiện lại vào lần tiếp theo bạn bật thông báo trong cài đặt."</string> + <string name="quick_settings_reset_confirmation_button" msgid="2660339101868367515">"Ẩn"</string> </resources> diff --git a/packages/SystemUI/res/values-zh-rCN/strings.xml b/packages/SystemUI/res/values-zh-rCN/strings.xml index 4dac3d3375da..6ae57f3e0459 100644 --- a/packages/SystemUI/res/values-zh-rCN/strings.xml +++ b/packages/SystemUI/res/values-zh-rCN/strings.xml @@ -354,22 +354,13 @@ <string name="hidden_notifications_text" msgid="2326409389088668981">"无需解锁即可查看通知"</string> <string name="hidden_notifications_cancel" msgid="3690709735122344913">"不用了"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"设置"</string> - <string name="muted_by" msgid="6147073845094180001">"已被<xliff:g id="THIRD_PARTY">%1$s</xliff:g>设为静音"</string> <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>（<xliff:g id="EXIT_CONDITION">%2$s</xliff:g>）"</string> - <!-- no translation found for screen_pinning_title (3273740381976175811) --> - <skip /> - <!-- no translation found for screen_pinning_description (1346522416878235405) --> - <skip /> - <!-- no translation found for screen_pinning_description_accessible (8518446209564202557) --> - <skip /> - <!-- no translation found for screen_pinning_positive (3783985798366751226) --> - <skip /> - <!-- no translation found for screen_pinning_negative (3741602308343880268) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_title (748792586749897883) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_message (2235970126803317374) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_button (2660339101868367515) --> - <skip /> + <string name="screen_pinning_title" msgid="3273740381976175811">"已固定屏幕"</string> + <string name="screen_pinning_description" msgid="1346522416878235405">"这将会固定显示此屏幕，直到您取消固定为止。触摸并同时按住“返回”和“概览”即可取消固定屏幕。"</string> + <string name="screen_pinning_description_accessible" msgid="8518446209564202557">"这将会固定显示此屏幕，直到您取消固定为止。触摸并按住“概览”即可取消固定屏幕。"</string> + <string name="screen_pinning_positive" msgid="3783985798366751226">"知道了"</string> + <string name="screen_pinning_negative" msgid="3741602308343880268">"不用了"</string> + <string name="quick_settings_reset_confirmation_title" msgid="748792586749897883">"要隐藏“<xliff:g id="TILE_LABEL">%1$s</xliff:g>”吗？"</string> + <string name="quick_settings_reset_confirmation_message" msgid="2235970126803317374">"下次在设置中将其开启后，此快捷设置条目将会重新显示。"</string> + <string name="quick_settings_reset_confirmation_button" msgid="2660339101868367515">"隐藏"</string> </resources> diff --git a/packages/SystemUI/res/values-zh-rHK/strings.xml b/packages/SystemUI/res/values-zh-rHK/strings.xml index 1cc638cc8abf..de69a86802cf 100644 --- a/packages/SystemUI/res/values-zh-rHK/strings.xml +++ b/packages/SystemUI/res/values-zh-rHK/strings.xml @@ -354,22 +354,13 @@ <string name="hidden_notifications_text" msgid="2326409389088668981">"解鎖前顯示"</string> <string name="hidden_notifications_cancel" msgid="3690709735122344913">"不用了，謝謝"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"設定"</string> - <string name="muted_by" msgid="6147073845094180001">"靜音設定者：<xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>。<xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> - <!-- no translation found for screen_pinning_title (3273740381976175811) --> - <skip /> - <!-- no translation found for screen_pinning_description (1346522416878235405) --> - <skip /> - <!-- no translation found for screen_pinning_description_accessible (8518446209564202557) --> - <skip /> - <!-- no translation found for screen_pinning_positive (3783985798366751226) --> - <skip /> - <!-- no translation found for screen_pinning_negative (3741602308343880268) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_title (748792586749897883) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_message (2235970126803317374) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_button (2660339101868367515) --> - <skip /> + <string name="screen_pinning_title" msgid="3273740381976175811">"螢幕已固定"</string> + <string name="screen_pinning_description" msgid="1346522416878235405">"在您取消固定前，它會保持在檢視狀態。輕觸並同時按住 [返回] 和 [概覽]，即可取消固定。"</string> + <string name="screen_pinning_description_accessible" msgid="8518446209564202557">"在您取消固定前，它會保持在檢視狀態。輕觸並按住 [概覽] 即可取消固定。"</string> + <string name="screen_pinning_positive" msgid="3783985798366751226">"知道了"</string> + <string name="screen_pinning_negative" msgid="3741602308343880268">"不用了，謝謝"</string> + <string name="quick_settings_reset_confirmation_title" msgid="748792586749897883">"隱藏 <xliff:g id="TILE_LABEL">%1$s</xliff:g>？"</string> + <string name="quick_settings_reset_confirmation_message" msgid="2235970126803317374">"下一次您在設定開啟它時，它將再次出現。"</string> + <string name="quick_settings_reset_confirmation_button" msgid="2660339101868367515">"隱藏"</string> </resources> diff --git a/packages/SystemUI/res/values-zh-rTW/strings.xml b/packages/SystemUI/res/values-zh-rTW/strings.xml index 0bcd38f6aa43..2e3601034730 100644 --- a/packages/SystemUI/res/values-zh-rTW/strings.xml +++ b/packages/SystemUI/res/values-zh-rTW/strings.xml @@ -164,7 +164,7 @@ <string name="accessibility_recents_item_launched" msgid="7616039892382525203">"正在啟動「<xliff:g id="APP">%s</xliff:g>」。"</string> <string name="accessibility_notification_dismissed" msgid="854211387186306927">"已關閉通知。"</string> <string name="accessibility_desc_notification_shade" msgid="4690274844447504208">"通知欄。"</string> - <string name="accessibility_desc_quick_settings" msgid="6186378411582437046">"快速設定。"</string> + <string name="accessibility_desc_quick_settings" msgid="6186378411582437046">"快捷設定。"</string> <string name="accessibility_desc_lock_screen" msgid="5625143713611759164">"螢幕鎖定。"</string> <string name="accessibility_desc_settings" msgid="3417884241751434521">"設定"</string> <string name="accessibility_desc_recent_apps" msgid="4876900986661819788">"總覽。"</string> @@ -267,7 +267,7 @@ <string name="quick_settings_tethering_label" msgid="7153452060448575549">"網路共用"</string> <string name="quick_settings_hotspot_label" msgid="6046917934974004879">"無線基地台"</string> <string name="quick_settings_notifications_label" msgid="4818156442169154523">"通知"</string> - <string name="quick_settings_flashlight_label" msgid="2133093497691661546">"閃光燈"</string> + <string name="quick_settings_flashlight_label" msgid="2133093497691661546">"手電筒"</string> <string name="quick_settings_cellular_detail_title" msgid="8575062783675171695">"行動數據"</string> <string name="quick_settings_cellular_detail_data_usage" msgid="1964260360259312002">"數據用量"</string> <string name="quick_settings_cellular_detail_remaining_data" msgid="722715415543541249">"剩餘資料"</string> @@ -354,22 +354,13 @@ <string name="hidden_notifications_text" msgid="2326409389088668981">"解鎖前顯示"</string> <string name="hidden_notifications_cancel" msgid="3690709735122344913">"不用了，謝謝"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"設定"</string> - <string name="muted_by" msgid="6147073845094180001">"由 <xliff:g id="THIRD_PARTY">%1$s</xliff:g> 設為靜音"</string> <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>。<xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> - <!-- no translation found for screen_pinning_title (3273740381976175811) --> - <skip /> - <!-- no translation found for screen_pinning_description (1346522416878235405) --> - <skip /> - <!-- no translation found for screen_pinning_description_accessible (8518446209564202557) --> - <skip /> - <!-- no translation found for screen_pinning_positive (3783985798366751226) --> - <skip /> - <!-- no translation found for screen_pinning_negative (3741602308343880268) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_title (748792586749897883) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_message (2235970126803317374) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_button (2660339101868367515) --> - <skip /> + <string name="screen_pinning_title" msgid="3273740381976175811">"螢幕已固定"</string> + <string name="screen_pinning_description" msgid="1346522416878235405">"這會讓目前的螢幕畫面保持顯示狀態，直到取消固定為止。同時按住返回按鈕和總覽按鈕即可取消固定。"</string> + <string name="screen_pinning_description_accessible" msgid="8518446209564202557">"這會讓目前的螢幕畫面保持顯示狀態，直到取消固定為止。按住總覽按鈕即可取消固定。"</string> + <string name="screen_pinning_positive" msgid="3783985798366751226">"知道了"</string> + <string name="screen_pinning_negative" msgid="3741602308343880268">"不用了，謝謝"</string> + <string name="quick_settings_reset_confirmation_title" msgid="748792586749897883">"隱藏<xliff:g id="TILE_LABEL">%1$s</xliff:g>？"</string> + <string name="quick_settings_reset_confirmation_message" msgid="2235970126803317374">"只要在設定頁面中重新啟用，就能再次看到快捷設定選項。"</string> + <string name="quick_settings_reset_confirmation_button" msgid="2660339101868367515">"隱藏"</string> </resources> diff --git a/packages/SystemUI/res/values-zu/strings.xml b/packages/SystemUI/res/values-zu/strings.xml index 50cc5f465229..4923457feba3 100644 --- a/packages/SystemUI/res/values-zu/strings.xml +++ b/packages/SystemUI/res/values-zu/strings.xml @@ -352,22 +352,13 @@ <string name="hidden_notifications_text" msgid="2326409389088668981">"Ibone ngaphambi kokuthi uyivule"</string> <string name="hidden_notifications_cancel" msgid="3690709735122344913">"Cha ngiyabonga"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"Lungisa"</string> - <string name="muted_by" msgid="6147073845094180001">"Ithuliswe ngu-<xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> - <!-- no translation found for screen_pinning_title (3273740381976175811) --> - <skip /> - <!-- no translation found for screen_pinning_description (1346522416878235405) --> - <skip /> - <!-- no translation found for screen_pinning_description_accessible (8518446209564202557) --> - <skip /> - <!-- no translation found for screen_pinning_positive (3783985798366751226) --> - <skip /> - <!-- no translation found for screen_pinning_negative (3741602308343880268) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_title (748792586749897883) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_message (2235970126803317374) --> - <skip /> - <!-- no translation found for quick_settings_reset_confirmation_button (2660339101868367515) --> - <skip /> + <string name="screen_pinning_title" msgid="3273740381976175811">"Isikrini siphiniwe"</string> + <string name="screen_pinning_description" msgid="1346522416878235405">"Lokhu kukugcina kubukeka uze ususe ukuphina. Thinta futhi ubambe u-Emuva no-Ukubuka konke ngesikhathi esisodwa ukuze ususe ukuphina."</string> + <string name="screen_pinning_description_accessible" msgid="8518446209564202557">"Lokhu kukugcina kubukeka uze ususe ukuphina. Thinta futhi ubambe u-Ukubuka konke ukuze ususe ukuphina."</string> + <string name="screen_pinning_positive" msgid="3783985798366751226">"Ngiyitholile"</string> + <string name="screen_pinning_negative" msgid="3741602308343880268">"Cha ngiyabonga"</string> + <string name="quick_settings_reset_confirmation_title" msgid="748792586749897883">"Fihla i-<xliff:g id="TILE_LABEL">%1$s</xliff:g>?"</string> + <string name="quick_settings_reset_confirmation_message" msgid="2235970126803317374">"Izovela ngesikhathi esilandelayo uma uvule lesi silungiselelo."</string> + <string name="quick_settings_reset_confirmation_button" msgid="2660339101868367515">"Fihla"</string> </resources> diff --git a/packages/SystemUI/res/values/config.xml b/packages/SystemUI/res/values/config.xml index 3cd72fc66abc..44e0fd1fdc62 100644 --- a/packages/SystemUI/res/values/config.xml +++ b/packages/SystemUI/res/values/config.xml @@ -182,6 +182,8 @@ <bool name="recents_has_transposed_search_bar">true</bool> <!-- Transposes the nav bar in landscape (only used for purposes of layout). --> <bool name="recents_has_transposed_nav_bar">true</bool> + <!-- Svelte specific logic, see RecentsConfiguration.SVELTE_* constants. --> + <integer name="recents_svelte_level">0</integer> <!-- Whether to enable KeyguardService or not --> <bool name="config_enableKeyguardService">true</bool> diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml index 5caa866497ba..3d9f7232c4b8 100644 --- a/packages/SystemUI/res/values/dimens.xml +++ b/packages/SystemUI/res/values/dimens.xml @@ -321,7 +321,7 @@ <dimen name="heads_up_window_height">250dp</dimen> <!-- The minimum amount the user needs to swipe to go to the camera / phone. --> - <dimen name="keyguard_min_swipe_amount">90dp</dimen> + <dimen name="keyguard_min_swipe_amount">110dp</dimen> <!-- The minimum background radius when swiping to a side for the camera / phone affordances. --> <dimen name="keyguard_affordance_min_background_radius">30dp</dimen> @@ -405,6 +405,9 @@ <!-- The width of user avatar when on Keyguard --> <dimen name="multi_user_avatar_keyguard_size">22dp</dimen> + <!-- The width of user avatar when expanded --> + <dimen name="multi_user_avatar_expanded_size">24dp</dimen> + <!-- The font size of the time when collapsed in QS --> <dimen name="qs_time_collapsed_size">14sp</dimen> diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml index d72643ecca7d..b28b0c5ee55e 100644 --- a/packages/SystemUI/res/values/strings.xml +++ b/packages/SystemUI/res/values/strings.xml @@ -894,9 +894,6 @@ <!-- continue action for notification educating the user about enabling notifications on the lockscreen. [CHAR LIMIT=20] --> <string name="hidden_notifications_setup">Set up</string> - <!-- Indication that the current volume and other effects (vibration) are being suppressed by a third party, such as a notification listener. [CHAR LIMIT=30] --> - <string name="muted_by">Muted by <xliff:g id="third_party">%1$s</xliff:g></string> - <!-- Accessibility string for current zen mode and selected exit condition. A template that simply concatenates existing mode string and the current condition description. [CHAR LIMIT=20] --> <string name="zen_mode_and_condition"><xliff:g id="zen_mode" example="Priority interruptions only">%1$s</xliff:g>. <xliff:g id="exit_condition" example="For one hour">%2$s</xliff:g></string> diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml index 7649340529cd..8d1e967153c3 100644 --- a/packages/SystemUI/res/values/styles.xml +++ b/packages/SystemUI/res/values/styles.xml @@ -228,6 +228,8 @@ <item name="android:colorControlActivated">@color/system_accent_color</item> </style> + <style name="Theme.SystemUI.Dialog.Alert" parent="@*android:style/Theme.DeviceDefault.Light.Dialog.Alert" /> + <style name="QSBorderlessButton"> <item name="android:padding">12dp</item> <item name="android:background">@drawable/btn_borderless_rect</item> diff --git a/packages/SystemUI/src/com/android/systemui/ImageWallpaper.java b/packages/SystemUI/src/com/android/systemui/ImageWallpaper.java index 4857adc15585..0516768d2d9f 100644 --- a/packages/SystemUI/src/com/android/systemui/ImageWallpaper.java +++ b/packages/SystemUI/src/com/android/systemui/ImageWallpaper.java @@ -174,7 +174,7 @@ public class ImageWallpaper extends WallpaperService { public void trimMemory(int level) { if (level >= ComponentCallbacks2.TRIM_MEMORY_RUNNING_LOW && - mBackground != null && mIsHwAccelerated) { + mBackground != null) { if (DEBUG) { Log.d(TAG, "trimMemory"); } @@ -212,6 +212,7 @@ public class ImageWallpaper extends WallpaperService { unregisterReceiver(mReceiver); } mBackground = null; + mWallpaperManager.forgetLoadedWallpaper(); } void updateSurfaceSize(SurfaceHolder surfaceHolder) { @@ -337,111 +338,116 @@ public class ImageWallpaper extends WallpaperService { } void drawFrame() { - int newRotation = ((WindowManager) getSystemService(WINDOW_SERVICE)). - getDefaultDisplay().getRotation(); - - // Sometimes a wallpaper is not large enough to cover the screen in one dimension. - // Call updateSurfaceSize -- it will only actually do the update if the dimensions - // should change - if (newRotation != mLastRotation) { - // Update surface size (if necessary) - updateSurfaceSize(getSurfaceHolder()); - } - SurfaceHolder sh = getSurfaceHolder(); - final Rect frame = sh.getSurfaceFrame(); - final int dw = frame.width(); - final int dh = frame.height(); - boolean surfaceDimensionsChanged = dw != mLastSurfaceWidth || dh != mLastSurfaceHeight; - - boolean redrawNeeded = surfaceDimensionsChanged || newRotation != mLastRotation; - if (!redrawNeeded && !mOffsetsChanged) { - if (DEBUG) { - Log.d(TAG, "Suppressed drawFrame since redraw is not needed " - + "and offsets have not changed."); + try { + int newRotation = ((WindowManager) getSystemService(WINDOW_SERVICE)). + getDefaultDisplay().getRotation(); + + // Sometimes a wallpaper is not large enough to cover the screen in one dimension. + // Call updateSurfaceSize -- it will only actually do the update if the dimensions + // should change + if (newRotation != mLastRotation) { + // Update surface size (if necessary) + updateSurfaceSize(getSurfaceHolder()); } - return; - } - mLastRotation = newRotation; + SurfaceHolder sh = getSurfaceHolder(); + final Rect frame = sh.getSurfaceFrame(); + final int dw = frame.width(); + final int dh = frame.height(); + boolean surfaceDimensionsChanged = dw != mLastSurfaceWidth + || dh != mLastSurfaceHeight; - // Load bitmap if it is not yet loaded or if it was loaded at a different size - if (mBackground == null || surfaceDimensionsChanged) { - if (DEBUG) { - Log.d(TAG, "Reloading bitmap: mBackground, bgw, bgh, dw, dh = " + - mBackground + ", " + - ((mBackground == null) ? 0 : mBackground.getWidth()) + ", " + - ((mBackground == null) ? 0 : mBackground.getHeight()) + ", " + - dw + ", " + dh); - } - mWallpaperManager.forgetLoadedWallpaper(); - updateWallpaperLocked(); - if (mBackground == null) { + boolean redrawNeeded = surfaceDimensionsChanged || newRotation != mLastRotation; + if (!redrawNeeded && !mOffsetsChanged) { if (DEBUG) { - Log.d(TAG, "Unable to load bitmap"); + Log.d(TAG, "Suppressed drawFrame since redraw is not needed " + + "and offsets have not changed."); } return; } - if (DEBUG) { - if (dw != mBackground.getWidth() || dh != mBackground.getHeight()) { - Log.d(TAG, "Surface != bitmap dimensions: surface w/h, bitmap w/h: " + - dw + ", " + dh + ", " + mBackground.getWidth() + ", " + - mBackground.getHeight()); + mLastRotation = newRotation; + + // Load bitmap if it is not yet loaded or if it was loaded at a different size + if (mBackground == null || surfaceDimensionsChanged) { + if (DEBUG) { + Log.d(TAG, "Reloading bitmap: mBackground, bgw, bgh, dw, dh = " + + mBackground + ", " + + ((mBackground == null) ? 0 : mBackground.getWidth()) + ", " + + ((mBackground == null) ? 0 : mBackground.getHeight()) + ", " + + dw + ", " + dh); + } + mWallpaperManager.forgetLoadedWallpaper(); + updateWallpaperLocked(); + if (mBackground == null) { + if (DEBUG) { + Log.d(TAG, "Unable to load bitmap"); + } + return; + } + if (DEBUG) { + if (dw != mBackground.getWidth() || dh != mBackground.getHeight()) { + Log.d(TAG, "Surface != bitmap dimensions: surface w/h, bitmap w/h: " + + dw + ", " + dh + ", " + mBackground.getWidth() + ", " + + mBackground.getHeight()); + } } } - } - // Center the scaled image - mScale = Math.max(1f, Math.max(dw / (float) mBackground.getWidth(), - dh / (float) mBackground.getHeight())); - final int availw = dw - (int) (mBackground.getWidth() * mScale); - final int availh = dh - (int) (mBackground.getHeight() * mScale); - int xPixels = availw / 2; - int yPixels = availh / 2; - - // Adjust the image for xOffset/yOffset values. If window manager is handling offsets, - // mXOffset and mYOffset are set to 0.5f by default and therefore xPixels and yPixels - // will remain unchanged - final int availwUnscaled = dw - mBackground.getWidth(); - final int availhUnscaled = dh - mBackground.getHeight(); - if (availwUnscaled < 0) xPixels += (int)(availwUnscaled * (mXOffset - .5f) + .5f); - if (availhUnscaled < 0) yPixels += (int)(availhUnscaled * (mYOffset - .5f) + .5f); - - mOffsetsChanged = false; - mRedrawNeeded = false; - if (surfaceDimensionsChanged) { - mLastSurfaceWidth = dw; - mLastSurfaceHeight = dh; - } - if (!redrawNeeded && xPixels == mLastXTranslation && yPixels == mLastYTranslation) { - if (DEBUG) { - Log.d(TAG, "Suppressed drawFrame since the image has not " - + "actually moved an integral number of pixels."); + // Center the scaled image + mScale = Math.max(1f, Math.max(dw / (float) mBackground.getWidth(), + dh / (float) mBackground.getHeight())); + final int availw = dw - (int) (mBackground.getWidth() * mScale); + final int availh = dh - (int) (mBackground.getHeight() * mScale); + int xPixels = availw / 2; + int yPixels = availh / 2; + + // Adjust the image for xOffset/yOffset values. If window manager is handling offsets, + // mXOffset and mYOffset are set to 0.5f by default and therefore xPixels and yPixels + // will remain unchanged + final int availwUnscaled = dw - mBackground.getWidth(); + final int availhUnscaled = dh - mBackground.getHeight(); + if (availwUnscaled < 0) + xPixels += (int) (availwUnscaled * (mXOffset - .5f) + .5f); + if (availhUnscaled < 0) + yPixels += (int) (availhUnscaled * (mYOffset - .5f) + .5f); + + mOffsetsChanged = false; + mRedrawNeeded = false; + if (surfaceDimensionsChanged) { + mLastSurfaceWidth = dw; + mLastSurfaceHeight = dh; } - return; - } - mLastXTranslation = xPixels; - mLastYTranslation = yPixels; + if (!redrawNeeded && xPixels == mLastXTranslation && yPixels == mLastYTranslation) { + if (DEBUG) { + Log.d(TAG, "Suppressed drawFrame since the image has not " + + "actually moved an integral number of pixels."); + } + return; + } + mLastXTranslation = xPixels; + mLastYTranslation = yPixels; - if (DEBUG) { - Log.d(TAG, "Redrawing wallpaper"); - } + if (DEBUG) { + Log.d(TAG, "Redrawing wallpaper"); + } - if (mIsHwAccelerated) { - if (!drawWallpaperWithOpenGL(sh, availw, availh, xPixels, yPixels)) { + if (mIsHwAccelerated) { + if (!drawWallpaperWithOpenGL(sh, availw, availh, xPixels, yPixels)) { + drawWallpaperWithCanvas(sh, availw, availh, xPixels, yPixels); + } + } else { drawWallpaperWithCanvas(sh, availw, availh, xPixels, yPixels); } - } else { - drawWallpaperWithCanvas(sh, availw, availh, xPixels, yPixels); - if (FIXED_SIZED_SURFACE) { + } finally { + if (FIXED_SIZED_SURFACE && !mIsHwAccelerated) { // If the surface is fixed-size, we should only need to // draw it once and then we'll let the window manager // position it appropriately. As such, we no longer needed // the loaded bitmap. Yay! - // hw-accelerated path retains bitmap for faster rotation + // hw-accelerated renderer retains bitmap for faster rotation mBackground = null; mWallpaperManager.forgetLoadedWallpaper(); } } - } private void updateWallpaperLocked() { diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardService.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardService.java index ee699d25ef1a..98d4112db69b 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardService.java +++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardService.java @@ -22,6 +22,7 @@ import android.os.Binder; import android.os.Bundle; import android.os.Debug; import android.os.IBinder; +import android.os.Process; import android.util.Log; import android.view.MotionEvent; @@ -52,6 +53,10 @@ public class KeyguardService extends Service { } void checkPermission() { + // Avoid deadlock by avoiding calling back into the system process. + if (Binder.getCallingUid() == Process.SYSTEM_UID) return; + + // Otherwise,explicitly check for caller permission ... if (getBaseContext().checkCallingOrSelfPermission(PERMISSION) != PERMISSION_GRANTED) { Log.w(TAG, "Caller needs permission '" + PERMISSION + "' to call " + Debug.getCaller()); throw new SecurityException("Access denied to process: " + Binder.getCallingPid() diff --git a/packages/SystemUI/src/com/android/systemui/recents/AlternateRecentsComponent.java b/packages/SystemUI/src/com/android/systemui/recents/AlternateRecentsComponent.java index b5a6dacbec5c..bb9a10563b02 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/AlternateRecentsComponent.java +++ b/packages/SystemUI/src/com/android/systemui/recents/AlternateRecentsComponent.java @@ -138,14 +138,15 @@ public class AlternateRecentsComponent implements ActivityOptions.OnAnimationSta } } - // When we start, preload the metadata and icons associated with the recent tasks. + // When we start, preload the data associated with the previous recent tasks. // We can use a new plan since the caches will be the same. RecentsTaskLoader loader = RecentsTaskLoader.getInstance(); RecentsTaskLoadPlan plan = loader.createLoadPlan(mContext); loader.preloadTasks(plan, true /* isTopTaskHome */); RecentsTaskLoadPlan.Options launchOpts = new RecentsTaskLoadPlan.Options(); launchOpts.numVisibleTasks = loader.getApplicationIconCacheSize(); - launchOpts.loadThumbnails = false; + launchOpts.numVisibleTaskThumbnails = loader.getThumbnailCacheSize(); + launchOpts.onlyLoadForCache = true; loader.loadTasks(mContext, plan, launchOpts); } @@ -510,6 +511,7 @@ public class AlternateRecentsComponent implements ActivityOptions.OnAnimationSta RecentsTaskLoadPlan.Options launchOpts = new RecentsTaskLoadPlan.Options(); launchOpts.runningTaskId = topTask.id; launchOpts.loadThumbnails = false; + launchOpts.onlyLoadForCache = true; loader.loadTasks(mContext, sInstanceLoadPlan, launchOpts); // Try starting with a thumbnail transition diff --git a/packages/SystemUI/src/com/android/systemui/recents/RecentsActivity.java b/packages/SystemUI/src/com/android/systemui/recents/RecentsActivity.java index 9a7fec4c8117..d1eadd880ffe 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/RecentsActivity.java +++ b/packages/SystemUI/src/com/android/systemui/recents/RecentsActivity.java @@ -213,10 +213,12 @@ public class RecentsActivity extends Activity implements RecentsView.RecentsView RecentsTaskLoadPlan plan = AlternateRecentsComponent.consumeInstanceLoadPlan(); if (plan == null) { plan = loader.createLoadPlan(this); - loader.preloadTasks(plan, mConfig.launchedFromHome); } // Start loading tasks according to the load plan + if (plan.getTaskStack() == null) { + loader.preloadTasks(plan, mConfig.launchedFromHome); + } RecentsTaskLoadPlan.Options loadOpts = new RecentsTaskLoadPlan.Options(); loadOpts.runningTaskId = mConfig.launchedToTaskId; loadOpts.numVisibleTasks = numVisibleTasks; diff --git a/packages/SystemUI/src/com/android/systemui/recents/RecentsConfiguration.java b/packages/SystemUI/src/com/android/systemui/recents/RecentsConfiguration.java index e0c76b1dea02..43d9dc1403d5 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/RecentsConfiguration.java +++ b/packages/SystemUI/src/com/android/systemui/recents/RecentsConfiguration.java @@ -38,6 +38,18 @@ public class RecentsConfiguration { static RecentsConfiguration sInstance; static int sPrevConfigurationHashCode; + /** Levels of svelte in increasing severity/austerity. */ + // No svelting. + public static final int SVELTE_NONE = 0; + // Limit thumbnail cache to number of visible thumbnails when Recents was loaded, disable + // caching thumbnails as you scroll. + public static final int SVELTE_LIMIT_CACHE = 1; + // Disable the thumbnail cache, load thumbnails asynchronously when the activity loads and + // evict all thumbnails when hidden. + public static final int SVELTE_DISABLE_CACHE = 2; + // Disable all thumbnail loading. + public static final int SVELTE_DISABLE_LOADING = 3; + /** Animations */ public float animationPxMovementPerSecond; @@ -128,6 +140,7 @@ public class RecentsConfiguration { public boolean lockToAppEnabled; public boolean developerOptionsEnabled; public boolean debugModeEnabled; + public int svelteLevel; /** Private constructor */ private RecentsConfiguration(Context context) { @@ -277,6 +290,7 @@ public class RecentsConfiguration { useHardwareLayers = res.getBoolean(R.bool.config_recents_use_hardware_layers); altTabKeyDelay = res.getInteger(R.integer.recents_alt_tab_key_delay); fakeShadows = res.getBoolean(R.bool.config_recents_fake_shadows); + svelteLevel = res.getInteger(R.integer.recents_svelte_level); } /** Updates the system insets */ diff --git a/packages/SystemUI/src/com/android/systemui/recents/model/RecentsTaskLoadPlan.java b/packages/SystemUI/src/com/android/systemui/recents/model/RecentsTaskLoadPlan.java index 41251c841950..0011811f942a 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/model/RecentsTaskLoadPlan.java +++ b/packages/SystemUI/src/com/android/systemui/recents/model/RecentsTaskLoadPlan.java @@ -49,6 +49,7 @@ public class RecentsTaskLoadPlan { public int runningTaskId = -1; public boolean loadIcons = true; public boolean loadThumbnails = true; + public boolean onlyLoadForCache = false; public int numVisibleTasks = 0; public int numVisibleTaskThumbnails = 0; } @@ -154,7 +155,8 @@ public class RecentsTaskLoadPlan { /** * Called to apply the actual loading based on the specified conditions. */ - synchronized void executePlan(Options opts, RecentsTaskLoader loader) { + synchronized void executePlan(Options opts, RecentsTaskLoader loader, + TaskResourceLoadQueue loadQueue) { if (DEBUG) Log.d(TAG, "executePlan, # tasks: " + opts.numVisibleTasks + ", # thumbnails: " + opts.numVisibleTaskThumbnails + ", running task id: " + opts.runningTaskId); @@ -194,8 +196,12 @@ public class RecentsTaskLoadPlan { if (opts.loadThumbnails && (isRunningTask || isVisibleThumbnail)) { if (task.thumbnail == null) { if (DEBUG) Log.d(TAG, "\tLoading thumbnail: " + taskKey); - task.thumbnail = loader.getAndUpdateThumbnail(taskKey, mSystemServicesProxy, - true); + if (mConfig.svelteLevel <= RecentsConfiguration.SVELTE_LIMIT_CACHE) { + task.thumbnail = loader.getAndUpdateThumbnail(taskKey, mSystemServicesProxy, + true); + } else if (mConfig.svelteLevel == RecentsConfiguration.SVELTE_DISABLE_CACHE) { + loadQueue.addTask(task); + } } } diff --git a/packages/SystemUI/src/com/android/systemui/recents/model/RecentsTaskLoader.java b/packages/SystemUI/src/com/android/systemui/recents/model/RecentsTaskLoader.java index 6fd738d01377..67a36b97eaa8 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/model/RecentsTaskLoader.java +++ b/packages/SystemUI/src/com/android/systemui/recents/model/RecentsTaskLoader.java @@ -94,6 +94,9 @@ class TaskResourceLoadQueue { /* Task resource loader */ class TaskResourceLoader implements Runnable { + static String TAG = "TaskResourceLoader"; + static boolean DEBUG = false; + Context mContext; HandlerThread mLoadThread; Handler mLoadThreadHandler; @@ -165,6 +168,7 @@ class TaskResourceLoader implements Runnable { } } } else { + RecentsConfiguration config = RecentsConfiguration.getInstance(); SystemServicesProxy ssp = mSystemServicesProxy; // If we've stopped the loader, then fall thorugh to the above logic to wait on // the load thread @@ -185,6 +189,7 @@ class TaskResourceLoader implements Runnable { ActivityInfo info = ssp.getActivityInfo(t.key.baseIntent.getComponent(), t.key.userId); if (info != null) { + if (DEBUG) Log.d(TAG, "Loading icon: " + t.key); cachedIcon = ssp.getActivityIcon(info, t.key.userId); } } @@ -199,11 +204,19 @@ class TaskResourceLoader implements Runnable { } // Load the thumbnail if it is stale or we haven't cached one yet if (cachedThumbnail == null) { - cachedThumbnail = ssp.getTaskThumbnail(t.key.id); + if (config.svelteLevel < RecentsConfiguration.SVELTE_DISABLE_LOADING) { + if (DEBUG) Log.d(TAG, "Loading thumbnail: " + t.key); + cachedThumbnail = ssp.getTaskThumbnail(t.key.id); + } if (cachedThumbnail == null) { cachedThumbnail = mDefaultThumbnail; } - mThumbnailCache.put(t.key, cachedThumbnail); + // When svelte, we trim the memory to just the visible thumbnails when + // leaving, so don't thrash the cache as the user scrolls (just load them + // from scratch each time) + if (config.svelteLevel < RecentsConfiguration.SVELTE_LIMIT_CACHE) { + mThumbnailCache.put(t.key, cachedThumbnail); + } } if (!mCancelled) { // Notify that the task data has changed @@ -267,6 +280,7 @@ public class RecentsTaskLoader { int mMaxThumbnailCacheSize; int mMaxIconCacheSize; int mNumVisibleTasksLoaded; + int mNumVisibleThumbnailsLoaded; BitmapDrawable mDefaultApplicationIcon; Bitmap mDefaultThumbnail; @@ -392,7 +406,8 @@ public class RecentsTaskLoader { return thumbnail; } - if (loadIfNotCached) { + RecentsConfiguration config = RecentsConfiguration.getInstance(); + if (config.svelteLevel < RecentsConfiguration.SVELTE_DISABLE_LOADING && loadIfNotCached) { // Load the thumbnail from the system thumbnail = ssp.getTaskThumbnail(taskKey.id); if (thumbnail != null) { @@ -418,28 +433,37 @@ public class RecentsTaskLoader { return mMaxIconCacheSize; } + /** Returns the size of the thumbnail cache. */ + public int getThumbnailCacheSize() { + return mMaxThumbnailCacheSize; + } + + /** Creates a new plan for loading the recent tasks. */ public RecentsTaskLoadPlan createLoadPlan(Context context) { RecentsConfiguration config = RecentsConfiguration.getInstance(); RecentsTaskLoadPlan plan = new RecentsTaskLoadPlan(context, config, mSystemServicesProxy); return plan; } + /** Preloads recents tasks using the specified plan to store the output. */ public void preloadTasks(RecentsTaskLoadPlan plan, boolean isTopTaskHome) { plan.preloadPlan(this, isTopTaskHome); } + /** Begins loading the heavy task data according to the specified options. */ public void loadTasks(Context context, RecentsTaskLoadPlan plan, RecentsTaskLoadPlan.Options opts) { if (opts == null) { throw new RuntimeException("Requires load options"); } - plan.executePlan(opts, this); - if (opts.numVisibleTasks > 0) { + plan.executePlan(opts, this, mLoadQueue); + if (!opts.onlyLoadForCache) { mNumVisibleTasksLoaded = opts.numVisibleTasks; - } + mNumVisibleThumbnailsLoaded = opts.numVisibleTaskThumbnails; - // Start the loader - mLoader.start(context); + // Start the loader + mLoader.start(context); + } } /** Acquires the task resource data directly from the pool. */ @@ -495,12 +519,19 @@ public class RecentsTaskLoader { * out of memory. */ public void onTrimMemory(int level) { + RecentsConfiguration config = RecentsConfiguration.getInstance(); switch (level) { case ComponentCallbacks2.TRIM_MEMORY_UI_HIDDEN: // Stop the loader immediately when the UI is no longer visible stopLoader(); - mThumbnailCache.trimToSize(Math.max(mNumVisibleTasksLoaded, - mMaxThumbnailCacheSize / 2)); + if (config.svelteLevel == RecentsConfiguration.SVELTE_NONE) { + mThumbnailCache.trimToSize(Math.max(mNumVisibleTasksLoaded, + mMaxThumbnailCacheSize / 2)); + } else if (config.svelteLevel == RecentsConfiguration.SVELTE_LIMIT_CACHE) { + mThumbnailCache.trimToSize(mNumVisibleThumbnailsLoaded); + } else if (config.svelteLevel >= RecentsConfiguration.SVELTE_DISABLE_CACHE) { + mThumbnailCache.evictAll(); + } mApplicationIconCache.trimToSize(Math.max(mNumVisibleTasksLoaded, mMaxIconCacheSize / 2)); break; 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 49fd792bf0a3..1731d3861504 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java +++ b/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java @@ -554,7 +554,8 @@ public class TaskStackView extends FrameLayout implements TaskStack.TaskStackCal /** Resets the focused task. */ void resetFocusedTask() { - if (mFocusedTaskIndex > -1) { + if ((mStack != null) && (0 <= mFocusedTaskIndex) && + (mFocusedTaskIndex < mStack.getTaskCount())) { Task t = mStack.getTasks().get(mFocusedTaskIndex); TaskView tv = getChildViewForTask(t); tv.unsetFocusedTask(); diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/TaskView.java b/packages/SystemUI/src/com/android/systemui/recents/views/TaskView.java index 790130ac6b35..27d2fda92bf6 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/views/TaskView.java +++ b/packages/SystemUI/src/com/android/systemui/recents/views/TaskView.java @@ -57,6 +57,7 @@ public class TaskView extends FrameLayout implements Task.TaskCallbacks, AccelerateInterpolator mDimInterpolator = new AccelerateInterpolator(1f); PorterDuffColorFilter mDimColorFilter = new PorterDuffColorFilter(0, PorterDuff.Mode.SRC_ATOP); Paint mDimLayerPaint = new Paint(); + float mActionButtonTranslationZ; Task mTask; boolean mTaskDataLoaded; @@ -145,6 +146,7 @@ public class TaskView extends FrameLayout implements Task.TaskCallbacks, outline.setOval(0, 0, mActionButtonView.getWidth(), mActionButtonView.getHeight()); } }); + mActionButtonTranslationZ = mActionButtonView.getTranslationZ(); } @Override @@ -201,6 +203,12 @@ public class TaskView extends FrameLayout implements Task.TaskCallbacks, setDim(0); setLayerType(View.LAYER_TYPE_NONE, null); TaskViewTransform.reset(this); + if (mActionButtonView != null) { + mActionButtonView.setScaleX(1f); + mActionButtonView.setScaleY(1f); + mActionButtonView.setAlpha(1f); + mActionButtonView.setTranslationZ(mActionButtonTranslationZ); + } } /** @@ -469,7 +477,9 @@ public class TaskView extends FrameLayout implements Task.TaskCallbacks, startDeleteTaskAnimation(new Runnable() { @Override public void run() { - mCb.onTaskViewDismissed(tv); + if (mCb != null) { + mCb.onTaskViewDismissed(tv); + } } }); } @@ -486,7 +496,9 @@ public class TaskView extends FrameLayout implements Task.TaskCallbacks, void setClipViewInStack(boolean clip) { if (clip != mClipViewInStack) { mClipViewInStack = clip; - mCb.onTaskViewClipStateChanged(this); + if (mCb != null) { + mCb.onTaskViewClipStateChanged(this); + } } } @@ -570,7 +582,9 @@ public class TaskView extends FrameLayout implements Task.TaskCallbacks, // Update the thumbnail alpha with the focus mThumbnailView.onFocusChanged(true); // Call the callback - mCb.onTaskViewFocusChanged(this, true); + if (mCb != null) { + mCb.onTaskViewFocusChanged(this, true); + } // Workaround, we don't always want it focusable in touch mode, but we want the first task // to be focused after the enter-recents animation, which can be triggered from either touch // or keyboard @@ -593,7 +607,9 @@ public class TaskView extends FrameLayout implements Task.TaskCallbacks, // Update the thumbnail alpha with the focus mThumbnailView.onFocusChanged(false); // Call the callback - mCb.onTaskViewFocusChanged(this, false); + if (mCb != null) { + mCb.onTaskViewFocusChanged(this, false); + } invalidate(); } @@ -694,7 +710,9 @@ public class TaskView extends FrameLayout implements Task.TaskCallbacks, @Override public void run() { if (Constants.DebugFlags.App.EnableTaskFiltering && v == mHeaderView.mApplicationIcon) { - mCb.onTaskViewAppIconClicked(tv); + if (mCb != null) { + mCb.onTaskViewAppIconClicked(tv); + } } else if (v == mHeaderView.mDismissButton) { dismissTask(); } @@ -705,7 +723,9 @@ public class TaskView extends FrameLayout implements Task.TaskCallbacks, // Reset the translation of the action button before we animate it out mActionButtonView.setTranslationZ(0f); } - mCb.onTaskViewClicked(tv, tv.getTask(), (v == mActionButtonView)); + if (mCb != null) { + mCb.onTaskViewClicked(tv, tv.getTask(), (v == mActionButtonView)); + } } } @@ -714,8 +734,10 @@ public class TaskView extends FrameLayout implements Task.TaskCallbacks, @Override public boolean onLongClick(View v) { if (v == mHeaderView.mApplicationIcon) { - mCb.onTaskViewAppInfoClicked(this); - return true; + if (mCb != null) { + mCb.onTaskViewAppInfoClicked(this); + return true; + } } return false; } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeScrimController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeScrimController.java new file mode 100644 index 000000000000..c0d7b9be08f4 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeScrimController.java @@ -0,0 +1,260 @@ +/* + * 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 com.android.systemui.statusbar.phone; + +import android.animation.Animator; +import android.animation.AnimatorListenerAdapter; +import android.animation.ValueAnimator; +import android.annotation.NonNull; +import android.content.Context; +import android.graphics.Color; +import android.os.Handler; +import android.util.Log; +import android.view.animation.Animation; +import android.view.animation.AnimationUtils; +import android.view.animation.Interpolator; + +import com.android.systemui.doze.DozeHost; +import com.android.systemui.doze.DozeLog; + +/** + * Controller which handles all the doze animations of the scrims. + */ +public class DozeScrimController { + private static final String TAG = "DozeScrimController"; + private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG); + + private final DozeParameters mDozeParameters; + private final Interpolator mPulseInInterpolator = PhoneStatusBar.ALPHA_OUT; + private final Interpolator mPulseOutInterpolator = PhoneStatusBar.ALPHA_IN; + private final Interpolator mDozeAnimationInterpolator; + private final Handler mHandler = new Handler(); + private final ScrimController mScrimController; + + private boolean mDozing; + private DozeHost.PulseCallback mPulseCallback; + private Animator mInFrontAnimator; + private Animator mBehindAnimator; + private float mInFrontTarget; + private float mBehindTarget; + + public DozeScrimController(ScrimController scrimController, Context context) { + mScrimController = scrimController; + mDozeParameters = new DozeParameters(context); + mDozeAnimationInterpolator = AnimationUtils.loadInterpolator(context, + android.R.interpolator.linear_out_slow_in); + } + + public void setDozing(boolean dozing, boolean animate) { + if (mDozing == dozing) return; + mDozing = dozing; + if (mDozing) { + abortAnimations(); + mScrimController.setDozeBehindAlpha(1f); + mScrimController.setDozeInFrontAlpha(1f); + } else { + cancelPulsing(); + if (animate) { + startScrimAnimation(false /* inFront */, 0f /* target */, + NotificationPanelView.DOZE_ANIMATION_DURATION, mDozeAnimationInterpolator); + startScrimAnimation(true /* inFront */, 0f /* target */, + NotificationPanelView.DOZE_ANIMATION_DURATION, mDozeAnimationInterpolator); + } else { + abortAnimations(); + mScrimController.setDozeBehindAlpha(0f); + mScrimController.setDozeInFrontAlpha(0f); + } + } + } + + /** When dozing, fade screen contents in and out using the front scrim. */ + public void pulse(@NonNull DozeHost.PulseCallback callback) { + if (callback == null) { + throw new IllegalArgumentException("callback must not be null"); + } + + if (!mDozing || mPulseCallback != null) { + // Pulse suppressed. + callback.onPulseFinished(); + return; + } + + // Begin pulse. Note that it's very important that the pulse finished callback + // be invoked when we're done so that the caller can drop the pulse wakelock. + mPulseCallback = callback; + mHandler.post(mPulseIn); + } + + public boolean isPulsing() { + return mPulseCallback != null; + } + + private void cancelPulsing() { + if (DEBUG) Log.d(TAG, "Cancel pulsing"); + + if (mPulseCallback != null) { + mHandler.removeCallbacks(mPulseIn); + mHandler.removeCallbacks(mPulseOut); + pulseFinished(); + } + } + + private void pulseStarted() { + if (mPulseCallback != null) { + mPulseCallback.onPulseStarted(); + } + } + + private void pulseFinished() { + if (mPulseCallback != null) { + mPulseCallback.onPulseFinished(); + mPulseCallback = null; + } + } + + private void abortAnimations() { + if (mInFrontAnimator != null) { + mInFrontAnimator.cancel(); + } + if (mBehindAnimator != null) { + mBehindAnimator.cancel(); + } + } + + private void startScrimAnimation(final boolean inFront, float target, long duration, + Interpolator interpolator) { + startScrimAnimation(inFront, target, duration, interpolator, 0 /* delay */, + null /* endRunnable */); + } + + private void startScrimAnimation(final boolean inFront, float target, long duration, + Interpolator interpolator, long delay, final Runnable endRunnable) { + Animator current = getCurrentAnimator(inFront); + if (current != null) { + float currentTarget = getCurrentTarget(inFront); + if (currentTarget == target) { + return; + } + current.cancel(); + } + ValueAnimator anim = ValueAnimator.ofFloat(getDozeAlpha(inFront), target); + anim.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() { + @Override + public void onAnimationUpdate(ValueAnimator animation) { + float value = (float) animation.getAnimatedValue(); + setDozeAlpha(inFront, value); + } + }); + anim.setInterpolator(interpolator); + anim.setDuration(duration); + anim.setStartDelay(delay); + anim.addListener(new AnimatorListenerAdapter() { + @Override + public void onAnimationEnd(Animator animation) { + setCurrentAnimator(inFront, null); + if (endRunnable != null) { + endRunnable.run(); + } + } + }); + anim.start(); + setCurrentAnimator(inFront, anim); + setCurrentTarget(inFront, target); + } + + private float getCurrentTarget(boolean inFront) { + return inFront ? mInFrontTarget : mBehindTarget; + } + + private void setCurrentTarget(boolean inFront, float target) { + if (inFront) { + mInFrontTarget = target; + } else { + mBehindTarget = target; + } + } + + private Animator getCurrentAnimator(boolean inFront) { + return inFront ? mInFrontAnimator : mBehindAnimator; + } + + private void setCurrentAnimator(boolean inFront, Animator animator) { + if (inFront) { + mInFrontAnimator = animator; + } else { + mBehindAnimator = animator; + } + } + + private void setDozeAlpha(boolean inFront, float alpha) { + if (inFront) { + mScrimController.setDozeInFrontAlpha(alpha); + } else { + mScrimController.setDozeBehindAlpha(alpha); + } + } + + private float getDozeAlpha(boolean inFront) { + return inFront + ? mScrimController.getDozeInFrontAlpha() + : mScrimController.getDozeBehindAlpha(); + } + + private final Runnable mPulseIn = new Runnable() { + @Override + public void run() { + if (DEBUG) Log.d(TAG, "Pulse in, mDozing=" + mDozing); + if (!mDozing) return; + DozeLog.tracePulseStart(); + startScrimAnimation(true /* inFront */, 0f, mDozeParameters.getPulseInDuration(), + mPulseInInterpolator, mDozeParameters.getPulseInDelay(), mPulseInFinished); + + // Signal that the pulse is ready to turn the screen on and draw. + pulseStarted(); + } + }; + + private final Runnable mPulseInFinished = new Runnable() { + @Override + public void run() { + if (DEBUG) Log.d(TAG, "Pulse in finished, mDozing=" + mDozing); + if (!mDozing) return; + mHandler.postDelayed(mPulseOut, mDozeParameters.getPulseVisibleDuration()); + } + }; + + private final Runnable mPulseOut = new Runnable() { + @Override + public void run() { + if (DEBUG) Log.d(TAG, "Pulse out, mDozing=" + mDozing); + if (!mDozing) return; + startScrimAnimation(true /* inFront */, 1f, mDozeParameters.getPulseOutDuration(), + mPulseOutInterpolator, 0 /* delay */, mPulseOutFinished); + } + }; + + private final Runnable mPulseOutFinished = new Runnable() { + @Override + public void run() { + if (DEBUG) Log.d(TAG, "Pulse out finished"); + DozeLog.tracePulseFinish(); + + // Signal that the pulse is all finished so we can turn the screen off now. + pulseFinished(); + } + }; +} diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardAffordanceHelper.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardAffordanceHelper.java index 4667d569c7b1..58a2d41372e9 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardAffordanceHelper.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardAffordanceHelper.java @@ -46,7 +46,6 @@ public class KeyguardAffordanceHelper { private FlingAnimationUtils mFlingAnimationUtils; private Callback mCallback; - private int mTrackingPointer; private VelocityTracker mVelocityTracker; private boolean mSwipingInProgress; private float mInitialTouchX; @@ -65,6 +64,7 @@ public class KeyguardAffordanceHelper { private Animator mSwipeAnimator; private int mMinBackgroundRadius; private boolean mMotionPerformedByUser; + private boolean mMotionCancelled; private AnimatorListenerAdapter mFlingEndListener = new AnimatorListenerAdapter() { @Override public void onAnimationEnd(Animator animation) { @@ -117,13 +117,11 @@ public class KeyguardAffordanceHelper { } public boolean onTouchEvent(MotionEvent event) { - int pointerIndex = event.findPointerIndex(mTrackingPointer); - if (pointerIndex < 0) { - pointerIndex = 0; - mTrackingPointer = event.getPointerId(pointerIndex); + if (mMotionCancelled && event.getActionMasked() != MotionEvent.ACTION_DOWN) { + return false; } - final float y = event.getY(pointerIndex); - final float x = event.getX(pointerIndex); + final float y = event.getY(); + final float x = event.getX(); boolean isUp = false; switch (event.getActionMasked()) { @@ -137,22 +135,12 @@ public class KeyguardAffordanceHelper { initVelocityTracker(); trackMovement(event); mMotionPerformedByUser = false; + mMotionCancelled = false; break; - - case MotionEvent.ACTION_POINTER_UP: - final int upPointer = event.getPointerId(event.getActionIndex()); - if (mTrackingPointer == upPointer) { - // gesture is ongoing, find a new pointer to track - final int newIndex = event.getPointerId(0) != upPointer ? 0 : 1; - final float newY = event.getY(newIndex); - final float newX = event.getX(newIndex); - mTrackingPointer = event.getPointerId(newIndex); - mInitialTouchY = newY; - mInitialTouchX = newX; - mTranslationOnDown = mTranslation; - } + case MotionEvent.ACTION_POINTER_DOWN: + mMotionCancelled = true; + endMotion(event, true /* forceSnapBack */); break; - case MotionEvent.ACTION_MOVE: final float w = x - mInitialTouchX; trackMovement(event); @@ -174,20 +162,23 @@ public class KeyguardAffordanceHelper { case MotionEvent.ACTION_UP: isUp = true; case MotionEvent.ACTION_CANCEL: - mTrackingPointer = -1; trackMovement(event); - if (mSwipingInProgress) { - flingWithCurrentVelocity(!isUp); - } - if (mVelocityTracker != null) { - mVelocityTracker.recycle(); - mVelocityTracker = null; - } + endMotion(event, !isUp); break; } return true; } + private void endMotion(MotionEvent event, boolean forceSnapBack) { + if (mSwipingInProgress) { + flingWithCurrentVelocity(forceSnapBack); + } + if (mVelocityTracker != null) { + mVelocityTracker.recycle(); + mVelocityTracker = null; + } + } + private void setSwipingInProgress(boolean inProgress) { mSwipingInProgress = inProgress; if (inProgress) { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/MultiUserSwitch.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/MultiUserSwitch.java index 4715d0abd996..82f5a9eb0c26 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/MultiUserSwitch.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/MultiUserSwitch.java @@ -67,15 +67,18 @@ public class MultiUserSwitch extends FrameLayout implements View.OnClickListener @Override public void onClick(View v) { - if (opensUserSwitcherWhenClicked()) { + if (UserSwitcherController.isUserSwitcherAvailable(mUserManager)) { if (mKeyguardMode) { if (mKeyguardUserSwitcher != null) { mKeyguardUserSwitcher.show(true /* animate */); } } else { if (mQsPanel != null) { - mQsPanel.showDetailAdapter(true, - mQsPanel.getHost().getUserSwitcherController().userDetailAdapter); + UserSwitcherController userSwitcherController = + mQsPanel.getHost().getUserSwitcherController(); + if (userSwitcherController != null) { + mQsPanel.showDetailAdapter(true, userSwitcherController.userDetailAdapter); + } } } } else { @@ -92,12 +95,14 @@ public class MultiUserSwitch extends FrameLayout implements View.OnClickListener if (isClickable()) { String text; - if (opensUserSwitcherWhenClicked()) { + if (UserSwitcherController.isUserSwitcherAvailable(mUserManager)) { String currentUser = null; if (mQsPanel != null) { UserSwitcherController controller = mQsPanel.getHost() .getUserSwitcherController(); - currentUser = controller.getCurrentUserName(mContext); + if (controller != null) { + currentUser = controller.getCurrentUserName(mContext); + } } if (TextUtils.isEmpty(currentUser)) { text = mContext.getString(R.string.accessibility_multi_user_switch_switcher); @@ -121,8 +126,4 @@ public class MultiUserSwitch extends FrameLayout implements View.OnClickListener return false; } - private boolean opensUserSwitcherWhenClicked() { - UserManager um = UserManager.get(getContext()); - return UserManager.supportsMultipleUsers() && um.isUserSwitcherEnabled(); - } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java index 9d7d31090338..de99a825a2cb 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java @@ -23,10 +23,7 @@ import android.animation.PropertyValuesHolder; import android.animation.ValueAnimator; import android.content.Context; import android.content.res.Configuration; -import android.graphics.Color; -import android.graphics.drawable.ColorDrawable; import android.util.AttributeSet; -import android.util.LayoutDirection; import android.util.MathUtils; import android.view.MotionEvent; import android.view.VelocityTracker; @@ -63,8 +60,6 @@ public class NotificationPanelView extends PanelView implements private static final float HEADER_RUBBERBAND_FACTOR = 2.05f; private static final float LOCK_ICON_ACTIVE_SCALE = 1.2f; - private static final int DOZE_BACKGROUND_COLOR = 0xff000000; - private static final int TAG_KEY_ANIM = R.id.scrim; public static final long DOZE_ANIMATION_DURATION = 700; private KeyguardAffordanceHelper mAfforanceHelper; @@ -1824,11 +1819,9 @@ public class NotificationPanelView extends PanelView implements if (dozing == mDozing) return; mDozing = dozing; if (mDozing) { - setBackgroundColorAlpha(DOZE_BACKGROUND_COLOR, 0xff, false /*animate*/); mKeyguardStatusBar.setVisibility(View.INVISIBLE); mKeyguardBottomArea.setVisibility(View.INVISIBLE); } else { - setBackgroundColorAlpha(DOZE_BACKGROUND_COLOR, 0, animate); mKeyguardBottomArea.setVisibility(View.VISIBLE); mKeyguardStatusBar.setVisibility(View.VISIBLE); if (animate) { @@ -1843,52 +1836,6 @@ public class NotificationPanelView extends PanelView implements return mDozing; } - private void setBackgroundColorAlpha(int rgb, int targetAlpha, - boolean animate) { - int currentAlpha = getBackgroundAlpha(this); - if (currentAlpha == targetAlpha) { - return; - } - final int r = Color.red(rgb); - final int g = Color.green(rgb); - final int b = Color.blue(rgb); - Object runningAnim = getTag(TAG_KEY_ANIM); - if (runningAnim instanceof ValueAnimator) { - ((ValueAnimator) runningAnim).cancel(); - } - if (!animate) { - setBackgroundColor(Color.argb(targetAlpha, r, g, b)); - return; - } - ValueAnimator anim = ValueAnimator.ofInt(currentAlpha, targetAlpha); - anim.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() { - @Override - public void onAnimationUpdate(ValueAnimator animation) { - int value = (int) animation.getAnimatedValue(); - setBackgroundColor(Color.argb(value, r, g, b)); - } - }); - anim.setInterpolator(mDozeAnimationInterpolator); - anim.setDuration(DOZE_ANIMATION_DURATION); - anim.addListener(new AnimatorListenerAdapter() { - @Override - public void onAnimationEnd(Animator animation) { - setTag(TAG_KEY_ANIM, null); - } - }); - anim.start(); - setTag(TAG_KEY_ANIM, anim); - } - - private static int getBackgroundAlpha(View view) { - if (view.getBackground() instanceof ColorDrawable) { - ColorDrawable drawable = (ColorDrawable) view.getBackground(); - return Color.alpha(drawable.getColor()); - } else { - return 0; - } - } - public void setShadeEmpty(boolean shadeEmpty) { mShadeEmpty = shadeEmpty; updateEmptyShadeView(); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java index 47ce6032c9b7..a04474364c58 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java @@ -98,6 +98,7 @@ public abstract class PanelView extends FrameLayout { private boolean mCollapseAfterPeek; private boolean mExpanding; private boolean mGestureWaitForTouchSlop; + private boolean mDozingOnDown; private Runnable mPeekRunnable = new Runnable() { @Override public void run() { @@ -244,6 +245,7 @@ public abstract class PanelView extends FrameLayout { mUpdateFlingOnLayout = false; mPeekTouching = mPanelClosedOnDown; mTouchAboveFalsingThreshold = false; + mDozingOnDown = isDozing(); if (mVelocityTracker == null) { initVelocityTracker(); } @@ -418,6 +420,7 @@ public abstract class PanelView extends FrameLayout { mHasLayoutedSinceDown = false; mUpdateFlingOnLayout = false; mTouchAboveFalsingThreshold = false; + mDozingOnDown = isDozing(); initVelocityTracker(); trackMovement(event); break; @@ -937,7 +940,7 @@ public abstract class PanelView extends FrameLayout { private boolean onMiddleClicked() { switch (mStatusBar.getBarState()) { case StatusBarState.KEYGUARD: - if (!isDozing()) { + if (!mDozingOnDown) { startUnlockHintAnimation(); } return true; 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 988534bb234b..3b2d3cb0b13c 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java @@ -74,6 +74,7 @@ import android.os.PowerManager; import android.os.RemoteException; import android.os.SystemClock; import android.os.UserHandle; +import android.os.UserManager; import android.provider.Settings; import android.service.notification.NotificationListenerService; import android.service.notification.NotificationListenerService.RankingMap; @@ -414,6 +415,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, private ViewMediatorCallback mKeyguardViewMediatorCallback; private ScrimController mScrimController; + private DozeScrimController mDozeScrimController; private final Runnable mAutohide = new Runnable() { @Override @@ -741,6 +743,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, mScrimController = new ScrimController(scrimBehind, scrimInFront, mScrimSrcModeEnabled); mScrimController.setBackDropView(mBackdrop); mStatusBarView.setScrimController(mScrimController); + mDozeScrimController = new DozeScrimController(mScrimController, context); mHeader = (StatusBarHeaderView) mStatusBarWindow.findViewById(R.id.header); mHeader.setActivityStarter(this); @@ -851,11 +854,16 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, mKeyguardBottomArea.setAccessibilityController(mAccessibilityController); mNextAlarmController = new NextAlarmController(mContext); mKeyguardMonitor = new KeyguardMonitor(); - mUserSwitcherController = new UserSwitcherController(mContext, mKeyguardMonitor); - + if (UserSwitcherController.isUserSwitcherAvailable(UserManager.get(mContext))) { + mUserSwitcherController = new UserSwitcherController(mContext, mKeyguardMonitor); + } mKeyguardUserSwitcher = new KeyguardUserSwitcher(mContext, (ViewStub) mStatusBarWindow.findViewById(R.id.keyguard_user_switcher), mKeyguardStatusBar, mNotificationPanel, mUserSwitcherController); + if (mUserSwitcherController != null) { + mUserSwitcherController.setKeyguardUserSwitcherAvailable( + mKeyguardUserSwitcher.isEnabled()); + } // Set up the quick settings tile panel @@ -1508,7 +1516,8 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, // If the user switcher is simple then disable QS during setup because // the user intends to use the lock screen user switcher, QS in not needed. mNotificationPanel.setQsExpansionEnabled(isDeviceProvisioned() - && (!mUserSwitcherController.isSimpleUserSwitcher() || mUserSetup)); + && (mUserSetup || mUserSwitcherController == null + || !mUserSwitcherController.isSimpleUserSwitcher())); mShadeUpdates.check(); } @@ -2121,6 +2130,9 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, public void setQsExpanded(boolean expanded) { mStatusBarWindowManager.setQsExpanded(expanded); + if (mUserSwitcherController != null) { + mUserSwitcherController.setQsExpanded(expanded); + } } public boolean isGoingToNotificationShade() { @@ -2657,6 +2669,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, @Override public void setInteracting(int barWindow, boolean interacting) { + final boolean changing = ((mInteractingWindows & barWindow) != 0) != interacting; mInteractingWindows = interacting ? (mInteractingWindows | barWindow) : (mInteractingWindows & ~barWindow); @@ -2665,6 +2678,12 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, } else { resumeSuspendedAutohide(); } + // manually dismiss the volume panel when interacting with the nav bar + if (changing && interacting && barWindow == StatusBarManager.WINDOW_NAVIGATION_BAR) { + if (mVolumeComponent != null) { + mVolumeComponent.dismissNow(); + } + } checkBarModes(); } @@ -3677,13 +3696,14 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, if (mState != StatusBarState.KEYGUARD && !mNotificationPanel.isDozing()) { return; } - mNotificationPanel.setDozing(mDozing, mScrimController.isPulsing() /*animate*/); + mNotificationPanel.setDozing(mDozing, mDozeScrimController.isPulsing() /*animate*/); if (mDozing) { mStackScroller.setDark(true, false /*animate*/); } else { mStackScroller.setDark(false, false /*animate*/); } - mScrimController.setDozing(mDozing, mScrimController.isPulsing() /*animate*/); + mScrimController.setDozing(mDozing); + mDozeScrimController.setDozing(mDozing, mDozeScrimController.isPulsing() /* animate */); } public void updateStackScrollerState(boolean goingToFullShade) { @@ -4060,11 +4080,12 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, } public void wakeUpIfDozing(long time, boolean fromTouch) { - if (mDozing && mScrimController.isPulsing()) { + if (mDozing && mDozeScrimController.isPulsing()) { PowerManager pm = (PowerManager) mContext.getSystemService(Context.POWER_SERVICE); pm.wakeUp(time); if (fromTouch) { mScreenOnComingFromTouch = true; + mNotificationPanel.setTouchDisabled(false); } } } @@ -4174,7 +4195,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, } private void handlePulseWhileDozing(@NonNull PulseCallback callback) { - mScrimController.pulse(callback); + mDozeScrimController.pulse(callback); } private void handleStopDozing() { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java index 10d65943b9f4..d6bd94b3d978 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java @@ -19,20 +19,15 @@ package com.android.systemui.statusbar.phone; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; import android.animation.ValueAnimator; -import android.annotation.NonNull; import android.content.Context; import android.graphics.Color; -import android.util.Log; import android.view.View; import android.view.ViewTreeObserver; import android.view.animation.AnimationUtils; import android.view.animation.DecelerateInterpolator; import android.view.animation.Interpolator; -import android.view.animation.PathInterpolator; import com.android.systemui.R; -import com.android.systemui.doze.DozeHost; -import com.android.systemui.doze.DozeLog; import com.android.systemui.statusbar.BackDropView; import com.android.systemui.statusbar.ScrimView; @@ -41,9 +36,6 @@ import com.android.systemui.statusbar.ScrimView; * security method gets shown). */ public class ScrimController implements ViewTreeObserver.OnPreDrawListener { - private static final String TAG = "ScrimController"; - private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG); - public static final long ANIMATION_DURATION = 220; private static final float SCRIM_BEHIND_ALPHA = 0.62f; @@ -55,7 +47,6 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener { private final ScrimView mScrimBehind; private final ScrimView mScrimInFront; private final UnlockMethodCache mUnlockMethodCache; - private final DozeParameters mDozeParameters; private boolean mKeyguardShowing; private float mFraction; @@ -70,15 +61,15 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener { private long mAnimationDelay; private Runnable mOnAnimationFinished; private boolean mAnimationStarted; - private boolean mDozing; - private boolean mPulsingOut; - private DozeHost.PulseCallback mPulseCallback; private final Interpolator mInterpolator = new DecelerateInterpolator(); private final Interpolator mLinearOutSlowInInterpolator; - private final Interpolator mPulseInInterpolator = PhoneStatusBar.ALPHA_OUT; - private final Interpolator mPulseOutInterpolator = PhoneStatusBar.ALPHA_IN; private BackDropView mBackDropView; private boolean mScrimSrcEnabled; + private boolean mDozing; + private float mDozeInFrontAlpha; + private float mDozeBehindAlpha; + private float mCurrentInFrontAlpha; + private float mCurrentBehindAlpha; public ScrimController(ScrimView scrimBehind, ScrimView scrimInFront, boolean scrimSrcEnabled) { mScrimBehind = scrimBehind; @@ -87,7 +78,6 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener { mUnlockMethodCache = UnlockMethodCache.getInstance(context); mLinearOutSlowInInterpolator = AnimationUtils.loadInterpolator(context, android.R.interpolator.linear_out_slow_in); - mDozeParameters = new DozeParameters(context); mScrimSrcEnabled = scrimSrcEnabled; } @@ -134,60 +124,27 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener { scheduleUpdate(); } - public void setDozing(boolean dozing, boolean animate) { - if (mDozing == dozing) return; + public void setDozing(boolean dozing) { mDozing = dozing; - if (!mDozing) { - cancelPulsing(); - mAnimateChange = animate; - } scheduleUpdate(); } - /** When dozing, fade screen contents in and out using the front scrim. */ - public void pulse(@NonNull DozeHost.PulseCallback callback) { - if (callback == null) { - throw new IllegalArgumentException("callback must not be null"); - } - - if (!mDozing || mPulseCallback != null) { - // Pulse suppressed. - callback.onPulseFinished(); - return; - } - - // Begin pulse. Note that it's very important that the pulse finished callback - // be invoked when we're done so that the caller can drop the pulse wakelock. - mPulseCallback = callback; - mScrimInFront.post(mPulseIn); + public void setDozeInFrontAlpha(float alpha) { + mDozeInFrontAlpha = alpha; + updateScrimColor(mScrimInFront); } - public boolean isPulsing() { - return mPulseCallback != null; + public void setDozeBehindAlpha(float alpha) { + mDozeBehindAlpha = alpha; + updateScrimColor(mScrimBehind); } - private void cancelPulsing() { - if (DEBUG) Log.d(TAG, "Cancel pulsing"); - - if (mPulseCallback != null) { - mScrimInFront.removeCallbacks(mPulseIn); - mScrimInFront.removeCallbacks(mPulseOut); - pulseFinished(); - } - } - - private void pulseStarted() { - if (mPulseCallback != null) { - mPulseCallback.onPulseStarted(); - } + public float getDozeBehindAlpha() { + return mDozeBehindAlpha; } - private void pulseFinished() { - mPulsingOut = false; - if (mPulseCallback != null) { - mPulseCallback.onPulseFinished(); - mPulseCallback = null; - } + public float getDozeInFrontAlpha() { + return mDozeInFrontAlpha; } private void scheduleUpdate() { @@ -223,12 +180,6 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener { } else if (mBouncerShowing) { setScrimInFrontColor(SCRIM_IN_FRONT_ALPHA); setScrimBehindColor(0f); - } else if (mDozing && isPulsing() && !mPulsingOut) { - setScrimInFrontColor(0); - setScrimBehindColor(SCRIM_BEHIND_ALPHA_KEYGUARD); - } else if (mDozing) { - setScrimInFrontColor(1); - setScrimBehindColor(SCRIM_BEHIND_ALPHA_KEYGUARD); } else { float fraction = Math.max(0, Math.min(mFraction, 1)); setScrimInFrontColor(0f); @@ -272,26 +223,46 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener { ((ValueAnimator) runningAnim).cancel(); scrim.setTag(TAG_KEY_ANIM, null); } - int color = Color.argb((int) (alpha * 255), 0, 0, 0); if (mAnimateChange) { - startScrimAnimation(scrim, color); + startScrimAnimation(scrim, alpha); } else { - scrim.setScrimColor(color); + setCurrentScrimAlpha(scrim, alpha); + updateScrimColor(scrim); } } - private void startScrimAnimation(final ScrimView scrim, int targetColor) { - int current = Color.alpha(scrim.getScrimColor()); - int target = Color.alpha(targetColor); - if (current == target) { - return; + private float getDozeAlpha(View scrim) { + return scrim == mScrimBehind ? mDozeBehindAlpha : mDozeInFrontAlpha; + } + + private float getCurrentScrimAlpha(View scrim) { + return scrim == mScrimBehind ? mCurrentBehindAlpha : mCurrentInFrontAlpha; + } + + private void setCurrentScrimAlpha(View scrim, float alpha) { + if (scrim == mScrimBehind) { + mCurrentBehindAlpha = alpha; + } else { + mCurrentInFrontAlpha = alpha; } - ValueAnimator anim = ValueAnimator.ofInt(current, target); + } + + private void updateScrimColor(ScrimView scrim) { + float alpha1 = getCurrentScrimAlpha(scrim); + float alpha2 = getDozeAlpha(scrim); + float alpha = 1 - (1 - alpha1) * (1 - alpha2); + scrim.setScrimColor(Color.argb((int) (alpha * 255), 0, 0, 0)); + } + + private void startScrimAnimation(final ScrimView scrim, float target) { + float current = getCurrentScrimAlpha(scrim); + ValueAnimator anim = ValueAnimator.ofFloat(current, target); anim.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() { @Override public void onAnimationUpdate(ValueAnimator animation) { - int value = (int) animation.getAnimatedValue(); - scrim.setScrimColor(Color.argb(value, 0, 0, 0)); + float alpha = (float) animation.getAnimatedValue(); + setCurrentScrimAlpha(scrim, alpha); + updateScrimColor(scrim); } }); anim.setInterpolator(getInterpolator()); @@ -313,15 +284,7 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener { } private Interpolator getInterpolator() { - if (mAnimateKeyguardFadingOut) { - return mLinearOutSlowInInterpolator; - } else if (isPulsing() && !mPulsingOut) { - return mPulseInInterpolator; - } else if (isPulsing()) { - return mPulseOutInterpolator; - } else { - return mInterpolator; - } + return mAnimateKeyguardFadingOut ? mLinearOutSlowInInterpolator : mInterpolator; } @Override @@ -342,56 +305,6 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener { return true; } - private final Runnable mPulseIn = new Runnable() { - @Override - public void run() { - if (DEBUG) Log.d(TAG, "Pulse in, mDozing=" + mDozing); - if (!mDozing) return; - DozeLog.tracePulseStart(); - mDurationOverride = mDozeParameters.getPulseInDuration(); - mAnimationDelay = mDozeParameters.getPulseInDelay(); - mAnimateChange = true; - mOnAnimationFinished = mPulseInFinished; - scheduleUpdate(); - - // Signal that the pulse is ready to turn the screen on and draw. - pulseStarted(); - } - }; - - private final Runnable mPulseInFinished = new Runnable() { - @Override - public void run() { - if (DEBUG) Log.d(TAG, "Pulse in finished, mDozing=" + mDozing); - if (!mDozing) return; - mScrimInFront.postDelayed(mPulseOut, mDozeParameters.getPulseVisibleDuration()); - } - }; - - private final Runnable mPulseOut = new Runnable() { - @Override - public void run() { - if (DEBUG) Log.d(TAG, "Pulse out, mDozing=" + mDozing); - if (!mDozing) return; - mDurationOverride = mDozeParameters.getPulseOutDuration(); - mAnimateChange = true; - mOnAnimationFinished = mPulseOutFinished; - mPulsingOut = true; - scheduleUpdate(); - } - }; - - private final Runnable mPulseOutFinished = new Runnable() { - @Override - public void run() { - if (DEBUG) Log.d(TAG, "Pulse out finished"); - DozeLog.tracePulseFinish(); - - // Signal that the pulse is all finished so we can turn the screen off now. - pulseFinished(); - } - }; - public void setBackDropView(BackDropView backDropView) { mBackDropView = backDropView; mBackDropView.setOnVisibilityChangedRunnable(new Runnable() { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyguardUserSwitcher.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyguardUserSwitcher.java index c71bccdaa535..0392e0daca33 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyguardUserSwitcher.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyguardUserSwitcher.java @@ -58,7 +58,9 @@ public class KeyguardUserSwitcher { public KeyguardUserSwitcher(Context context, ViewStub userSwitcher, KeyguardStatusBarView statusBarView, NotificationPanelView panelView, UserSwitcherController userSwitcherController) { - if (context.getResources().getBoolean(R.bool.config_keyguardUserSwitcher) || ALWAYS_ON) { + boolean keyguardUserSwitcherEnabled = + context.getResources().getBoolean(R.bool.config_keyguardUserSwitcher) || ALWAYS_ON; + if (userSwitcherController != null && keyguardUserSwitcherEnabled) { mUserSwitcherContainer = (Container) userSwitcher.inflate(); mUserSwitcher = (ViewGroup) mUserSwitcherContainer.findViewById(R.id.keyguard_user_switcher_inner); @@ -225,6 +227,10 @@ public class KeyguardUserSwitcher { } }; + public boolean isEnabled() { + return mUserSwitcherContainer != null; + } + public static class Adapter extends UserSwitcherController.BaseUserAdapter implements View.OnClickListener { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java index 9cfd26b322e5..07762a4604c0 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java @@ -177,12 +177,24 @@ public class NetworkControllerImpl extends BroadcastReceiver * Construct this controller object and register for updates. */ public NetworkControllerImpl(Context context) { + this(context, (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE), + (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE), + (WifiManager) context.getSystemService(Context.WIFI_SERVICE), + new AccessPointController(context), new MobileDataController(context)); + registerListeners(); + } + + @VisibleForTesting + NetworkControllerImpl(Context context, ConnectivityManager connectivityManager, + TelephonyManager telephonyManager, WifiManager wifiManager, + AccessPointController accessPointController, + MobileDataController mobileDataController) { mContext = context; final Resources res = context.getResources(); - mConnectivityManager = - (ConnectivityManager)mContext.getSystemService(Context.CONNECTIVITY_SERVICE); - mHasMobileDataFeature = getCM().isNetworkSupported(ConnectivityManager.TYPE_MOBILE); + mConnectivityManager = connectivityManager; + mHasMobileDataFeature = + mConnectivityManager.isNetworkSupported(ConnectivityManager.TYPE_MOBILE); mShowPhoneRSSIForData = res.getBoolean(R.bool.config_showPhoneRSSIForData); mShowAtLeastThreeGees = res.getBoolean(R.bool.config_showMin3G); @@ -203,7 +215,7 @@ public class NetworkControllerImpl extends BroadcastReceiver mNetworkName = mNetworkNameDefault; // wifi - mWifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE); + mWifiManager = wifiManager; Handler handler = new WifiHandler(); mWifiChannel = new AsyncChannel(); Messenger wifiMessenger = mWifiManager.getWifiServiceMessenger(); @@ -211,14 +223,12 @@ public class NetworkControllerImpl extends BroadcastReceiver mWifiChannel.connect(mContext, handler, wifiMessenger); } - registerListeners(); - // AIRPLANE_MODE_CHANGED is sent at boot; we've probably already missed it updateAirplaneMode(); mLastLocale = mContext.getResources().getConfiguration().locale; - mAccessPoints = new AccessPointController(mContext); - mMobileDataController = new MobileDataController(mContext); + mAccessPoints = accessPointController; + mMobileDataController = mobileDataController; mMobileDataController.setCallback(new MobileDataController.Callback() { @Override public void onMobileDataEnabled(boolean enabled) { @@ -227,13 +237,7 @@ public class NetworkControllerImpl extends BroadcastReceiver }); } - @VisibleForTesting - protected ConnectivityManager getCM() { - return mConnectivityManager; - } - - @VisibleForTesting - protected void registerListeners() { + private void registerListeners() { mPhone.listen(mPhoneStateListener, PhoneStateListener.LISTEN_SERVICE_STATE | PhoneStateListener.LISTEN_SIGNAL_STRENGTHS @@ -1085,7 +1089,7 @@ public class NetworkControllerImpl extends BroadcastReceiver Log.d(TAG, "updateConnectivity: intent=" + intent); } - final NetworkInfo info = getCM().getActiveNetworkInfo(); + final NetworkInfo info = mConnectivityManager.getActiveNetworkInfo(); // Are we connected at all, by any interface? mConnected = info != null && info.isConnected(); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/UserInfoController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/UserInfoController.java index d50e39fcbb1c..a8d4f131b54e 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/UserInfoController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/UserInfoController.java @@ -23,6 +23,7 @@ import android.content.Intent; import android.content.IntentFilter; import android.content.pm.PackageManager; import android.content.pm.UserInfo; +import android.content.res.Resources; import android.database.Cursor; import android.graphics.Bitmap; import android.graphics.drawable.BitmapDrawable; @@ -131,8 +132,11 @@ public final class UserInfoController { final int userId = userInfo.id; final boolean isGuest = userInfo.isGuest(); final String userName = userInfo.name; - final int avatarSize - = mContext.getResources().getDimensionPixelSize(R.dimen.max_avatar_size); + + final Resources res = mContext.getResources(); + final int avatarSize = Math.max( + res.getDimensionPixelSize(R.dimen.multi_user_avatar_expanded_size), + res.getDimensionPixelSize(R.dimen.multi_user_avatar_keyguard_size)); final Context context = currentUserContext; mUserInfoTask = new AsyncTask<Void, Void, Pair<String, Drawable>>() { @@ -160,8 +164,9 @@ public final class UserInfoController { // Try and read the display name from the local profile final Cursor cursor = context.getContentResolver().query( ContactsContract.Profile.CONTENT_URI, new String[] { - ContactsContract.CommonDataKinds.Phone._ID, ContactsContract.CommonDataKinds.Phone.DISPLAY_NAME}, - null, null, null); + ContactsContract.CommonDataKinds.Phone._ID, + ContactsContract.CommonDataKinds.Phone.DISPLAY_NAME + }, null, null, null); if (cursor != null) { try { if (cursor.moveToFirst()) { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/UserSwitcherController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/UserSwitcherController.java index 5c7909a25147..5f6c39968abd 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/UserSwitcherController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/UserSwitcherController.java @@ -78,6 +78,9 @@ public class UserSwitcherController { private boolean mSimpleUserSwitcher; private boolean mAddUsersWhenLocked; + private boolean mKeyguardUserSwitcherAvailable; + private boolean mQsExpanded; + public UserSwitcherController(Context context, KeyguardMonitor keyguardMonitor) { mContext = context; mGuestResumeSessionReceiver.register(context); @@ -116,16 +119,18 @@ public class UserSwitcherController { */ @SuppressWarnings("unchecked") private void refreshUsers(int forcePictureLoadForId) { - - SparseArray<Bitmap> bitmaps = new SparseArray<>(mUsers.size()); - final int N = mUsers.size(); - for (int i = 0; i < N; i++) { - UserRecord r = mUsers.get(i); - if (r == null || r.info == null - || r.info.id == forcePictureLoadForId || r.picture == null) { - continue; + SparseArray<Bitmap> bitmaps = null; + if (allowCachingOfBitmaps()) { + bitmaps = new SparseArray<>(mUsers.size()); + final int N = mUsers.size(); + for (int i = 0; i < N; i++) { + UserRecord r = mUsers.get(i); + if (r == null || r.info == null + || r.info.id == forcePictureLoadForId || r.picture == null) { + continue; + } + bitmaps.put(r.info.id, r.picture); } - bitmaps.put(r.info.id, r.picture); } final boolean addUsersWhenLocked = mAddUsersWhenLocked; @@ -151,13 +156,15 @@ public class UserSwitcherController { true /* isGuest */, isCurrent, false /* isAddUser */, false /* isRestricted */); } else if (info.supportsSwitchTo()) { - Bitmap picture = bitmaps.get(info.id); - if (picture == null) { - picture = mUserManager.getUserIcon(info.id); - } - if (picture != null) { - picture = BitmapHelper.createCircularClip( - picture, avatarSize, avatarSize); + Bitmap picture = bitmaps != null ? bitmaps.get(info.id) : null; + if (picture == null && allowCachingOfBitmaps()) { + Bitmap loadedPicture = mUserManager.getUserIcon(info.id); + + if (loadedPicture != null) { + picture = BitmapHelper.createCircularClip( + loadedPicture, avatarSize, avatarSize); + loadedPicture.recycle(); + } } int index = isCurrent ? 0 : records.size(); records.add(index, new UserRecord(info, picture, false /* isGuest */, @@ -552,6 +559,32 @@ public class UserSwitcherController { } } + /** + * Notify if the keyguard user switcher is available. + */ + public void setKeyguardUserSwitcherAvailable(boolean available) { + boolean oldShouldCacheBitmaps = allowCachingOfBitmaps(); + mKeyguardUserSwitcherAvailable = available; + if (allowCachingOfBitmaps() != oldShouldCacheBitmaps) { + refreshUsers(UserHandle.USER_NULL); + } + } + + /** + * Notify if the quick settings are expanded. + */ + public void setQsExpanded(boolean qsExpanded) { + boolean oldShouldCacheBitmaps = allowCachingOfBitmaps(); + mQsExpanded = qsExpanded; + if (allowCachingOfBitmaps() != oldShouldCacheBitmaps) { + refreshUsers(UserHandle.USER_NULL); + } + } + + private boolean allowCachingOfBitmaps() { + return mQsExpanded || mKeyguardUserSwitcherAvailable; + } + private final class AddUserDialog extends SystemUIDialog implements DialogInterface.OnClickListener { @@ -589,4 +622,9 @@ public class UserSwitcherController { } } } + + public static boolean isUserSwitcherAvailable(UserManager um) { + return UserManager.supportsMultipleUsers() && um.isUserSwitcherEnabled(); + } + } diff --git a/packages/SystemUI/src/com/android/systemui/volume/VolumeComponent.java b/packages/SystemUI/src/com/android/systemui/volume/VolumeComponent.java index 31adc9593fb2..e3f8f3de323d 100644 --- a/packages/SystemUI/src/com/android/systemui/volume/VolumeComponent.java +++ b/packages/SystemUI/src/com/android/systemui/volume/VolumeComponent.java @@ -21,4 +21,5 @@ import com.android.systemui.statusbar.policy.ZenModeController; public interface VolumeComponent extends DemoMode { ZenModeController getZenController(); + void dismissNow(); } diff --git a/packages/SystemUI/src/com/android/systemui/volume/VolumePanel.java b/packages/SystemUI/src/com/android/systemui/volume/VolumePanel.java index 247cc517c25a..f12053cf5242 100644 --- a/packages/SystemUI/src/com/android/systemui/volume/VolumePanel.java +++ b/packages/SystemUI/src/com/android/systemui/volume/VolumePanel.java @@ -744,7 +744,7 @@ public class VolumePanel extends Handler implements DemoMode { } else { sc.seekbarView.setVisibility(View.GONE); sc.suppressorView.setVisibility(View.VISIBLE); - sc.suppressorView.setText(mContext.getString(com.android.systemui.R.string.muted_by, + sc.suppressorView.setText(mContext.getString(R.string.muted_by, getSuppressorCaption(suppressor))); sc.icon.setImageResource(sc.iconSuppressedRes); } diff --git a/packages/SystemUI/src/com/android/systemui/volume/VolumeUI.java b/packages/SystemUI/src/com/android/systemui/volume/VolumeUI.java index 5232a174e901..7102c2a7d426 100644 --- a/packages/SystemUI/src/com/android/systemui/volume/VolumeUI.java +++ b/packages/SystemUI/src/com/android/systemui/volume/VolumeUI.java @@ -178,7 +178,7 @@ public class VolumeUI extends SystemUI { @Override public void dismiss() throws RemoteException { - mPanel.postDismiss(0); + dismissNow(); } @Override @@ -190,6 +190,11 @@ public class VolumeUI extends SystemUI { public void dispatchDemoCommand(String command, Bundle args) { mPanel.dispatchDemoCommand(command, args); } + + @Override + public void dismissNow() { + mPanel.postDismiss(0); + } } private final class RemoteVolumeController extends IRemoteVolumeController.Stub { diff --git a/packages/SystemUI/src/com/android/systemui/volume/ZenModePanel.java b/packages/SystemUI/src/com/android/systemui/volume/ZenModePanel.java index b3256530c14c..ed6ddd2b9aa8 100644 --- a/packages/SystemUI/src/com/android/systemui/volume/ZenModePanel.java +++ b/packages/SystemUI/src/com/android/systemui/volume/ZenModePanel.java @@ -244,7 +244,7 @@ public class ZenModePanel extends LinearLayout { } private void setExitCondition(Condition exitCondition) { - if (sameConditionId(mExitCondition, exitCondition)) return; + if (Objects.equals(mExitCondition, exitCondition)) return; mExitCondition = exitCondition; refreshExitConditionText(); updateWidgets(); diff --git a/packages/SystemUI/tests/Android.mk b/packages/SystemUI/tests/Android.mk index 262e0714f660..5a903242c643 100644 --- a/packages/SystemUI/tests/Android.mk +++ b/packages/SystemUI/tests/Android.mk @@ -17,14 +17,20 @@ include $(CLEAR_VARS) LOCAL_MODULE_TAGS := tests -LOCAL_SRC_FILES := $(call all-java-files-under, src) +LOCAL_AAPT_FLAGS := --auto-add-overlay --extra-packages com.android.systemui:com.android.keyguard +LOCAL_SRC_FILES := $(call all-java-files-under, src) \ + $(call all-java-files-under, ../src) \ + src/com/android/systemui/EventLogTags.logtags -LOCAL_JAVA_LIBRARIES := android.test.runner +LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res \ + frameworks/base/packages/SystemUI/res \ + frameworks/base/packages/Keyguard/res + +LOCAL_JAVA_LIBRARIES := android.test.runner telephony-common LOCAL_PACKAGE_NAME := SystemUITests -LOCAL_INSTRUMENTATION_FOR := SystemUI -LOCAL_STATIC_JAVA_LIBRARIES := mockito-target +LOCAL_STATIC_JAVA_LIBRARIES := mockito-target Keyguard # sign this with platform cert, so this test is allowed to inject key events into # UI it doesn't own. This is necessary to allow screenshots to be taken diff --git a/packages/SystemUI/tests/AndroidManifest.xml b/packages/SystemUI/tests/AndroidManifest.xml index 1d319cf0bd0a..e52806d6a7ac 100644 --- a/packages/SystemUI/tests/AndroidManifest.xml +++ b/packages/SystemUI/tests/AndroidManifest.xml @@ -25,7 +25,7 @@ </application> <instrumentation android:name="android.test.InstrumentationTestRunner" - android:targetPackage="com.android.systemui" + android:targetPackage="com.android.systemui.tests" android:label="Tests for SystemUI"> </instrumentation> </manifest> diff --git a/packages/SystemUI/tests/src/com/android/systemui/EventLogTags.logtags b/packages/SystemUI/tests/src/com/android/systemui/EventLogTags.logtags new file mode 120000 index 000000000000..2f243d70449d --- /dev/null +++ b/packages/SystemUI/tests/src/com/android/systemui/EventLogTags.logtags @@ -0,0 +1 @@ +../../../../../src/com/android/systemui/EventLogTags.logtags
\ No newline at end of file diff --git a/packages/SystemUI/tests/src/com/android/systemui/screenshot/ScreenshotStubActivity.java b/packages/SystemUI/tests/src/com/android/systemui/screenshot/ScreenshotStubActivity.java index 293537315f86..784d0352c679 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/screenshot/ScreenshotStubActivity.java +++ b/packages/SystemUI/tests/src/com/android/systemui/screenshot/ScreenshotStubActivity.java @@ -15,7 +15,7 @@ */ package com.android.systemui.screenshot; -import com.android.systemui.tests.R; +import com.android.systemui.R; import android.app.Activity; import android.os.Bundle; diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerBaseTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerBaseTest.java index c0aa31dbdd39..10cffc49574b 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerBaseTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerBaseTest.java @@ -4,16 +4,19 @@ package com.android.systemui.statusbar.policy; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import android.content.Context; import android.content.Intent; import android.net.ConnectivityManager; import android.net.NetworkInfo; +import android.net.wifi.WifiManager; import android.telephony.PhoneStateListener; import android.telephony.ServiceState; import android.telephony.SignalStrength; +import android.telephony.TelephonyManager; import android.test.AndroidTestCase; import android.util.Log; +import com.android.internal.telephony.cdma.EriInfo; +import com.android.systemui.statusbar.policy.NetworkController.NetworkSignalChangedCallback; import com.android.systemui.statusbar.policy.NetworkControllerImpl.SignalCluster; import org.mockito.ArgumentCaptor; @@ -24,13 +27,23 @@ import java.io.StringWriter; public class NetworkControllerBaseTest extends AndroidTestCase { private static final String TAG = "NetworkControllerBaseTest"; + protected static final int DEFAULT_LEVEL = 2; + protected static final int DEFAULT_SIGNAL_STRENGTH = + TelephonyIcons.TELEPHONY_SIGNAL_STRENGTH[1][DEFAULT_LEVEL]; + protected static final int DEFAULT_QS_SIGNAL_STRENGTH = + TelephonyIcons.QS_TELEPHONY_SIGNAL_STRENGTH[1][DEFAULT_LEVEL]; + protected static final int DEFAULT_ICON = TelephonyIcons.ICON_3G; + protected static final int DEFAULT_QS_ICON = TelephonyIcons.QS_ICON_3G; protected NetworkControllerImpl mNetworkController; protected PhoneStateListener mPhoneStateListener; protected SignalCluster mSignalCluster; + protected NetworkSignalChangedCallback mNetworkSignalChangedCallback; private SignalStrength mSignalStrength; private ServiceState mServiceState; - private ConnectivityManager mMockCM; + protected ConnectivityManager mMockCm; + protected WifiManager mMockWm; + protected TelephonyManager mMockTm; @Override protected void setUp() throws Exception { @@ -39,17 +52,25 @@ public class NetworkControllerBaseTest extends AndroidTestCase { System.setProperty("dexmaker.dexcache", mContext.getCacheDir().getPath()); Thread.currentThread().setContextClassLoader(getClass().getClassLoader()); - mMockCM = mock(ConnectivityManager.class); - when(mMockCM.isNetworkSupported(ConnectivityManager.TYPE_MOBILE)).thenReturn(true); + mMockWm = mock(WifiManager.class); + mMockTm = mock(TelephonyManager.class); + mMockCm = mock(ConnectivityManager.class); + when(mMockCm.isNetworkSupported(ConnectivityManager.TYPE_MOBILE)).thenReturn(true); - // TODO: Move away from fake, use spy if possible after MSIM refactor. - mNetworkController = new FakeNetworkControllerImpl(mContext); - - mPhoneStateListener = mNetworkController.mPhoneStateListener; mSignalStrength = mock(SignalStrength.class); mServiceState = mock(ServiceState.class); mSignalCluster = mock(SignalCluster.class); + mNetworkSignalChangedCallback = mock(NetworkSignalChangedCallback.class); + + mNetworkController = new NetworkControllerImpl(mContext, mMockCm, mMockTm, mMockWm, + mock(AccessPointController.class), mock(MobileDataController.class)); + setupNetworkController(); + } + + protected void setupNetworkController() { + mPhoneStateListener = mNetworkController.mPhoneStateListener; mNetworkController.addSignalCluster(mSignalCluster); + mNetworkController.addNetworkSignalChangedCallback(mNetworkSignalChangedCallback); } @Override @@ -62,13 +83,24 @@ public class NetworkControllerBaseTest extends AndroidTestCase { super.tearDown(); } + // 2 Bars 3G GSM. + public void setupDefaultSignal() { + setIsGsm(true); + setVoiceRegState(ServiceState.STATE_IN_SERVICE); + setGsmRoaming(false); + setLevel(DEFAULT_LEVEL); + updateDataConnectionState(TelephonyManager.DATA_CONNECTED, + TelephonyManager.NETWORK_TYPE_UMTS); + setConnectivity(100, ConnectivityManager.TYPE_MOBILE, true); + } + public void setConnectivity(int inetCondition, int networkType, boolean isConnected) { Intent i = new Intent(ConnectivityManager.INET_CONDITION_ACTION); NetworkInfo networkInfo = mock(NetworkInfo.class); when(networkInfo.isConnected()).thenReturn(isConnected); when(networkInfo.getType()).thenReturn(networkType); when(networkInfo.getTypeName()).thenReturn(""); - when(mMockCM.getActiveNetworkInfo()).thenReturn(networkInfo); + when(mMockCm.getActiveNetworkInfo()).thenReturn(networkInfo); i.putExtra(ConnectivityManager.EXTRA_INET_CONDITION, inetCondition); mNetworkController.onReceive(mContext, i); @@ -79,11 +111,24 @@ public class NetworkControllerBaseTest extends AndroidTestCase { updateServiceState(); } + public void setCdmaRoaming(boolean isRoaming) { + when(mServiceState.getCdmaEriIconIndex()).thenReturn(isRoaming ? + EriInfo.ROAMING_INDICATOR_ON : EriInfo.ROAMING_INDICATOR_OFF); + when(mServiceState.getCdmaEriIconMode()).thenReturn(isRoaming ? + EriInfo.ROAMING_ICON_MODE_NORMAL : -1); + updateServiceState(); + } + public void setVoiceRegState(int voiceRegState) { when(mServiceState.getVoiceRegState()).thenReturn(voiceRegState); updateServiceState(); } + public void setDataRegState(int dataRegState) { + when(mServiceState.getDataRegState()).thenReturn(dataRegState); + updateServiceState(); + } + public void setIsEmergencyOnly(boolean isEmergency) { when(mServiceState.isEmergencyOnly()).thenReturn(isEmergency); updateServiceState(); @@ -131,32 +176,49 @@ public class NetworkControllerBaseTest extends AndroidTestCase { mPhoneStateListener.onDataActivity(dataActivity); } - protected void verifyLastMobileDataIndicators(boolean visible, int icon) { + protected void verifyLastQsMobileDataIndicators(boolean visible, int icon, int typeIcon, + boolean dataIn, boolean dataOut, boolean noSim) { + ArgumentCaptor<Integer> iconArg = ArgumentCaptor.forClass(Integer.class); + ArgumentCaptor<Integer> typeIconArg = ArgumentCaptor.forClass(Integer.class); + ArgumentCaptor<Boolean> visibleArg = ArgumentCaptor.forClass(Boolean.class); + ArgumentCaptor<Boolean> dataInArg = ArgumentCaptor.forClass(Boolean.class); + ArgumentCaptor<Boolean> dataOutArg = ArgumentCaptor.forClass(Boolean.class); + ArgumentCaptor<Boolean> noSimArg = ArgumentCaptor.forClass(Boolean.class); + + Mockito.verify(mNetworkSignalChangedCallback, Mockito.atLeastOnce()) + .onMobileDataSignalChanged(visibleArg.capture(), iconArg.capture(), + ArgumentCaptor.forClass(String.class).capture(), + typeIconArg.capture(), + dataInArg.capture(), + dataOutArg.capture(), + ArgumentCaptor.forClass(String.class).capture(), + ArgumentCaptor.forClass(String.class).capture(), + noSimArg.capture(), + ArgumentCaptor.forClass(Boolean.class).capture()); + assertEquals("Visibility in, quick settings", visible, (boolean) visibleArg.getValue()); + assertEquals("Signal icon in, quick settings", icon, (int) iconArg.getValue()); + assertEquals("Data icon in, quick settings", typeIcon, (int) typeIconArg.getValue()); + assertEquals("Data direction in, in quick settings", dataIn, + (boolean) dataInArg.getValue()); + assertEquals("Data direction out, in quick settings", dataOut, + (boolean) dataOutArg.getValue()); + assertEquals("Sim state in quick settings", noSim, (boolean) noSimArg.getValue()); + } + + protected void verifyLastMobileDataIndicators(boolean visible, int icon, int typeIcon) { ArgumentCaptor<Integer> iconArg = ArgumentCaptor.forClass(Integer.class); + ArgumentCaptor<Integer> typeIconArg = ArgumentCaptor.forClass(Integer.class); ArgumentCaptor<Boolean> visibleArg = ArgumentCaptor.forClass(Boolean.class); // TODO: Verify all fields. Mockito.verify(mSignalCluster, Mockito.atLeastOnce()).setMobileDataIndicators( - visibleArg.capture(), iconArg.capture(), - ArgumentCaptor.forClass(Integer.class).capture(), + visibleArg.capture(), iconArg.capture(), typeIconArg.capture(), ArgumentCaptor.forClass(String.class).capture(), ArgumentCaptor.forClass(String.class).capture(), ArgumentCaptor.forClass(Boolean.class).capture()); - assertEquals(icon, (int) iconArg.getValue()); - assertEquals(visible, (boolean) visibleArg.getValue()); - } - - private class FakeNetworkControllerImpl extends NetworkControllerImpl { - public FakeNetworkControllerImpl(Context context) { - super(context); - } - - @Override - public ConnectivityManager getCM() { - return mMockCM; - } - - public void registerListeners() {}; + assertEquals("Signal icon in status bar", icon, (int) iconArg.getValue()); + assertEquals("Data icon in status bar", typeIcon, (int) typeIconArg.getValue()); + assertEquals("Visibility in status bar", visible, (boolean) visibleArg.getValue()); } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerDataTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerDataTest.java new file mode 100644 index 000000000000..146e76db7251 --- /dev/null +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerDataTest.java @@ -0,0 +1,99 @@ +package com.android.systemui.statusbar.policy; + +import android.telephony.TelephonyManager; + +// WARNING: Many of these tests may fail with config showMin3G. +// TODO: Maybe fix the above. +public class NetworkControllerDataTest extends NetworkControllerBaseTest { + + public void test3gDataIcon() { + setupDefaultSignal(); + + verifyDataIndicators(TelephonyIcons.DATA_3G[1][0 /* No direction */], + TelephonyIcons.QS_DATA_3G[1]); + } + + public void testRoamingDataIcon() { + setupDefaultSignal(); + setGsmRoaming(true); + + verifyLastMobileDataIndicators(true, + TelephonyIcons.TELEPHONY_SIGNAL_STRENGTH_ROAMING[1][DEFAULT_LEVEL], + TelephonyIcons.ROAMING_ICON); + verifyLastQsMobileDataIndicators(true, + TelephonyIcons.QS_TELEPHONY_SIGNAL_STRENGTH[1][DEFAULT_LEVEL], + TelephonyIcons.QS_DATA_R[1], false, false, false); + } + + public void test2gDataIcon() { + setupDefaultSignal(); + updateDataConnectionState(TelephonyManager.DATA_CONNECTED, + TelephonyManager.NETWORK_TYPE_GSM); + + verifyDataIndicators(TelephonyIcons.DATA_G[1][0 /* No direction */], + TelephonyIcons.QS_DATA_G[1]); + } + + public void testCdmaDataIcon() { + setupDefaultSignal(); + updateDataConnectionState(TelephonyManager.DATA_CONNECTED, + TelephonyManager.NETWORK_TYPE_CDMA); + + verifyDataIndicators(TelephonyIcons.DATA_1X[1][0 /* No direction */], + TelephonyIcons.QS_DATA_1X[1]); + } + + public void testEdgeDataIcon() { + setupDefaultSignal(); + updateDataConnectionState(TelephonyManager.DATA_CONNECTED, + TelephonyManager.NETWORK_TYPE_EDGE); + + verifyDataIndicators(TelephonyIcons.DATA_E[1][0 /* No direction */], + TelephonyIcons.QS_DATA_E[1]); + } + + public void testLteDataIcon() { + setupDefaultSignal(); + updateDataConnectionState(TelephonyManager.DATA_CONNECTED, + TelephonyManager.NETWORK_TYPE_LTE); + + // WARNING: May fail depending on config. + verifyDataIndicators(TelephonyIcons.DATA_LTE[1][0 /* No direction */], + TelephonyIcons.QS_DATA_LTE[1]); + } + + public void testHspaDataIcon() { + setupDefaultSignal(); + updateDataConnectionState(TelephonyManager.DATA_CONNECTED, + TelephonyManager.NETWORK_TYPE_HSPA); + + // WARNING: May fail depending on config. + verifyDataIndicators(TelephonyIcons.DATA_H[1][0 /* No direction */], + TelephonyIcons.QS_DATA_H[1]); + } + + public void testDataActivity() { + setupDefaultSignal(); + + testDataActivity(TelephonyManager.DATA_ACTIVITY_NONE, false, false); + testDataActivity(TelephonyManager.DATA_ACTIVITY_IN, true, false); + testDataActivity(TelephonyManager.DATA_ACTIVITY_OUT, false, true); + testDataActivity(TelephonyManager.DATA_ACTIVITY_INOUT, true, true); + } + + private void testDataActivity(int direction, boolean in, boolean out) { + updateDataActivity(direction); + + verifyLastMobileDataIndicators(true, DEFAULT_SIGNAL_STRENGTH, DEFAULT_ICON); + verifyLastQsMobileDataIndicators(true, DEFAULT_QS_SIGNAL_STRENGTH, + DEFAULT_QS_ICON, in, out, false); + + } + + private void verifyDataIndicators(int dataIcon, int qsDataIcon) { + verifyLastMobileDataIndicators(true, DEFAULT_SIGNAL_STRENGTH, dataIcon); + verifyLastQsMobileDataIndicators(true, DEFAULT_QS_SIGNAL_STRENGTH, qsDataIcon, false, + false, false); + } + +} diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerSignalTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerSignalTest.java index fc2b1aa6da08..af053094352f 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerSignalTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerSignalTest.java @@ -1,37 +1,129 @@ package com.android.systemui.statusbar.policy; +import static org.mockito.Mockito.mock; + import android.net.ConnectivityManager; import android.telephony.ServiceState; import android.telephony.SignalStrength; import android.telephony.TelephonyManager; +import com.android.systemui.R; + +import org.mockito.Mockito; + public class NetworkControllerSignalTest extends NetworkControllerBaseTest { + public void testNoIconWithoutMobile() { + // Turn off mobile network support. + Mockito.when(mMockCm.isNetworkSupported(ConnectivityManager.TYPE_MOBILE)).thenReturn(false); + // Create a new NetworkController as this is currently handled in constructor. + mNetworkController = new NetworkControllerImpl(mContext, mMockCm, mMockTm, mMockWm, + mock(AccessPointController.class), mock(MobileDataController.class)); + setupNetworkController(); + + verifyLastMobileDataIndicators(false, 0, 0); + } + public void testSignalStrength() { - int testStrength = SignalStrength.SIGNAL_STRENGTH_MODERATE; - setIsGsm(true); - setVoiceRegState(ServiceState.STATE_IN_SERVICE); - setGsmRoaming(false); - setLevel(testStrength); - updateDataConnectionState(TelephonyManager.DATA_CONNECTED, - TelephonyManager.NETWORK_TYPE_UMTS); - setConnectivity(100, ConnectivityManager.TYPE_MOBILE, true); + for (int testStrength = SignalStrength.SIGNAL_STRENGTH_NONE_OR_UNKNOWN; + testStrength <= SignalStrength.SIGNAL_STRENGTH_GREAT; testStrength++) { + setupDefaultSignal(); + setLevel(testStrength); - verifyLastMobileDataIndicators(true, - TelephonyIcons.TELEPHONY_SIGNAL_STRENGTH[1][testStrength]); + verifyLastMobileDataIndicators(true, + TelephonyIcons.TELEPHONY_SIGNAL_STRENGTH[1][testStrength], + DEFAULT_ICON); + + // Verify low inet number indexing. + setConnectivity(10, ConnectivityManager.TYPE_MOBILE, true); + verifyLastMobileDataIndicators(true, + TelephonyIcons.TELEPHONY_SIGNAL_STRENGTH[0][testStrength], 0); + } + } + + public void testCdmaSignalStrength() { + for (int testStrength = SignalStrength.SIGNAL_STRENGTH_NONE_OR_UNKNOWN; + testStrength <= SignalStrength.SIGNAL_STRENGTH_GREAT; testStrength++) { + setupDefaultSignal(); + setCdma(); + setLevel(testStrength); + + verifyLastMobileDataIndicators(true, + TelephonyIcons.TELEPHONY_SIGNAL_STRENGTH[1][testStrength], + TelephonyIcons.DATA_1X[1][0 /* No direction */]); + } } public void testSignalRoaming() { - int testStrength = SignalStrength.SIGNAL_STRENGTH_MODERATE; - setIsGsm(true); - setVoiceRegState(ServiceState.STATE_IN_SERVICE); - setGsmRoaming(true); - setLevel(testStrength); - updateDataConnectionState(TelephonyManager.DATA_CONNECTED, - TelephonyManager.NETWORK_TYPE_UMTS); - setConnectivity(100, ConnectivityManager.TYPE_MOBILE, true); + for (int testStrength = SignalStrength.SIGNAL_STRENGTH_NONE_OR_UNKNOWN; + testStrength <= SignalStrength.SIGNAL_STRENGTH_GREAT; testStrength++) { + setupDefaultSignal(); + setGsmRoaming(true); + setLevel(testStrength); + + verifyLastMobileDataIndicators(true, + TelephonyIcons.TELEPHONY_SIGNAL_STRENGTH_ROAMING[1][testStrength], + TelephonyIcons.ROAMING_ICON); + } + } - verifyLastMobileDataIndicators(true, - TelephonyIcons.TELEPHONY_SIGNAL_STRENGTH_ROAMING[1][testStrength]); + public void testCdmaSignalRoaming() { + for (int testStrength = SignalStrength.SIGNAL_STRENGTH_NONE_OR_UNKNOWN; + testStrength <= SignalStrength.SIGNAL_STRENGTH_GREAT; testStrength++) { + setupDefaultSignal(); + setCdma(); + setCdmaRoaming(true); + setLevel(testStrength); + + verifyLastMobileDataIndicators(true, + TelephonyIcons.TELEPHONY_SIGNAL_STRENGTH_ROAMING[1][testStrength], + TelephonyIcons.ROAMING_ICON); + } + } + + public void testQsSignalStrength() { + for (int testStrength = SignalStrength.SIGNAL_STRENGTH_NONE_OR_UNKNOWN; + testStrength <= SignalStrength.SIGNAL_STRENGTH_GREAT; testStrength++) { + setupDefaultSignal(); + setLevel(testStrength); + + verifyLastQsMobileDataIndicators(true, + TelephonyIcons.QS_TELEPHONY_SIGNAL_STRENGTH[1][testStrength], + DEFAULT_QS_ICON, false, false, false); + } + } + + public void testCdmaQsSignalStrength() { + for (int testStrength = SignalStrength.SIGNAL_STRENGTH_NONE_OR_UNKNOWN; + testStrength <= SignalStrength.SIGNAL_STRENGTH_GREAT; testStrength++) { + setupDefaultSignal(); + setCdma(); + setLevel(testStrength); + + verifyLastQsMobileDataIndicators(true, + TelephonyIcons.QS_TELEPHONY_SIGNAL_STRENGTH[1][testStrength], + TelephonyIcons.QS_ICON_1X, false, false, false); + } + } + + public void testNoRoamingWithoutSignal() { + setupDefaultSignal(); + setCdma(); + setCdmaRoaming(true); + setVoiceRegState(ServiceState.STATE_OUT_OF_SERVICE); + setDataRegState(ServiceState.STATE_OUT_OF_SERVICE); + + // This exposes the bug in b/18034542, and should be switched to the commented out + // verification below (and pass), once the bug is fixed. + verifyLastMobileDataIndicators(true, R.drawable.stat_sys_signal_null, + TelephonyIcons.ROAMING_ICON); + //verifyLastMobileDataIndicators(true, R.drawable.stat_sys_signal_null, 0 /* No Icon */); + } + + private void setCdma() { + setIsGsm(false); + updateDataConnectionState(TelephonyManager.DATA_CONNECTED, + TelephonyManager.NETWORK_TYPE_CDMA); + setCdmaRoaming(false); } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerWifiTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerWifiTest.java new file mode 100644 index 000000000000..4ffdff280b44 --- /dev/null +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerWifiTest.java @@ -0,0 +1,201 @@ +package com.android.systemui.statusbar.policy; + +import android.content.Intent; +import android.net.ConnectivityManager; +import android.net.NetworkInfo; +import android.net.wifi.WifiInfo; +import android.net.wifi.WifiManager; + +import com.android.systemui.R; + +import org.mockito.ArgumentCaptor; +import org.mockito.Mockito; + +public class NetworkControllerWifiTest extends NetworkControllerBaseTest { + // These match the constants in WifiManager and need to be kept up to date. + private static final int MIN_RSSI = -100; + private static final int MAX_RSSI = -55; + + // TODO: Move this into WifiIcons, remove all R.drawable from NetworkControllerImpl. + private static final int NULL_SIGNAL = R.drawable.stat_sys_wifi_signal_null; + private static final int QS_NO_NET = R.drawable.ic_qs_wifi_no_network; + + public void testWifiIcon() { + String testSsid = "Test SSID"; + setWifiEnabled(true); + verifyLastWifiIcon(false, NULL_SIGNAL); + + setWifiState(true, testSsid); + verifyLastWifiIcon(true, WifiIcons.WIFI_SIGNAL_STRENGTH[0][0]); + + for (int testLevel = 0; testLevel < WifiIcons.WIFI_LEVEL_COUNT; testLevel++) { + setWifiLevel(testLevel); + + setConnectivity(100, ConnectivityManager.TYPE_WIFI, true); + verifyLastWifiIcon(true, WifiIcons.WIFI_SIGNAL_STRENGTH[1][testLevel]); + setConnectivity(10, ConnectivityManager.TYPE_WIFI, true); + verifyLastWifiIcon(true, WifiIcons.WIFI_SIGNAL_STRENGTH[0][testLevel]); + } + } + + public void testQsWifiIcon() { + String testSsid = "Test SSID"; + + setWifiEnabled(false); + verifyLastQsWifiIcon(false, false, 0, null); + + setWifiEnabled(true); + verifyLastQsWifiIcon(true, false, QS_NO_NET, null); + + setWifiState(true, testSsid); + for (int testLevel = 0; testLevel < WifiIcons.WIFI_LEVEL_COUNT; testLevel++) { + setWifiLevel(testLevel); + + setConnectivity(100, ConnectivityManager.TYPE_WIFI, true); + verifyLastQsWifiIcon(true, true, WifiIcons.QS_WIFI_SIGNAL_STRENGTH[1][testLevel], + testSsid); + setConnectivity(10, ConnectivityManager.TYPE_WIFI, true); + verifyLastQsWifiIcon(true, true, WifiIcons.QS_WIFI_SIGNAL_STRENGTH[0][testLevel], + testSsid); + } + } + + public void testQsDataDirection() { + // Setup normal connection + String testSsid = "Test SSID"; + int testLevel = 2; + setWifiEnabled(true); + setWifiState(true, testSsid); + setWifiLevel(testLevel); + setConnectivity(100, ConnectivityManager.TYPE_WIFI, true); + verifyLastQsWifiIcon(true, true, + WifiIcons.QS_WIFI_SIGNAL_STRENGTH[1][testLevel], testSsid); + + setWifiActivity(WifiManager.DATA_ACTIVITY_NONE); + verifyLastQsDataDirection(false, false); + setWifiActivity(WifiManager.DATA_ACTIVITY_IN); + verifyLastQsDataDirection(true, false); + setWifiActivity(WifiManager.DATA_ACTIVITY_OUT); + verifyLastQsDataDirection(false, true); + setWifiActivity(WifiManager.DATA_ACTIVITY_INOUT); + verifyLastQsDataDirection(true, true); + } + + public void testNoDataIconDuringWifi() { + // Setup normal connection + String testSsid = "Test SSID"; + int testLevel = 2; + setWifiEnabled(true); + setWifiState(true, testSsid); + setWifiLevel(testLevel); + setConnectivity(100, ConnectivityManager.TYPE_WIFI, true); + verifyLastWifiIcon(true, WifiIcons.WIFI_SIGNAL_STRENGTH[1][testLevel]); + + setupDefaultSignal(); + // Still be on wifi though. + setConnectivity(100, ConnectivityManager.TYPE_WIFI, true); + verifyLastMobileDataIndicators(true, DEFAULT_SIGNAL_STRENGTH, 0 /* No icon */); + } + + public void testRoamingIconDuringWifi() { + // Setup normal connection + String testSsid = "Test SSID"; + int testLevel = 2; + setWifiEnabled(true); + setWifiState(true, testSsid); + setWifiLevel(testLevel); + setConnectivity(100, ConnectivityManager.TYPE_WIFI, true); + verifyLastWifiIcon(true, WifiIcons.WIFI_SIGNAL_STRENGTH[1][testLevel]); + + setupDefaultSignal(); + setGsmRoaming(true); + // Still be on wifi though. + setConnectivity(100, ConnectivityManager.TYPE_WIFI, true); + verifyLastMobileDataIndicators(true, + TelephonyIcons.TELEPHONY_SIGNAL_STRENGTH_ROAMING[1][DEFAULT_LEVEL], + TelephonyIcons.ROAMING_ICON); + } + + protected void setWifiActivity(int activity) { + // TODO: Not this, because this variable probably isn't sticking around. + mNetworkController.mWifiActivity = activity; + mNetworkController.refreshViews(); + } + + protected void setWifiLevel(int level) { + float amountPerLevel = (MAX_RSSI - MIN_RSSI) / (WifiIcons.WIFI_LEVEL_COUNT - 1); + int rssi = (int)(MIN_RSSI + level * amountPerLevel); + // Put RSSI in the middle of the range. + rssi += amountPerLevel / 2; + Intent i = new Intent(WifiManager.RSSI_CHANGED_ACTION); + i.putExtra(WifiManager.EXTRA_NEW_RSSI, rssi); + mNetworkController.onReceive(mContext, i); + } + + protected void setWifiEnabled(boolean enabled) { + Intent i = new Intent(WifiManager.WIFI_STATE_CHANGED_ACTION); + i.putExtra(WifiManager.EXTRA_WIFI_STATE, + enabled ? WifiManager.WIFI_STATE_ENABLED : WifiManager.WIFI_STATE_DISABLED); + mNetworkController.onReceive(mContext, i); + } + + protected void setWifiState(boolean connected, String ssid) { + Intent i = new Intent(WifiManager.NETWORK_STATE_CHANGED_ACTION); + NetworkInfo networkInfo = Mockito.mock(NetworkInfo.class); + Mockito.when(networkInfo.isConnected()).thenReturn(connected); + + WifiInfo wifiInfo = Mockito.mock(WifiInfo.class); + Mockito.when(wifiInfo.getSSID()).thenReturn(ssid); + + i.putExtra(WifiManager.EXTRA_NETWORK_INFO, networkInfo); + i.putExtra(WifiManager.EXTRA_WIFI_INFO, wifiInfo); + mNetworkController.onReceive(mContext, i); + } + + protected void verifyLastQsDataDirection(boolean in, boolean out) { + ArgumentCaptor<Boolean> inArg = ArgumentCaptor.forClass(Boolean.class); + ArgumentCaptor<Boolean> outArg = ArgumentCaptor.forClass(Boolean.class); + + Mockito.verify(mNetworkSignalChangedCallback, Mockito.atLeastOnce()).onWifiSignalChanged( + ArgumentCaptor.forClass(Boolean.class).capture(), + ArgumentCaptor.forClass(Boolean.class).capture(), + ArgumentCaptor.forClass(Integer.class).capture(), + inArg.capture(), outArg.capture(), + ArgumentCaptor.forClass(String.class).capture(), + ArgumentCaptor.forClass(String.class).capture()); + assertEquals("WiFi data in, in quick settings", in, (boolean) inArg.getValue()); + assertEquals("WiFi data out, in quick settings", out, (boolean) outArg.getValue()); + } + + protected void verifyLastQsWifiIcon(boolean enabled, boolean connected, int icon, + String description) { + ArgumentCaptor<Boolean> enabledArg = ArgumentCaptor.forClass(Boolean.class); + ArgumentCaptor<Boolean> connectedArg = ArgumentCaptor.forClass(Boolean.class); + ArgumentCaptor<Integer> iconArg = ArgumentCaptor.forClass(Integer.class); + ArgumentCaptor<String> descArg = ArgumentCaptor.forClass(String.class); + + Mockito.verify(mNetworkSignalChangedCallback, Mockito.atLeastOnce()).onWifiSignalChanged( + enabledArg.capture(), connectedArg.capture(), iconArg.capture(), + ArgumentCaptor.forClass(Boolean.class).capture(), + ArgumentCaptor.forClass(Boolean.class).capture(), + ArgumentCaptor.forClass(String.class).capture(), + descArg.capture()); + assertEquals("WiFi enabled, in quick settings", enabled, (boolean) enabledArg.getValue()); + assertEquals("WiFi connected, in quick settings", connected, + (boolean) connectedArg.getValue()); + assertEquals("WiFi signal, in quick settings", icon, (int) iconArg.getValue()); + assertEquals("WiFI desc (ssid), in quick settings", description, + (String) descArg.getValue()); + } + + protected void verifyLastWifiIcon(boolean visible, int icon) { + ArgumentCaptor<Boolean> visibleArg = ArgumentCaptor.forClass(Boolean.class); + ArgumentCaptor<Integer> iconArg = ArgumentCaptor.forClass(Integer.class); + + Mockito.verify(mSignalCluster, Mockito.atLeastOnce()).setWifiIndicators( + visibleArg.capture(), iconArg.capture(), + ArgumentCaptor.forClass(String.class).capture()); + assertEquals("WiFi visible, in status bar", visible, (boolean) visibleArg.getValue()); + assertEquals("WiFi signal, in status bar", icon, (int) iconArg.getValue()); + } +} diff --git a/packages/VpnDialogs/AndroidManifest.xml b/packages/VpnDialogs/AndroidManifest.xml index 03d920a4b71b..375c5d8aeda9 100644 --- a/packages/VpnDialogs/AndroidManifest.xml +++ b/packages/VpnDialogs/AndroidManifest.xml @@ -19,6 +19,8 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.android.vpndialogs"> + <uses-permission android:name="android.permission.CONTROL_VPN" /> + <application android:label="VpnDialogs" android:allowBackup="false" > <activity android:name=".ConfirmDialog" diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java index b6705840cf34..1ac956a77e80 100644 --- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java @@ -342,6 +342,8 @@ public class PhoneWindowManager implements WindowManagerPolicy { int mUndockedHdmiRotation; int mDemoHdmiRotation; boolean mDemoHdmiRotationLock; + int mDemoRotation; + boolean mDemoRotationLock; boolean mWakeGestureEnabledSetting; MyWakeGestureListener mWakeGestureListener; @@ -998,6 +1000,10 @@ public class PhoneWindowManager implements WindowManagerPolicy { } break; case MULTI_PRESS_POWER_BRIGHTNESS_BOOST: + Slog.i(TAG, "Starting brightness boost."); + if (!interactive) { + wakeUpFromPowerKey(eventTime); + } mPowerManager.boostScreenBrightness(eventTime); break; } @@ -1447,6 +1453,16 @@ public class PhoneWindowManager implements WindowManagerPolicy { } mDemoHdmiRotationLock = SystemProperties.getBoolean("persist.demo.hdmirotationlock", false); + // For demo purposes, allow the rotation of the remote display to be controlled. + // By default, remote display locks rotation to landscape. + if ("portrait".equals(SystemProperties.get("persist.demo.remoterotation"))) { + mDemoRotation = mPortraitRotation; + } else { + mDemoRotation = mLandscapeRotation; + } + mDemoRotationLock = SystemProperties.getBoolean( + "persist.demo.rotationlock", false); + // Only force the default orientation if the screen is xlarge, at least 960dp x 720dp, per // http://developer.android.com/guide/practices/screens_support.html#range mForceDefaultOrientation = longSizeDp >= 960 && shortSizeDp >= 720 && @@ -5315,6 +5331,10 @@ public class PhoneWindowManager implements WindowManagerPolicy { // full multi-display support). // Note that the dock orientation overrides the HDMI orientation. preferredRotation = mUndockedHdmiRotation; + } else if (mDemoRotationLock) { + // Ignore sensor when demo rotation lock is enabled. + // Note that the dock orientation and HDMI rotation lock override this. + preferredRotation = mDemoRotation; } else if (orientation == ActivityInfo.SCREEN_ORIENTATION_LOCKED) { // Application just wants to remain locked in the last rotation. preferredRotation = lastRotation; diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java index 5997680b28f2..17889eae772a 100644 --- a/services/core/java/com/android/server/ConnectivityService.java +++ b/services/core/java/com/android/server/ConnectivityService.java @@ -2813,9 +2813,8 @@ public class ConnectivityService extends IConnectivityManager.Stub } /** - * Prepare for a VPN application. This method is used by VpnDialogs - * and not available in ConnectivityManager. Permissions are checked - * in Vpn class. + * Prepare for a VPN application. This method is used by system-privileged apps. + * Permissions are checked in Vpn class. * @hide */ @Override @@ -2829,8 +2828,8 @@ public class ConnectivityService extends IConnectivityManager.Stub /** * Set whether the current VPN package has the ability to launch VPNs without - * user intervention. This method is used by system UIs and not available - * in ConnectivityManager. Permissions are checked in Vpn class. + * user intervention. This method is used by system-privileged apps. + * Permissions are checked in Vpn class. * @hide */ @Override @@ -3247,7 +3246,7 @@ public class ConnectivityService extends IConnectivityManager.Stub Settings.Global.putInt(cr, Settings.Global.AIRPLANE_MODE_ON, enable ? 1 : 0); Intent intent = new Intent(Intent.ACTION_AIRPLANE_MODE_CHANGED); intent.putExtra("state", enable); - mContext.sendBroadcast(intent); + mContext.sendBroadcastAsUser(intent, UserHandle.ALL); } finally { Binder.restoreCallingIdentity(ident); } diff --git a/services/core/java/com/android/server/DropBoxManagerService.java b/services/core/java/com/android/server/DropBoxManagerService.java index 29b04da9c564..a44cb72034e9 100644 --- a/services/core/java/com/android/server/DropBoxManagerService.java +++ b/services/core/java/com/android/server/DropBoxManagerService.java @@ -408,9 +408,14 @@ public final class DropBoxManagerService extends IDropBoxManagerService.Stub { if (!newline) out.append("\n"); } else { String text = dbe.getText(70); - boolean truncated = (text.length() == 70); - out.append(" ").append(text.trim().replace('\n', '/')); - if (truncated) out.append(" ..."); + out.append(" "); + if (text == null) { + out.append("[null]"); + } else { + boolean truncated = (text.length() == 70); + out.append(text.trim().replace('\n', '/')); + if (truncated) out.append(" ..."); + } out.append("\n"); } } catch (IOException e) { diff --git a/services/core/java/com/android/server/MmsServiceBroker.java b/services/core/java/com/android/server/MmsServiceBroker.java index 9596b57a5e15..da507519676e 100644 --- a/services/core/java/com/android/server/MmsServiceBroker.java +++ b/services/core/java/com/android/server/MmsServiceBroker.java @@ -16,8 +16,6 @@ package com.android.server; -import com.android.internal.telephony.IMms; - import android.Manifest; import android.app.AppOpsManager; import android.app.PendingIntent; @@ -38,6 +36,8 @@ import android.os.SystemClock; import android.telephony.TelephonyManager; import android.util.Slog; +import com.android.internal.telephony.IMms; + /** * This class is a proxy for MmsService APIs. We need this because MmsService runs * in phone process and may crash anytime. This manages a connection to the actual @@ -118,7 +118,7 @@ public class MmsServiceBroker extends SystemService { } public void systemRunning() { - tryConnecting(); + Slog.i(TAG, "Delay connecting to MmsService until an API is called"); } private void tryConnecting() { @@ -206,7 +206,7 @@ public class MmsServiceBroker extends SystemService { * Throws a security exception unless the caller has carrier privilege. */ private void enforceCarrierPrivilege() { - String[] packages = getPackageManager().getPackagesForUid(Binder.getCallingUid()); + final String[] packages = getPackageManager().getPackagesForUid(Binder.getCallingUid()); for (String pkg : packages) { if (getTelephonyManager().checkCarrierPrivilegesForPackage(pkg) == TelephonyManager.CARRIER_PRIVILEGE_STATUS_HAS_ACCESS) { @@ -216,12 +216,21 @@ public class MmsServiceBroker extends SystemService { throw new SecurityException("No carrier privilege"); } + private String getCallingPackageName() { + final String[] packages = getPackageManager().getPackagesForUid(Binder.getCallingUid()); + if (packages != null && packages.length > 0) { + return packages[0]; + } + return "unknown"; + } + // Service API calls implementation, proxied to the real MmsService in "com.android.mms.service" private final class BinderService extends IMms.Stub { @Override public void sendMessage(int subId, String callingPkg, Uri contentUri, String locationUrl, Bundle configOverrides, PendingIntent sentIntent) throws RemoteException { + Slog.d(TAG, "sendMessage() by " + callingPkg); mContext.enforceCallingPermission(Manifest.permission.SEND_SMS, "Send MMS message"); if (getAppOpsManager().noteOp(AppOpsManager.OP_SEND_SMS, Binder.getCallingUid(), callingPkg) != AppOpsManager.MODE_ALLOWED) { @@ -235,6 +244,7 @@ public class MmsServiceBroker extends SystemService { public void downloadMessage(int subId, String callingPkg, String locationUrl, Uri contentUri, Bundle configOverrides, PendingIntent downloadedIntent) throws RemoteException { + Slog.d(TAG, "downloadMessage() by " + callingPkg); mContext.enforceCallingPermission(Manifest.permission.RECEIVE_MMS, "Download MMS message"); if (getAppOpsManager().noteOp(AppOpsManager.OP_RECEIVE_MMS, Binder.getCallingUid(), @@ -260,6 +270,7 @@ public class MmsServiceBroker extends SystemService { @Override public Bundle getCarrierConfigValues(int subId) throws RemoteException { + Slog.d(TAG, "getCarrierConfigValues() by " + getCallingPackageName()); return getServiceGuarded().getCarrierConfigValues(subId); } diff --git a/services/core/java/com/android/server/SystemConfig.java b/services/core/java/com/android/server/SystemConfig.java index f4fb5199e730..92fbc1e7125a 100644 --- a/services/core/java/com/android/server/SystemConfig.java +++ b/services/core/java/com/android/server/SystemConfig.java @@ -16,6 +16,7 @@ package com.android.server; +import android.app.ActivityManager; import android.content.pm.FeatureInfo; import android.os.*; import android.os.Process; @@ -177,6 +178,8 @@ public class SystemConfig { return; } + final boolean lowRam = ActivityManager.isLowRamDeviceStatic(); + try { XmlPullParser parser = Xml.newPullParser(); parser.setInput(permReader); @@ -276,10 +279,17 @@ public class SystemConfig { } else if ("feature".equals(name)) { String fname = parser.getAttributeValue(null, "name"); + boolean allowed; + if (!lowRam) { + allowed = true; + } else { + String notLowRam = parser.getAttributeValue(null, "notLowRam"); + allowed = !"true".equals(notLowRam); + } if (fname == null) { Slog.w(TAG, "<feature> without name at " + parser.getPositionDescription()); - } else { + } else if (allowed) { //Log.i(TAG, "Got feature " + fname); FeatureInfo fi = new FeatureInfo(); fi.name = fname; diff --git a/services/core/java/com/android/server/accounts/AccountManagerService.java b/services/core/java/com/android/server/accounts/AccountManagerService.java index d480f68bfe3b..a2f4d562f132 100644 --- a/services/core/java/com/android/server/accounts/AccountManagerService.java +++ b/services/core/java/com/android/server/accounts/AccountManagerService.java @@ -77,7 +77,6 @@ import com.android.internal.R; import com.android.internal.util.ArrayUtils; import com.android.internal.util.IndentingPrintWriter; import com.android.server.FgThread; - import com.google.android.collect.Lists; import com.google.android.collect.Sets; @@ -487,7 +486,7 @@ public class AccountManagerService for (Account sa : sharedAccounts) { if (ArrayUtils.contains(accounts, sa)) continue; // Account doesn't exist. Copy it now. - copyAccountToUser(sa, UserHandle.USER_OWNER, userId); + copyAccountToUser(null /*no response*/, sa, UserHandle.USER_OWNER, userId); } } @@ -673,16 +672,31 @@ public class AccountManagerService } } - private boolean copyAccountToUser(final Account account, int userFrom, int userTo) { + @Override + public void copyAccountToUser(final IAccountManagerResponse response, final Account account, + int userFrom, int userTo) { + enforceCrossUserPermission(UserHandle.USER_ALL, "Calling copyAccountToUser requires " + + android.Manifest.permission.INTERACT_ACROSS_USERS_FULL); final UserAccounts fromAccounts = getUserAccounts(userFrom); final UserAccounts toAccounts = getUserAccounts(userTo); if (fromAccounts == null || toAccounts == null) { - return false; + if (response != null) { + Bundle result = new Bundle(); + result.putBoolean(AccountManager.KEY_BOOLEAN_RESULT, false); + try { + response.onResult(result); + } catch (RemoteException e) { + Slog.w(TAG, "Failed to report error back to the client." + e); + } + } + return; } + Slog.d(TAG, "Copying account " + account.name + + " from user " + userFrom + " to user " + userTo); long identityToken = clearCallingIdentity(); try { - new Session(fromAccounts, null, account.type, false, + new Session(fromAccounts, response, account.type, false, false /* stripAuthTokenFromResult */) { @Override protected String toDebugString(long now) { @@ -697,12 +711,10 @@ public class AccountManagerService @Override public void onResult(Bundle result) { - if (result != null) { - if (result.getBoolean(AccountManager.KEY_BOOLEAN_RESULT, false)) { - // Create a Session for the target user and pass in the bundle - completeCloningAccount(result, account, toAccounts); - } - return; + if (result != null + && result.getBoolean(AccountManager.KEY_BOOLEAN_RESULT, false)) { + // Create a Session for the target user and pass in the bundle + completeCloningAccount(response, result, account, toAccounts); } else { super.onResult(result); } @@ -711,14 +723,13 @@ public class AccountManagerService } finally { restoreCallingIdentity(identityToken); } - return true; } - void completeCloningAccount(final Bundle result, final Account account, - final UserAccounts targetUser) { + private void completeCloningAccount(IAccountManagerResponse response, + final Bundle accountCredentials, final Account account, final UserAccounts targetUser) { long id = clearCallingIdentity(); try { - new Session(targetUser, null, account.type, false, + new Session(targetUser, response, account.type, false, false /* stripAuthTokenFromResult */) { @Override protected String toDebugString(long now) { @@ -731,10 +742,10 @@ public class AccountManagerService // Confirm that the owner's account still exists before this step. UserAccounts owner = getUserAccounts(UserHandle.USER_OWNER); synchronized (owner.cacheLock) { - Account[] ownerAccounts = getAccounts(UserHandle.USER_OWNER); - for (Account acc : ownerAccounts) { + for (Account acc : getAccounts(UserHandle.USER_OWNER)) { if (acc.equals(account)) { - mAuthenticator.addAccountFromCredentials(this, account, result); + mAuthenticator.addAccountFromCredentials( + this, account, accountCredentials); break; } } @@ -743,17 +754,10 @@ public class AccountManagerService @Override public void onResult(Bundle result) { - if (result != null) { - if (result.getBoolean(AccountManager.KEY_BOOLEAN_RESULT, false)) { - // TODO: Anything? - } else { - // TODO: Show error notification - // TODO: Should we remove the shadow account to avoid retries? - } - return; - } else { - super.onResult(result); - } + // TODO: Anything to do if if succedded? + // TODO: If it failed: Show error notification? Should we remove the shadow + // account to avoid retries? + super.onResult(result); } @Override @@ -1043,7 +1047,8 @@ public class AccountManagerService } @Override - public void removeAccount(IAccountManagerResponse response, Account account) { + public void removeAccount(IAccountManagerResponse response, Account account, + boolean expectActivityLaunch) { if (Log.isLoggable(TAG, Log.VERBOSE)) { Log.v(TAG, "removeAccount: " + account + ", response " + response @@ -1088,7 +1093,7 @@ public class AccountManagerService } try { - new RemoveAccountSession(accounts, response, account).bind(); + new RemoveAccountSession(accounts, response, account, expectActivityLaunch).bind(); } finally { restoreCallingIdentity(identityToken); } @@ -1096,7 +1101,7 @@ public class AccountManagerService @Override public void removeAccountAsUser(IAccountManagerResponse response, Account account, - int userId) { + boolean expectActivityLaunch, int userId) { if (Log.isLoggable(TAG, Log.VERBOSE)) { Log.v(TAG, "removeAccount: " + account + ", response " + response @@ -1145,7 +1150,30 @@ public class AccountManagerService } try { - new RemoveAccountSession(accounts, response, account).bind(); + new RemoveAccountSession(accounts, response, account, expectActivityLaunch).bind(); + } finally { + restoreCallingIdentity(identityToken); + } + } + + @Override + public boolean removeAccountExplicitly(Account account) { + if (Log.isLoggable(TAG, Log.VERBOSE)) { + Log.v(TAG, "removeAccountExplicitly: " + account + + ", caller's uid " + Binder.getCallingUid() + + ", pid " + Binder.getCallingPid()); + } + if (account == null) throw new IllegalArgumentException("account is null"); + checkAuthenticateAccountsPermission(account); + + UserAccounts accounts = getUserAccountsForCaller(); + int userId = Binder.getCallingUserHandle().getIdentifier(); + if (!canUserModifyAccounts(userId) || !canUserModifyAccountsForType(userId, account.type)) { + return false; + } + long identityToken = clearCallingIdentity(); + try { + return removeAccountInternal(accounts, account); } finally { restoreCallingIdentity(identityToken); } @@ -1154,8 +1182,8 @@ public class AccountManagerService private class RemoveAccountSession extends Session { final Account mAccount; public RemoveAccountSession(UserAccounts accounts, IAccountManagerResponse response, - Account account) { - super(accounts, response, account.type, false /* expectActivityLaunch */, + Account account, boolean expectActivityLaunch) { + super(accounts, response, account.type, expectActivityLaunch, true /* stripAuthTokenFromResult */); mAccount = account; } @@ -1203,10 +1231,12 @@ public class AccountManagerService removeAccountInternal(getUserAccountsForCaller(), account); } - private void removeAccountInternal(UserAccounts accounts, Account account) { + private boolean removeAccountInternal(UserAccounts accounts, Account account) { + int deleted; synchronized (accounts.cacheLock) { final SQLiteDatabase db = accounts.openHelper.getWritableDatabase(); - db.delete(TABLE_ACCOUNTS, ACCOUNTS_NAME + "=? AND " + ACCOUNTS_TYPE+ "=?", + deleted = db.delete(TABLE_ACCOUNTS, ACCOUNTS_NAME + "=? AND " + ACCOUNTS_TYPE + + "=?", new String[]{account.name, account.type}); removeAccountFromCacheLocked(accounts, account); sendAccountsChangedBroadcast(accounts.userId); @@ -1226,6 +1256,7 @@ public class AccountManagerService Binder.restoreCallingIdentity(id); } } + return (deleted > 0); } @Override @@ -2714,7 +2745,7 @@ public class AccountManagerService break; case MESSAGE_COPY_SHARED_ACCOUNT: - copyAccountToUser((Account) msg.obj, msg.arg1, msg.arg2); + copyAccountToUser(/*no response*/ null, (Account) msg.obj, msg.arg1, msg.arg2); break; default: diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index d0f5eeda2ee5..772192a28cad 100755 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -61,7 +61,6 @@ import com.android.internal.app.IAppOpsService; import com.android.internal.app.IVoiceInteractor; import com.android.internal.app.ProcessMap; import com.android.internal.app.ProcessStats; -import com.android.internal.content.PackageMonitor; import com.android.internal.os.BackgroundThread; import com.android.internal.os.BatteryStatsImpl; import com.android.internal.os.ProcessCpuTracker; @@ -1183,7 +1182,7 @@ public final class ActivityManagerService extends ActivityManagerNative static final int SERVICE_TIMEOUT_MSG = 12; static final int UPDATE_TIME_ZONE = 13; static final int SHOW_UID_ERROR_MSG = 14; - static final int IM_FEELING_LUCKY_MSG = 15; + static final int SHOW_FINGERPRINT_ERROR_MSG = 15; static final int PROC_START_TIMEOUT_MSG = 20; static final int DO_PENDING_ACTIVITY_LAUNCHES_MSG = 21; static final int KILL_APPLICATION_MSG = 22; @@ -1212,13 +1211,13 @@ public final class ActivityManagerService extends ActivityManagerNative static final int FINISH_BOOTING_MSG = 45; static final int START_USER_SWITCH_MSG = 46; static final int SEND_LOCALE_TO_MOUNT_DAEMON_MSG = 47; + static final int DISMISS_DIALOG_MSG = 48; static final int FIRST_ACTIVITY_STACK_MSG = 100; static final int FIRST_BROADCAST_QUEUE_MSG = 200; static final int FIRST_COMPAT_MODE_MSG = 300; static final int FIRST_SUPERVISOR_STACK_MSG = 100; - AlertDialog mUidAlert; CompatModeDialog mCompatModeDialog; long mLastMemUsageReportTime = 0; @@ -1447,27 +1446,27 @@ public final class ActivityManagerService extends ActivityManagerNative } } break; case SHOW_UID_ERROR_MSG: { - String title = "System UIDs Inconsistent"; - String text = "UIDs on the system are inconsistent, you need to wipe your" - + " data partition or your device will be unstable."; - Log.e(TAG, title + ": " + text); if (mShowDialogs) { - // XXX This is a temporary dialog, no need to localize. AlertDialog d = new BaseErrorDialog(mContext); d.getWindow().setType(WindowManager.LayoutParams.TYPE_SYSTEM_ERROR); d.setCancelable(false); - d.setTitle(title); - d.setMessage(text); - d.setButton(DialogInterface.BUTTON_POSITIVE, "I'm Feeling Lucky", - mHandler.obtainMessage(IM_FEELING_LUCKY_MSG)); - mUidAlert = d; + d.setTitle(mContext.getText(R.string.android_system_label)); + d.setMessage(mContext.getText(R.string.system_error_wipe_data)); + d.setButton(DialogInterface.BUTTON_POSITIVE, mContext.getText(R.string.ok), + mHandler.obtainMessage(DISMISS_DIALOG_MSG, d)); d.show(); } } break; - case IM_FEELING_LUCKY_MSG: { - if (mUidAlert != null) { - mUidAlert.dismiss(); - mUidAlert = null; + case SHOW_FINGERPRINT_ERROR_MSG: { + if (mShowDialogs) { + AlertDialog d = new BaseErrorDialog(mContext); + d.getWindow().setType(WindowManager.LayoutParams.TYPE_SYSTEM_ERROR); + d.setCancelable(false); + d.setTitle(mContext.getText(R.string.android_system_label)); + d.setMessage(mContext.getText(R.string.system_error_manufacturer)); + d.setButton(DialogInterface.BUTTON_POSITIVE, mContext.getText(R.string.ok), + mHandler.obtainMessage(DISMISS_DIALOG_MSG, d)); + d.show(); } } break; case PROC_START_TIMEOUT_MSG: { @@ -1727,6 +1726,11 @@ public final class ActivityManagerService extends ActivityManagerNative } break; } + case DISMISS_DIALOG_MSG: { + final Dialog d = (Dialog) msg.obj; + d.dismiss(); + break; + } } } }; @@ -1776,7 +1780,8 @@ public final class ActivityManagerService extends ActivityManagerNative } } - int i=0, num=0; + int i = 0; + int num = 0; long[] tmp = new long[1]; do { ProcessRecord proc; @@ -1826,99 +1831,6 @@ public final class ActivityManagerService extends ActivityManagerNative } }; - /** - * Monitor for package changes and update our internal state. - */ - private final PackageMonitor mPackageMonitor = new PackageMonitor() { - @Override - public void onPackageRemoved(String packageName, int uid) { - // Remove all tasks with activities in the specified package from the list of recent tasks - final int eventUserId = getChangingUserId(); - synchronized (ActivityManagerService.this) { - for (int i = mRecentTasks.size() - 1; i >= 0; i--) { - TaskRecord tr = mRecentTasks.get(i); - if (tr.userId != eventUserId) continue; - - ComponentName cn = tr.intent.getComponent(); - if (cn != null && cn.getPackageName().equals(packageName)) { - // If the package name matches, remove the task - removeTaskByIdLocked(tr.taskId, true); - } - } - } - } - - @Override - public boolean onPackageChanged(String packageName, int uid, String[] components) { - onPackageModified(packageName); - return true; - } - - @Override - public void onPackageModified(String packageName) { - final int eventUserId = getChangingUserId(); - final IPackageManager pm = AppGlobals.getPackageManager(); - final ArrayList<Pair<Intent, Integer>> recentTaskIntents = - new ArrayList<Pair<Intent, Integer>>(); - final HashSet<ComponentName> componentsKnownToExist = new HashSet<ComponentName>(); - final ArrayList<Integer> tasksToRemove = new ArrayList<Integer>(); - // Copy the list of recent tasks so that we don't hold onto the lock on - // ActivityManagerService for long periods while checking if components exist. - synchronized (ActivityManagerService.this) { - for (int i = mRecentTasks.size() - 1; i >= 0; i--) { - TaskRecord tr = mRecentTasks.get(i); - if (tr.userId != eventUserId) continue; - - recentTaskIntents.add(new Pair<Intent, Integer>(tr.intent, tr.taskId)); - } - } - // Check the recent tasks and filter out all tasks with components that no longer exist. - for (int i = recentTaskIntents.size() - 1; i >= 0; i--) { - Pair<Intent, Integer> p = recentTaskIntents.get(i); - ComponentName cn = p.first.getComponent(); - if (cn != null && cn.getPackageName().equals(packageName)) { - if (componentsKnownToExist.contains(cn)) { - // If we know that the component still exists in the package, then skip - continue; - } - try { - ActivityInfo info = pm.getActivityInfo(cn, 0, eventUserId); - if (info != null) { - componentsKnownToExist.add(cn); - } else { - tasksToRemove.add(p.second); - } - } catch (RemoteException e) { - Log.e(TAG, "Failed to query activity info for component: " + cn, e); - } - } - } - // Prune all the tasks with removed components from the list of recent tasks - synchronized (ActivityManagerService.this) { - for (int i = tasksToRemove.size() - 1; i >= 0; i--) { - removeTaskByIdLocked(tasksToRemove.get(i), false); - } - } - } - - @Override - public boolean onHandleForceStop(Intent intent, String[] packages, int uid, boolean doit) { - // Force stop the specified packages - int userId = intent.getIntExtra(Intent.EXTRA_USER_HANDLE, 0); - if (packages != null) { - for (String pkg : packages) { - synchronized (ActivityManagerService.this) { - if (forceStopPackageLocked(pkg, -1, false, false, false, false, false, - userId, "finished booting")) { - return true; - } - } - } - } - return false; - } - }; - public void setSystemProcess() { try { ServiceManager.addService(Context.ACTIVITY_SERVICE, this, true); @@ -6166,8 +6078,26 @@ public final class ActivityManagerService extends ActivityManagerNative } } - // Register receivers to handle package update events - mPackageMonitor.register(mContext, Looper.getMainLooper(), UserHandle.ALL, false); + IntentFilter pkgFilter = new IntentFilter(); + pkgFilter.addAction(Intent.ACTION_QUERY_PACKAGE_RESTART); + pkgFilter.addDataScheme("package"); + mContext.registerReceiver(new BroadcastReceiver() { + @Override + public void onReceive(Context context, Intent intent) { + String[] pkgs = intent.getStringArrayExtra(Intent.EXTRA_PACKAGES); + if (pkgs != null) { + for (String pkg : pkgs) { + synchronized (ActivityManagerService.this) { + if (forceStopPackageLocked(pkg, -1, false, false, false, false, false, + 0, "finished booting")) { + setResultCode(Activity.RESULT_OK); + return; + } + } + } + } + } + }, pkgFilter); // Let system services know. mSystemServiceManager.startBootPhase(SystemService.PHASE_BOOT_COMPLETED); @@ -8401,6 +8331,47 @@ public final class ActivityManagerService extends ActivityManagerNative } } + private void removeTasksByPackageNameLocked(String packageName, int userId) { + // Remove all tasks with activities in the specified package from the list of recent tasks + for (int i = mRecentTasks.size() - 1; i >= 0; i--) { + TaskRecord tr = mRecentTasks.get(i); + if (tr.userId != userId) continue; + + ComponentName cn = tr.intent.getComponent(); + if (cn != null && cn.getPackageName().equals(packageName)) { + // If the package name matches, remove the task. + removeTaskByIdLocked(tr.taskId, true); + } + } + } + + private void removeTasksByRemovedPackageComponentsLocked(String packageName, int userId) { + final IPackageManager pm = AppGlobals.getPackageManager(); + final HashSet<ComponentName> componentsKnownToExist = new HashSet<ComponentName>(); + + for (int i = mRecentTasks.size() - 1; i >= 0; i--) { + TaskRecord tr = mRecentTasks.get(i); + if (tr.userId != userId) continue; + + ComponentName cn = tr.intent.getComponent(); + if (cn != null && cn.getPackageName().equals(packageName)) { + // Skip if component still exists in the package. + if (componentsKnownToExist.contains(cn)) continue; + + try { + ActivityInfo info = pm.getActivityInfo(cn, 0, userId); + if (info != null) { + componentsKnownToExist.add(cn); + } else { + removeTaskByIdLocked(tr.taskId, false); + } + } catch (RemoteException e) { + Log.e(TAG, "Activity info query failed. component=" + cn, e); + } + } + } + } + /** * Removes the task with the specified task id. * @@ -8460,6 +8431,7 @@ public final class ActivityManagerService extends ActivityManagerNative try { final TaskRecord task = mStackSupervisor.anyTaskForIdLocked(taskId); if (task == null) { + Slog.d(TAG, "Could not find task for id: "+ taskId); return; } if (mStackSupervisor.isLockTaskModeViolation(task)) { @@ -11249,13 +11221,18 @@ public final class ActivityManagerService extends ActivityManagerNative try { if (AppGlobals.getPackageManager().hasSystemUidErrors()) { - Message msg = Message.obtain(); - msg.what = SHOW_UID_ERROR_MSG; - mHandler.sendMessage(msg); + Slog.e(TAG, "UIDs on the system are inconsistent, you need to wipe your" + + " data partition or your device will be unstable."); + mHandler.obtainMessage(SHOW_UID_ERROR_MSG).sendToTarget(); } } catch (RemoteException e) { } + if (!Build.isFingerprintConsistent()) { + Slog.e(TAG, "Build fingerprint is not consistent, warning user"); + mHandler.obtainMessage(SHOW_FINGERPRINT_ERROR_MSG).sendToTarget(); + } + long ident = Binder.clearCallingIdentity(); try { Intent intent = new Intent(Intent.ACTION_USER_STARTED); @@ -13961,7 +13938,9 @@ public final class ActivityManagerService extends ActivityManagerNative ArrayList<MemItem> procMems = new ArrayList<MemItem>(); final SparseArray<MemItem> procMemsMap = new SparseArray<MemItem>(); - long nativePss=0, dalvikPss=0, otherPss=0; + long nativePss = 0; + long dalvikPss = 0; + long otherPss = 0; long[] miscPss = new long[Debug.MemoryInfo.NUM_OTHER_STATS]; long oomPss[] = new long[DUMP_MEM_OOM_LABEL.length]; @@ -15660,128 +15639,135 @@ public final class ActivityManagerService extends ActivityManagerNative } } - // Handle special intents: if this broadcast is from the package - // manager about a package being removed, we need to remove all of - // its activities from the history stack. - final boolean uidRemoved = Intent.ACTION_UID_REMOVED.equals( - intent.getAction()); - if (Intent.ACTION_PACKAGE_REMOVED.equals(intent.getAction()) - || Intent.ACTION_PACKAGE_CHANGED.equals(intent.getAction()) - || Intent.ACTION_EXTERNAL_APPLICATIONS_UNAVAILABLE.equals(intent.getAction()) - || Intent.ACTION_EXTERNAL_APPLICATIONS_AVAILABLE.equals(intent.getAction()) - || uidRemoved) { - if (checkComponentPermission( - android.Manifest.permission.BROADCAST_PACKAGE_REMOVED, - callingPid, callingUid, -1, true) - == PackageManager.PERMISSION_GRANTED) { - if (uidRemoved) { - final Bundle intentExtras = intent.getExtras(); - final int uid = intentExtras != null - ? intentExtras.getInt(Intent.EXTRA_UID) : -1; - if (uid >= 0) { - BatteryStatsImpl bs = mBatteryStatsService.getActiveStatistics(); - synchronized (bs) { - bs.removeUidStatsLocked(uid); - } - mAppOpsService.uidRemoved(uid); + final String action = intent.getAction(); + if (action != null) { + switch (action) { + case Intent.ACTION_UID_REMOVED: + case Intent.ACTION_PACKAGE_REMOVED: + case Intent.ACTION_PACKAGE_CHANGED: + case Intent.ACTION_EXTERNAL_APPLICATIONS_UNAVAILABLE: + case Intent.ACTION_EXTERNAL_APPLICATIONS_AVAILABLE: + // Handle special intents: if this broadcast is from the package + // manager about a package being removed, we need to remove all of + // its activities from the history stack. + if (checkComponentPermission( + android.Manifest.permission.BROADCAST_PACKAGE_REMOVED, + callingPid, callingUid, -1, true) + != PackageManager.PERMISSION_GRANTED) { + String msg = "Permission Denial: " + intent.getAction() + + " broadcast from " + callerPackage + " (pid=" + callingPid + + ", uid=" + callingUid + ")" + + " requires " + + android.Manifest.permission.BROADCAST_PACKAGE_REMOVED; + Slog.w(TAG, msg); + throw new SecurityException(msg); } - } else { - // If resources are unavailable just force stop all - // those packages and flush the attribute cache as well. - if (Intent.ACTION_EXTERNAL_APPLICATIONS_UNAVAILABLE.equals(intent.getAction())) { - String list[] = intent.getStringArrayExtra(Intent.EXTRA_CHANGED_PACKAGE_LIST); - if (list != null && (list.length > 0)) { - for (String pkg : list) { - forceStopPackageLocked(pkg, -1, false, true, true, false, false, userId, - "storage unmount"); + switch (action) { + case Intent.ACTION_UID_REMOVED: + final Bundle intentExtras = intent.getExtras(); + final int uid = intentExtras != null + ? intentExtras.getInt(Intent.EXTRA_UID) : -1; + if (uid >= 0) { + BatteryStatsImpl bs = mBatteryStatsService.getActiveStatistics(); + synchronized (bs) { + bs.removeUidStatsLocked(uid); + } + mAppOpsService.uidRemoved(uid); } - cleanupRecentTasksLocked(UserHandle.USER_ALL); - sendPackageBroadcastLocked( - IApplicationThread.EXTERNAL_STORAGE_UNAVAILABLE, list, userId); - } - } else if (Intent.ACTION_EXTERNAL_APPLICATIONS_AVAILABLE.equals( - intent.getAction())) { - cleanupRecentTasksLocked(UserHandle.USER_ALL); - } else { - Uri data = intent.getData(); - String ssp; - if (data != null && (ssp=data.getSchemeSpecificPart()) != null) { - boolean removed = Intent.ACTION_PACKAGE_REMOVED.equals( - intent.getAction()); - boolean fullUninstall = removed && - !intent.getBooleanExtra(Intent.EXTRA_REPLACING, false); - if (!intent.getBooleanExtra(Intent.EXTRA_DONT_KILL_APP, false)) { - forceStopPackageLocked(ssp, UserHandle.getAppId( - intent.getIntExtra(Intent.EXTRA_UID, -1)), false, true, true, - false, fullUninstall, userId, - removed ? "pkg removed" : "pkg changed"); + break; + case Intent.ACTION_EXTERNAL_APPLICATIONS_UNAVAILABLE: + // If resources are unavailable just force stop all those packages + // and flush the attribute cache as well. + String list[] = + intent.getStringArrayExtra(Intent.EXTRA_CHANGED_PACKAGE_LIST); + if (list != null && list.length > 0) { + for (int i = 0; i < list.length; i++) { + forceStopPackageLocked(list[i], -1, false, true, true, + false, false, userId, "storage unmount"); + } + cleanupRecentTasksLocked(UserHandle.USER_ALL); + sendPackageBroadcastLocked( + IApplicationThread.EXTERNAL_STORAGE_UNAVAILABLE, list, + userId); } - if (removed) { - sendPackageBroadcastLocked(IApplicationThread.PACKAGE_REMOVED, - new String[] {ssp}, userId); - if (!intent.getBooleanExtra(Intent.EXTRA_REPLACING, false)) { - mAppOpsService.packageRemoved( - intent.getIntExtra(Intent.EXTRA_UID, -1), ssp); - - // Remove all permissions granted from/to this package - removeUriPermissionsForPackageLocked(ssp, userId, true); + break; + case Intent.ACTION_EXTERNAL_APPLICATIONS_AVAILABLE: + cleanupRecentTasksLocked(UserHandle.USER_ALL); + break; + case Intent.ACTION_PACKAGE_REMOVED: + case Intent.ACTION_PACKAGE_CHANGED: + Uri data = intent.getData(); + String ssp; + if (data != null && (ssp=data.getSchemeSpecificPart()) != null) { + boolean removed = Intent.ACTION_PACKAGE_REMOVED.equals(action); + boolean fullUninstall = removed && + !intent.getBooleanExtra(Intent.EXTRA_REPLACING, false); + if (!intent.getBooleanExtra(Intent.EXTRA_DONT_KILL_APP, false)) { + forceStopPackageLocked(ssp, UserHandle.getAppId( + intent.getIntExtra(Intent.EXTRA_UID, -1)), + false, true, true, false, fullUninstall, userId, + removed ? "pkg removed" : "pkg changed"); + } + if (removed) { + sendPackageBroadcastLocked(IApplicationThread.PACKAGE_REMOVED, + new String[] {ssp}, userId); + if (fullUninstall) { + mAppOpsService.packageRemoved( + intent.getIntExtra(Intent.EXTRA_UID, -1), ssp); + + // Remove all permissions granted from/to this package + removeUriPermissionsForPackageLocked(ssp, userId, true); + + removeTasksByPackageNameLocked(ssp, userId); + } + } else { + removeTasksByRemovedPackageComponentsLocked(ssp, userId); } } + break; + } + break; + case Intent.ACTION_PACKAGE_ADDED: + // Special case for adding a package: by default turn on compatibility mode. + Uri data = intent.getData(); + String ssp; + if (data != null && (ssp = data.getSchemeSpecificPart()) != null) { + final boolean replacing = + intent.getBooleanExtra(Intent.EXTRA_REPLACING, false); + mCompatModePackages.handlePackageAddedLocked(ssp, replacing); + + if (replacing) { + removeTasksByRemovedPackageComponentsLocked(ssp, userId); } } - } - } else { - String msg = "Permission Denial: " + intent.getAction() - + " broadcast from " + callerPackage + " (pid=" + callingPid - + ", uid=" + callingUid + ")" - + " requires " - + android.Manifest.permission.BROADCAST_PACKAGE_REMOVED; - Slog.w(TAG, msg); - throw new SecurityException(msg); - } - - // Special case for adding a package: by default turn on compatibility - // mode. - } else if (Intent.ACTION_PACKAGE_ADDED.equals(intent.getAction())) { - Uri data = intent.getData(); - String ssp; - if (data != null && (ssp=data.getSchemeSpecificPart()) != null) { - mCompatModePackages.handlePackageAddedLocked(ssp, - intent.getBooleanExtra(Intent.EXTRA_REPLACING, false)); - } - } - - /* - * If this is the time zone changed action, queue up a message that will reset the timezone - * of all currently running processes. This message will get queued up before the broadcast - * happens. - */ - if (Intent.ACTION_TIMEZONE_CHANGED.equals(intent.getAction())) { - mHandler.sendEmptyMessage(UPDATE_TIME_ZONE); - } - - /* - * If the user set the time, let all running processes know. - */ - if (Intent.ACTION_TIME_CHANGED.equals(intent.getAction())) { - final int is24Hour = intent.getBooleanExtra( - Intent.EXTRA_TIME_PREF_24_HOUR_FORMAT, false) ? 1 : 0; - mHandler.sendMessage(mHandler.obtainMessage(UPDATE_TIME, is24Hour, 0)); - BatteryStatsImpl stats = mBatteryStatsService.getActiveStatistics(); - synchronized (stats) { - stats.noteCurrentTimeChangedLocked(); + break; + case Intent.ACTION_TIMEZONE_CHANGED: + // If this is the time zone changed action, queue up a message that will reset + // the timezone of all currently running processes. This message will get + // queued up before the broadcast happens. + mHandler.sendEmptyMessage(UPDATE_TIME_ZONE); + break; + case Intent.ACTION_TIME_CHANGED: + // If the user set the time, let all running processes know. + final int is24Hour = + intent.getBooleanExtra(Intent.EXTRA_TIME_PREF_24_HOUR_FORMAT, false) ? 1 + : 0; + mHandler.sendMessage(mHandler.obtainMessage(UPDATE_TIME, is24Hour, 0)); + BatteryStatsImpl stats = mBatteryStatsService.getActiveStatistics(); + synchronized (stats) { + stats.noteCurrentTimeChangedLocked(); + } + break; + case Intent.ACTION_CLEAR_DNS_CACHE: + mHandler.sendEmptyMessage(CLEAR_DNS_CACHE_MSG); + break; + case Proxy.PROXY_CHANGE_ACTION: + ProxyInfo proxy = intent.getParcelableExtra(Proxy.EXTRA_PROXY_INFO); + mHandler.sendMessage(mHandler.obtainMessage(UPDATE_HTTP_PROXY_MSG, proxy)); + break; } } - if (Intent.ACTION_CLEAR_DNS_CACHE.equals(intent.getAction())) { - mHandler.sendEmptyMessage(CLEAR_DNS_CACHE_MSG); - } - - if (Proxy.PROXY_CHANGE_ACTION.equals(intent.getAction())) { - ProxyInfo proxy = intent.getParcelableExtra(Proxy.EXTRA_PROXY_INFO); - mHandler.sendMessage(mHandler.obtainMessage(UPDATE_HTTP_PROXY_MSG, proxy)); - } - // Add to the sticky list if requested. if (sticky) { if (checkPermission(android.Manifest.permission.BROADCAST_STICKY, diff --git a/services/core/java/com/android/server/am/ActivityStackSupervisor.java b/services/core/java/com/android/server/am/ActivityStackSupervisor.java index 120002e419d8..38809cb5e467 100644 --- a/services/core/java/com/android/server/am/ActivityStackSupervisor.java +++ b/services/core/java/com/android/server/am/ActivityStackSupervisor.java @@ -121,7 +121,7 @@ public final class ActivityStackSupervisor implements DisplayListener { static final boolean DEBUG_RELEASE = DEBUG || false; static final boolean DEBUG_SAVED_STATE = DEBUG || false; static final boolean DEBUG_SCREENSHOTS = DEBUG || false; - static final boolean DEBUG_STATES = DEBUG || true; + static final boolean DEBUG_STATES = DEBUG || false; static final boolean DEBUG_VISIBLE_BEHIND = DEBUG || false; public static final int HOME_STACK_ID = 0; diff --git a/services/core/java/com/android/server/connectivity/Nat464Xlat.java b/services/core/java/com/android/server/connectivity/Nat464Xlat.java index 576556b30648..3fa21d09ee75 100644 --- a/services/core/java/com/android/server/connectivity/Nat464Xlat.java +++ b/services/core/java/com/android/server/connectivity/Nat464Xlat.java @@ -63,8 +63,8 @@ public class Nat464Xlat extends BaseNetworkObserver { // - Idle: start() not called. Everything is null. // - Starting: start() called. Interfaces are non-null. isStarted() returns true. // mIsRunning is false. - // - Running: start() called, and interfaceAdded() told us that mIface is up. Clat IP address - // is non-null. mIsRunning is true. + // - Running: start() called, and interfaceLinkStateChanged() told us that mIface is up. + // mIsRunning is true. // // Once mIface is non-null and isStarted() is true, methods called by ConnectivityService on // its handler thread must not modify any internal state variables; they are only updated by the @@ -236,10 +236,10 @@ public class Nat464Xlat extends BaseNetworkObserver { } @Override - public void interfaceAdded(String iface) { + public void interfaceLinkStateChanged(String iface, boolean up) { // Called by the InterfaceObserver on its own thread, so can race with stop(). - if (isStarted() && mIface.equals(iface)) { - Slog.i(TAG, "interface " + iface + " added, mIsRunning " + mIsRunning + "->true"); + if (isStarted() && up && mIface.equals(iface)) { + Slog.i(TAG, "interface " + iface + " is up, mIsRunning " + mIsRunning + "->true"); if (!mIsRunning) { LinkAddress clatAddress = getLinkAddress(iface); diff --git a/services/core/java/com/android/server/connectivity/Vpn.java b/services/core/java/com/android/server/connectivity/Vpn.java index 83756aa8cd06..03c05ecd464d 100644 --- a/services/core/java/com/android/server/connectivity/Vpn.java +++ b/services/core/java/com/android/server/connectivity/Vpn.java @@ -23,6 +23,7 @@ import static android.net.RouteInfo.RTN_UNREACHABLE; import static android.system.OsConstants.AF_INET; import static android.system.OsConstants.AF_INET6; +import android.Manifest; import android.app.AppGlobals; import android.app.AppOpsManager; import android.app.PendingIntent; @@ -739,31 +740,7 @@ public class Vpn { }; private void enforceControlPermission() { - // System user is allowed to control VPN. - if (Binder.getCallingUid() == Process.SYSTEM_UID) { - return; - } - int appId = UserHandle.getAppId(Binder.getCallingUid()); - final long token = Binder.clearCallingIdentity(); - try { - // System VPN dialogs are also allowed to control VPN. - PackageManager pm = mContext.getPackageManager(); - ApplicationInfo app = pm.getApplicationInfo(VpnConfig.DIALOGS_PACKAGE, 0); - if (((app.flags & ApplicationInfo.FLAG_SYSTEM) != 0) && (appId == app.uid)) { - return; - } - // SystemUI dialogs are also allowed to control VPN. - ApplicationInfo sysUiApp = pm.getApplicationInfo("com.android.systemui", 0); - if (((sysUiApp.flags & ApplicationInfo.FLAG_SYSTEM) != 0) && (appId == sysUiApp.uid)) { - return; - } - } catch (Exception e) { - // ignore - } finally { - Binder.restoreCallingIdentity(token); - } - - throw new SecurityException("Unauthorized Caller"); + mContext.enforceCallingPermission(Manifest.permission.CONTROL_VPN, "Unauthorized Caller"); } private class Connection implements ServiceConnection { diff --git a/services/core/java/com/android/server/display/DisplayPowerController.java b/services/core/java/com/android/server/display/DisplayPowerController.java index 81cd94b16f28..78610ff71bd1 100644 --- a/services/core/java/com/android/server/display/DisplayPowerController.java +++ b/services/core/java/com/android/server/display/DisplayPowerController.java @@ -582,11 +582,8 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call state = mPowerState.getScreenState(); // Use zero brightness when screen is off. - // Use full brightness when screen brightness is boosted. if (state == Display.STATE_OFF) { brightness = PowerManager.BRIGHTNESS_OFF; - } else if (mPowerRequest.boostScreenBrightness) { - brightness = PowerManager.BRIGHTNESS_ON; } // Configure auto-brightness. @@ -601,6 +598,16 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call mPowerRequest.screenAutoBrightnessAdjustment, state != Display.STATE_ON); } + // Apply brightness boost. + // We do this here after configuring auto-brightness so that we don't + // disable the light sensor during this temporary state. That way when + // boost ends we will be able to resume normal auto-brightness behavior + // without any delay. + if (mPowerRequest.boostScreenBrightness + && brightness != PowerManager.BRIGHTNESS_OFF) { + brightness = PowerManager.BRIGHTNESS_ON; + } + // Apply auto-brightness. boolean slowChange = false; if (brightness < 0) { @@ -662,11 +669,13 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call // Animate the screen brightness when the screen is on or dozing. // Skip the animation when the screen is off or suspended. - if (state == Display.STATE_ON || state == Display.STATE_DOZE) { - animateScreenBrightness(brightness, - slowChange ? BRIGHTNESS_RAMP_RATE_SLOW : BRIGHTNESS_RAMP_RATE_FAST); - } else { - animateScreenBrightness(brightness, 0); + if (!mPendingScreenOff) { + if (state == Display.STATE_ON || state == Display.STATE_DOZE) { + animateScreenBrightness(brightness, + slowChange ? BRIGHTNESS_RAMP_RATE_SLOW : BRIGHTNESS_RAMP_RATE_FAST); + } else { + animateScreenBrightness(brightness, 0); + } } // Determine whether the display is ready for use in the newly requested state. diff --git a/services/core/java/com/android/server/display/VirtualDisplayAdapter.java b/services/core/java/com/android/server/display/VirtualDisplayAdapter.java index 0232bad0605c..28d5fc03af0e 100644 --- a/services/core/java/com/android/server/display/VirtualDisplayAdapter.java +++ b/services/core/java/com/android/server/display/VirtualDisplayAdapter.java @@ -23,6 +23,7 @@ import android.media.projection.IMediaProjection; import android.media.projection.IMediaProjectionCallback; import android.os.Handler; import android.os.IBinder; +import android.os.SystemProperties; import android.os.IBinder.DeathRecipient; import android.os.Message; import android.os.RemoteException; @@ -278,6 +279,15 @@ final class VirtualDisplayAdapter extends DisplayAdapter { } if ((mFlags & DisplayManager.VIRTUAL_DISPLAY_FLAG_PRESENTATION) != 0) { mInfo.flags |= DisplayDeviceInfo.FLAG_PRESENTATION; + + if ((mFlags & DisplayManager.VIRTUAL_DISPLAY_FLAG_PUBLIC) != 0) { + // For demonstration purposes, allow rotation of the external display. + // In the future we might allow the user to configure this directly. + if ("portrait".equals(SystemProperties.get( + "persist.demo.remoterotation"))) { + mInfo.rotation = Surface.ROTATION_270; + } + } } mInfo.type = Display.TYPE_VIRTUAL; mInfo.touch = DisplayDeviceInfo.TOUCH_NONE; diff --git a/services/core/java/com/android/server/hdmi/DelayedMessageBuffer.java b/services/core/java/com/android/server/hdmi/DelayedMessageBuffer.java new file mode 100644 index 000000000000..68311defd3eb --- /dev/null +++ b/services/core/java/com/android/server/hdmi/DelayedMessageBuffer.java @@ -0,0 +1,133 @@ +/* + * 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 com.android.server.hdmi; + +import android.hardware.hdmi.HdmiDeviceInfo; +import android.util.Slog; + +import java.util.ArrayList; +import java.util.Iterator; + +/** + * Buffer storage to keep incoming messages for later processing. Used to + * handle messages that arrive when the device is not ready. Useful when + * keeping the messages from a connected device which are not discovered yet. + */ +final class DelayedMessageBuffer { + private final ArrayList<HdmiCecMessage> mBuffer = new ArrayList<>(); + private final HdmiCecLocalDevice mDevice; + + DelayedMessageBuffer(HdmiCecLocalDevice device) { + mDevice = device; + } + + /** + * Add a new message to the buffer. The buffer keeps selected messages in + * the order they are received. + * + * @param message {@link HdmiCecMessage} to add + */ + void add(HdmiCecMessage message) { + boolean buffered = true; + + // Note that all the messages are not handled in the same manner. + // For <Active Source> we keep the latest one only. + // TODO: This might not be the best way to choose the active source. + // Devise a better way to pick up the best one. + switch (message.getOpcode()) { + case Constants.MESSAGE_ACTIVE_SOURCE: + removeActiveSource(); + mBuffer.add(message); + break; + case Constants.MESSAGE_INITIATE_ARC: + mBuffer.add(message); + break; + default: + buffered = false; + break; + } + if (buffered) { + HdmiLogger.debug("Buffering message:" + message); + } + } + + private void removeActiveSource() { + // Uses iterator to remove elements while looping through the list. + for (Iterator<HdmiCecMessage> iter = mBuffer.iterator(); iter.hasNext(); ) { + HdmiCecMessage message = iter.next(); + if (message.getOpcode() == Constants.MESSAGE_ACTIVE_SOURCE) { + iter.remove(); + } + } + } + + void processAllMessages() { + for (HdmiCecMessage message : mBuffer) { + mDevice.onMessage(message); + HdmiLogger.debug("Processing message:" + message); + } + mBuffer.clear(); + } + + /** + * Process messages from a given logical device. Called by + * {@link NewDeviceAction} actions when they finish adding the device + * information. + * <p><Active Source> is not processed in this method but processed + * separately via {@link #processActiveSource()}. + * + * @param address logical address of CEC device which the messages to process + * are associated with + */ + void processMessagesForDevice(int address) { + HdmiLogger.debug("Processing message for address:" + address); + for (Iterator<HdmiCecMessage> iter = mBuffer.iterator(); iter.hasNext(); ) { + HdmiCecMessage message = iter.next(); + if (message.getOpcode() == Constants.MESSAGE_ACTIVE_SOURCE) { + continue; + } + if (message.getSource() == address) { + mDevice.onMessage(message); + HdmiLogger.debug("Processing message:" + message); + iter.remove(); + } + } + } + + /** + * Process <Active Source>. + * + * <p>The message has a dependency on TV input framework. Should be invoked + * after we get the callback + * {@link android.media.tv.TvInputManager.TvInputCallback#onInputAdded(String)} + * to ensure the processing of the message takes effect when transformed + * to input change callback. + * + * @param address logical address of the device to be the active source + */ + void processActiveSource(int address) { + for (Iterator<HdmiCecMessage> iter = mBuffer.iterator(); iter.hasNext(); ) { + HdmiCecMessage message = iter.next(); + if (message.getOpcode() == Constants.MESSAGE_ACTIVE_SOURCE + && message.getSource() == address) { + mDevice.onMessage(message); + HdmiLogger.debug("Processing message:" + message); + iter.remove(); + } + } + } +} diff --git a/services/core/java/com/android/server/hdmi/DeviceDiscoveryAction.java b/services/core/java/com/android/server/hdmi/DeviceDiscoveryAction.java index 2ec9778695a4..da404c4324a2 100644 --- a/services/core/java/com/android/server/hdmi/DeviceDiscoveryAction.java +++ b/services/core/java/com/android/server/hdmi/DeviceDiscoveryAction.java @@ -326,6 +326,8 @@ final class DeviceDiscoveryAction extends HdmiCecFeatureAction { Slog.v(TAG, "--------------------------------------------"); mCallback.onDeviceDiscoveryDone(result); finish(); + // Process any commands buffered while device discovery action was in progress. + tv().processAllDelayedMessages(); } private void checkAndProceedStage() { diff --git a/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java b/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java index 65361656abaf..0cdb4d56369b 100644 --- a/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java +++ b/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java @@ -30,6 +30,8 @@ import static android.hardware.hdmi.HdmiControlManager.TIMER_RECORDING_TYPE_ANAL import static android.hardware.hdmi.HdmiControlManager.TIMER_RECORDING_TYPE_DIGITAL; import static android.hardware.hdmi.HdmiControlManager.TIMER_RECORDING_TYPE_EXTERNAL; +import android.annotation.Nullable; +import android.content.Context; import android.hardware.hdmi.HdmiControlManager; import android.hardware.hdmi.HdmiDeviceInfo; import android.hardware.hdmi.HdmiRecordSources; @@ -37,6 +39,9 @@ import android.hardware.hdmi.HdmiTimerRecordSources; import android.hardware.hdmi.IHdmiControlCallback; import android.media.AudioManager; import android.media.AudioSystem; +import android.media.tv.TvInputInfo; +import android.media.tv.TvInputManager; +import android.media.tv.TvInputManager.TvInputCallback; import android.os.RemoteException; import android.os.SystemProperties; import android.provider.Settings.Global; @@ -49,6 +54,7 @@ import com.android.internal.util.IndentingPrintWriter; import com.android.server.hdmi.DeviceDiscoveryAction.DeviceDiscoveryCallback; import com.android.server.hdmi.HdmiAnnotations.ServiceThreadOnly; import com.android.server.hdmi.HdmiControlService.SendMessageCallback; +import com.android.server.SystemService; import java.io.UnsupportedEncodingException; import java.util.ArrayList; @@ -123,6 +129,26 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice { // other CEC devices since they might not have logical address. private final ArraySet<Integer> mCecSwitches = new ArraySet<Integer>(); + // Message buffer used to buffer selected messages to process later. <Active Source> + // from a source device, for instance, needs to be buffered if the device is not + // discovered yet. The buffered commands are taken out and when they are ready to + // handle. + private final DelayedMessageBuffer mDelayedMessageBuffer = new DelayedMessageBuffer(this); + + // Defines the callback invoked when TV input framework is updated with input status. + // We are interested in the notification for HDMI input addition event, in order to + // process any CEC commands that arrived before the input is added. + private final TvInputCallback mTvInputCallback = new TvInputCallback() { + @Override + public void onInputAdded(String inputId) { + TvInputInfo tvInfo = mService.getTvInputManager().getTvInputInfo(inputId); + HdmiDeviceInfo info = tvInfo.getHdmiDeviceInfo(); + if (info != null && info.isCecDevice()) { + mDelayedMessageBuffer.processActiveSource(info.getLogicalAddress()); + } + } + }; + HdmiCecLocalDeviceTv(HdmiControlService service) { super(service, HdmiDeviceInfo.DEVICE_TV); mPrevPortId = Constants.INVALID_PORT_ID; @@ -136,6 +162,7 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice { @ServiceThreadOnly protected void onAddressAllocated(int logicalAddress, int reason) { assertRunOnServiceThread(); + mService.registerTvInputCallback(mTvInputCallback); mService.sendCecCommand(HdmiCecMessageBuilder.buildReportPhysicalAddressCommand( mAddress, mService.getPhysicalAddress(), mDeviceType)); mService.sendCecCommand(HdmiCecMessageBuilder.buildDeviceVendorIdCommand( @@ -407,7 +434,9 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice { int physicalAddress = HdmiUtils.twoBytesToInt(message.getParams()); HdmiDeviceInfo info = getCecDeviceInfo(logicalAddress); if (info == null) { - handleNewDeviceAtTheTailOfActivePath(physicalAddress); + if (!handleNewDeviceAtTheTailOfActivePath(physicalAddress)) { + mDelayedMessageBuffer.add(message); + } } else { ActiveSource activeSource = ActiveSource.of(logicalAddress, physicalAddress); ActiveSourceHandler.create(this, null).process(activeSource, info.getDeviceType()); @@ -555,7 +584,7 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice { activeSource.physicalAddress, deviceType)); } - private void handleNewDeviceAtTheTailOfActivePath(int path) { + private boolean handleNewDeviceAtTheTailOfActivePath(int path) { // Seq #22 if (isTailOfActivePath(path, getActivePath())) { removeAction(RoutingControlAction.class); @@ -564,7 +593,9 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice { mService.sendCecCommand(HdmiCecMessageBuilder.buildRoutingChange( mAddress, getActivePath(), newPath)); addAndStartAction(new RoutingControlAction(this, newPath, false, null)); + return true; } + return false; } /** @@ -706,8 +737,10 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice { @ServiceThreadOnly void onNewAvrAdded(HdmiDeviceInfo avr) { assertRunOnServiceThread(); - addAndStartAction(new SystemAudioAutoInitiationAction(this, avr.getLogicalAddress())); - if (isArcFeatureEnabled()) { + if (getSystemAudioModeSetting()) { + addAndStartAction(new SystemAudioAutoInitiationAction(this, avr.getLogicalAddress())); + } + if (isArcFeatureEnabled() && !hasAction(SetArcTransmissionStateAction.class)) { startArcAction(true); } } @@ -941,6 +974,11 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice { assertRunOnServiceThread(); if (!canStartArcUpdateAction(message.getSource(), true)) { + if (getAvrDeviceInfo() == null) { + // AVR may not have been discovered yet. Delay the message processing. + mDelayedMessageBuffer.add(message); + return true; + } mService.maySendFeatureAbortCommand(message, Constants.ABORT_REFUSED); if (!isConnectedToArcPort(message.getSource())) { displayOsd(OSD_MESSAGE_ARC_CONNECTED_INVALID_PORT); @@ -1436,6 +1474,7 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice { protected void disableDevice(boolean initiatedByCec, PendingActionClearedCallback callback) { super.disableDevice(initiatedByCec, callback); assertRunOnServiceThread(); + mService.unregisterTvInputCallback(mTvInputCallback); // Remove any repeated working actions. // HotplugDetectionAction will be reinstated during the wake up process. // HdmiControlService.onWakeUp() -> initializeLocalDevices() -> @@ -1714,6 +1753,18 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice { mService.sendCecCommand(HdmiCecMessageBuilder.buildStandby(mAddress, targetAddress)); } + @ServiceThreadOnly + void processAllDelayedMessages() { + assertRunOnServiceThread(); + mDelayedMessageBuffer.processAllMessages(); + } + + @ServiceThreadOnly + void processDelayedMessages(int address) { + assertRunOnServiceThread(); + mDelayedMessageBuffer.processMessagesForDevice(address); + } + @Override protected void dump(final IndentingPrintWriter pw) { super.dump(pw); diff --git a/services/core/java/com/android/server/hdmi/HdmiControlService.java b/services/core/java/com/android/server/hdmi/HdmiControlService.java index 907a49a8d22c..8a25f6251faa 100644 --- a/services/core/java/com/android/server/hdmi/HdmiControlService.java +++ b/services/core/java/com/android/server/hdmi/HdmiControlService.java @@ -48,6 +48,8 @@ import android.hardware.hdmi.IHdmiRecordListener; import android.hardware.hdmi.IHdmiSystemAudioModeChangeListener; import android.hardware.hdmi.IHdmiVendorCommandListener; import android.media.AudioManager; +import android.media.tv.TvInputManager; +import android.media.tv.TvInputManager.TvInputCallback; import android.net.Uri; import android.os.Build; import android.os.Handler; @@ -272,6 +274,9 @@ public final class HdmiControlService extends SystemService { @Nullable private HdmiMhlControllerStub mMhlController; + @Nullable + private TvInputManager mTvInputManager; + // Last input port before switching to the MHL port. Should switch back to this port // when the mobile device sends the request one touch play with off. // Gets invalidated if we go to other port/input. @@ -343,6 +348,28 @@ public final class HdmiControlService extends SystemService { } } + @Override + public void onBootPhase(int phase) { + if (phase == SystemService.PHASE_SYSTEM_SERVICES_READY) { + mTvInputManager = (TvInputManager) getContext().getSystemService( + Context.TV_INPUT_SERVICE); + } + } + + TvInputManager getTvInputManager() { + return mTvInputManager; + } + + void registerTvInputCallback(TvInputCallback callback) { + if (mTvInputManager == null) return; + mTvInputManager.registerCallback(callback, mHandler); + } + + void unregisterTvInputCallback(TvInputCallback callback) { + if (mTvInputManager == null) return; + mTvInputManager.unregisterCallback(callback); + } + /** * Called when the initialization of local devices is complete. */ diff --git a/services/core/java/com/android/server/hdmi/NewDeviceAction.java b/services/core/java/com/android/server/hdmi/NewDeviceAction.java index 998889bc270d..64f070339405 100644 --- a/services/core/java/com/android/server/hdmi/NewDeviceAction.java +++ b/services/core/java/com/android/server/hdmi/NewDeviceAction.java @@ -161,6 +161,9 @@ final class NewDeviceAction extends HdmiCecFeatureAction { mDeviceType, mVendorId, mDisplayName); tv().addCecDevice(deviceInfo); + // Consume CEC messages we already got for this newly found device. + tv().processDelayedMessages(mDeviceLogicalAddress); + if (HdmiUtils.getTypeFromAddress(mDeviceLogicalAddress) == HdmiDeviceInfo.DEVICE_AUDIO_SYSTEM) { tv().onNewAvrAdded(deviceInfo); diff --git a/services/core/java/com/android/server/media/MediaSessionService.java b/services/core/java/com/android/server/media/MediaSessionService.java index 02c9fcb517ac..ba18f48a21e0 100644 --- a/services/core/java/com/android/server/media/MediaSessionService.java +++ b/services/core/java/com/android/server/media/MediaSessionService.java @@ -805,7 +805,12 @@ public class MediaSessionService extends SystemService implements Monitor { + flags + ", suggestedStream=" + suggestedStream); } - if (session == null) { + boolean preferSuggestedStream = false; + if (isValidLocalStreamType(suggestedStream) + && AudioSystem.isStreamActive(suggestedStream, 0)) { + preferSuggestedStream = true; + } + if (session == null || preferSuggestedStream) { if ((flags & AudioManager.FLAG_ACTIVE_MEDIA_ONLY) != 0 && !AudioSystem.isStreamActive(AudioManager.STREAM_MUSIC, 0)) { if (DEBUG) { @@ -959,6 +964,12 @@ public class MediaSessionService extends SystemService implements Monitor { return keyCode == KeyEvent.KEYCODE_HEADSETHOOK; } + // we only handle public stream types, which are 0-5 + private boolean isValidLocalStreamType(int streamType) { + return streamType >= AudioManager.STREAM_VOICE_CALL + && streamType <= AudioManager.STREAM_NOTIFICATION; + } + private KeyEventWakeLockReceiver mKeyEventReceiver = new KeyEventWakeLockReceiver(mHandler); class KeyEventWakeLockReceiver extends ResultReceiver implements Runnable, diff --git a/services/core/java/com/android/server/notification/ConditionProviders.java b/services/core/java/com/android/server/notification/ConditionProviders.java index a1085d32580b..5de1a6423814 100644 --- a/services/core/java/com/android/server/notification/ConditionProviders.java +++ b/services/core/java/com/android/server/notification/ConditionProviders.java @@ -260,9 +260,11 @@ public class ConditionProviders extends ManagedServices { for (int i = 0; i < N; i++) { final Condition c = conditions[i]; final ConditionRecord r = getRecordLocked(c.id, info.component); + final Condition oldCondition = r.condition; + final boolean conditionUpdate = oldCondition != null && !oldCondition.equals(c); r.info = info; r.condition = c; - // if manual, exit zen if false (or failed) + // if manual, exit zen if false (or failed), update if true (and changed) if (r.isManual) { if (c.state == Condition.STATE_FALSE || c.state == Condition.STATE_ERROR) { final boolean failed = c.state == Condition.STATE_ERROR; @@ -275,6 +277,10 @@ public class ConditionProviders extends ManagedServices { "manualConditionExit"); unsubscribeLocked(r); r.isManual = false; + } else if (c.state == Condition.STATE_TRUE && conditionUpdate) { + if (DEBUG) Slog.d(TAG, "Current condition updated, still true. old=" + + oldCondition + " new=" + c); + setZenModeCondition(c, "conditionUpdate"); } } // if automatic, exit zen if false (or failed), enter zen if true @@ -559,7 +565,7 @@ public class ConditionProviders extends ManagedServices { // enter downtime, or update mode if reconfigured during an active downtime if (inDowntime && (mode == Global.ZEN_MODE_OFF || downtimeCurrent) && config != null) { final Condition condition = mDowntime.createCondition(config.toDowntimeInfo(), - Condition.STATE_TRUE); + config.sleepNone, Condition.STATE_TRUE); mZenModeHelper.setZenMode(downtimeMode, "downtimeEnter"); setZenModeCondition(condition, "downtime"); } diff --git a/services/core/java/com/android/server/notification/DowntimeConditionProvider.java b/services/core/java/com/android/server/notification/DowntimeConditionProvider.java index 0fb5732dae50..097589a764b1 100644 --- a/services/core/java/com/android/server/notification/DowntimeConditionProvider.java +++ b/services/core/java/com/android/server/notification/DowntimeConditionProvider.java @@ -122,7 +122,8 @@ public class DowntimeConditionProvider extends ConditionProviderService { if (DEBUG) Slog.d(TAG, "onRequestConditions relevance=" + relevance); if ((relevance & Condition.FLAG_RELEVANT_NOW) != 0) { if (isInDowntime() && mConfig != null) { - notifyCondition(createCondition(mConfig.toDowntimeInfo(), Condition.STATE_TRUE)); + notifyCondition(createCondition(mConfig.toDowntimeInfo(), mConfig.sleepNone, + Condition.STATE_TRUE)); } } } @@ -135,7 +136,7 @@ public class DowntimeConditionProvider extends ConditionProviderService { final int state = mConfig.toDowntimeInfo().equals(downtime) && isInDowntime() ? Condition.STATE_TRUE : Condition.STATE_FALSE; if (DEBUG) Slog.d(TAG, "notify condition state: " + Condition.stateToString(state)); - notifyCondition(createCondition(downtime, state)); + notifyCondition(createCondition(downtime, mConfig.sleepNone, state)); } } @@ -157,14 +158,22 @@ public class DowntimeConditionProvider extends ConditionProviderService { return mDowntimeMode != Global.ZEN_MODE_OFF; } - public Condition createCondition(DowntimeInfo downtime, int state) { + public Condition createCondition(DowntimeInfo downtime, boolean orAlarm, int state) { if (downtime == null) return null; final Uri id = ZenModeConfig.toDowntimeConditionId(downtime); final String skeleton = DateFormat.is24HourFormat(mContext) ? "Hm" : "hma"; final Locale locale = Locale.getDefault(); final String pattern = DateFormat.getBestDateTimePattern(locale, skeleton); - final long time = getTime(System.currentTimeMillis(), downtime.endHour, downtime.endMinute); - final String formatted = new SimpleDateFormat(pattern, locale).format(new Date(time)); + final long now = System.currentTimeMillis(); + long endTime = getTime(now, downtime.endHour, downtime.endMinute); + if (orAlarm) { + final AlarmClockInfo nextAlarm = mTracker.getNextAlarm(); + final long nextAlarmTime = nextAlarm != null ? nextAlarm.getTriggerTime() : 0; + if (nextAlarmTime > now && nextAlarmTime < endTime) { + endTime = nextAlarmTime; + } + } + final String formatted = new SimpleDateFormat(pattern, locale).format(new Date(endTime)); final String summary = mContext.getString(R.string.downtime_condition_summary, formatted); final String line1 = mContext.getString(R.string.downtime_condition_line_one); return new Condition(id, summary, line1, formatted, 0, state, Condition.FLAG_RELEVANT_NOW); @@ -302,6 +311,11 @@ public class DowntimeConditionProvider extends ConditionProviderService { private void onEvaluateNextAlarm(AlarmClockInfo nextAlarm, long wakeupTime, boolean booted) { if (!booted) return; // we don't know yet + // update condition description if we're in downtime (mode = none) + if (isInDowntime() && mConfig != null && mConfig.sleepNone) { + notifyCondition(createCondition(mConfig.toDowntimeInfo(), true /*orAlarm*/, + Condition.STATE_TRUE)); + } if (nextAlarm == null) return; // not fireable if (DEBUG) Slog.d(TAG, "onEvaluateNextAlarm " + mTracker.formatAlarmDebug(nextAlarm)); if (System.currentTimeMillis() > wakeupTime) { @@ -336,6 +350,10 @@ public class DowntimeConditionProvider extends ConditionProviderService { } else if (Intent.ACTION_TIMEZONE_CHANGED.equals(action)) { if (DEBUG) Slog.d(TAG, "timezone changed to " + TimeZone.getDefault()); mCalendar.setTimeZone(TimeZone.getDefault()); + mFiredAlarms.clear(); + } else if (Intent.ACTION_TIME_CHANGED.equals(action)) { + if (DEBUG) Slog.d(TAG, "time changed to " + now); + mFiredAlarms.clear(); } else { if (DEBUG) Slog.d(TAG, action + " fired at " + now); } diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index 25c31c1194c7..195a886c8d5b 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -2872,6 +2872,38 @@ public class PackageManagerService extends IPackageManager.Stub { return PackageManager.SIGNATURE_NO_MATCH; } + private boolean isRecoverSignatureUpdateNeeded(PackageParser.Package scannedPkg) { + if (isExternal(scannedPkg)) { + return mSettings.isExternalDatabaseVersionOlderThan( + DatabaseVersion.SIGNATURE_MALFORMED_RECOVER); + } else { + return mSettings.isInternalDatabaseVersionOlderThan( + DatabaseVersion.SIGNATURE_MALFORMED_RECOVER); + } + } + + private int compareSignaturesRecover(PackageSignatures existingSigs, + PackageParser.Package scannedPkg) { + if (!isRecoverSignatureUpdateNeeded(scannedPkg)) { + return PackageManager.SIGNATURE_NO_MATCH; + } + + String msg = null; + try { + if (Signature.areEffectiveMatch(existingSigs.mSignatures, scannedPkg.mSignatures)) { + logCriticalInfo(Log.INFO, "Recovered effectively matching certificates for " + + scannedPkg.packageName); + return PackageManager.SIGNATURE_MATCH; + } + } catch (CertificateException e) { + msg = e.getMessage(); + } + + logCriticalInfo(Log.INFO, + "Failed to recover certificates for " + scannedPkg.packageName + ": " + msg); + return PackageManager.SIGNATURE_NO_MATCH; + } + @Override public String[] getPackagesForUid(int uid) { uid = UserHandle.getAppId(uid); @@ -4160,7 +4192,8 @@ public class PackageManagerService extends IPackageManager.Stub { if (ps != null && ps.codePath.equals(srcFile) && ps.timeStamp == srcFile.lastModified() - && !isCompatSignatureUpdateNeeded(pkg)) { + && !isCompatSignatureUpdateNeeded(pkg) + && !isRecoverSignatureUpdateNeeded(pkg)) { long mSigningKeySetId = ps.keySetData.getProperSigningKeySet(); if (ps.signatures.mSignatures != null && ps.signatures.mSignatures.length != 0 @@ -4245,7 +4278,7 @@ public class PackageManagerService extends IPackageManager.Stub { if (pkg.mVersionCode < ps.versionCode) { // The system package has been updated and the code path does not match // Ignore entry. Skip it. - logCriticalInfo(Log.INFO, "Package " + ps.name + " at " + scanFile + Slog.i(TAG, "Package " + ps.name + " at " + scanFile + " ignored: updated version " + ps.versionCode + " better than this " + pkg.mVersionCode); if (!updatedPkg.codePath.equals(scanFile)) { @@ -4435,6 +4468,10 @@ public class PackageManagerService extends IPackageManager.Stub { == PackageManager.SIGNATURE_MATCH; } if (!match) { + match = compareSignaturesRecover(pkgSetting.signatures, pkg) + == PackageManager.SIGNATURE_MATCH; + } + if (!match) { throw new PackageManagerException(INSTALL_FAILED_UPDATE_INCOMPATIBLE, "Package " + pkg.packageName + " signatures do not match the " + "previously installed version; ignoring!"); @@ -4451,6 +4488,10 @@ public class PackageManagerService extends IPackageManager.Stub { == PackageManager.SIGNATURE_MATCH; } if (!match) { + match = compareSignaturesRecover(pkgSetting.sharedUser.signatures, pkg) + == PackageManager.SIGNATURE_MATCH; + } + if (!match) { throw new PackageManagerException(INSTALL_FAILED_SHARED_USER_INCOMPATIBLE, "Package " + pkg.packageName + " has no signatures that match those in shared user " @@ -5394,6 +5435,9 @@ public class PackageManagerService extends IPackageManager.Stub { if (!pkgSetting.keySetData.isUsingUpgradeKeySets() || pkgSetting.sharedUser != null) { try { verifySignaturesLP(pkgSetting, pkg); + // We just determined the app is signed correctly, so bring + // over the latest parsed certs. + pkgSetting.signatures.mSignatures = pkg.mSignatures; } catch (PackageManagerException e) { if ((parseFlags & PackageParser.PARSE_IS_SYSTEM_DIR) == 0) { throw e; @@ -5426,7 +5470,8 @@ public class PackageManagerService extends IPackageManager.Stub { + pkg.packageName + " upgrade keys do not match the " + "previously installed version"); } else { - // signatures may have changed as result of upgrade + // We just determined the app is signed correctly, so bring + // over the latest parsed certs. pkgSetting.signatures.mSignatures = pkg.mSignatures; } } @@ -6392,7 +6437,7 @@ public class PackageManagerService extends IPackageManager.Stub { mResolveActivity.applicationInfo = pkg.applicationInfo; mResolveActivity.name = mCustomResolverComponentName.getClassName(); mResolveActivity.packageName = pkg.applicationInfo.packageName; - mResolveActivity.processName = null; + mResolveActivity.processName = pkg.applicationInfo.packageName; mResolveActivity.launchMode = ActivityInfo.LAUNCH_MULTIPLE; mResolveActivity.flags = ActivityInfo.FLAG_EXCLUDE_FROM_RECENTS | ActivityInfo.FLAG_FINISH_ON_CLOSE_SYSTEM_DIALOGS; @@ -8937,6 +8982,7 @@ public class PackageManagerService extends IPackageManager.Stub { && isVerificationEnabled(userIdentifier, installFlags)) { final Intent verification = new Intent( Intent.ACTION_PACKAGE_NEEDS_VERIFICATION); + verification.addFlags(Intent.FLAG_RECEIVER_FOREGROUND); verification.setDataAndType(Uri.fromFile(new File(origin.resolvedPath)), PACKAGE_MIME_TYPE); verification.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION); diff --git a/services/core/java/com/android/server/pm/Settings.java b/services/core/java/com/android/server/pm/Settings.java index 200eb5f16afb..f0506a68daa3 100644 --- a/services/core/java/com/android/server/pm/Settings.java +++ b/services/core/java/com/android/server/pm/Settings.java @@ -103,7 +103,7 @@ final class Settings { * Note that care should be taken to make sure all database upgrades are * idempotent. */ - private static final int CURRENT_DATABASE_VERSION = DatabaseVersion.SIGNATURE_END_ENTITY; + private static final int CURRENT_DATABASE_VERSION = DatabaseVersion.SIGNATURE_MALFORMED_RECOVER; /** * This class contains constants that can be referred to from upgrade code. @@ -121,6 +121,14 @@ final class Settings { * just the signing certificate. */ public static final int SIGNATURE_END_ENTITY = 2; + + /** + * There was a window of time in + * {@link android.os.Build.VERSION_CODES#LOLLIPOP} where we persisted + * certificates after potentially mutating them. To switch back to the + * original untouched certificates, we need to force a collection pass. + */ + public static final int SIGNATURE_MALFORMED_RECOVER = 3; } private static final boolean DEBUG_STOPPED = false; diff --git a/services/core/java/com/android/server/pm/UserManagerService.java b/services/core/java/com/android/server/pm/UserManagerService.java index 0cf2249396c0..db0f53bf2f68 100644 --- a/services/core/java/com/android/server/pm/UserManagerService.java +++ b/services/core/java/com/android/server/pm/UserManagerService.java @@ -1298,7 +1298,12 @@ public class UserManagerService extends IUserManager.Stub { if (userHandle == 0 || user == null || mRemovingUserIds.get(userHandle)) { return false; } + + // We remember deleted user IDs to prevent them from being + // reused during the current boot; they can still be reused + // after a reboot. mRemovingUserIds.put(userHandle, true); + try { mAppOpsService.removeUser(userHandle); } catch (RemoteException e) { @@ -1387,18 +1392,6 @@ public class UserManagerService extends IUserManager.Stub { // Remove this user from the list mUsers.remove(userHandle); - // Have user ID linger for several seconds to let external storage VFS - // cache entries expire. This must be greater than the 'entry_valid' - // timeout used by the FUSE daemon. - mHandler.postDelayed(new Runnable() { - @Override - public void run() { - synchronized (mPackagesLock) { - mRemovingUserIds.delete(userHandle); - } - } - }, MINUTE_IN_MILLIS); - mRestrictionsPinStates.remove(userHandle); // Remove user file AtomicFile userFile = new AtomicFile(new File(mUsersDir, userHandle + XML_SUFFIX)); diff --git a/services/core/java/com/android/server/power/PowerManagerService.java b/services/core/java/com/android/server/power/PowerManagerService.java index c054e6c46766..4d8b98f1f23e 100644 --- a/services/core/java/com/android/server/power/PowerManagerService.java +++ b/services/core/java/com/android/server/power/PowerManagerService.java @@ -1234,6 +1234,7 @@ public final class PowerManagerService extends SystemService // Phase 0: Basic state updates. updateIsPoweredLocked(mDirty); updateStayOnLocked(mDirty); + updateScreenBrightnessBoostLocked(mDirty); // Phase 1: Update wakefulness. // Loop because the wake lock and user activity computations are influenced @@ -1641,7 +1642,8 @@ public final class PowerManagerService extends SystemService || mProximityPositive || (mWakeLockSummary & WAKE_LOCK_STAY_AWAKE) != 0 || (mUserActivitySummary & (USER_ACTIVITY_SCREEN_BRIGHT - | USER_ACTIVITY_SCREEN_DIM)) != 0; + | USER_ACTIVITY_SCREEN_DIM)) != 0 + || mScreenBrightnessBoostInProgress; } /** @@ -1828,9 +1830,6 @@ public final class PowerManagerService extends SystemService | DIRTY_SETTINGS | DIRTY_SCREEN_BRIGHTNESS_BOOST)) != 0) { mDisplayPowerRequest.policy = getDesiredScreenPolicyLocked(); - // Handle screen brightness boost timeout. - updateScreenBrightnessBoostLocked(); - // Determine appropriate screen brightness and auto-brightness adjustments. int screenBrightness = mScreenBrightnessSettingDefault; float screenAutoBrightnessAdjustment = 0.0f; @@ -1879,7 +1878,7 @@ public final class PowerManagerService extends SystemService } mDisplayReady = mDisplayManagerInternal.requestPowerState(mDisplayPowerRequest, - mRequestWaitForNegativeProximity) && !mScreenBrightnessBoostInProgress; + mRequestWaitForNegativeProximity); mRequestWaitForNegativeProximity = false; if (DEBUG_SPEW) { @@ -1896,20 +1895,25 @@ public final class PowerManagerService extends SystemService return mDisplayReady && !oldDisplayReady; } - private void updateScreenBrightnessBoostLocked() { - if (mScreenBrightnessBoostInProgress) { - mHandler.removeMessages(MSG_SCREEN_BRIGHTNESS_BOOST_TIMEOUT); - if (mLastScreenBrightnessBoostTime > mLastSleepTime) { - final long boostTimeout = mLastScreenBrightnessBoostTime + - SCREEN_BRIGHTNESS_BOOST_TIMEOUT; - if (boostTimeout > SystemClock.uptimeMillis()) { - Message msg = mHandler.obtainMessage(MSG_SCREEN_BRIGHTNESS_BOOST_TIMEOUT); - msg.setAsynchronous(true); - mHandler.sendMessageAtTime(msg, boostTimeout); - return; + private void updateScreenBrightnessBoostLocked(int dirty) { + if ((dirty & DIRTY_SCREEN_BRIGHTNESS_BOOST) != 0) { + if (mScreenBrightnessBoostInProgress) { + final long now = SystemClock.uptimeMillis(); + mHandler.removeMessages(MSG_SCREEN_BRIGHTNESS_BOOST_TIMEOUT); + if (mLastScreenBrightnessBoostTime > mLastSleepTime) { + final long boostTimeout = mLastScreenBrightnessBoostTime + + SCREEN_BRIGHTNESS_BOOST_TIMEOUT; + if (boostTimeout > now) { + Message msg = mHandler.obtainMessage(MSG_SCREEN_BRIGHTNESS_BOOST_TIMEOUT); + msg.setAsynchronous(true); + mHandler.sendMessageAtTime(msg, boostTimeout); + return; + } } + mScreenBrightnessBoostInProgress = false; + userActivityNoUpdateLocked(now, + PowerManager.USER_ACTIVITY_EVENT_OTHER, 0, Process.SYSTEM_UID); } - mScreenBrightnessBoostInProgress = false; } } @@ -1940,7 +1944,8 @@ public final class PowerManagerService extends SystemService if ((mWakeLockSummary & WAKE_LOCK_SCREEN_BRIGHT) != 0 || (mUserActivitySummary & USER_ACTIVITY_SCREEN_BRIGHT) != 0 - || !mBootCompleted) { + || !mBootCompleted + || mScreenBrightnessBoostInProgress) { return DisplayPowerRequest.POLICY_BRIGHT; } @@ -2037,15 +2042,13 @@ public final class PowerManagerService extends SystemService final boolean needWakeLockSuspendBlocker = ((mWakeLockSummary & WAKE_LOCK_CPU) != 0); final boolean needDisplaySuspendBlocker = needDisplaySuspendBlockerLocked(); final boolean autoSuspend = !needDisplaySuspendBlocker; + final boolean interactive = mDisplayPowerRequest.isBrightOrDim(); // Disable auto-suspend if needed. - if (!autoSuspend) { - if (mDecoupleHalAutoSuspendModeFromDisplayConfig) { - setHalAutoSuspendModeLocked(false); - } - if (mDecoupleHalInteractiveModeFromDisplayConfig) { - setHalInteractiveModeLocked(true); - } + // FIXME We should consider just leaving auto-suspend enabled forever since + // we already hold the necessary wakelocks. + if (!autoSuspend && mDecoupleHalAutoSuspendModeFromDisplayConfig) { + setHalAutoSuspendModeLocked(false); } // First acquire suspend blockers if needed. @@ -2058,6 +2061,22 @@ public final class PowerManagerService extends SystemService mHoldingDisplaySuspendBlocker = true; } + // Inform the power HAL about interactive mode. + // Although we could set interactive strictly based on the wakefulness + // as reported by isInteractive(), it is actually more desirable to track + // the display policy state instead so that the interactive state observed + // by the HAL more accurately tracks transitions between AWAKE and DOZING. + // Refer to getDesiredScreenPolicyLocked() for details. + if (mDecoupleHalInteractiveModeFromDisplayConfig) { + // When becoming non-interactive, we want to defer sending this signal + // until the display is actually ready so that all transitions have + // completed. This is probably a good sign that things have gotten + // too tangled over here... + if (interactive || mDisplayReady) { + setHalInteractiveModeLocked(interactive); + } + } + // Then release suspend blockers if needed. if (!needWakeLockSuspendBlocker && mHoldingWakeLockSuspendBlocker) { mWakeLockSuspendBlocker.release(); @@ -2069,13 +2088,8 @@ public final class PowerManagerService extends SystemService } // Enable auto-suspend if needed. - if (autoSuspend) { - if (mDecoupleHalInteractiveModeFromDisplayConfig) { - setHalInteractiveModeLocked(false); - } - if (mDecoupleHalAutoSuspendModeFromDisplayConfig) { - setHalAutoSuspendModeLocked(true); - } + if (autoSuspend && mDecoupleHalAutoSuspendModeFromDisplayConfig) { + setHalAutoSuspendModeLocked(true); } } @@ -2097,6 +2111,9 @@ public final class PowerManagerService extends SystemService return true; } } + if (mScreenBrightnessBoostInProgress) { + return true; + } // Let the system suspend if the screen is off or dozing. return false; } diff --git a/services/core/java/com/android/server/wm/AccessibilityController.java b/services/core/java/com/android/server/wm/AccessibilityController.java index f947b6ab8654..7e6da8b578b0 100644 --- a/services/core/java/com/android/server/wm/AccessibilityController.java +++ b/services/core/java/com/android/server/wm/AccessibilityController.java @@ -984,12 +984,7 @@ final class AccessibilityController { final int visibleWindowCount = visibleWindows.size(); for (int i = visibleWindowCount - 1; i >= 0; i--) { - WindowState windowState = visibleWindows.valueAt(i); - - // Compute the bounds in the screen. - Rect boundsInScreen = mTempRect; - computeWindowBoundsInScreen(windowState, boundsInScreen); - + final WindowState windowState = visibleWindows.valueAt(i); final int flags = windowState.mAttrs.flags; // If the window is not touchable - ignore. @@ -997,6 +992,16 @@ final class AccessibilityController { continue; } + // If the window is an accessibility overlay - ignore. + if (windowState.mAttrs.type == + WindowManager.LayoutParams.TYPE_ACCESSIBILITY_OVERLAY) { + continue; + } + + // Compute the bounds in the screen. + final Rect boundsInScreen = mTempRect; + computeWindowBoundsInScreen(windowState, boundsInScreen); + // If the window is completely covered by other windows - ignore. if (unaccountedSpace.quickReject(boundsInScreen)) { continue; @@ -1013,14 +1018,8 @@ final class AccessibilityController { } } - // Account for the space this window takes if the window - // is not an accessibility overlay which does not change - // the reported windows. - if (windowState.mAttrs.type == WindowManager.LayoutParams - .TYPE_ACCESSIBILITY_OVERLAY) { - unaccountedSpace.op(boundsInScreen, unaccountedSpace, - Region.Op.REVERSE_DIFFERENCE); - } + unaccountedSpace.op(boundsInScreen, unaccountedSpace, + Region.Op.REVERSE_DIFFERENCE); // We figured out what is touchable for the entire screen - done. if (unaccountedSpace.isEmpty()) { diff --git a/services/core/java/com/android/server/wm/WindowAnimator.java b/services/core/java/com/android/server/wm/WindowAnimator.java index 5deb1cd066ee..fe2e0a65a209 100644 --- a/services/core/java/com/android/server/wm/WindowAnimator.java +++ b/services/core/java/com/android/server/wm/WindowAnimator.java @@ -221,6 +221,24 @@ public class WindowAnimator { } } + private boolean shouldForceHide(WindowState win) { + final WindowState imeTarget = mService.mInputMethodTarget; + final boolean showImeOverKeyguard = imeTarget != null && imeTarget.isVisibleNow() && + (imeTarget.getAttrs().flags & FLAG_SHOW_WHEN_LOCKED) != 0; + + final WindowState winShowWhenLocked = (WindowState) mPolicy.getWinShowWhenLockedLw(); + final AppWindowToken appShowWhenLocked = winShowWhenLocked == null ? + null : winShowWhenLocked.mAppToken; + final boolean hideWhenLocked = + !(((win.mIsImWindow || imeTarget == win) && showImeOverKeyguard) + || (appShowWhenLocked != null && (appShowWhenLocked == win.mAppToken || + // Show error dialogs over apps that dismiss keyguard. + (win.mAttrs.privateFlags & PRIVATE_FLAG_SYSTEM_ERROR) != 0))); + return ((mForceHiding == KEYGUARD_ANIMATING_IN) + && (!win.mWinAnimator.isAnimating() || hideWhenLocked)) + || ((mForceHiding == KEYGUARD_SHOWN) && hideWhenLocked); + } + private void updateWindowsLocked(final int displayId) { ++mAnimTransactionSequence; @@ -256,14 +274,6 @@ public class WindowAnimator { mForceHiding = KEYGUARD_NOT_SHOWN; - final WindowState imeTarget = mService.mInputMethodTarget; - final boolean showImeOverKeyguard = imeTarget != null && imeTarget.isVisibleNow() && - (imeTarget.getAttrs().flags & FLAG_SHOW_WHEN_LOCKED) != 0; - - final WindowState winShowWhenLocked = (WindowState) mPolicy.getWinShowWhenLockedLw(); - final AppWindowToken appShowWhenLocked = winShowWhenLocked == null ? - null : winShowWhenLocked.mAppToken; - boolean wallpaperInUnForceHiding = false; boolean startingInUnForceHiding = false; ArrayList<WindowStateAnimator> unForceHiding = null; @@ -272,7 +282,8 @@ public class WindowAnimator { WindowState win = windows.get(i); WindowStateAnimator winAnimator = win.mWinAnimator; final int flags = win.mAttrs.flags; - + boolean canBeForceHidden = mPolicy.canBeForceHidden(win, win.mAttrs); + boolean shouldBeForceHidden = shouldForceHide(win); if (winAnimator.mSurfaceControl != null) { final boolean wasAnimating = winAnimator.mWasAnimating; final boolean nowAnimating = winAnimator.stepAnimationLocked(mCurrentTime); @@ -332,14 +343,8 @@ public class WindowAnimator { + " vis=" + win.mViewVisibility + " hidden=" + win.mRootToken.hidden + " anim=" + win.mWinAnimator.mAnimation); - } else if (mPolicy.canBeForceHidden(win, win.mAttrs)) { - final boolean hideWhenLocked = !((win.mIsImWindow || imeTarget == win) && showImeOverKeyguard) || - (appShowWhenLocked != null && (appShowWhenLocked == win.mAppToken || - // Show error dialogs over apps that dismiss keyguard. - (win.mAttrs.privateFlags & PRIVATE_FLAG_SYSTEM_ERROR) != 0))); - if (((mForceHiding == KEYGUARD_ANIMATING_IN) - && (!winAnimator.isAnimating() || hideWhenLocked)) - || ((mForceHiding == KEYGUARD_SHOWN) && hideWhenLocked)) { + } else if (canBeForceHidden) { + if (shouldBeForceHidden) { if (!win.hideLw(false, false)) { // Was already hidden continue; @@ -410,6 +415,16 @@ public class WindowAnimator { } } + // If the window doesn't have a surface, the only thing we care about is the correct + // policy visibility. + else if (canBeForceHidden) { + if (shouldBeForceHidden) { + win.hideLw(false, false); + } else { + win.showLw(false, false); + } + } + final AppWindowToken atoken = win.mAppToken; if (winAnimator.mDrawState == WindowStateAnimator.READY_TO_SHOW) { if (atoken == null || atoken.allDrawn) { diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java index eb418ed6b417..bcfd7f00cea8 100644 --- a/services/core/java/com/android/server/wm/WindowManagerService.java +++ b/services/core/java/com/android/server/wm/WindowManagerService.java @@ -2541,7 +2541,7 @@ public class WindowManagerService extends IWindowManager.Stub } mInputMonitor.updateInputWindowsLw(false /*force*/); - if (true || localLOGV || DEBUG_ADD_REMOVE) Slog.v(TAG, "addWindow: New client " + if (localLOGV || DEBUG_ADD_REMOVE) Slog.v(TAG, "addWindow: New client " + client.asBinder() + ": window=" + win + " Callers=" + Debug.getCallers(5)); if (win.isVisibleOrAdding() && updateOrientationFromAppTokensLocked(false)) { @@ -2706,8 +2706,7 @@ public class WindowManagerService extends IWindowManager.Stub mPolicy.removeWindowLw(win); win.removeLocked(); - if (true || DEBUG_ADD_REMOVE) Slog.v(TAG, "removeWindowInnerLocked: " + win + - " Callers=" + Debug.getCallers(5)); + if (DEBUG_ADD_REMOVE) Slog.v(TAG, "removeWindowInnerLocked: " + win); mWindowMap.remove(win.mClient.asBinder()); if (win.mAppOp != AppOpsManager.OP_NONE) { mAppOps.finishOp(win.mAppOp, win.getOwningUid(), win.getOwningPackage()); diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index 07137724b699..9e51849e7fb9 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java @@ -900,23 +900,25 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { if (DBG) Slog.d(LOG_TAG, "Handling package changes for user " + userHandle); DevicePolicyData policy = getUserData(userHandle); IPackageManager pm = AppGlobals.getPackageManager(); - for (int i = policy.mAdminList.size() - 1; i >= 0; i--) { - ActiveAdmin aa = policy.mAdminList.get(i); - try { - if (pm.getPackageInfo(aa.info.getPackageName(), 0, userHandle) == null - || pm.getReceiverInfo(aa.info.getComponent(), 0, userHandle) == null) { - removed = true; - policy.mAdminList.remove(i); - policy.mAdminMap.remove(aa.info.getComponent()); + synchronized (this) { + for (int i = policy.mAdminList.size() - 1; i >= 0; i--) { + ActiveAdmin aa = policy.mAdminList.get(i); + try { + if (pm.getPackageInfo(aa.info.getPackageName(), 0, userHandle) == null + || pm.getReceiverInfo(aa.info.getComponent(), 0, userHandle) == null) { + removed = true; + policy.mAdminList.remove(i); + policy.mAdminMap.remove(aa.info.getComponent()); + } + } catch (RemoteException re) { + // Shouldn't happen } - } catch (RemoteException re) { - // Shouldn't happen } - } - if (removed) { - validatePasswordOwnerLocked(policy); - syncDeviceCapabilitiesLocked(policy); - saveSettingsLocked(policy.mUserHandle); + if (removed) { + validatePasswordOwnerLocked(policy); + syncDeviceCapabilitiesLocked(policy); + saveSettingsLocked(policy.mUserHandle); + } } } diff --git a/services/usb/java/com/android/server/usb/UsbDebuggingManager.java b/services/usb/java/com/android/server/usb/UsbDebuggingManager.java index cc5d004a494e..1cf00d24cfd2 100644 --- a/services/usb/java/com/android/server/usb/UsbDebuggingManager.java +++ b/services/usb/java/com/android/server/usb/UsbDebuggingManager.java @@ -207,7 +207,12 @@ public class UsbDebuggingManager implements Runnable { case MESSAGE_ADB_CONFIRM: { String key = (String)msg.obj; - mFingerprints = getFingerprints(key); + String fingerprints = getFingerprints(key); + if ("".equals(fingerprints)) { + sendResponse("NO"); + break; + } + mFingerprints = fingerprints; startConfirmation(key, mFingerprints); break; } @@ -224,16 +229,25 @@ public class UsbDebuggingManager implements Runnable { StringBuilder sb = new StringBuilder(); MessageDigest digester; + if (key == null) { + return ""; + } + try { digester = MessageDigest.getInstance("MD5"); } catch (Exception ex) { - Slog.e(TAG, "Error getting digester: " + ex); + Slog.e(TAG, "Error getting digester", ex); return ""; } byte[] base64_data = key.split("\\s+")[0].getBytes(); - byte[] digest = digester.digest(Base64.decode(base64_data, Base64.DEFAULT)); - + byte[] digest; + try { + digest = digester.digest(Base64.decode(base64_data, Base64.DEFAULT)); + } catch (IllegalArgumentException e) { + Slog.e(TAG, "error doing base64 decoding", e); + return ""; + } for (int i = 0; i < digest.length; i++) { sb.append(hex.charAt((digest[i] >> 4) & 0xf)); sb.append(hex.charAt(digest[i] & 0xf)); diff --git a/services/voiceinteraction/java/com/android/server/voiceinteraction/SoundTriggerHelper.java b/services/voiceinteraction/java/com/android/server/voiceinteraction/SoundTriggerHelper.java index 8ce7f74cef57..3ca0c84543d3 100644 --- a/services/voiceinteraction/java/com/android/server/voiceinteraction/SoundTriggerHelper.java +++ b/services/voiceinteraction/java/com/android/server/voiceinteraction/SoundTriggerHelper.java @@ -40,7 +40,6 @@ import android.util.Slog; import java.io.FileDescriptor; import java.io.PrintWriter; import java.util.ArrayList; -import java.util.UUID; /** * Helper for {@link SoundTrigger} APIs. @@ -78,7 +77,7 @@ public class SoundTriggerHelper implements SoundTrigger.StatusListener { private IRecognitionStatusCallback mActiveListener; private int mKeyphraseId = INVALID_VALUE; private int mCurrentSoundModelHandle = INVALID_VALUE; - private UUID mCurrentSoundModelUuid = null; + private KeyphraseSoundModel mCurrentSoundModel = null; // FIXME: Ideally this should not be stored if allowMultipleTriggers happens at a lower layer. private RecognitionConfig mRecognitionConfig = null; private boolean mRequested = false; @@ -134,7 +133,7 @@ public class SoundTriggerHelper implements SoundTrigger.StatusListener { + (mActiveListener == null ? "null" : mActiveListener.asBinder())); Slog.d(TAG, "current SoundModel handle=" + mCurrentSoundModelHandle); Slog.d(TAG, "current SoundModel UUID=" - + (mCurrentSoundModelUuid == null ? null : mCurrentSoundModelUuid)); + + (mCurrentSoundModel == null ? null : mCurrentSoundModel.uuid)); } if (!mStarted) { @@ -166,20 +165,16 @@ public class SoundTriggerHelper implements SoundTrigger.StatusListener { } // Unload the previous model if the current one isn't invalid - // and, it's not the same as the new one, or we are already started - // if we are already started, we can get multiple calls to start - // if the underlying sound model changes, in which case we should unload and reload. - // The model reuse helps only in cases when we trigger and stop internally - // without a start recognition call. + // and, it's not the same as the new one. + // This helps use cache and reuse the model and just start/stop it when necessary. if (mCurrentSoundModelHandle != INVALID_VALUE - && (!soundModel.uuid.equals(mCurrentSoundModelUuid) || mStarted)) { + && !soundModel.equals(mCurrentSoundModel)) { Slog.w(TAG, "Unloading previous sound model"); int status = mModule.unloadSoundModel(mCurrentSoundModelHandle); if (status != SoundTrigger.STATUS_OK) { Slog.w(TAG, "unloadSoundModel call failed with " + status); } - mCurrentSoundModelHandle = INVALID_VALUE; - mCurrentSoundModelUuid = null; + internalClearSoundModelLocked(); mStarted = false; } @@ -198,7 +193,7 @@ public class SoundTriggerHelper implements SoundTrigger.StatusListener { // Load the sound model if the current one is null. int soundModelHandle = mCurrentSoundModelHandle; if (mCurrentSoundModelHandle == INVALID_VALUE - || mCurrentSoundModelUuid == null) { + || mCurrentSoundModel == null) { int[] handle = new int[] { INVALID_VALUE }; int status = mModule.loadSoundModel(soundModel, handle); if (status != SoundTrigger.STATUS_OK) { @@ -218,7 +213,7 @@ public class SoundTriggerHelper implements SoundTrigger.StatusListener { mRequested = true; mKeyphraseId = keyphraseId; mCurrentSoundModelHandle = soundModelHandle; - mCurrentSoundModelUuid = soundModel.uuid; + mCurrentSoundModel = soundModel; mRecognitionConfig = recognitionConfig; // Register the new listener. This replaces the old one. // There can only be a maximum of one active listener at any given time. @@ -275,14 +270,9 @@ public class SoundTriggerHelper implements SoundTrigger.StatusListener { return status; } - status = mModule.unloadSoundModel(mCurrentSoundModelHandle); - if (status != SoundTrigger.STATUS_OK) { - Slog.w(TAG, "unloadSoundModel call failed with " + status); - } - - // Clear the internal state once the recognition has been stopped. - // Unload sound model call may fail in scenarios, and we'd still want - // to reload the sound model. + // We leave the sound model loaded but not started, this helps us when we start + // back. + // Also clear the internal state once the recognition has been stopped. internalClearStateLocked(); return status; } @@ -303,11 +293,6 @@ public class SoundTriggerHelper implements SoundTrigger.StatusListener { mRequested = false; int status = updateRecognitionLocked(false /* don't notify for synchronous calls */); - status = mModule.unloadSoundModel(mCurrentSoundModelHandle); - if (status != SoundTrigger.STATUS_OK) { - Slog.w(TAG, "unloadSoundModel call failed with " + status); - } - internalClearStateLocked(); } } @@ -456,6 +441,7 @@ public class SoundTriggerHelper implements SoundTrigger.StatusListener { } catch (RemoteException e) { Slog.w(TAG, "RemoteException in onError", e); } finally { + internalClearSoundModelLocked(); internalClearStateLocked(); if (mModule != null) { mModule.detach(); @@ -535,8 +521,6 @@ public class SoundTriggerHelper implements SoundTrigger.StatusListener { mRequested = false; mKeyphraseId = INVALID_VALUE; - mCurrentSoundModelHandle = INVALID_VALUE; - mCurrentSoundModelUuid = null; mRecognitionConfig = null; mActiveListener = null; @@ -550,6 +534,11 @@ public class SoundTriggerHelper implements SoundTrigger.StatusListener { } } + private void internalClearSoundModelLocked() { + mCurrentSoundModelHandle = INVALID_VALUE; + mCurrentSoundModel = null; + } + class MyCallStateListener extends PhoneStateListener { @Override public void onCallStateChanged(int state, String arg1) { @@ -581,7 +570,7 @@ public class SoundTriggerHelper implements SoundTrigger.StatusListener { pw.print(" keyphrase ID="); pw.println(mKeyphraseId); pw.print(" sound model handle="); pw.println(mCurrentSoundModelHandle); pw.print(" sound model UUID="); - pw.println(mCurrentSoundModelUuid == null ? "null" : mCurrentSoundModelUuid); + pw.println(mCurrentSoundModel == null ? "null" : mCurrentSoundModel.uuid); pw.print(" current listener="); pw.println(mActiveListener == null ? "null" : mActiveListener.asBinder()); diff --git a/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java b/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java index 82b7f8b6eb52..f5d48675fa59 100644 --- a/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java +++ b/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java @@ -136,11 +136,14 @@ public class VoiceInteractionManagerService extends SystemService { Settings.Secure.VOICE_INTERACTION_SERVICE, userHandle); ComponentName curRecognizer = getCurRecognizer(userHandle); VoiceInteractionServiceInfo curInteractorInfo = null; - if (curInteractorStr == null && curRecognizer != null) { + if (curInteractorStr == null && curRecognizer != null + && !ActivityManager.isLowRamDeviceStatic()) { // If there is no interactor setting, that means we are upgrading // from an older platform version. If the current recognizer is not // set or matches the preferred recognizer, then we want to upgrade // the user to have the default voice interaction service enabled. + // Note that we don't do this for low-RAM devices, since we aren't + // supporting voice interaction services there. curInteractorInfo = findAvailInteractor(userHandle, curRecognizer); if (curInteractorInfo != null) { // Looks good! We'll apply this one. To make it happen, we clear the @@ -150,6 +153,15 @@ public class VoiceInteractionManagerService extends SystemService { } } + // If we are on a svelte device, make sure an interactor is not currently + // enabled; if it is, turn it off. + if (ActivityManager.isLowRamDeviceStatic() && curInteractorStr != null) { + if (!TextUtils.isEmpty(curInteractorStr)) { + setCurInteractor(null, userHandle); + curInteractorStr = ""; + } + } + if (curRecognizer != null) { // If we already have at least a recognizer, then we probably want to // leave things as they are... unless something has disappeared. @@ -171,10 +183,11 @@ public class VoiceInteractionManagerService extends SystemService { } } - // Initializing settings, look for an interactor first. - if (curInteractorInfo == null) { + // Initializing settings, look for an interactor first (but only on non-svelte). + if (curInteractorInfo == null && !ActivityManager.isLowRamDeviceStatic()) { curInteractorInfo = findAvailInteractor(userHandle, null); } + if (curInteractorInfo != null) { // Eventually it will be an error to not specify this. setCurInteractor(new ComponentName(curInteractorInfo.getServiceInfo().packageName, diff --git a/telecomm/java/android/telecom/PhoneAccount.java b/telecomm/java/android/telecom/PhoneAccount.java index a49c204f6aed..2240c44723f0 100644 --- a/telecomm/java/android/telecom/PhoneAccount.java +++ b/telecomm/java/android/telecom/PhoneAccount.java @@ -640,6 +640,7 @@ public class PhoneAccount implements Parcelable { if (mIconBitmap == null) { out.writeInt(0); } else { + out.writeInt(1); mIconBitmap.writeToParcel(out, flags); } out.writeInt(mIconTint); diff --git a/telephony/java/android/telephony/DisconnectCause.java b/telephony/java/android/telephony/DisconnectCause.java index 6fe10dc9d256..189197658d2d 100644 --- a/telephony/java/android/telephony/DisconnectCause.java +++ b/telephony/java/android/telephony/DisconnectCause.java @@ -160,11 +160,27 @@ public class DisconnectCause { */ public static final int OUTGOING_CANCELED = 44; + /** + * The call, which was an IMS call, disconnected because it merged with another call. + */ + public static final int IMS_MERGED_SUCCESSFULLY = 45; + + //********************************************************************************************* + // When adding a disconnect type: + // 1) Please assign the new type the next id value below. + // 2) Increment the next id value below to a new value. + // 3) Update MAXIMUM_VALID_VALUE to the new disconnect type. + // 4) Update toString() with the newly added disconnect type. + // 5) Update android.telecom.DisconnectCauseUtil with any mappings to a telecom.DisconnectCause. + // + // NextId: 46 + //********************************************************************************************* + /** 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 = OUTGOING_CANCELED; + public static final int MAXIMUM_VALID_VALUE = IMS_MERGED_SUCCESSFULLY; /** Private constructor to avoid class instantiation. */ private DisconnectCause() { @@ -262,6 +278,8 @@ public class DisconnectCause { return "OUTGOING_FAILURE"; case OUTGOING_CANCELED: return "OUTGOING_CANCELED"; + case IMS_MERGED_SUCCESSFULLY: + return "IMS_MERGED_SUCCESSFULLY"; default: return "INVALID: " + cause; } diff --git a/telephony/java/android/telephony/SubscriptionInfo.java b/telephony/java/android/telephony/SubscriptionInfo.java index 26f17c8e331d..a3ace36b7e59 100644 --- a/telephony/java/android/telephony/SubscriptionInfo.java +++ b/telephony/java/android/telephony/SubscriptionInfo.java @@ -34,6 +34,11 @@ import android.os.Parcelable; public class SubscriptionInfo implements Parcelable { /** + * Size of text to render on the icon. + */ + private static final int TEXT_SIZE = 22; + + /** * Subscription Identifier, this is a device unique number * and not an index into an array */ @@ -201,10 +206,11 @@ public class SubscriptionInfo implements Parcelable { paint.setColorFilter(null); // Write the sim slot index. + paint.setAntiAlias(true); paint.setTypeface(Typeface.create("sans-serif", Typeface.NORMAL)); paint.setColor(Color.WHITE); - paint.setTextSize(12); - final String index = Integer.toString(mSimSlotIndex); + paint.setTextSize(TEXT_SIZE); + final String index = Integer.toString(mSimSlotIndex + 1); final Rect textBound = new Rect(); paint.getTextBounds(index, 0, 1, textBound); final float xOffset = (width / 2.f) - textBound.centerX(); diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index b06d44c27d2c..f2d859fe3413 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -1973,6 +1973,41 @@ public class TelephonyManager { } /** + * Sets the voice mail number. + * <p> + * Requires Permission: + * {@link android.Manifest.permission#MODIFY_PHONE_STATE MODIFY_PHONE_STATE} + * Or the calling app has carrier privileges. @see #hasCarrierPrivileges + * + * @param alphaTag The alpha tag to display. + * @param number The voicemail number. + */ + public boolean setVoiceMailNumber(String alphaTag, String number) { + return setVoiceMailNumber(getDefaultSubscription(), alphaTag, number); + } + + /** + * Sets the voicemail number for the given subscriber. + * <p> + * Requires Permission: + * {@link android.Manifest.permission#MODIFY_PHONE_STATE MODIFY_PHONE_STATE} + * Or the calling app has carrier privileges. @see #hasCarrierPrivileges + * + * @param subId The subscriber id. + * @param alphaTag The alpha tag to display. + * @param number The voicemail number. + */ + /** {@hide} */ + public boolean setVoiceMailNumber(int subId, String alphaTag, String number) { + try { + return getITelephony().setVoiceMailNumber(subId, alphaTag, number); + } catch (RemoteException ex) { + } catch (NullPointerException ex) { + } + return false; + } + + /** * Returns the voice mail count. Return 0 if unavailable. * <p> * Requires Permission: diff --git a/telephony/java/com/android/internal/telephony/ISms.aidl b/telephony/java/com/android/internal/telephony/ISms.aidl index 560af450d326..15fa3400e156 100644 --- a/telephony/java/com/android/internal/telephony/ISms.aidl +++ b/telephony/java/com/android/internal/telephony/ISms.aidl @@ -290,81 +290,102 @@ interface ISms { /** * Enable reception of cell broadcast (SMS-CB) messages with the given - * message identifier. Note that if two different clients enable the same - * message identifier, they must both disable it for the device to stop - * receiving those messages. + * message identifier and RAN type. The RAN type specify this message ID + * belong to 3GPP (GSM) or 3GPP2(CDMA). Note that if two different clients + * enable the same message identifier, they must both disable it for the + * device to stop receiving those messages. * * @param messageIdentifier Message identifier as specified in TS 23.041 (3GPP) or * C.R1001-G (3GPP2) + * @param ranType as defined in class SmsManager, the value can be one of these: + * android.telephony.SmsMessage.CELL_BROADCAST_RAN_TYPE_GSM + * android.telephony.SmsMessage.CELL_BROADCAST_RAN_TYPE_CDMA * @return true if successful, false otherwise * - * @see #disableCellBroadcast(int) + * @see #disableCellBroadcast(int, int) */ - boolean enableCellBroadcast(int messageIdentifier); + boolean enableCellBroadcast(int messageIdentifier, int ranType); /** * Enable reception of cell broadcast (SMS-CB) messages with the given - * message identifier. Note that if two different clients enable the same - * message identifier, they must both disable it for the device to stop - * receiving those messages. + * message identifier and RAN type. The RAN type specify this message ID + * belong to 3GPP (GSM) or 3GPP2(CDMA). Note that if two different clients + * enable the same message identifier, they must both disable it for the + * device to stop receiving those messages. * * @param messageIdentifier Message identifier as specified in TS 23.041 (3GPP) or * C.R1001-G (3GPP2) * @param subId for which the broadcast has to be enabled + * @param ranType as defined in class SmsManager, the value can be one of these: + * android.telephony.SmsMessage.CELL_BROADCAST_RAN_TYPE_GSM + * android.telephony.SmsMessage.CELL_BROADCAST_RAN_TYPE_CDMA * @return true if successful, false otherwise * - * @see #disableCellBroadcast(int) + * @see #disableCellBroadcast(int, int) */ - boolean enableCellBroadcastForSubscriber(in int subId, int messageIdentifier); + boolean enableCellBroadcastForSubscriber(int subId, int messageIdentifier, int ranType); /** * Disable reception of cell broadcast (SMS-CB) messages with the given - * message identifier. Note that if two different clients enable the same - * message identifier, they must both disable it for the device to stop - * receiving those messages. + * message identifier and RAN type. The RAN type specify this message ID + * belong to 3GPP (GSM) or 3GPP2(CDMA). Note that if two different clients + * enable the same message identifier, they must both disable it for the + * device to stop receiving those messages. * * @param messageIdentifier Message identifier as specified in TS 23.041 (3GPP) or * C.R1001-G (3GPP2) + * @param ranType as defined in class SmsManager, the value can be one of these: + * android.telephony.SmsMessage.CELL_BROADCAST_RAN_TYPE_GSM + * android.telephony.SmsMessage.CELL_BROADCAST_RAN_TYPE_CDMA * @return true if successful, false otherwise * - * @see #enableCellBroadcast(int) + * @see #enableCellBroadcast(int, int) */ - boolean disableCellBroadcast(int messageIdentifier); + boolean disableCellBroadcast(int messageIdentifier, int ranType); /** * Disable reception of cell broadcast (SMS-CB) messages with the given - * message identifier. Note that if two different clients enable the same - * message identifier, they must both disable it for the device to stop - * receiving those messages. + * message identifier and RAN type. The RAN type specify this message ID + * belong to 3GPP (GSM) or 3GPP2(CDMA). Note that if two different clients + * enable the same message identifier, they must both disable it for the + * device to stop receiving those messages. * * @param messageIdentifier Message identifier as specified in TS 23.041 (3GPP) or * C.R1001-G (3GPP2) * @param subId for which the broadcast has to be disabled + * @param ranType as defined in class SmsManager, the value can be one of these: + * android.telephony.SmsMessage.CELL_BROADCAST_RAN_TYPE_GSM + * android.telephony.SmsMessage.CELL_BROADCAST_RAN_TYPE_CDMA * @return true if successful, false otherwise * - * @see #enableCellBroadcast(int) + * @see #enableCellBroadcast(int, int) */ - boolean disableCellBroadcastForSubscriber(in int subId, int messageIdentifier); + boolean disableCellBroadcastForSubscriber(int subId, int messageIdentifier, int ranType); /* * Enable reception of cell broadcast (SMS-CB) messages with the given - * message identifier range. Note that if two different clients enable - * a message identifier range, they must both disable it for the device - * to stop receiving those messages. + * message identifier range and RAN type. The RAN type specify this message + * ID range belong to 3GPP (GSM) or 3GPP2(CDMA). Note that if two different + * clients enable a message identifier range, they must both disable it for + * the device to stop receiving those messages. * * @param startMessageId first message identifier as specified in TS 23.041 (3GPP) or * C.R1001-G (3GPP2) * @param endMessageId last message identifier as specified in TS 23.041 (3GPP) or * C.R1001-G (3GPP2) + * @param ranType as defined in class SmsManager, the value can be one of these: + * android.telephony.SmsMessage.CELL_BROADCAST_RAN_TYPE_GSM + * android.telephony.SmsMessage.CELL_BROADCAST_RAN_TYPE_CDMA * @return true if successful, false otherwise * - * @see #disableCellBroadcastRange(int, int) + * @see #disableCellBroadcastRange(int, int, int) */ - boolean enableCellBroadcastRange(int startMessageId, int endMessageId); + boolean enableCellBroadcastRange(int startMessageId, int endMessageId, int ranType); /* * Enable reception of cell broadcast (SMS-CB) messages with the given - * message identifier range. Note that if two different clients enable + * message identifier range and RAN type. The RAN type specify this message ID range + * belong to 3GPP (GSM) or 3GPP2(CDMA). Note that if two different clients enable * a message identifier range, they must both disable it for the device * to stop receiving those messages. * @@ -373,15 +394,20 @@ interface ISms { * @param endMessageId last message identifier as specified in TS 23.041 (3GPP) or * C.R1001-G (3GPP2) * @param subId for which the broadcast has to be enabled + * @param ranType as defined in class SmsManager, the value can be one of these: + * android.telephony.SmsMessage.CELL_BROADCAST_RAN_TYPE_GSM + * android.telephony.SmsMessage.CELL_BROADCAST_RAN_TYPE_CDMA * @return true if successful, false otherwise * - * @see #disableCellBroadcastRange(int, int) + * @see #disableCellBroadcastRange(int, int, int) */ - boolean enableCellBroadcastRangeForSubscriber(int subId, int startMessageId, int endMessageId); + boolean enableCellBroadcastRangeForSubscriber(int subId, int startMessageId, int endMessageId, + int ranType); /** * Disable reception of cell broadcast (SMS-CB) messages with the given - * message identifier range. Note that if two different clients enable + * message identifier range and RAN type. The RAN type specify this message ID range + * belong to 3GPP (GSM) or 3GPP2(CDMA). Note that if two different clients enable * a message identifier range, they must both disable it for the device * to stop receiving those messages. * @@ -389,15 +415,19 @@ interface ISms { * C.R1001-G (3GPP2) * @param endMessageId last message identifier as specified in TS 23.041 (3GPP) or * C.R1001-G (3GPP2) + * @param ranType as defined in class SmsManager, the value can be one of these: + * android.telephony.SmsMessage.CELL_BROADCAST_RAN_TYPE_GSM + * android.telephony.SmsMessage.CELL_BROADCAST_RAN_TYPE_CDMA * @return true if successful, false otherwise * - * @see #enableCellBroadcastRange(int, int) + * @see #enableCellBroadcastRange(int, int, int) */ - boolean disableCellBroadcastRange(int startMessageId, int endMessageId); + boolean disableCellBroadcastRange(int startMessageId, int endMessageId, int ranType); /** * Disable reception of cell broadcast (SMS-CB) messages with the given - * message identifier range. Note that if two different clients enable + * message identifier range and RAN type. The RAN type specify this message ID range + * belong to 3GPP (GSM) or 3GPP2(CDMA). Note that if two different clients enable * a message identifier range, they must both disable it for the device * to stop receiving those messages. * @@ -406,12 +436,15 @@ interface ISms { * @param endMessageId last message identifier as specified in TS 23.041 (3GPP) or * C.R1001-G (3GPP2) * @param subId for which the broadcast has to be disabled + * @param ranType as defined in class SmsManager, the value can be one of these: + * android.telephony.SmsMessage.CELL_BROADCAST_RAN_TYPE_GSM + * android.telephony.SmsMessage.CELL_BROADCAST_RAN_TYPE_CDMA * @return true if successful, false otherwise * - * @see #enableCellBroadcastRange(int, int, int) + * @see #enableCellBroadcastRange(int, int, int, int) */ boolean disableCellBroadcastRangeForSubscriber(int subId, int startMessageId, - int endMessageId); + int endMessageId, int ranType); /** * Returns the premium SMS send permission for the specified package. diff --git a/telephony/java/com/android/internal/telephony/ITelephony.aidl b/telephony/java/com/android/internal/telephony/ITelephony.aidl index c50261d3d849..cbfa9f6bf6e4 100644 --- a/telephony/java/com/android/internal/telephony/ITelephony.aidl +++ b/telephony/java/com/android/internal/telephony/ITelephony.aidl @@ -417,6 +417,11 @@ interface ITelephony { boolean needsOtaServiceProvisioning(); /** + * Sets the voicemail number for a particular subscriber. + */ + boolean setVoiceMailNumber(int subId, String alphaTag, String number); + + /** * Returns the unread count of voicemails */ int getVoiceMessageCount(); diff --git a/tests/VectorDrawableTest/res/drawable/vector_drawable30.xml b/tests/VectorDrawableTest/res/drawable/vector_drawable30.xml new file mode 100644 index 000000000000..3dff196e96ec --- /dev/null +++ b/tests/VectorDrawableTest/res/drawable/vector_drawable30.xml @@ -0,0 +1,28 @@ +<!-- + 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. +--> +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:height="48dp" + android:width="48dp" + android:viewportHeight="48" + android:viewportWidth="48" > + + <group> + <path + android:name="plus1" + android:pathData="M20 16h-4v8h-8v4h8v8h4v-8h8v-4h-8zm9-3.84v3.64l5-1v21.2h4v-26z" + android:fillColor="#ff00ff00"/> + </group> +</vector> diff --git a/tests/VectorDrawableTest/src/com/android/test/dynamic/VectorDrawablePerformance.java b/tests/VectorDrawableTest/src/com/android/test/dynamic/VectorDrawablePerformance.java index 1cd6533585ae..5a2e5a779fb7 100644 --- a/tests/VectorDrawableTest/src/com/android/test/dynamic/VectorDrawablePerformance.java +++ b/tests/VectorDrawableTest/src/com/android/test/dynamic/VectorDrawablePerformance.java @@ -57,6 +57,7 @@ public class VectorDrawablePerformance extends Activity { R.drawable.vector_drawable27, R.drawable.vector_drawable28, R.drawable.vector_drawable29, + R.drawable.vector_drawable30, }; @Override |
