diff options
225 files changed, 2098 insertions, 1367 deletions
diff --git a/api/current.txt b/api/current.txt index c6053dfbe5f6..9e962490da96 100644 --- a/api/current.txt +++ b/api/current.txt @@ -4275,6 +4275,7 @@ package android.app { public class DownloadManager { method public long addCompletedDownload(java.lang.String, java.lang.String, boolean, java.lang.String, java.lang.String, long, boolean); + method public long addCompletedDownload(java.lang.String, java.lang.String, boolean, java.lang.String, java.lang.String, long, boolean, android.net.Uri, android.net.Uri); method public long enqueue(android.app.DownloadManager.Request); method public static java.lang.Long getMaxBytesOverMobile(android.content.Context); method public java.lang.String getMimeTypeForDownloadedFile(long); @@ -5929,7 +5930,7 @@ package android.app.admin { method public void setMaximumTimeToLock(android.content.ComponentName, long); method public void setOrganizationColor(android.content.ComponentName, int); method public void setOrganizationName(android.content.ComponentName, java.lang.String); - method public boolean setPackageSuspended(android.content.ComponentName, java.lang.String, boolean); + method public java.lang.String[] setPackagesSuspended(android.content.ComponentName, java.lang.String[], boolean); method public void setPasswordExpirationTimeout(android.content.ComponentName, long); method public void setPasswordHistoryLength(android.content.ComponentName, int); method public void setPasswordMinimumLength(android.content.ComponentName, int); @@ -28574,7 +28575,6 @@ package android.os { field public static java.lang.String DIRECTORY_DCIM; field public static java.lang.String DIRECTORY_DOCUMENTS; field public static java.lang.String DIRECTORY_DOWNLOADS; - field public static java.lang.String DIRECTORY_HOME; field public static java.lang.String DIRECTORY_MOVIES; field public static java.lang.String DIRECTORY_MUSIC; field public static java.lang.String DIRECTORY_NOTIFICATIONS; @@ -32153,6 +32153,7 @@ package android.provider { field public static final java.lang.String ACTION_PRIVACY_SETTINGS = "android.settings.PRIVACY_SETTINGS"; field public static final java.lang.String ACTION_QUICK_LAUNCH_SETTINGS = "android.settings.QUICK_LAUNCH_SETTINGS"; field public static final java.lang.String ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS = "android.settings.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS"; + field public static final java.lang.String ACTION_SCREEN_READER_TUTORIAL = "android.settings.SCREEN_READER_TUTORIAL"; field public static final java.lang.String ACTION_SEARCH_SETTINGS = "android.search.action.SEARCH_SETTINGS"; field public static final java.lang.String ACTION_SECURITY_SETTINGS = "android.settings.SECURITY_SETTINGS"; field public static final java.lang.String ACTION_SETTINGS = "android.settings.SETTINGS"; @@ -54135,7 +54136,6 @@ package java.security { public abstract class Signature extends java.security.SignatureSpi { ctor protected Signature(java.lang.String); method public final java.lang.String getAlgorithm(); - method public java.security.SignatureSpi getCurrentSpi(); method public static java.security.Signature getInstance(java.lang.String) throws java.security.NoSuchAlgorithmException; method public static java.security.Signature getInstance(java.lang.String, java.lang.String) throws java.security.NoSuchAlgorithmException, java.security.NoSuchProviderException; method public static java.security.Signature getInstance(java.lang.String, java.security.Provider) throws java.security.NoSuchAlgorithmException; diff --git a/api/system-current.txt b/api/system-current.txt index 2d6e86719d3d..c7b2604b6b9e 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -4407,6 +4407,7 @@ package android.app { public class DownloadManager { method public long addCompletedDownload(java.lang.String, java.lang.String, boolean, java.lang.String, java.lang.String, long, boolean); + method public long addCompletedDownload(java.lang.String, java.lang.String, boolean, java.lang.String, java.lang.String, long, boolean, android.net.Uri, android.net.Uri); method public long enqueue(android.app.DownloadManager.Request); method public static java.lang.Long getMaxBytesOverMobile(android.content.Context); method public java.lang.String getMimeTypeForDownloadedFile(long); @@ -6075,7 +6076,7 @@ package android.app.admin { method public void setMaximumTimeToLock(android.content.ComponentName, long); method public void setOrganizationColor(android.content.ComponentName, int); method public void setOrganizationName(android.content.ComponentName, java.lang.String); - method public boolean setPackageSuspended(android.content.ComponentName, java.lang.String, boolean); + method public java.lang.String[] setPackagesSuspended(android.content.ComponentName, java.lang.String[], boolean); method public void setPasswordExpirationTimeout(android.content.ComponentName, long); method public void setPasswordHistoryLength(android.content.ComponentName, int); method public void setPasswordMinimumLength(android.content.ComponentName, int); @@ -30858,7 +30859,6 @@ package android.os { field public static java.lang.String DIRECTORY_DCIM; field public static java.lang.String DIRECTORY_DOCUMENTS; field public static java.lang.String DIRECTORY_DOWNLOADS; - field public static java.lang.String DIRECTORY_HOME; field public static java.lang.String DIRECTORY_MOVIES; field public static java.lang.String DIRECTORY_MUSIC; field public static java.lang.String DIRECTORY_NOTIFICATIONS; @@ -34634,6 +34634,7 @@ package android.provider { field public static final java.lang.String ACTION_PRIVACY_SETTINGS = "android.settings.PRIVACY_SETTINGS"; field public static final java.lang.String ACTION_QUICK_LAUNCH_SETTINGS = "android.settings.QUICK_LAUNCH_SETTINGS"; field public static final java.lang.String ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS = "android.settings.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS"; + field public static final java.lang.String ACTION_SCREEN_READER_TUTORIAL = "android.settings.SCREEN_READER_TUTORIAL"; field public static final java.lang.String ACTION_SEARCH_SETTINGS = "android.search.action.SEARCH_SETTINGS"; field public static final java.lang.String ACTION_SECURITY_SETTINGS = "android.settings.SECURITY_SETTINGS"; field public static final java.lang.String ACTION_SETTINGS = "android.settings.SETTINGS"; @@ -34694,6 +34695,7 @@ package android.provider { field public static final deprecated java.lang.String INSTALL_NON_MARKET_APPS = "install_non_market_apps"; field public static final java.lang.String MODE_RINGER = "mode_ringer"; field public static final java.lang.String NETWORK_PREFERENCE = "network_preference"; + field public static final java.lang.String OTA_DISABLE_AUTOMATIC_UPDATE = "ota_disable_automatic_update"; field public static final java.lang.String RADIO_BLUETOOTH = "bluetooth"; field public static final java.lang.String RADIO_CELL = "cell"; field public static final java.lang.String RADIO_NFC = "nfc"; @@ -57222,7 +57224,6 @@ package java.security { public abstract class Signature extends java.security.SignatureSpi { ctor protected Signature(java.lang.String); method public final java.lang.String getAlgorithm(); - method public java.security.SignatureSpi getCurrentSpi(); method public static java.security.Signature getInstance(java.lang.String) throws java.security.NoSuchAlgorithmException; method public static java.security.Signature getInstance(java.lang.String, java.lang.String) throws java.security.NoSuchAlgorithmException, java.security.NoSuchProviderException; method public static java.security.Signature getInstance(java.lang.String, java.security.Provider) throws java.security.NoSuchAlgorithmException; diff --git a/api/test-current.txt b/api/test-current.txt index 1f8480062cb1..74c6787443a0 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -4275,6 +4275,7 @@ package android.app { public class DownloadManager { method public long addCompletedDownload(java.lang.String, java.lang.String, boolean, java.lang.String, java.lang.String, long, boolean); + method public long addCompletedDownload(java.lang.String, java.lang.String, boolean, java.lang.String, java.lang.String, long, boolean, android.net.Uri, android.net.Uri); method public long enqueue(android.app.DownloadManager.Request); method public static java.lang.Long getMaxBytesOverMobile(android.content.Context); method public java.lang.String getMimeTypeForDownloadedFile(long); @@ -5931,7 +5932,7 @@ package android.app.admin { method public void setMaximumTimeToLock(android.content.ComponentName, long); method public void setOrganizationColor(android.content.ComponentName, int); method public void setOrganizationName(android.content.ComponentName, java.lang.String); - method public boolean setPackageSuspended(android.content.ComponentName, java.lang.String, boolean); + method public java.lang.String[] setPackagesSuspended(android.content.ComponentName, java.lang.String[], boolean); method public void setPasswordExpirationTimeout(android.content.ComponentName, long); method public void setPasswordHistoryLength(android.content.ComponentName, int); method public void setPasswordMinimumLength(android.content.ComponentName, int); @@ -28583,7 +28584,6 @@ package android.os { field public static java.lang.String DIRECTORY_DCIM; field public static java.lang.String DIRECTORY_DOCUMENTS; field public static java.lang.String DIRECTORY_DOWNLOADS; - field public static java.lang.String DIRECTORY_HOME; field public static java.lang.String DIRECTORY_MOVIES; field public static java.lang.String DIRECTORY_MUSIC; field public static java.lang.String DIRECTORY_NOTIFICATIONS; @@ -32166,6 +32166,7 @@ package android.provider { field public static final java.lang.String ACTION_PRIVACY_SETTINGS = "android.settings.PRIVACY_SETTINGS"; field public static final java.lang.String ACTION_QUICK_LAUNCH_SETTINGS = "android.settings.QUICK_LAUNCH_SETTINGS"; field public static final java.lang.String ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS = "android.settings.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS"; + field public static final java.lang.String ACTION_SCREEN_READER_TUTORIAL = "android.settings.SCREEN_READER_TUTORIAL"; field public static final java.lang.String ACTION_SEARCH_SETTINGS = "android.search.action.SEARCH_SETTINGS"; field public static final java.lang.String ACTION_SECURITY_SETTINGS = "android.settings.SECURITY_SETTINGS"; field public static final java.lang.String ACTION_SETTINGS = "android.settings.SETTINGS"; @@ -54152,7 +54153,6 @@ package java.security { public abstract class Signature extends java.security.SignatureSpi { ctor protected Signature(java.lang.String); method public final java.lang.String getAlgorithm(); - method public java.security.SignatureSpi getCurrentSpi(); method public static java.security.Signature getInstance(java.lang.String) throws java.security.NoSuchAlgorithmException; method public static java.security.Signature getInstance(java.lang.String, java.lang.String) throws java.security.NoSuchAlgorithmException, java.security.NoSuchProviderException; method public static java.security.Signature getInstance(java.lang.String, java.security.Provider) throws java.security.NoSuchAlgorithmException; diff --git a/core/java/android/app/ApplicationPackageManager.java b/core/java/android/app/ApplicationPackageManager.java index e71556c9eb6e..ab7d708c5220 100644 --- a/core/java/android/app/ApplicationPackageManager.java +++ b/core/java/android/app/ApplicationPackageManager.java @@ -1907,13 +1907,14 @@ public class ApplicationPackageManager extends PackageManager { } @Override - public boolean setPackageSuspendedAsUser(String packageName, boolean suspended, int userId) { + public String[] setPackagesSuspendedAsUser(String[] packageNames, boolean suspended, + int userId) { try { - return mPM.setPackageSuspendedAsUser(packageName, suspended, userId); + return mPM.setPackagesSuspendedAsUser(packageNames, suspended, userId); } catch (RemoteException e) { // Should never happen! } - return false; + return packageNames; } @Override diff --git a/core/java/android/app/DownloadManager.java b/core/java/android/app/DownloadManager.java index ed4bb28427ae..1e5f00727e12 100644 --- a/core/java/android/app/DownloadManager.java +++ b/core/java/android/app/DownloadManager.java @@ -1193,13 +1193,52 @@ public class DownloadManager { boolean isMediaScannerScannable, String mimeType, String path, long length, boolean showNotification) { return addCompletedDownload(title, description, isMediaScannerScannable, mimeType, path, - length, showNotification, false); + length, showNotification, false, null, null); + } + + /** + * Adds a file to the downloads database system, so it could appear in Downloads App + * (and thus become eligible for management by the Downloads App). + * <p> + * It is helpful to make the file scannable by MediaScanner by setting the param + * isMediaScannerScannable to true. It makes the file visible in media managing + * applications such as Gallery App, which could be a useful purpose of using this API. + * + * @param title the title that would appear for this file in Downloads App. + * @param description the description that would appear for this file in Downloads App. + * @param isMediaScannerScannable true if the file is to be scanned by MediaScanner. Files + * scanned by MediaScanner appear in the applications used to view media (for example, + * Gallery app). + * @param mimeType mimetype of the file. + * @param path absolute pathname to the file. The file should be world-readable, so that it can + * be managed by the Downloads App and any other app that is used to read it (for example, + * Gallery app to display the file, if the file contents represent a video/image). + * @param length length of the downloaded file + * @param showNotification true if a notification is to be sent, false otherwise + * @param uri the original HTTP URI of the download + * @param referer the HTTP Referer for the download + * @return an ID for the download entry added to the downloads app, unique across the system + * This ID is used to make future calls related to this download. + */ + public long addCompletedDownload(String title, String description, + boolean isMediaScannerScannable, String mimeType, String path, long length, + boolean showNotification, Uri uri, Uri referer) { + return addCompletedDownload(title, description, isMediaScannerScannable, mimeType, path, + length, showNotification, false, uri, referer); } /** {@hide} */ public long addCompletedDownload(String title, String description, boolean isMediaScannerScannable, String mimeType, String path, long length, boolean showNotification, boolean allowWrite) { + return addCompletedDownload(title, description, isMediaScannerScannable, mimeType, path, + length, showNotification, allowWrite, null, null); + } + + /** {@hide} */ + public long addCompletedDownload(String title, String description, + boolean isMediaScannerScannable, String mimeType, String path, long length, + boolean showNotification, boolean allowWrite, Uri uri, Uri referer) { // make sure the input args are non-null/non-zero validateArgumentIsNonEmpty("title", title); validateArgumentIsNonEmpty("description", description); @@ -1210,10 +1249,18 @@ public class DownloadManager { } // if there is already an entry with the given path name in downloads.db, return its id - Request request = new Request(NON_DOWNLOADMANAGER_DOWNLOAD) - .setTitle(title) + Request request; + if (uri != null) { + request = new Request(uri); + } else { + request = new Request(NON_DOWNLOADMANAGER_DOWNLOAD); + } + request.setTitle(title) .setDescription(description) .setMimeType(mimeType); + if (referer != null) { + request.addRequestHeader("Referer", referer.toString()); + } ContentValues values = request.toContentValues(null); values.put(Downloads.Impl.COLUMN_DESTINATION, Downloads.Impl.DESTINATION_NON_DOWNLOADMANAGER_DOWNLOAD); diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index a95e89d62ff6..5b8e09c711d5 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -3472,27 +3472,31 @@ public class DevicePolicyManager { } /** - * Called by device or profile owners for setting the package suspended for this user. - * A suspended package will not be started by the package manager, its notifications will - * be hidden and it will not show up in recents. The package must already be installed. + * Called by device or profile owners to suspend packages for this user. + * + * <p>A suspended package will not be able to start activities. Its notifications will + * be hidden, it will not show up in recents, will not be able to show toasts or dialogs + * or ring the device. + * + * <p>The package must already be installed. * * @param admin The name of the admin component to check. - * @param packageName The package name of the app to suspend or unsuspend. - * @param suspended If set to {@code true} than the package will be suspended, if set to - * {@code false} the package will be unsuspended. - * @return boolean {@code true} if the operation was successfully performed, {@code false} - * otherwise. + * @param packageNames The package names to suspend or unsuspend. + * @param suspended If set to {@code true} than the packages will be suspended, if set to + * {@code false} the packages will be unsuspended. + * @return an array of package names for which the suspended status is not set as requested in + * this method. */ - public boolean setPackageSuspended(@NonNull ComponentName admin, String packageName, + public String[] setPackagesSuspended(@NonNull ComponentName admin, String[] packageNames, boolean suspended) { if (mService != null) { try { - return mService.setPackageSuspended(admin, packageName, suspended); + return mService.setPackagesSuspended(admin, packageNames, suspended); } catch (RemoteException re) { Log.w(TAG, "Failed talking with device policy service", re); } } - return false; + return packageNames; } /** @@ -3501,7 +3505,7 @@ public class DevicePolicyManager { * @param admin Which {@link DeviceAdminReceiver} this request is associated with. * @param packageName The name of the package to retrieve the suspended status of. * @return {@code true} if the package is suspended or {@code false} if the package is not - * suspended, could not be found or an error occured. + * suspended, could not be found or an error occurred. */ public boolean getPackageSuspended(@NonNull ComponentName admin, String packageName) { if (mService != null) { diff --git a/core/java/android/app/admin/IDevicePolicyManager.aidl b/core/java/android/app/admin/IDevicePolicyManager.aidl index 685ec3e08415..e9af8727012a 100644 --- a/core/java/android/app/admin/IDevicePolicyManager.aidl +++ b/core/java/android/app/admin/IDevicePolicyManager.aidl @@ -138,7 +138,7 @@ interface IDevicePolicyManager { boolean setDeviceOwnerLockScreenInfo(in ComponentName who, String deviceOwnerInfo); String getDeviceOwnerLockScreenInfo(); - boolean setPackageSuspended(in ComponentName admin, String packageName, boolean suspended); + String[] setPackagesSuspended(in ComponentName admin, in String[] packageNames, boolean suspended); boolean getPackageSuspended(in ComponentName admin, String packageName); boolean installCaCert(in ComponentName admin, in byte[] certBuffer); diff --git a/core/java/android/app/backup/BackupTransport.java b/core/java/android/app/backup/BackupTransport.java index ac23b6888dd0..da81d19ca3cb 100644 --- a/core/java/android/app/backup/BackupTransport.java +++ b/core/java/android/app/backup/BackupTransport.java @@ -501,7 +501,7 @@ public class BackupTransport { * @param packageName ID of package to provide the quota. * @param isFullBackup If set, transport should return limit for full data backup, otherwise * for key-value backup. - * @return Current limit on full data backup size in bytes. + * @return Current limit on backup size in bytes. */ public long getBackupQuota(String packageName, boolean isFullBackup) { return Long.MAX_VALUE; diff --git a/core/java/android/appwidget/AppWidgetHostView.java b/core/java/android/appwidget/AppWidgetHostView.java index bed91ecafb96..cd8f1260b590 100644 --- a/core/java/android/appwidget/AppWidgetHostView.java +++ b/core/java/android/appwidget/AppWidgetHostView.java @@ -376,7 +376,13 @@ public class AppWidgetHostView extends FrameLayout { * AppWidget provider. Will animate into these new views as needed */ public void updateAppWidget(RemoteViews remoteViews) { + applyRemoteViews(remoteViews); + } + /** + * @hide + */ + protected void applyRemoteViews(RemoteViews remoteViews) { if (LOGD) Log.d(TAG, "updateAppWidget called mOld=" + mOld); boolean recycled = false; @@ -573,8 +579,9 @@ public class AppWidgetHostView extends FrameLayout { /** * Build a {@link Context} cloned into another package name, usually for the * purposes of reading remote resources. + * @hide */ - private Context getRemoteContext() { + protected Context getRemoteContext() { try { // Return if cloned successfully, otherwise default return mContext.createApplicationContext( diff --git a/core/java/android/content/pm/IPackageManager.aidl b/core/java/android/content/pm/IPackageManager.aidl index 868b44b6dc00..ccb5f8268105 100644 --- a/core/java/android/content/pm/IPackageManager.aidl +++ b/core/java/android/content/pm/IPackageManager.aidl @@ -283,7 +283,7 @@ interface IPackageManager { void clearCrossProfileIntentFilters(int sourceUserId, String ownerPackage); - boolean setPackageSuspendedAsUser(String packageName, boolean suspended, int userId); + String[] setPackagesSuspendedAsUser(in String[] packageNames, boolean suspended, int userId); boolean isPackageSuspendedForUser(String packageName, int userId); /** diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java index daf8b92e695c..c9ee4f39abd0 100644 --- a/core/java/android/content/pm/PackageManager.java +++ b/core/java/android/content/pm/PackageManager.java @@ -5302,19 +5302,24 @@ public abstract class PackageManager { public abstract boolean isSignedByExactly(String packageName, KeySet ks); /** - * Puts the package in a suspended state, making the package un-runnable, - * but it doesn't remove the data or the actual package file. The application notifications - * will be hidden and also the application will not show up in recents. + * Puts the package in a suspended state, where attempts at starting activities are denied. * - * @param packageName The name of the package to set the suspended status. - * @param suspended If set to {@code true} than the package will be suspended, if set to - * {@code false} the package will be unsuspended. + * <p>It doesn't remove the data or the actual package file. The application notifications + * will be hidden, the application will not show up in recents, will not be able to show + * toasts or dialogs or ring the device. + * + * @param packageNames The names of the packages to set the suspended status. + * @param suspended If set to {@code true} than the packages will be suspended, if set to + * {@code false} the packages will be unsuspended. * @param userId The user id. * + * @return an array of package names for which the suspended status is not set as requested in + * this method. + * * @hide */ - public abstract boolean setPackageSuspendedAsUser( - String packageName, boolean suspended, @UserIdInt int userId); + public abstract String[] setPackagesSuspendedAsUser( + String[] packageNames, boolean suspended, @UserIdInt int userId); /** * @see #setPackageSuspendedAsUser(String, boolean, int) diff --git a/core/java/android/os/Environment.java b/core/java/android/os/Environment.java index 59bf2938cfce..70f9cc57faf8 100644 --- a/core/java/android/os/Environment.java +++ b/core/java/android/os/Environment.java @@ -476,11 +476,6 @@ public class Environment { public static String DIRECTORY_DOCUMENTS = "Documents"; /** - * Standard directory in which user managed files are stored. - */ - public static String DIRECTORY_HOME = "Home"; - - /** * List of standard storage directories. * <p> * Each of its values have its own constant: @@ -495,7 +490,6 @@ public class Environment { * <li>{@link #DIRECTORY_DOWNLOADS} * <li>{@link #DIRECTORY_DCIM} * <li>{@link #DIRECTORY_DOCUMENTS} - * <li>{@link #DIRECTORY_HOME} * </ul> * @hide */ @@ -509,8 +503,7 @@ public class Environment { DIRECTORY_MOVIES, DIRECTORY_DOWNLOADS, DIRECTORY_DCIM, - DIRECTORY_DOCUMENTS, - DIRECTORY_HOME + DIRECTORY_DOCUMENTS }; /** diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 3169bf4f0e64..5ab2b001614a 100755 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -201,6 +201,21 @@ public final class Settings { "android.settings.ACCESSIBILITY_SETTINGS"; /** + * Activity Action: Launch the screen reader tutorial. + * <p> + * In some cases, a matching Activity may not exist, so ensure you + * safeguard against this. + * <p> + * Input: Nothing. + * <p> + * Output: Nothing. + */ + @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION) + public static final String ACTION_SCREEN_READER_TUTORIAL = + "android.settings.SCREEN_READER_TUTORIAL"; + + + /** * Activity Action: Show settings to control access to usage information. * <p> * In some cases, a matching Activity may not exist, so ensure you @@ -6716,6 +6731,16 @@ public final class Settings { public static final String STORAGE_BENCHMARK_INTERVAL = "storage_benchmark_interval"; /** + * Whether to disable the automatic scheduling of system updates. + * 1 = system updates won't be automatically scheduled (will always + * present notification instead). + * 0 = system updates will be automatically scheduled. (default) + * @hide + */ + @SystemApi + public static final String OTA_DISABLE_AUTOMATIC_UPDATE = "ota_disable_automatic_update"; + + /** * Whether the package manager should send package verification broadcasts for verifiers to * review apps prior to installation. * 1 = request apps to be verified prior to installation, if a verifier exists. diff --git a/core/java/android/widget/RemoteViewsAdapter.java b/core/java/android/widget/RemoteViewsAdapter.java index 5953a989c928..8278c5af92cb 100644 --- a/core/java/android/widget/RemoteViewsAdapter.java +++ b/core/java/android/widget/RemoteViewsAdapter.java @@ -18,11 +18,13 @@ package android.widget; import java.lang.ref.WeakReference; import java.util.ArrayList; +import java.util.Arrays; import java.util.HashMap; import java.util.HashSet; import java.util.LinkedList; import android.Manifest; +import android.appwidget.AppWidgetHostView; import android.appwidget.AppWidgetManager; import android.content.Context; import android.content.Intent; @@ -34,6 +36,9 @@ import android.os.Message; import android.os.RemoteException; import android.util.Log; import android.util.Slog; +import android.util.SparseArray; +import android.util.SparseBooleanArray; +import android.util.SparseIntArray; import android.view.LayoutInflater; import android.view.View; import android.view.View.MeasureSpec; @@ -74,7 +79,7 @@ public class RemoteViewsAdapter extends BaseAdapter implements Handler.Callback private RemoteViewsAdapterServiceConnection mServiceConnection; private WeakReference<RemoteAdapterConnectionCallback> mCallback; private OnClickHandler mRemoteViewsOnClickHandler; - private FixedSizeRemoteViewsCache mCache; + private final FixedSizeRemoteViewsCache mCache; private int mVisibleWindowLowerBound; private int mVisibleWindowUpperBound; @@ -92,13 +97,10 @@ public class RemoteViewsAdapter extends BaseAdapter implements Handler.Callback // We cache the FixedSizeRemoteViewsCaches across orientation. These are the related data // structures; - private static final HashMap<RemoteViewsCacheKey, - FixedSizeRemoteViewsCache> sCachedRemoteViewsCaches - = new HashMap<RemoteViewsCacheKey, - FixedSizeRemoteViewsCache>(); + private static final HashMap<RemoteViewsCacheKey, FixedSizeRemoteViewsCache> + sCachedRemoteViewsCaches = new HashMap<>(); private static final HashMap<RemoteViewsCacheKey, Runnable> - sRemoteViewsCacheRemoveRunnables - = new HashMap<RemoteViewsCacheKey, Runnable>(); + sRemoteViewsCacheRemoveRunnables = new HashMap<>(); private static HandlerThread sCacheRemovalThread; private static Handler sCacheRemovalQueue; @@ -286,9 +288,12 @@ public class RemoteViewsAdapter extends BaseAdapter implements Handler.Callback * A FrameLayout which contains a loading view, and manages the re/applying of RemoteViews when * they are loaded. */ - private static class RemoteViewsFrameLayout extends FrameLayout { - public RemoteViewsFrameLayout(Context context) { + private static class RemoteViewsFrameLayout extends AppWidgetHostView { + private final FixedSizeRemoteViewsCache mCache; + + public RemoteViewsFrameLayout(Context context, FixedSizeRemoteViewsCache cache) { super(context); + mCache = cache; } /** @@ -297,13 +302,24 @@ public class RemoteViewsAdapter extends BaseAdapter implements Handler.Callback * successfully. */ public void onRemoteViewsLoaded(RemoteViews view, OnClickHandler handler) { - try { - // Remove all the children of this layout first - removeAllViews(); - addView(view.apply(getContext(), this, handler)); - } catch (Exception e) { - Log.e(TAG, "Failed to apply RemoteViews."); - } + setOnClickHandler(handler); + applyRemoteViews(view); + } + + @Override + protected View getDefaultView() { + return mCache.getMetaData().createDefaultLoadingView(this); + } + + @Override + protected Context getRemoteContext() { + return null; + } + + @Override + protected View getErrorView() { + // Use the default loading view as the error view. + return getDefaultView(); } } @@ -312,29 +328,21 @@ public class RemoteViewsAdapter extends BaseAdapter implements Handler.Callback * adapter that have not yet had their RemoteViews loaded. */ private class RemoteViewsFrameLayoutRefSet { - private HashMap<Integer, LinkedList<RemoteViewsFrameLayout>> mReferences; - private HashMap<RemoteViewsFrameLayout, LinkedList<RemoteViewsFrameLayout>> - mViewToLinkedList; - - public RemoteViewsFrameLayoutRefSet() { - mReferences = new HashMap<Integer, LinkedList<RemoteViewsFrameLayout>>(); - mViewToLinkedList = - new HashMap<RemoteViewsFrameLayout, LinkedList<RemoteViewsFrameLayout>>(); - } + private final SparseArray<LinkedList<RemoteViewsFrameLayout>> mReferences = + new SparseArray<>(); + private final HashMap<RemoteViewsFrameLayout, LinkedList<RemoteViewsFrameLayout>> + mViewToLinkedList = new HashMap<>(); /** * Adds a new reference to a RemoteViewsFrameLayout returned by the adapter. */ public void add(int position, RemoteViewsFrameLayout layout) { - final Integer pos = position; - LinkedList<RemoteViewsFrameLayout> refs; + LinkedList<RemoteViewsFrameLayout> refs = mReferences.get(position); // Create the list if necessary - if (mReferences.containsKey(pos)) { - refs = mReferences.get(pos); - } else { + if (refs == null) { refs = new LinkedList<RemoteViewsFrameLayout>(); - mReferences.put(pos, refs); + mReferences.put(position, refs); } mViewToLinkedList.put(layout, refs); @@ -349,10 +357,9 @@ public class RemoteViewsAdapter extends BaseAdapter implements Handler.Callback public void notifyOnRemoteViewsLoaded(int position, RemoteViews view) { if (view == null) return; - final Integer pos = position; - if (mReferences.containsKey(pos)) { + final LinkedList<RemoteViewsFrameLayout> refs = mReferences.get(position); + if (refs != null) { // Notify all the references for that position of the newly loaded RemoteViews - final LinkedList<RemoteViewsFrameLayout> refs = mReferences.get(pos); for (final RemoteViewsFrameLayout ref : refs) { ref.onRemoteViewsLoaded(view, mRemoteViewsOnClickHandler); if (mViewToLinkedList.containsKey(ref)) { @@ -361,7 +368,7 @@ public class RemoteViewsAdapter extends BaseAdapter implements Handler.Callback } refs.clear(); // Remove this set from the original mapping - mReferences.remove(pos); + mReferences.remove(position); } } @@ -402,7 +409,7 @@ public class RemoteViewsAdapter extends BaseAdapter implements Handler.Callback int mFirstViewHeight; // A mapping from type id to a set of unique type ids - private final HashMap<Integer, Integer> mTypeIdIndexMap = new HashMap<Integer, Integer>(); + private final SparseIntArray mTypeIdIndexMap = new SparseIntArray(); public RemoteViewsMetaData() { reset(); @@ -438,82 +445,47 @@ public class RemoteViewsAdapter extends BaseAdapter implements Handler.Callback } public int getMappedViewType(int typeId) { - if (mTypeIdIndexMap.containsKey(typeId)) { - return mTypeIdIndexMap.get(typeId); - } else { + int mappedTypeId = mTypeIdIndexMap.get(typeId, -1); + if (mappedTypeId == -1) { // We +1 because the loading view always has view type id of 0 - int incrementalTypeId = mTypeIdIndexMap.size() + 1; - mTypeIdIndexMap.put(typeId, incrementalTypeId); - return incrementalTypeId; + mappedTypeId = mTypeIdIndexMap.size() + 1; + mTypeIdIndexMap.put(typeId, mappedTypeId); } + return mappedTypeId; } public boolean isViewTypeInRange(int typeId) { int mappedType = getMappedViewType(typeId); - if (mappedType >= viewTypeCount) { - return false; - } else { - return true; - } + return (mappedType < viewTypeCount); } - private RemoteViewsFrameLayout createLoadingView(int position, View convertView, - ViewGroup parent, Object lock, LayoutInflater layoutInflater, OnClickHandler - handler) { - // Create and return a new FrameLayout, and setup the references for this position + /** + * Creates a default loading view. Uses the size of the first row as a guide for the + * size of the loading view. + */ + private synchronized View createDefaultLoadingView(ViewGroup parent) { final Context context = parent.getContext(); - RemoteViewsFrameLayout layout = new RemoteViewsFrameLayout(context); - - // Create a new loading view - synchronized (lock) { - boolean customLoadingViewAvailable = false; - - if (mUserLoadingView != null) { - // Try to inflate user-specified loading view - try { - View loadingView = mUserLoadingView.apply(parent.getContext(), parent, - handler); - loadingView.setTagInternal(com.android.internal.R.id.rowTypeId, - new Integer(0)); - layout.addView(loadingView); - customLoadingViewAvailable = true; - } catch (Exception e) { - Log.w(TAG, "Error inflating custom loading view, using default loading" + - "view instead", e); - } - } - if (!customLoadingViewAvailable) { - // A default loading view - // Use the size of the first row as a guide for the size of the loading view - if (mFirstViewHeight < 0) { - try { - View firstView = mFirstView.apply(parent.getContext(), parent, handler); - firstView.measure( - MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED), - MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED)); - mFirstViewHeight = firstView.getMeasuredHeight(); - mFirstView = null; - } catch (Exception e) { - float density = context.getResources().getDisplayMetrics().density; - mFirstViewHeight = (int) - Math.round(sDefaultLoadingViewHeight * density); - mFirstView = null; - Log.w(TAG, "Error inflating first RemoteViews" + e); - } - } - - // Compose the loading view text - TextView loadingTextView = (TextView) layoutInflater.inflate( - com.android.internal.R.layout.remote_views_adapter_default_loading_view, - layout, false); - loadingTextView.setHeight(mFirstViewHeight); - loadingTextView.setTag(new Integer(0)); - - layout.addView(loadingTextView); + if (mFirstViewHeight < 0) { + try { + View firstView = mFirstView.apply(parent.getContext(), parent); + firstView.measure( + MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED), + MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED)); + mFirstViewHeight = firstView.getMeasuredHeight(); + } catch (Exception e) { + float density = context.getResources().getDisplayMetrics().density; + mFirstViewHeight = Math.round(sDefaultLoadingViewHeight * density); + Log.w(TAG, "Error inflating first RemoteViews" + e); } + mFirstView = null; } - return layout; + // Compose the loading view text + TextView loadingTextView = (TextView) LayoutInflater.from(context).inflate( + com.android.internal.R.layout.remote_views_adapter_default_loading_view, + parent, false); + loadingTextView.setHeight(mFirstViewHeight); + return loadingTextView; } } @@ -548,8 +520,8 @@ public class RemoteViewsAdapter extends BaseAdapter implements Handler.Callback // The meta data objects are made final so that they can be locked on independently // of the FixedSizeRemoteViewsCache. If we ever lock on both meta data objects, it is in // the order mTemporaryMetaData followed by mMetaData. - private final RemoteViewsMetaData mMetaData; - private final RemoteViewsMetaData mTemporaryMetaData; + private final RemoteViewsMetaData mMetaData = new RemoteViewsMetaData(); + private final RemoteViewsMetaData mTemporaryMetaData = new RemoteViewsMetaData(); // The cache/mapping of position to RemoteViewsMetaData. This set is guaranteed to be // greater than or equal to the set of RemoteViews. @@ -558,22 +530,20 @@ public class RemoteViewsAdapter extends BaseAdapter implements Handler.Callback // the heavy RemoteViews around. The RemoteViews cache is trimmed to fixed constraints wrt. // memory and size, but this metadata cache will retain information until the data at the // position is guaranteed as not being necessary any more (usually on notifyDataSetChanged). - private HashMap<Integer, RemoteViewsIndexMetaData> mIndexMetaData; + private final SparseArray<RemoteViewsIndexMetaData> mIndexMetaData = new SparseArray<>(); // The cache of actual RemoteViews, which may be pruned if the cache gets too large, or uses // too much memory. - private HashMap<Integer, RemoteViews> mIndexRemoteViews; + private final SparseArray<RemoteViews> mIndexRemoteViews = new SparseArray<>(); - // The set of indices that have been explicitly requested by the collection view - private HashSet<Integer> mRequestedIndices; + // An array of indices to load, Indices which are explicitely requested are set to true, + // and those determined by the preloading algorithm to prefetch are set to false. + private final SparseBooleanArray mIndicesToLoad = new SparseBooleanArray(); // We keep a reference of the last requested index to determine which item to prune the // farthest items from when we hit the memory limit private int mLastRequestedIndex; - // The set of indices to load, including those explicitly requested, as well as those - // determined by the preloading algorithm to be prefetched - private HashSet<Integer> mLoadIndices; // The lower and upper bounds of the preloaded range private int mPreloadLowerBound; @@ -584,8 +554,8 @@ public class RemoteViewsAdapter extends BaseAdapter implements Handler.Callback // The maxCountSlack is used to determine if a new position in the cache to be loaded is // sufficiently ouside the old set, prompting a shifting of the "window" of items to be // preloaded. - private int mMaxCount; - private int mMaxCountSlack; + private final int mMaxCount; + private final int mMaxCountSlack; private static final float sMaxCountSlackPercent = 0.75f; private static final int sMaxMemoryLimitInBytes = 2 * 1024 * 1024; @@ -594,17 +564,10 @@ public class RemoteViewsAdapter extends BaseAdapter implements Handler.Callback mMaxCountSlack = Math.round(sMaxCountSlackPercent * (mMaxCount / 2)); mPreloadLowerBound = 0; mPreloadUpperBound = -1; - mMetaData = new RemoteViewsMetaData(); - mTemporaryMetaData = new RemoteViewsMetaData(); - mIndexMetaData = new HashMap<Integer, RemoteViewsIndexMetaData>(); - mIndexRemoteViews = new HashMap<Integer, RemoteViews>(); - mRequestedIndices = new HashSet<Integer>(); mLastRequestedIndex = -1; - mLoadIndices = new HashSet<Integer>(); } - public void insert(int position, RemoteViews v, long itemId, - ArrayList<Integer> visibleWindow) { + public void insert(int position, RemoteViews v, long itemId, int[] visibleWindow) { // Trim the cache if we go beyond the count if (mIndexRemoteViews.size() >= mMaxCount) { mIndexRemoteViews.remove(getFarthestPositionFrom(position, visibleWindow)); @@ -630,8 +593,8 @@ public class RemoteViewsAdapter extends BaseAdapter implements Handler.Callback } // Update the metadata cache - if (mIndexMetaData.containsKey(position)) { - final RemoteViewsIndexMetaData metaData = mIndexMetaData.get(position); + final RemoteViewsIndexMetaData metaData = mIndexMetaData.get(position); + if (metaData != null) { metaData.set(v, itemId); } else { mIndexMetaData.put(position, new RemoteViewsIndexMetaData(v, itemId)); @@ -646,16 +609,10 @@ public class RemoteViewsAdapter extends BaseAdapter implements Handler.Callback return mTemporaryMetaData; } public RemoteViews getRemoteViewsAt(int position) { - if (mIndexRemoteViews.containsKey(position)) { - return mIndexRemoteViews.get(position); - } - return null; + return mIndexRemoteViews.get(position); } public RemoteViewsIndexMetaData getMetaDataAt(int position) { - if (mIndexMetaData.containsKey(position)) { - return mIndexMetaData.get(position); - } - return null; + return mIndexMetaData.get(position); } public void commitTemporaryMetaData() { @@ -669,8 +626,8 @@ public class RemoteViewsAdapter extends BaseAdapter implements Handler.Callback private int getRemoteViewsBitmapMemoryUsage() { // Calculate the memory usage of all the RemoteViews bitmaps being cached int mem = 0; - for (Integer i : mIndexRemoteViews.keySet()) { - final RemoteViews v = mIndexRemoteViews.get(i); + for (int i = mIndexRemoteViews.size() - 1; i >= 0; i--) { + final RemoteViews v = mIndexRemoteViews.valueAt(i); if (v != null) { mem += v.estimateMemoryUsage(); } @@ -678,24 +635,25 @@ public class RemoteViewsAdapter extends BaseAdapter implements Handler.Callback return mem; } - private int getFarthestPositionFrom(int pos, ArrayList<Integer> visibleWindow) { + private int getFarthestPositionFrom(int pos, int[] visibleWindow) { // Find the index farthest away and remove that int maxDist = 0; int maxDistIndex = -1; int maxDistNotVisible = 0; int maxDistIndexNotVisible = -1; - for (int i : mIndexRemoteViews.keySet()) { - int dist = Math.abs(i-pos); - if (dist > maxDistNotVisible && !visibleWindow.contains(i)) { + for (int i = mIndexRemoteViews.size() - 1; i >= 0; i--) { + int index = mIndexRemoteViews.keyAt(i); + int dist = Math.abs(index-pos); + if (dist > maxDistNotVisible && Arrays.binarySearch(visibleWindow, index) < 0) { // maxDistNotVisible/maxDistIndexNotVisible will store the index of the // farthest non-visible position - maxDistIndexNotVisible = i; + maxDistIndexNotVisible = index; maxDistNotVisible = dist; } if (dist >= maxDist) { // maxDist/maxDistIndex will store the index of the farthest position // regardless of whether it is visible or not - maxDistIndex = i; + maxDistIndex = index; maxDist = dist; } } @@ -707,9 +665,8 @@ public class RemoteViewsAdapter extends BaseAdapter implements Handler.Callback public void queueRequestedPositionToLoad(int position) { mLastRequestedIndex = position; - synchronized (mLoadIndices) { - mRequestedIndices.add(position); - mLoadIndices.add(position); + synchronized (mIndicesToLoad) { + mIndicesToLoad.put(position, true); } } public boolean queuePositionsToBePreloadedFromRequestedPosition(int position) { @@ -725,11 +682,13 @@ public class RemoteViewsAdapter extends BaseAdapter implements Handler.Callback synchronized (mMetaData) { count = mMetaData.count; } - synchronized (mLoadIndices) { - mLoadIndices.clear(); - - // Add all the requested indices - mLoadIndices.addAll(mRequestedIndices); + synchronized (mIndicesToLoad) { + // Remove all indices which have not been previously requested. + for (int i = mIndicesToLoad.size() - 1; i >= 0; i--) { + if (!mIndicesToLoad.valueAt(i)) { + mIndicesToLoad.removeAt(i); + } + } // Add all the preload indices int halfMaxCount = mMaxCount / 2; @@ -738,43 +697,40 @@ public class RemoteViewsAdapter extends BaseAdapter implements Handler.Callback int effectiveLowerBound = Math.max(0, mPreloadLowerBound); int effectiveUpperBound = Math.min(mPreloadUpperBound, count - 1); for (int i = effectiveLowerBound; i <= effectiveUpperBound; ++i) { - mLoadIndices.add(i); + if (mIndexRemoteViews.indexOfKey(i) < 0 && !mIndicesToLoad.get(i)) { + // If the index has not been requested, and has not been loaded. + mIndicesToLoad.put(i, false); + } } - - // But remove all the indices that have already been loaded and are cached - mLoadIndices.removeAll(mIndexRemoteViews.keySet()); } return true; } - /** Returns the next index to load, and whether that index was directly requested or not */ - public int[] getNextIndexToLoad() { + /** Returns the next index to load */ + public int getNextIndexToLoad() { // We try and prioritize items that have been requested directly, instead // of items that are loaded as a result of the caching mechanism - synchronized (mLoadIndices) { + synchronized (mIndicesToLoad) { // Prioritize requested indices to be loaded first - if (!mRequestedIndices.isEmpty()) { - Integer i = mRequestedIndices.iterator().next(); - mRequestedIndices.remove(i); - mLoadIndices.remove(i); - return new int[]{i.intValue(), 1}; + int index = mIndicesToLoad.indexOfValue(true); + if (index < 0) { + // Otherwise, preload other indices as necessary + index = mIndicesToLoad.indexOfValue(false); } - - // Otherwise, preload other indices as necessary - if (!mLoadIndices.isEmpty()) { - Integer i = mLoadIndices.iterator().next(); - mLoadIndices.remove(i); - return new int[]{i.intValue(), 0}; + if (index < 0) { + return -1; + } else { + int key = mIndicesToLoad.keyAt(index); + mIndicesToLoad.removeAt(index); + return key; } - - return new int[]{-1, 0}; } } public boolean containsRemoteViewAt(int position) { - return mIndexRemoteViews.containsKey(position); + return mIndexRemoteViews.indexOfKey(position) >= 0; } public boolean containsMetaDataAt(int position) { - return mIndexMetaData.containsKey(position); + return mIndexMetaData.indexOfKey(position) >= 0; } public void reset() { @@ -787,9 +743,8 @@ public class RemoteViewsAdapter extends BaseAdapter implements Handler.Callback mLastRequestedIndex = -1; mIndexRemoteViews.clear(); mIndexMetaData.clear(); - synchronized (mLoadIndices) { - mRequestedIndices.clear(); - mLoadIndices.clear(); + synchronized (mIndicesToLoad) { + mIndicesToLoad.clear(); } } } @@ -942,8 +897,7 @@ public class RemoteViewsAdapter extends BaseAdapter implements Handler.Callback // Get the next index to load int position = -1; synchronized (mCache) { - int[] res = mCache.getNextIndexToLoad(); - position = res[0]; + position = mCache.getNextIndexToLoad(); } if (position > -1) { // Load the item, and notify any existing RemoteViewsFrameLayouts @@ -1048,7 +1002,7 @@ public class RemoteViewsAdapter extends BaseAdapter implements Handler.Callback } synchronized (mCache) { if (viewTypeInRange) { - ArrayList<Integer> visibleWindow = getVisibleWindow(mVisibleWindowLowerBound, + int[] visibleWindow = getVisibleWindow(mVisibleWindowLowerBound, mVisibleWindowUpperBound, cacheCount); // Cache the RemoteViews we loaded mCache.insert(position, remoteViews, itemId, visibleWindow); @@ -1117,21 +1071,6 @@ public class RemoteViewsAdapter extends BaseAdapter implements Handler.Callback } /** - * Returns the item type id for the specified convert view. Returns -1 if the convert view - * is invalid. - */ - private int getConvertViewTypeId(View convertView) { - int typeId = -1; - if (convertView != null) { - Object tag = convertView.getTag(com.android.internal.R.id.rowTypeId); - if (tag != null) { - typeId = (Integer) tag; - } - } - return typeId; - } - - /** * This method allows an AdapterView using this Adapter to provide information about which * views are currently being displayed. This allows for certain optimizations and preloading * which wouldn't otherwise be possible. @@ -1145,7 +1084,8 @@ public class RemoteViewsAdapter extends BaseAdapter implements Handler.Callback // "Request" an index so that we can queue it for loading, initiate subsequent // preloading, etc. synchronized (mCache) { - boolean isInCache = mCache.containsRemoteViewAt(position); + RemoteViews rv = mCache.getRemoteViewsAt(position); + boolean isInCache = (rv != null); boolean isConnected = mServiceConnection.isConnected(); boolean hasNewItems = false; @@ -1162,75 +1102,23 @@ public class RemoteViewsAdapter extends BaseAdapter implements Handler.Callback hasNewItems = mCache.queuePositionsToBePreloadedFromRequestedPosition(position); } + final RemoteViewsFrameLayout layout = + (convertView instanceof RemoteViewsFrameLayout) + ? (RemoteViewsFrameLayout) convertView + : new RemoteViewsFrameLayout(parent.getContext(), mCache); if (isInCache) { - View convertViewChild = null; - int convertViewTypeId = 0; - RemoteViewsFrameLayout layout = null; - - if (convertView instanceof RemoteViewsFrameLayout) { - layout = (RemoteViewsFrameLayout) convertView; - convertViewChild = layout.getChildAt(0); - convertViewTypeId = getConvertViewTypeId(convertViewChild); - } - - // Second, we try and retrieve the RemoteViews from the cache, returning a loading - // view and queueing it to be loaded if it has not already been loaded. - Context context = parent.getContext(); - RemoteViews rv = mCache.getRemoteViewsAt(position); - RemoteViewsIndexMetaData indexMetaData = mCache.getMetaDataAt(position); - int typeId = indexMetaData.typeId; - - try { - // Reuse the convert view where possible - if (layout != null) { - if (convertViewTypeId == typeId) { - rv.reapply(context, convertViewChild, mRemoteViewsOnClickHandler); - return layout; - } - layout.removeAllViews(); - } else { - layout = new RemoteViewsFrameLayout(context); - } - - // Otherwise, create a new view to be returned - View newView = rv.apply(context, parent, mRemoteViewsOnClickHandler); - newView.setTagInternal(com.android.internal.R.id.rowTypeId, - new Integer(typeId)); - layout.addView(newView); - return layout; - - } catch (Exception e){ - // We have to make sure that we successfully inflated the RemoteViews, if not - // we return the loading view instead. - Log.w(TAG, "Error inflating RemoteViews at position: " + position + ", using" + - "loading view instead" + e); - - RemoteViewsFrameLayout loadingView = null; - final RemoteViewsMetaData metaData = mCache.getMetaData(); - synchronized (metaData) { - loadingView = metaData.createLoadingView(position, convertView, parent, - mCache, mLayoutInflater, mRemoteViewsOnClickHandler); - } - return loadingView; - } finally { - if (hasNewItems) loadNextIndexInBackground(); - } + layout.onRemoteViewsLoaded(rv, mRemoteViewsOnClickHandler); + if (hasNewItems) loadNextIndexInBackground(); } else { - // If the cache does not have the RemoteViews at this position, then create a - // loading view and queue the actual position to be loaded in the background - RemoteViewsFrameLayout loadingView = null; - final RemoteViewsMetaData metaData = mCache.getMetaData(); - synchronized (metaData) { - loadingView = metaData.createLoadingView(position, convertView, parent, - mCache, mLayoutInflater, mRemoteViewsOnClickHandler); - } - - mRequestedViews.add(position, loadingView); + // If the views is not loaded, apply the loading view. If the loading view doesn't + // exist, the layout will create a default view based on the firstView height. + layout.onRemoteViewsLoaded(mCache.getMetaData().mUserLoadingView, + mRemoteViewsOnClickHandler); + mRequestedViews.add(position, layout); mCache.queueRequestedPositionToLoad(position); loadNextIndexInBackground(); - - return loadingView; } + return layout; } } @@ -1276,7 +1164,7 @@ public class RemoteViewsAdapter extends BaseAdapter implements Handler.Callback // Re-request the new metadata (only after the notification to the factory) updateTemporaryMetaData(); int newCount; - ArrayList<Integer> visibleWindow; + int[] visibleWindow; synchronized(mCache.getTemporaryMetaData()) { newCount = mCache.getTemporaryMetaData().count; visibleWindow = getVisibleWindow(mVisibleWindowLowerBound, @@ -1311,26 +1199,33 @@ public class RemoteViewsAdapter extends BaseAdapter implements Handler.Callback mNotifyDataSetChangedAfterOnServiceConnected = false; } - private ArrayList<Integer> getVisibleWindow(int lower, int upper, int count) { - ArrayList<Integer> window = new ArrayList<Integer>(); - + /** + * Returns a sorted array of all integers between lower and upper. + */ + private int[] getVisibleWindow(int lower, int upper, int count) { // In the case that the window is invalid or uninitialized, return an empty window. if ((lower == 0 && upper == 0) || lower < 0 || upper < 0) { - return window; + return new int[0]; } + int[] window; if (lower <= upper) { - for (int i = lower; i <= upper; i++){ - window.add(i); + window = new int[upper + 1 - lower]; + for (int i = lower, j = 0; i <= upper; i++, j++){ + window[j] = i; } } else { // If the upper bound is less than the lower bound it means that the visible window // wraps around. - for (int i = lower; i < count; i++) { - window.add(i); + count = Math.max(count, lower); + window = new int[count - lower + upper + 1]; + int j = 0; + // Add the entries in sorted order + for (int i = 0; i <= upper; i++, j++) { + window[j] = i; } - for (int i = 0; i <= upper; i++) { - window.add(i); + for (int i = lower; i < count; i++, j++) { + window[j] = i; } } return window; diff --git a/core/java/com/android/internal/inputmethod/InputMethodUtils.java b/core/java/com/android/internal/inputmethod/InputMethodUtils.java index c1011503dae7..4c63941abe0c 100644 --- a/core/java/com/android/internal/inputmethod/InputMethodUtils.java +++ b/core/java/com/android/internal/inputmethod/InputMethodUtils.java @@ -18,6 +18,7 @@ package com.android.internal.inputmethod; import android.annotation.NonNull; import android.annotation.Nullable; +import android.annotation.UserIdInt; import android.app.AppOpsManager; import android.content.ContentResolver; import android.content.Context; @@ -32,6 +33,7 @@ import android.text.TextUtils.SimpleStringSplitter; import android.util.ArrayMap; import android.util.ArraySet; import android.util.Pair; +import android.util.Printer; import android.util.Slog; import android.view.inputmethod.InputMethodInfo; import android.view.inputmethod.InputMethodSubtype; @@ -826,7 +828,14 @@ public class InputMethodUtils { private final HashMap<String, InputMethodInfo> mMethodMap; private final ArrayList<InputMethodInfo> mMethodList; + /** + * On-memory data store to emulate when {@link #mCopyOnWrite} is {@code true}. + */ + private final HashMap<String, String> mCopyOnWriteDataStore = new HashMap<>(); + + private boolean mCopyOnWrite = false; private String mEnabledInputMethodsStrCache; + @UserIdInt private int mCurrentUserId; private int[] mCurrentProfileIds = new int[0]; @@ -879,48 +888,85 @@ public class InputMethodUtils { return imsList; } + @Deprecated + public InputMethodSettings( + Resources res, ContentResolver resolver, + HashMap<String, InputMethodInfo> methodMap, ArrayList<InputMethodInfo> methodList, + @UserIdInt int userId) { + this(res, resolver, methodMap, methodList, userId, false /* copyOnWrite */); + } + public InputMethodSettings( Resources res, ContentResolver resolver, HashMap<String, InputMethodInfo> methodMap, ArrayList<InputMethodInfo> methodList, - int userId) { - setCurrentUserId(userId); + @UserIdInt int userId, boolean copyOnWrite) { mRes = res; mResolver = resolver; mMethodMap = methodMap; mMethodList = methodList; + switchCurrentUser(userId, copyOnWrite); } - public void setCurrentUserId(int userId) { + /** + * Must be called when the current user is changed. + * + * @param userId The user ID. + * @param copyOnWrite If {@code true}, for each settings key + * (e.g. {@link Settings.Secure#ACTION_INPUT_METHOD_SUBTYPE_SETTINGS}) we use the actual + * settings on the {@link Settings.Secure} until we do the first write operation. + */ + public void switchCurrentUser(@UserIdInt int userId, boolean copyOnWrite) { if (DEBUG) { - Slog.d(TAG, "--- Swtich the current user from " + mCurrentUserId + " to " + userId); + Slog.d(TAG, "--- Switch the current user from " + mCurrentUserId + " to " + userId); + } + if (mCurrentUserId != userId || mCopyOnWrite != copyOnWrite) { + mCopyOnWriteDataStore.clear(); + mEnabledInputMethodsStrCache = ""; + // TODO: mCurrentProfileIds should be cleared here. } - // IMMS settings are kept per user, so keep track of current user mCurrentUserId = userId; + mCopyOnWrite = copyOnWrite; + // TODO: mCurrentProfileIds should be updated here. } private void putString(final String key, final String str) { - Settings.Secure.putStringForUser(mResolver, key, str, mCurrentUserId); + if (mCopyOnWrite) { + mCopyOnWriteDataStore.put(key, str); + } else { + Settings.Secure.putStringForUser(mResolver, key, str, mCurrentUserId); + } } private String getString(final String key) { + if (mCopyOnWrite && mCopyOnWriteDataStore.containsKey(key)) { + final String result = mCopyOnWriteDataStore.get(key); + return result != null ? result : ""; + } return Settings.Secure.getStringForUser(mResolver, key, mCurrentUserId); } private void putInt(final String key, final int value) { - Settings.Secure.putIntForUser(mResolver, key, value, mCurrentUserId); + if (mCopyOnWrite) { + mCopyOnWriteDataStore.put(key, String.valueOf(value)); + } else { + Settings.Secure.putIntForUser(mResolver, key, value, mCurrentUserId); + } } private int getInt(final String key, final int defaultValue) { + if (mCopyOnWrite && mCopyOnWriteDataStore.containsKey(key)) { + final String result = mCopyOnWriteDataStore.get(key); + return result != null ? Integer.valueOf(result) : 0; + } return Settings.Secure.getIntForUser(mResolver, key, defaultValue, mCurrentUserId); } private void putBoolean(final String key, final boolean value) { - Settings.Secure.putIntForUser(mResolver, key, value ? 1 : 0, mCurrentUserId); + putInt(key, value ? 1 : 0); } private boolean getBoolean(final String key, final boolean defaultValue) { - return Settings.Secure.getIntForUser(mResolver, key, defaultValue ? 1 : 0, - mCurrentUserId) == 1; + return getInt(key, defaultValue ? 1 : 0) == 1; } public void setCurrentProfileIds(int[] currentProfileIds) { @@ -1290,6 +1336,7 @@ public class InputMethodUtils { putBoolean(Settings.Secure.SHOW_IME_WITH_HARD_KEYBOARD, show); } + @UserIdInt public int getCurrentUserId() { return mCurrentUserId; } @@ -1324,6 +1371,13 @@ public class InputMethodUtils { } return enabledInputMethodAndSubtypes; } + + public void dumpLocked(final Printer pw, final String prefix) { + pw.println(prefix + "mCurrentUserId=" + mCurrentUserId); + pw.println(prefix + "mCurrentProfileIds=" + Arrays.toString(mCurrentProfileIds)); + pw.println(prefix + "mCopyOnWrite=" + mCopyOnWrite); + pw.println(prefix + "mEnabledInputMethodsStrCache=" + mEnabledInputMethodsStrCache); + } } // For spell checker service manager. diff --git a/media/java/android/media/tv/TvInputService.java b/media/java/android/media/tv/TvInputService.java index 16e1c5c2f64f..da4a03832191 100644 --- a/media/java/android/media/tv/TvInputService.java +++ b/media/java/android/media/tv/TvInputService.java @@ -1940,6 +1940,15 @@ public abstract class TvInputService extends Service { * </ul> */ public void onHardwareVideoUnavailable(int reason) { } + + @Override + void release() { + if (mHardwareSession != null) { + mHardwareSession.release(); + mHardwareSession = null; + } + super.release(); + } } /** @hide */ diff --git a/packages/DocumentsUI/res/drawable/ic_root_home.xml b/packages/DocumentsUI/res/drawable/ic_root_documents.xml index 696ee0534b63..afd886d2adc5 100644 --- a/packages/DocumentsUI/res/drawable/ic_root_home.xml +++ b/packages/DocumentsUI/res/drawable/ic_root_documents.xml @@ -20,5 +20,5 @@ Copyright (C) 2015 The Android Open Source Project android:viewportHeight="24.0"> <path android:fillColor="#FF000000" - android:pathData="M10 20v-6h4v6h5v-8h3L12 3 2 12h3v8z"/> + android:pathData="M10 4H4c-1.1 0,-1.99.9,-1.99 2L2 18c0 1.1.9 2 2 2h16c1.1 0 2,-.9 2,-2V8c0,-1.1,-.9,-2,-2,-2h-8l-2,-2z"/> </vector> diff --git a/packages/DocumentsUI/res/values-bs-rBA/strings.xml b/packages/DocumentsUI/res/values-bs-rBA/strings.xml index 8db4d83af116..d3151666f45f 100644 --- a/packages/DocumentsUI/res/values-bs-rBA/strings.xml +++ b/packages/DocumentsUI/res/values-bs-rBA/strings.xml @@ -17,50 +17,40 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="2783841764617238354">"Dokumenti"</string> - <!-- no translation found for files_label (6051402950202690279) --> - <skip /> - <!-- no translation found for downloads_label (959113951084633612) --> - <skip /> + <string name="files_label" msgid="6051402950202690279">"Fajlovi"</string> + <string name="downloads_label" msgid="959113951084633612">"Preuzimanja"</string> <string name="title_open" msgid="4353228937663917801">"Otvori iz"</string> - <string name="title_save" msgid="2433679664882857999">"Pohrani u"</string> - <!-- no translation found for menu_create_dir (2547620241173881754) --> - <skip /> + <string name="title_save" msgid="2433679664882857999">"Sačuvaj u"</string> + <string name="menu_create_dir" msgid="2547620241173881754">"Nova fascikla"</string> <string name="menu_grid" msgid="6878021334497835259">"Prikaz u vidu mreže"</string> <string name="menu_list" msgid="7279285939892417279">"Prikaz u vidu liste"</string> <string name="menu_sort" msgid="7677740407158414452">"Sortiraj po"</string> <string name="menu_search" msgid="3816712084502856974">"Traži"</string> <string name="menu_settings" msgid="8239065133341597825">"Postavke pohrane"</string> <string name="menu_open" msgid="432922957274920903">"Otvori"</string> - <string name="menu_save" msgid="2394743337684426338">"Pohrani"</string> + <string name="menu_save" msgid="2394743337684426338">"Sačuvaj"</string> <string name="menu_share" msgid="3075149983979628146">"Podijeli"</string> <string name="menu_delete" msgid="8138799623850614177">"Izbriši"</string> <string name="menu_select_all" msgid="8323579667348729928">"Odaberi sve"</string> <string name="menu_copy" msgid="3612326052677229148">"Kopiraj na..."</string> - <!-- no translation found for menu_move (1828090633118079817) --> - <skip /> - <!-- no translation found for menu_new_window (1226032889278727538) --> - <skip /> - <!-- no translation found for menu_copy_to_clipboard (489311381979634291) --> - <skip /> - <!-- no translation found for menu_paste_from_clipboard (2071583031180257091) --> - <skip /> - <string name="menu_advanced_show" msgid="4693652895715631401">"Pokaži interni prostor"</string> - <string name="menu_advanced_hide" msgid="4218809952721972589">"Sakrij interni prostor"</string> - <string name="menu_file_size_show" msgid="3240323619260823076">"Pokaži veličinu datoteke"</string> - <string name="menu_file_size_hide" msgid="8881975928502581042">"Sakrij veličinu datoteke"</string> + <string name="menu_move" msgid="1828090633118079817">"Premjesti u..."</string> + <string name="menu_new_window" msgid="1226032889278727538">"Novi prozor"</string> + <string name="menu_copy_to_clipboard" msgid="489311381979634291">"Kopiraj"</string> + <string name="menu_paste_from_clipboard" msgid="2071583031180257091">"Zalijepi"</string> + <string name="menu_advanced_show" msgid="4693652895715631401">"Pokaži internu pohranu"</string> + <string name="menu_advanced_hide" msgid="4218809952721972589">"Sakrij internu pohranu"</string> + <string name="menu_file_size_show" msgid="3240323619260823076">"Pokaži veličinu fajla"</string> + <string name="menu_file_size_hide" msgid="8881975928502581042">"Sakrij veličinu fajla"</string> <string name="button_select" msgid="527196987259139214">"Odaberi"</string> <string name="button_copy" msgid="8706475544635021302">"Kopiraj"</string> - <!-- no translation found for button_move (2202666023104202232) --> - <skip /> - <!-- no translation found for button_dismiss (3714065566893946085) --> - <skip /> - <!-- no translation found for button_retry (4392027584153752797) --> - <skip /> + <string name="button_move" msgid="2202666023104202232">"Premjesti"</string> + <string name="button_dismiss" msgid="3714065566893946085">"Odbaci"</string> + <string name="button_retry" msgid="4392027584153752797">"Pokušajte ponovo"</string> <string name="sort_name" msgid="9183560467917256779">"Po nazivu"</string> <string name="sort_date" msgid="586080032956151448">"Po datumu izmjene"</string> <string name="sort_size" msgid="3350681319735474741">"Po veličini"</string> - <string name="drawer_open" msgid="4545466532430226949">"Pokaži ishodišta"</string> - <string name="drawer_close" msgid="7602734368552123318">"Sakrij ishodišta"</string> + <string name="drawer_open" msgid="4545466532430226949">"Pokaži korijeni"</string> + <string name="drawer_close" msgid="7602734368552123318">"Sakrij korijenske foldere"</string> <string name="save_error" msgid="6167009778003223664">"Pohranjivanje dokumenta nije uspjelo"</string> <string name="create_error" msgid="3735649141335444215">"Kreiranje mape nije uspjelo"</string> <string name="query_error" msgid="5999895349602476581">"Trenutno nije moguće učitati sadržaj"</string> @@ -76,21 +66,26 @@ <string name="toast_failed_delete" msgid="2180678019407244069">"Nije moguće obrisati neke dokumente"</string> <string name="share_via" msgid="8966594246261344259">"Podijeli preko"</string> <string name="copy_notification_title" msgid="6374299806748219777">"Kopiraju se fajlovi"</string> - <!-- no translation found for move_notification_title (6193835179777284805) --> - <skip /> + <string name="move_notification_title" msgid="6193835179777284805">"Premještanje fajlova"</string> <string name="copy_remaining" msgid="6283790937387975095">"Još <xliff:g id="DURATION">%s</xliff:g>"</string> <plurals name="copy_begin" formatted="false" msgid="9071199452634086365"> <item quantity="one">Kopira se <xliff:g id="COUNT_1">%1$d</xliff:g> fajl.</item> <item quantity="few">Kopiraju se <xliff:g id="COUNT_1">%1$d</xliff:g> fajla.</item> <item quantity="other">Kopira se <xliff:g id="COUNT_1">%1$d</xliff:g> fajlova.</item> </plurals> - <!-- no translation found for move_begin (8430330882138871643) --> - <!-- no translation found for deleting (5054338566802559411) --> - <!-- no translation found for undo (7905788502491742328) --> - <skip /> + <plurals name="move_begin" formatted="false" msgid="8430330882138871643"> + <item quantity="one">Premješta se <xliff:g id="COUNT_1">%1$d</xliff:g> fajl.</item> + <item quantity="few">Premještaju se <xliff:g id="COUNT_1">%1$d</xliff:g> fajla.</item> + <item quantity="other">Premješta se <xliff:g id="COUNT_1">%1$d</xliff:g> fajlova.</item> + </plurals> + <plurals name="deleting" formatted="false" msgid="5054338566802559411"> + <item quantity="one">Briše se <xliff:g id="COUNT_1">%1$d</xliff:g> fajl.</item> + <item quantity="few">Brišu se <xliff:g id="COUNT_1">%1$d</xliff:g> fajla.</item> + <item quantity="other">Briše se <xliff:g id="COUNT_1">%1$d</xliff:g> fajlova.</item> + </plurals> + <string name="undo" msgid="7905788502491742328">"Vrati"</string> <string name="copy_preparing" msgid="3896202461003039386">"Priprema se kopiranje..."</string> - <!-- no translation found for move_preparing (2772219441375531410) --> - <skip /> + <string name="move_preparing" msgid="2772219441375531410">"Priprema za premještanje..."</string> <string name="delete_preparing" msgid="5655813182533491992">"Pripremanje za brisanje…"</string> <plurals name="copy_error_notification_title" formatted="false" msgid="7160447124922897689"> <item quantity="one">Nije moguće kopirati <xliff:g id="COUNT_1">%1$d</xliff:g> fajl</item> @@ -112,9 +107,12 @@ <string name="copy_failure_alert_content" msgid="4563147454522476183">"Nisu kopirani sljedeći fajlovi: <xliff:g id="LIST">%1$s</xliff:g>"</string> <string name="move_failure_alert_content" msgid="2635075788682922861">"Nisu premješteni sljedeći fajlovi: <xliff:g id="LIST">%1$s</xliff:g>"</string> <string name="copy_converted_warning_content" msgid="5753861488218674361">"Ove datoteke su pretvorene u drugi format: <xliff:g id="LIST">%1$s</xliff:g>"</string> - <!-- no translation found for clipboard_files_clipped (855459017537058539) --> - <!-- no translation found for clipboard_files_cannot_paste (2878324825602325706) --> - <skip /> + <plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539"> + <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> fajl je kopiran u međuspremnik.</item> + <item quantity="few"><xliff:g id="COUNT_1">%1$d</xliff:g> fajla su kopirana u međuspremnik.</item> + <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> fajlova je kopirano u međuspremnik.</item> + </plurals> + <string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"Odabrani fajlovi se ne mogu zalijepiti na ovu lokaciju."</string> <string name="menu_rename" msgid="7678802479104285353">"Preimenuj"</string> <string name="rename_error" msgid="4203041674883412606">"Nije uspjelo preimenovanje dokumenta"</string> <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Neke od datoteka su pretvorene"</string> diff --git a/packages/DocumentsUI/src/com/android/documentsui/BaseActivity.java b/packages/DocumentsUI/src/com/android/documentsui/BaseActivity.java index 470989de3362..648c79e9fc41 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/BaseActivity.java +++ b/packages/DocumentsUI/src/com/android/documentsui/BaseActivity.java @@ -23,7 +23,6 @@ import static com.android.documentsui.dirlist.DirectoryFragment.ANIM_LEAVE; import static com.android.documentsui.dirlist.DirectoryFragment.ANIM_NONE; import static com.android.documentsui.dirlist.DirectoryFragment.ANIM_SIDE; import static com.android.internal.util.Preconditions.checkArgument; -import static com.android.internal.util.Preconditions.checkState; import android.app.Activity; import android.app.Fragment; @@ -464,8 +463,7 @@ public abstract class BaseActivity extends Activity * Set mode based on explicit user action. */ void setViewMode(@ViewMode int mode) { - checkState(mState.stack.root != null); - LocalPreferences.setViewMode(this, mState.stack.root, mode); + LocalPreferences.setViewMode(this, getCurrentRoot(), mode); mState.derivedMode = mode; // view icon needs to be updated, but we *could* do it diff --git a/packages/DocumentsUI/src/com/android/documentsui/model/RootInfo.java b/packages/DocumentsUI/src/com/android/documentsui/model/RootInfo.java index 3f14a5506adf..ffa8f596af65 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/model/RootInfo.java +++ b/packages/DocumentsUI/src/com/android/documentsui/model/RootInfo.java @@ -171,7 +171,7 @@ public class RootInfo implements Durable, Parcelable { // TODO: remove these special case icons if (isHome()) { - derivedIcon = R.drawable.ic_root_home; + derivedIcon = R.drawable.ic_root_documents; derivedType = TYPE_LOCAL; } else if (isExternalStorage()) { derivedIcon = R.drawable.ic_root_smartphone; diff --git a/packages/ExternalStorageProvider/res/values/strings.xml b/packages/ExternalStorageProvider/res/values/strings.xml index e48436ecb8ba..8b16d3c3b9d4 100644 --- a/packages/ExternalStorageProvider/res/values/strings.xml +++ b/packages/ExternalStorageProvider/res/values/strings.xml @@ -20,6 +20,6 @@ <!-- Title for documents backend that offers internal storage. [CHAR LIMIT=24] --> <string name="root_internal_storage">Internal storage</string> - <!-- Title for user home dir. [CHAR LIMIT=24] --> - <string name="root_home">Home</string> + <!-- Title for directory in which a user may store their own documents and files. [CHAR LIMIT=24] --> + <string name="root_documents">Documents</string> </resources> diff --git a/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java b/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java index f89934dc50e4..97dfd47aea9f 100644 --- a/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java +++ b/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java @@ -199,7 +199,7 @@ public class ExternalStorageProvider extends DocumentsProvider { final RootInfo root = new RootInfo(); root.rootId = ROOT_ID_HOME; mRoots.put(root.rootId, root); - root.title = getContext().getString(R.string.root_home); + root.title = getContext().getString(R.string.root_documents); // Only report bytes on *volumes*...as a matter of policy. root.reportAvailableBytes = false; @@ -214,9 +214,9 @@ public class ExternalStorageProvider extends DocumentsProvider { // Create the "Home" directory on disk, but don't the localized root.title // since the directories shouldn't be localized. root.visiblePath = new File( - primaryVolume.getPathForUser(userId), Environment.DIRECTORY_HOME); + primaryVolume.getPathForUser(userId), Environment.DIRECTORY_DOCUMENTS); root.path = new File( - primaryVolume.getInternalPathForUser(userId), root.rootId); + primaryVolume.getInternalPathForUser(userId), Environment.DIRECTORY_DOCUMENTS); try { root.docId = getDocIdForFile(root.path); } catch (FileNotFoundException e) { diff --git a/packages/SettingsLib/res/layout/usage_view.xml b/packages/SettingsLib/res/layout/usage_view.xml index 56716d3b90fb..28981f87978f 100644 --- a/packages/SettingsLib/res/layout/usage_view.xml +++ b/packages/SettingsLib/res/layout/usage_view.xml @@ -17,10 +17,10 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="wrap_content" - android:paddingEnd="@dimen/usage_graph_padding_end" android:orientation="vertical"> <LinearLayout + android:id="@+id/graph_label_group" android:layout_width="match_parent" android:layout_height="@dimen/usage_graph_area_height" android:orientation="horizontal" @@ -28,9 +28,9 @@ android:clipToPadding="false"> <LinearLayout + android:id="@+id/label_group" android:layout_width="@dimen/usage_graph_labels_width" android:layout_height="match_parent" - android:paddingStart="@dimen/usage_graph_labels_padding" android:orientation="vertical"> <include android:id="@+id/label_top" @@ -65,6 +65,7 @@ </LinearLayout> <LinearLayout + android:id="@+id/bottom_label_group" android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingStart="@dimen/usage_graph_labels_width" diff --git a/packages/SettingsLib/res/values-af/strings.xml b/packages/SettingsLib/res/values-af/strings.xml index 63905a9c0cee..2ddb1e9703a3 100644 --- a/packages/SettingsLib/res/values-af/strings.xml +++ b/packages/SettingsLib/res/values-af/strings.xml @@ -296,6 +296,8 @@ <string name="accessibility_display_daltonizer_preference_title" msgid="5800761362678707872">"Kleurregstelling"</string> <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"Hierdie kenmerk is eksperimenteel en kan werkverrigting beïnvloed."</string> <string name="daltonizer_type_overridden" msgid="3116947244410245916">"Geneutraliseer deur <xliff:g id="TITLE">%1$s</xliff:g>"</string> + <!-- no translation found for power_remaining_duration_only (4400068916452346544) --> + <skip /> <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> – sowat <xliff:g id="TIME">%2$s</xliff:g> oor"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="STATE">%2$s</xliff:g>"</string> <string name="power_charging_duration" msgid="2853265177761520490">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g> tot vol"</string> @@ -312,4 +314,8 @@ <string name="battery_info_status_full" msgid="2824614753861462808">"Vol"</string> <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"Gedeaktiveer deur administrateur"</string> <string name="home" msgid="8263346537524314127">"Tuis"</string> + <!-- no translation found for charge_length_format (8978516217024434156) --> + <skip /> + <!-- no translation found for remaining_length_format (7886337596669190587) --> + <skip /> </resources> diff --git a/packages/SettingsLib/res/values-am/strings.xml b/packages/SettingsLib/res/values-am/strings.xml index 0237124138bf..4276bea13a3c 100644 --- a/packages/SettingsLib/res/values-am/strings.xml +++ b/packages/SettingsLib/res/values-am/strings.xml @@ -296,6 +296,8 @@ <string name="accessibility_display_daltonizer_preference_title" msgid="5800761362678707872">"የቀለም ማስተካከያ"</string> <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"ይህ ባህሪ የሙከራ ነውና አፈጻጸም ላይ ተጽዕኖ ሊኖረው ይችላል።"</string> <string name="daltonizer_type_overridden" msgid="3116947244410245916">"በ<xliff:g id="TITLE">%1$s</xliff:g> ተሽሯል"</string> + <!-- no translation found for power_remaining_duration_only (4400068916452346544) --> + <skip /> <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> - ገደማ <xliff:g id="TIME">%2$s</xliff:g> ይቀራል"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATE">%2$s</xliff:g>"</string> <string name="power_charging_duration" msgid="2853265177761520490">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> እስከሚሞላ ድረስ"</string> @@ -312,4 +314,8 @@ <string name="battery_info_status_full" msgid="2824614753861462808">"ሙሉነው"</string> <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"በአስተዳዳሪ የተሰናከለ"</string> <string name="home" msgid="8263346537524314127">"መነሻ"</string> + <!-- no translation found for charge_length_format (8978516217024434156) --> + <skip /> + <!-- no translation found for remaining_length_format (7886337596669190587) --> + <skip /> </resources> diff --git a/packages/SettingsLib/res/values-ar/strings.xml b/packages/SettingsLib/res/values-ar/strings.xml index e82e7afb6e70..67fb59c84983 100644 --- a/packages/SettingsLib/res/values-ar/strings.xml +++ b/packages/SettingsLib/res/values-ar/strings.xml @@ -296,6 +296,8 @@ <string name="accessibility_display_daltonizer_preference_title" msgid="5800761362678707872">"تصحيح الألوان"</string> <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"هذه الميزة تجريبية وقد تؤثر في الأداء."</string> <string name="daltonizer_type_overridden" msgid="3116947244410245916">"تم الاستبدال بـ <xliff:g id="TITLE">%1$s</xliff:g>"</string> + <!-- no translation found for power_remaining_duration_only (4400068916452346544) --> + <skip /> <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> - تبقى <xliff:g id="TIME">%2$s</xliff:g> تقريبًا"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATE">%2$s</xliff:g>"</string> <string name="power_charging_duration" msgid="2853265177761520490">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> حتى الاكتمال"</string> @@ -312,4 +314,8 @@ <string name="battery_info_status_full" msgid="2824614753861462808">"ممتلئة"</string> <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"تم التعطيل بواسطة المشرف"</string> <string name="home" msgid="8263346537524314127">"الشاشة الرئيسية"</string> + <!-- no translation found for charge_length_format (8978516217024434156) --> + <skip /> + <!-- no translation found for remaining_length_format (7886337596669190587) --> + <skip /> </resources> diff --git a/packages/SettingsLib/res/values-az-rAZ/strings.xml b/packages/SettingsLib/res/values-az-rAZ/strings.xml index 9ebd63b703d8..12b077e92d06 100644 --- a/packages/SettingsLib/res/values-az-rAZ/strings.xml +++ b/packages/SettingsLib/res/values-az-rAZ/strings.xml @@ -296,6 +296,7 @@ <string name="accessibility_display_daltonizer_preference_title" msgid="5800761362678707872">"Rəng düzəlişi"</string> <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"Bu funksiya eksperimentaldır və performansa təsir edə bilər."</string> <string name="daltonizer_type_overridden" msgid="3116947244410245916">"<xliff:g id="TITLE">%1$s</xliff:g> tərəfindən qəbul edilmir"</string> + <string name="power_remaining_duration_only" msgid="4400068916452346544">"Təxminən <xliff:g id="TIME">%2$s</xliff:g> qalıb"</string> <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> - təxminən <xliff:g id="TIME">%2$s</xliff:g> qalıb"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATE">%2$s</xliff:g>"</string> <string name="power_charging_duration" msgid="2853265177761520490">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> dolana qədər"</string> @@ -312,4 +313,6 @@ <string name="battery_info_status_full" msgid="2824614753861462808">"Tam"</string> <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"Administrator tərəfindən deaktiv edildi"</string> <string name="home" msgid="8263346537524314127">"Əsas səhifə"</string> + <string name="charge_length_format" msgid="8978516217024434156">"<xliff:g id="ID_1">%1$s</xliff:g> əvvəl"</string> + <string name="remaining_length_format" msgid="7886337596669190587">"<xliff:g id="ID_1">%1$s</xliff:g> qalıb"</string> </resources> diff --git a/packages/SettingsLib/res/values-b+sr+Latn/strings.xml b/packages/SettingsLib/res/values-b+sr+Latn/strings.xml index c44737ad2373..ae5697867530 100644 --- a/packages/SettingsLib/res/values-b+sr+Latn/strings.xml +++ b/packages/SettingsLib/res/values-b+sr+Latn/strings.xml @@ -296,6 +296,8 @@ <string name="accessibility_display_daltonizer_preference_title" msgid="5800761362678707872">"Korekcija boja"</string> <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"Ova funkcija je eksperimentalna i može da utiče na performanse."</string> <string name="daltonizer_type_overridden" msgid="3116947244410245916">"Zamenjuje ga <xliff:g id="TITLE">%1$s</xliff:g>"</string> + <!-- no translation found for power_remaining_duration_only (4400068916452346544) --> + <skip /> <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> – preostalo oko <xliff:g id="TIME">%2$s</xliff:g>"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="STATE">%2$s</xliff:g>"</string> <string name="power_charging_duration" msgid="2853265177761520490">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g> dok se ne napuni"</string> @@ -312,4 +314,8 @@ <string name="battery_info_status_full" msgid="2824614753861462808">"Puno"</string> <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"Onemogućio je administrator"</string> <string name="home" msgid="8263346537524314127">"Početni"</string> + <!-- no translation found for charge_length_format (8978516217024434156) --> + <skip /> + <!-- no translation found for remaining_length_format (7886337596669190587) --> + <skip /> </resources> diff --git a/packages/SettingsLib/res/values-bg/strings.xml b/packages/SettingsLib/res/values-bg/strings.xml index 5159abd4e4c3..ad0ace49864e 100644 --- a/packages/SettingsLib/res/values-bg/strings.xml +++ b/packages/SettingsLib/res/values-bg/strings.xml @@ -296,6 +296,8 @@ <string name="accessibility_display_daltonizer_preference_title" msgid="5800761362678707872">"Корекция на цветове"</string> <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"Тази функция е експериментална и може да се отрази на ефективността."</string> <string name="daltonizer_type_overridden" msgid="3116947244410245916">"Заменено от „<xliff:g id="TITLE">%1$s</xliff:g>“"</string> + <!-- no translation found for power_remaining_duration_only (4400068916452346544) --> + <skip /> <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> – приблизително оставащо време: <xliff:g id="TIME">%2$s</xliff:g>"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="STATE">%2$s</xliff:g>"</string> <string name="power_charging_duration" msgid="2853265177761520490">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g> до пълно зареждане"</string> @@ -312,4 +314,8 @@ <string name="battery_info_status_full" msgid="2824614753861462808">"Пълна"</string> <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"Деактивирано от администратора"</string> <string name="home" msgid="8263346537524314127">"Начало"</string> + <!-- no translation found for charge_length_format (8978516217024434156) --> + <skip /> + <!-- no translation found for remaining_length_format (7886337596669190587) --> + <skip /> </resources> diff --git a/packages/SettingsLib/res/values-bn-rBD/strings.xml b/packages/SettingsLib/res/values-bn-rBD/strings.xml index f3418561bf62..589c52ef6018 100644 --- a/packages/SettingsLib/res/values-bn-rBD/strings.xml +++ b/packages/SettingsLib/res/values-bn-rBD/strings.xml @@ -296,6 +296,7 @@ <string name="accessibility_display_daltonizer_preference_title" msgid="5800761362678707872">"রঙ সংশোধন"</string> <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"এই বৈশিষ্ট্যটি পরীক্ষামূলক এবং এটি কার্য-সম্পাদনা প্রভাবিত করতে পারে।"</string> <string name="daltonizer_type_overridden" msgid="3116947244410245916">"<xliff:g id="TITLE">%1$s</xliff:g> এর দ্বারা ওভাররাইড করা হয়েছে"</string> + <string name="power_remaining_duration_only" msgid="4400068916452346544">"প্রায় <xliff:g id="TIME">%2$s</xliff:g> বাকী আছে"</string> <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> - আনুমানিক <xliff:g id="TIME">%2$s</xliff:g> বাকি আছে"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATE">%2$s</xliff:g>"</string> <string name="power_charging_duration" msgid="2853265177761520490">"<xliff:g id="LEVEL">%1$s</xliff:g> - সম্পূর্ণ হতে <xliff:g id="TIME">%2$s</xliff:g> বাকি"</string> @@ -312,4 +313,6 @@ <string name="battery_info_status_full" msgid="2824614753861462808">"পূর্ণ"</string> <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"প্রশাসক দ্বারা অক্ষমিত"</string> <string name="home" msgid="8263346537524314127">"হোম"</string> + <string name="charge_length_format" msgid="8978516217024434156">"<xliff:g id="ID_1">%1$s</xliff:g> আগে"</string> + <string name="remaining_length_format" msgid="7886337596669190587">"<xliff:g id="ID_1">%1$s</xliff:g> বাকী আছে"</string> </resources> diff --git a/packages/SettingsLib/res/values-bs-rBA/strings.xml b/packages/SettingsLib/res/values-bs-rBA/strings.xml index 1ff5901549d5..8da12cb5c9fa 100644 --- a/packages/SettingsLib/res/values-bs-rBA/strings.xml +++ b/packages/SettingsLib/res/values-bs-rBA/strings.xml @@ -375,6 +375,8 @@ <string name="accessibility_display_daltonizer_preference_title" msgid="5800761362678707872">"Ispravka boje"</string> <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"Ova funkcija je eksperimentalna te može utjecati na performanse."</string> <string name="daltonizer_type_overridden" msgid="3116947244410245916">"Zamjenjuje <xliff:g id="TITLE">%1$s</xliff:g>"</string> + <!-- no translation found for power_remaining_duration_only (4400068916452346544) --> + <skip /> <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> – preostalo vreme je otprilike <xliff:g id="TIME">%2$s</xliff:g>"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="STATE">%2$s</xliff:g>"</string> <string name="power_charging_duration" msgid="2853265177761520490">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g> do pune baterije"</string> @@ -391,4 +393,8 @@ <string name="battery_info_status_full" msgid="2824614753861462808">"Puna"</string> <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"Onemogućio administrator"</string> <string name="home" msgid="8263346537524314127">"Početna stranica"</string> + <!-- no translation found for charge_length_format (8978516217024434156) --> + <skip /> + <!-- no translation found for remaining_length_format (7886337596669190587) --> + <skip /> </resources> diff --git a/packages/SettingsLib/res/values-ca/strings.xml b/packages/SettingsLib/res/values-ca/strings.xml index c0bfc224c5f8..333868b704a0 100644 --- a/packages/SettingsLib/res/values-ca/strings.xml +++ b/packages/SettingsLib/res/values-ca/strings.xml @@ -296,6 +296,8 @@ <string name="accessibility_display_daltonizer_preference_title" msgid="5800761362678707872">"Correcció del color"</string> <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"Aquesta funció és experimental i pot afectar el rendiment."</string> <string name="daltonizer_type_overridden" msgid="3116947244410245916">"S\'ha substituït per <xliff:g id="TITLE">%1$s</xliff:g>"</string> + <!-- no translation found for power_remaining_duration_only (4400068916452346544) --> + <skip /> <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g>: falten aproximadament <xliff:g id="TIME">%2$s</xliff:g>"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g>: <xliff:g id="STATE">%2$s</xliff:g>"</string> <string name="power_charging_duration" msgid="2853265177761520490">"<xliff:g id="LEVEL">%1$s</xliff:g>: <xliff:g id="TIME">%2$s</xliff:g> per completar la càrrega"</string> @@ -312,4 +314,8 @@ <string name="battery_info_status_full" msgid="2824614753861462808">"Plena"</string> <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"Opció desactivada per l\'administrador"</string> <string name="home" msgid="8263346537524314127">"Inici"</string> + <!-- no translation found for charge_length_format (8978516217024434156) --> + <skip /> + <!-- no translation found for remaining_length_format (7886337596669190587) --> + <skip /> </resources> diff --git a/packages/SettingsLib/res/values-cs/strings.xml b/packages/SettingsLib/res/values-cs/strings.xml index 708f1bac966b..e21995958567 100644 --- a/packages/SettingsLib/res/values-cs/strings.xml +++ b/packages/SettingsLib/res/values-cs/strings.xml @@ -296,6 +296,8 @@ <string name="accessibility_display_daltonizer_preference_title" msgid="5800761362678707872">"Korekce barev"</string> <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"Funkce je experimentální a může mít vliv na výkon."</string> <string name="daltonizer_type_overridden" msgid="3116947244410245916">"Přepsáno nastavením <xliff:g id="TITLE">%1$s</xliff:g>"</string> + <!-- no translation found for power_remaining_duration_only (4400068916452346544) --> + <skip /> <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> – zbývá přibližně <xliff:g id="TIME">%2$s</xliff:g>"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="STATE">%2$s</xliff:g>"</string> <string name="power_charging_duration" msgid="2853265177761520490">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g> do úplného nabití"</string> @@ -312,4 +314,8 @@ <string name="battery_info_status_full" msgid="2824614753861462808">"Nabitá"</string> <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"Zakázáno administrátorem"</string> <string name="home" msgid="8263346537524314127">"Plocha"</string> + <!-- no translation found for charge_length_format (8978516217024434156) --> + <skip /> + <!-- no translation found for remaining_length_format (7886337596669190587) --> + <skip /> </resources> diff --git a/packages/SettingsLib/res/values-da/strings.xml b/packages/SettingsLib/res/values-da/strings.xml index e0f6a0dbbfb9..6acdcc7cbf79 100644 --- a/packages/SettingsLib/res/values-da/strings.xml +++ b/packages/SettingsLib/res/values-da/strings.xml @@ -296,6 +296,7 @@ <string name="accessibility_display_daltonizer_preference_title" msgid="5800761362678707872">"Korriger farver"</string> <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"Denne funktion er eksperimentel og kan påvirke ydeevnen."</string> <string name="daltonizer_type_overridden" msgid="3116947244410245916">"Tilsidesat af <xliff:g id="TITLE">%1$s</xliff:g>"</string> + <string name="power_remaining_duration_only" msgid="4400068916452346544">"Ca. <xliff:g id="TIME">%2$s</xliff:g> tilbage"</string> <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> – ca. <xliff:g id="TIME">%2$s</xliff:g> tilbage"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="STATE">%2$s</xliff:g>"</string> <string name="power_charging_duration" msgid="2853265177761520490">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g> til fuldt opladet"</string> @@ -312,4 +313,6 @@ <string name="battery_info_status_full" msgid="2824614753861462808">"Fuld"</string> <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"Deaktiveret af administratoren"</string> <string name="home" msgid="8263346537524314127">"Start"</string> + <string name="charge_length_format" msgid="8978516217024434156">"<xliff:g id="ID_1">%1$s</xliff:g> siden"</string> + <string name="remaining_length_format" msgid="7886337596669190587">"<xliff:g id="ID_1">%1$s</xliff:g> tilbage"</string> </resources> diff --git a/packages/SettingsLib/res/values-de/strings.xml b/packages/SettingsLib/res/values-de/strings.xml index 422f86e91d0b..5f4f60b1f5a8 100644 --- a/packages/SettingsLib/res/values-de/strings.xml +++ b/packages/SettingsLib/res/values-de/strings.xml @@ -296,6 +296,8 @@ <string name="accessibility_display_daltonizer_preference_title" msgid="5800761362678707872">"Farbkorrektur"</string> <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"Hierbei handelt es sich um eine experimentelle Funktion. Dies kann sich auf die Leistung auswirken."</string> <string name="daltonizer_type_overridden" msgid="3116947244410245916">"Außer Kraft gesetzt von \"<xliff:g id="TITLE">%1$s</xliff:g>\""</string> + <!-- no translation found for power_remaining_duration_only (4400068916452346544) --> + <skip /> <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> – noch etwa <xliff:g id="TIME">%2$s</xliff:g>"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="STATE">%2$s</xliff:g>"</string> <string name="power_charging_duration" msgid="2853265177761520490">"<xliff:g id="LEVEL">%1$s</xliff:g> – voll in <xliff:g id="TIME">%2$s</xliff:g>"</string> @@ -312,4 +314,8 @@ <string name="battery_info_status_full" msgid="2824614753861462808">"Voll"</string> <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"Vom Administrator deaktiviert"</string> <string name="home" msgid="8263346537524314127">"Startseite"</string> + <!-- no translation found for charge_length_format (8978516217024434156) --> + <skip /> + <!-- no translation found for remaining_length_format (7886337596669190587) --> + <skip /> </resources> diff --git a/packages/SettingsLib/res/values-el/strings.xml b/packages/SettingsLib/res/values-el/strings.xml index c77b7781cd0f..826e8233e7dc 100644 --- a/packages/SettingsLib/res/values-el/strings.xml +++ b/packages/SettingsLib/res/values-el/strings.xml @@ -296,6 +296,8 @@ <string name="accessibility_display_daltonizer_preference_title" msgid="5800761362678707872">"Διόρθωση χρωμάτων"</string> <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"Αυτή η λειτουργία είναι πειραματική και ενδεχομένως να επηρεάσει τις επιδόσεις."</string> <string name="daltonizer_type_overridden" msgid="3116947244410245916">"Αντικαταστάθηκε από <xliff:g id="TITLE">%1$s</xliff:g>"</string> + <!-- no translation found for power_remaining_duration_only (4400068916452346544) --> + <skip /> <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> - απομένουν περίπου <xliff:g id="TIME">%2$s</xliff:g>"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATE">%2$s</xliff:g>"</string> <string name="power_charging_duration" msgid="2853265177761520490">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> για πλήρη φόρτιση"</string> @@ -312,4 +314,8 @@ <string name="battery_info_status_full" msgid="2824614753861462808">"Πλήρης"</string> <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"Απενεργοποιήθηκε από το διαχειριστή"</string> <string name="home" msgid="8263346537524314127">"Αρχική οθόνη"</string> + <!-- no translation found for charge_length_format (8978516217024434156) --> + <skip /> + <!-- no translation found for remaining_length_format (7886337596669190587) --> + <skip /> </resources> diff --git a/packages/SettingsLib/res/values-en-rAU/strings.xml b/packages/SettingsLib/res/values-en-rAU/strings.xml index 49cbca815fd5..481cc47e0ae9 100644 --- a/packages/SettingsLib/res/values-en-rAU/strings.xml +++ b/packages/SettingsLib/res/values-en-rAU/strings.xml @@ -296,6 +296,7 @@ <string name="accessibility_display_daltonizer_preference_title" msgid="5800761362678707872">"Colour correction"</string> <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"This feature is experimental and may affect performance."</string> <string name="daltonizer_type_overridden" msgid="3116947244410245916">"Overridden by <xliff:g id="TITLE">%1$s</xliff:g>"</string> + <string name="power_remaining_duration_only" msgid="4400068916452346544">"Approx. <xliff:g id="TIME">%2$s</xliff:g> left"</string> <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> – approx. <xliff:g id="TIME">%2$s</xliff:g> left"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATE">%2$s</xliff:g>"</string> <string name="power_charging_duration" msgid="2853265177761520490">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> until full"</string> @@ -312,4 +313,6 @@ <string name="battery_info_status_full" msgid="2824614753861462808">"Full"</string> <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"Disabled by administrator"</string> <string name="home" msgid="8263346537524314127">"Home"</string> + <string name="charge_length_format" msgid="8978516217024434156">"<xliff:g id="ID_1">%1$s</xliff:g> ago"</string> + <string name="remaining_length_format" msgid="7886337596669190587">"<xliff:g id="ID_1">%1$s</xliff:g> left"</string> </resources> diff --git a/packages/SettingsLib/res/values-en-rGB/strings.xml b/packages/SettingsLib/res/values-en-rGB/strings.xml index 49cbca815fd5..481cc47e0ae9 100644 --- a/packages/SettingsLib/res/values-en-rGB/strings.xml +++ b/packages/SettingsLib/res/values-en-rGB/strings.xml @@ -296,6 +296,7 @@ <string name="accessibility_display_daltonizer_preference_title" msgid="5800761362678707872">"Colour correction"</string> <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"This feature is experimental and may affect performance."</string> <string name="daltonizer_type_overridden" msgid="3116947244410245916">"Overridden by <xliff:g id="TITLE">%1$s</xliff:g>"</string> + <string name="power_remaining_duration_only" msgid="4400068916452346544">"Approx. <xliff:g id="TIME">%2$s</xliff:g> left"</string> <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> – approx. <xliff:g id="TIME">%2$s</xliff:g> left"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATE">%2$s</xliff:g>"</string> <string name="power_charging_duration" msgid="2853265177761520490">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> until full"</string> @@ -312,4 +313,6 @@ <string name="battery_info_status_full" msgid="2824614753861462808">"Full"</string> <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"Disabled by administrator"</string> <string name="home" msgid="8263346537524314127">"Home"</string> + <string name="charge_length_format" msgid="8978516217024434156">"<xliff:g id="ID_1">%1$s</xliff:g> ago"</string> + <string name="remaining_length_format" msgid="7886337596669190587">"<xliff:g id="ID_1">%1$s</xliff:g> left"</string> </resources> diff --git a/packages/SettingsLib/res/values-en-rIN/strings.xml b/packages/SettingsLib/res/values-en-rIN/strings.xml index 49cbca815fd5..481cc47e0ae9 100644 --- a/packages/SettingsLib/res/values-en-rIN/strings.xml +++ b/packages/SettingsLib/res/values-en-rIN/strings.xml @@ -296,6 +296,7 @@ <string name="accessibility_display_daltonizer_preference_title" msgid="5800761362678707872">"Colour correction"</string> <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"This feature is experimental and may affect performance."</string> <string name="daltonizer_type_overridden" msgid="3116947244410245916">"Overridden by <xliff:g id="TITLE">%1$s</xliff:g>"</string> + <string name="power_remaining_duration_only" msgid="4400068916452346544">"Approx. <xliff:g id="TIME">%2$s</xliff:g> left"</string> <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> – approx. <xliff:g id="TIME">%2$s</xliff:g> left"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATE">%2$s</xliff:g>"</string> <string name="power_charging_duration" msgid="2853265177761520490">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> until full"</string> @@ -312,4 +313,6 @@ <string name="battery_info_status_full" msgid="2824614753861462808">"Full"</string> <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"Disabled by administrator"</string> <string name="home" msgid="8263346537524314127">"Home"</string> + <string name="charge_length_format" msgid="8978516217024434156">"<xliff:g id="ID_1">%1$s</xliff:g> ago"</string> + <string name="remaining_length_format" msgid="7886337596669190587">"<xliff:g id="ID_1">%1$s</xliff:g> left"</string> </resources> diff --git a/packages/SettingsLib/res/values-es-rUS/strings.xml b/packages/SettingsLib/res/values-es-rUS/strings.xml index e36287ba4524..738024014cf1 100644 --- a/packages/SettingsLib/res/values-es-rUS/strings.xml +++ b/packages/SettingsLib/res/values-es-rUS/strings.xml @@ -296,6 +296,8 @@ <string name="accessibility_display_daltonizer_preference_title" msgid="5800761362678707872">"Corrección de color"</string> <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"Esta función es experimental y puede afectar el rendimiento."</string> <string name="daltonizer_type_overridden" msgid="3116947244410245916">"Reemplazado por <xliff:g id="TITLE">%1$s</xliff:g>"</string> + <!-- no translation found for power_remaining_duration_only (4400068916452346544) --> + <skip /> <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g>: alrededor de <xliff:g id="TIME">%2$s</xliff:g> para completar la carga"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g>: <xliff:g id="STATE">%2$s</xliff:g>"</string> <string name="power_charging_duration" msgid="2853265177761520490">"<xliff:g id="LEVEL">%1$s</xliff:g>: <xliff:g id="TIME">%2$s</xliff:g> para completar la carga"</string> @@ -312,4 +314,8 @@ <string name="battery_info_status_full" msgid="2824614753861462808">"Cargado"</string> <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"Inhabilitada por el administrador"</string> <string name="home" msgid="8263346537524314127">"Página principal"</string> + <!-- no translation found for charge_length_format (8978516217024434156) --> + <skip /> + <!-- no translation found for remaining_length_format (7886337596669190587) --> + <skip /> </resources> diff --git a/packages/SettingsLib/res/values-es/strings.xml b/packages/SettingsLib/res/values-es/strings.xml index bb54c0fcefdc..1cf51fe7112b 100644 --- a/packages/SettingsLib/res/values-es/strings.xml +++ b/packages/SettingsLib/res/values-es/strings.xml @@ -296,6 +296,8 @@ <string name="accessibility_display_daltonizer_preference_title" msgid="5800761362678707872">"Corrección del color"</string> <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"Esta función es experimental y puede afectar al rendimiento."</string> <string name="daltonizer_type_overridden" msgid="3116947244410245916">"Anulado por <xliff:g id="TITLE">%1$s</xliff:g>"</string> + <!-- no translation found for power_remaining_duration_only (4400068916452346544) --> + <skip /> <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> - Quedan <xliff:g id="TIME">%2$s</xliff:g> aproximadamente"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATE">%2$s</xliff:g>"</string> <string name="power_charging_duration" msgid="2853265177761520490">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> para completar la batería"</string> @@ -312,4 +314,8 @@ <string name="battery_info_status_full" msgid="2824614753861462808">"Completa"</string> <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"Inhabilitada por el administrador"</string> <string name="home" msgid="8263346537524314127">"Inicio"</string> + <!-- no translation found for charge_length_format (8978516217024434156) --> + <skip /> + <!-- no translation found for remaining_length_format (7886337596669190587) --> + <skip /> </resources> diff --git a/packages/SettingsLib/res/values-et-rEE/strings.xml b/packages/SettingsLib/res/values-et-rEE/strings.xml index acb860b9a9f5..c5153ff7e541 100644 --- a/packages/SettingsLib/res/values-et-rEE/strings.xml +++ b/packages/SettingsLib/res/values-et-rEE/strings.xml @@ -296,6 +296,7 @@ <string name="accessibility_display_daltonizer_preference_title" msgid="5800761362678707872">"Värviparandus"</string> <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"See funktsioon on katseline ja võib mõjutada toimivust."</string> <string name="daltonizer_type_overridden" msgid="3116947244410245916">"Alistas <xliff:g id="TITLE">%1$s</xliff:g>"</string> + <string name="power_remaining_duration_only" msgid="4400068916452346544">"Umbes <xliff:g id="TIME">%2$s</xliff:g> on jäänud"</string> <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> – jäänud on umbes <xliff:g id="TIME">%2$s</xliff:g>"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="STATE">%2$s</xliff:g>"</string> <string name="power_charging_duration" msgid="2853265177761520490">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g>, kuni aku on täis"</string> @@ -312,4 +313,6 @@ <string name="battery_info_status_full" msgid="2824614753861462808">"Täis"</string> <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"Administraator on keelanud"</string> <string name="home" msgid="8263346537524314127">"Avaekraan"</string> + <string name="charge_length_format" msgid="8978516217024434156">"<xliff:g id="ID_1">%1$s</xliff:g> tagasi"</string> + <string name="remaining_length_format" msgid="7886337596669190587">"<xliff:g id="ID_1">%1$s</xliff:g> on jäänud"</string> </resources> diff --git a/packages/SettingsLib/res/values-eu-rES/strings.xml b/packages/SettingsLib/res/values-eu-rES/strings.xml index c7a1e6142cd6..1e06c6ad6ac4 100644 --- a/packages/SettingsLib/res/values-eu-rES/strings.xml +++ b/packages/SettingsLib/res/values-eu-rES/strings.xml @@ -296,6 +296,8 @@ <string name="accessibility_display_daltonizer_preference_title" msgid="5800761362678707872">"Kolore-zuzenketa"</string> <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"Eginbidea esperimentala da eta eragina izan dezake funtzionamenduan."</string> <string name="daltonizer_type_overridden" msgid="3116947244410245916">"<xliff:g id="TITLE">%1$s</xliff:g> hobespena gainjarri zaio"</string> + <!-- no translation found for power_remaining_duration_only (4400068916452346544) --> + <skip /> <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> inguru. <xliff:g id="TIME">%2$s</xliff:g> geratzen d(ir)a"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATE">%2$s</xliff:g>"</string> <string name="power_charging_duration" msgid="2853265177761520490">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> guztiz kargatu arte"</string> @@ -312,4 +314,8 @@ <string name="battery_info_status_full" msgid="2824614753861462808">"Beteta"</string> <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"Administratzaileak desgaitu du"</string> <string name="home" msgid="8263346537524314127">"Hasierako pantaila"</string> + <!-- no translation found for charge_length_format (8978516217024434156) --> + <skip /> + <!-- no translation found for remaining_length_format (7886337596669190587) --> + <skip /> </resources> diff --git a/packages/SettingsLib/res/values-fa/strings.xml b/packages/SettingsLib/res/values-fa/strings.xml index 4f697a0dadcf..e023f247c7d2 100644 --- a/packages/SettingsLib/res/values-fa/strings.xml +++ b/packages/SettingsLib/res/values-fa/strings.xml @@ -296,6 +296,8 @@ <string name="accessibility_display_daltonizer_preference_title" msgid="5800761362678707872">"تصحیح رنگ"</string> <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"این قابلیت آزمایشی است و ممکن است عملکرد را تحت تأثیر قرار دهد."</string> <string name="daltonizer_type_overridden" msgid="3116947244410245916">"توسط <xliff:g id="TITLE">%1$s</xliff:g> لغو شد"</string> + <!-- no translation found for power_remaining_duration_only (4400068916452346544) --> + <skip /> <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> - تقریباً <xliff:g id="TIME">%2$s</xliff:g> باقی مانده است"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATE">%2$s</xliff:g>"</string> <string name="power_charging_duration" msgid="2853265177761520490">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> تا شارژ کامل"</string> @@ -312,4 +314,8 @@ <string name="battery_info_status_full" msgid="2824614753861462808">"پر"</string> <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"سرپرست آن را غیرفعال کرده است"</string> <string name="home" msgid="8263346537524314127">"صفحه اصلی"</string> + <!-- no translation found for charge_length_format (8978516217024434156) --> + <skip /> + <!-- no translation found for remaining_length_format (7886337596669190587) --> + <skip /> </resources> diff --git a/packages/SettingsLib/res/values-fi/strings.xml b/packages/SettingsLib/res/values-fi/strings.xml index 9461dcc54449..c4f572cfab0c 100644 --- a/packages/SettingsLib/res/values-fi/strings.xml +++ b/packages/SettingsLib/res/values-fi/strings.xml @@ -296,6 +296,8 @@ <string name="accessibility_display_daltonizer_preference_title" msgid="5800761362678707872">"Värikorjaus"</string> <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"Tämä ominaisuus on kokeellinen ja voi vaikuttaa suorituskykyyn."</string> <string name="daltonizer_type_overridden" msgid="3116947244410245916">"Tämän ohittaa <xliff:g id="TITLE">%1$s</xliff:g>"</string> + <!-- no translation found for power_remaining_duration_only (4400068916452346544) --> + <skip /> <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> – noin <xliff:g id="TIME">%2$s</xliff:g> jäljellä"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="STATE">%2$s</xliff:g>"</string> <string name="power_charging_duration" msgid="2853265177761520490">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g> kunnes täynnä"</string> @@ -312,4 +314,8 @@ <string name="battery_info_status_full" msgid="2824614753861462808">"Täynnä"</string> <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"Järjestelmänvalvojan käytöstä poistama"</string> <string name="home" msgid="8263346537524314127">"Aloitusnäyttö"</string> + <!-- no translation found for charge_length_format (8978516217024434156) --> + <skip /> + <!-- no translation found for remaining_length_format (7886337596669190587) --> + <skip /> </resources> diff --git a/packages/SettingsLib/res/values-fr-rCA/strings.xml b/packages/SettingsLib/res/values-fr-rCA/strings.xml index fb72d91dd3db..f888ec813000 100644 --- a/packages/SettingsLib/res/values-fr-rCA/strings.xml +++ b/packages/SettingsLib/res/values-fr-rCA/strings.xml @@ -296,6 +296,8 @@ <string name="accessibility_display_daltonizer_preference_title" msgid="5800761362678707872">"Correction des couleurs"</string> <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"Cette fonctionnalité est expérimentale et peut toucher les performances."</string> <string name="daltonizer_type_overridden" msgid="3116947244410245916">"Remplacé par <xliff:g id="TITLE">%1$s</xliff:g>"</string> + <!-- no translation found for power_remaining_duration_only (4400068916452346544) --> + <skip /> <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> %% – Temps restant : environ <xliff:g id="TIME">%2$s</xliff:g>"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATE">%2$s</xliff:g>"</string> <string name="power_charging_duration" msgid="2853265177761520490">"<xliff:g id="LEVEL">%1$s</xliff:g> %% (chargée à 100 %% dans <xliff:g id="TIME">%2$s</xliff:g>)"</string> @@ -312,4 +314,8 @@ <string name="battery_info_status_full" msgid="2824614753861462808">"Pleine"</string> <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"Désactivé par l\'administrateur"</string> <string name="home" msgid="8263346537524314127">"Accueil"</string> + <!-- no translation found for charge_length_format (8978516217024434156) --> + <skip /> + <!-- no translation found for remaining_length_format (7886337596669190587) --> + <skip /> </resources> diff --git a/packages/SettingsLib/res/values-fr/strings.xml b/packages/SettingsLib/res/values-fr/strings.xml index 06964e119d2c..dfc71f1f7e37 100644 --- a/packages/SettingsLib/res/values-fr/strings.xml +++ b/packages/SettingsLib/res/values-fr/strings.xml @@ -296,6 +296,8 @@ <string name="accessibility_display_daltonizer_preference_title" msgid="5800761362678707872">"Correction couleur"</string> <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"Cette fonctionnalité est expérimentale et peut affecter les performances."</string> <string name="daltonizer_type_overridden" msgid="3116947244410245916">"Remplacé par <xliff:g id="TITLE">%1$s</xliff:g>"</string> + <!-- no translation found for power_remaining_duration_only (4400068916452346544) --> + <skip /> <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> – Temps restant : <xliff:g id="TIME">%2$s</xliff:g> environ"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="STATE">%2$s</xliff:g>"</string> <string name="power_charging_duration" msgid="2853265177761520490">"<xliff:g id="LEVEL">%1$s</xliff:g> (chargée à 100 %% dans <xliff:g id="TIME">%2$s</xliff:g>)"</string> @@ -312,4 +314,8 @@ <string name="battery_info_status_full" msgid="2824614753861462808">"pleine"</string> <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"Désactivé par l\'administrateur"</string> <string name="home" msgid="8263346537524314127">"Accueil"</string> + <!-- no translation found for charge_length_format (8978516217024434156) --> + <skip /> + <!-- no translation found for remaining_length_format (7886337596669190587) --> + <skip /> </resources> diff --git a/packages/SettingsLib/res/values-gl-rES/strings.xml b/packages/SettingsLib/res/values-gl-rES/strings.xml index 91dfbc02e6f6..20985bd43eb7 100644 --- a/packages/SettingsLib/res/values-gl-rES/strings.xml +++ b/packages/SettingsLib/res/values-gl-rES/strings.xml @@ -296,6 +296,8 @@ <string name="accessibility_display_daltonizer_preference_title" msgid="5800761362678707872">"Corrección da cor"</string> <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"Esta función é experimental e pode afectar ao rendemento."</string> <string name="daltonizer_type_overridden" msgid="3116947244410245916">"Anulado por <xliff:g id="TITLE">%1$s</xliff:g>"</string> + <!-- no translation found for power_remaining_duration_only (4400068916452346544) --> + <skip /> <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> - faltan aproximadamente <xliff:g id="TIME">%2$s</xliff:g>"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATE">%2$s</xliff:g>"</string> <string name="power_charging_duration" msgid="2853265177761520490">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> para completar a carga"</string> @@ -312,4 +314,8 @@ <string name="battery_info_status_full" msgid="2824614753861462808">"Completa"</string> <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"Desactivado polo administrador"</string> <string name="home" msgid="8263346537524314127">"Inicio"</string> + <!-- no translation found for charge_length_format (8978516217024434156) --> + <skip /> + <!-- no translation found for remaining_length_format (7886337596669190587) --> + <skip /> </resources> diff --git a/packages/SettingsLib/res/values-gu-rIN/strings.xml b/packages/SettingsLib/res/values-gu-rIN/strings.xml index 3c4c280e269d..18917e0a4c85 100644 --- a/packages/SettingsLib/res/values-gu-rIN/strings.xml +++ b/packages/SettingsLib/res/values-gu-rIN/strings.xml @@ -296,6 +296,8 @@ <string name="accessibility_display_daltonizer_preference_title" msgid="5800761362678707872">"રંગ સુધારણા"</string> <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"આ સુવિધા પ્રાયોગિક છે અને કામગીરી પર અસર કરી શકે છે."</string> <string name="daltonizer_type_overridden" msgid="3116947244410245916">"<xliff:g id="TITLE">%1$s</xliff:g> દ્વારા ઓવરરાઇડ થયું"</string> + <!-- no translation found for power_remaining_duration_only (4400068916452346544) --> + <skip /> <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> - આશરે <xliff:g id="TIME">%2$s</xliff:g> બાકી"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATE">%2$s</xliff:g>"</string> <string name="power_charging_duration" msgid="2853265177761520490">"સંપૂર્ણ થવામાં <xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g>"</string> @@ -312,4 +314,8 @@ <string name="battery_info_status_full" msgid="2824614753861462808">"પૂર્ણ"</string> <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"વ્યવસ્થાપક દ્વારા અક્ષમ"</string> <string name="home" msgid="8263346537524314127">"હોમ"</string> + <!-- no translation found for charge_length_format (8978516217024434156) --> + <skip /> + <!-- no translation found for remaining_length_format (7886337596669190587) --> + <skip /> </resources> diff --git a/packages/SettingsLib/res/values-hi/strings.xml b/packages/SettingsLib/res/values-hi/strings.xml index 824e0ab99d67..32b281409433 100644 --- a/packages/SettingsLib/res/values-hi/strings.xml +++ b/packages/SettingsLib/res/values-hi/strings.xml @@ -296,6 +296,7 @@ <string name="accessibility_display_daltonizer_preference_title" msgid="5800761362678707872">"रंग सुधार"</string> <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"यह सुविधा प्रायोगिक है और निष्पादन को प्रभावित कर सकती है."</string> <string name="daltonizer_type_overridden" msgid="3116947244410245916">"<xliff:g id="TITLE">%1$s</xliff:g> के द्वारा ओवरराइड किया गया"</string> + <string name="power_remaining_duration_only" msgid="4400068916452346544">"लगभग <xliff:g id="TIME">%2$s</xliff:g> शेष"</string> <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> - लगभग <xliff:g id="TIME">%2$s</xliff:g> शेष"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATE">%2$s</xliff:g>"</string> <string name="power_charging_duration" msgid="2853265177761520490">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> पूरी होने तक"</string> @@ -312,4 +313,6 @@ <string name="battery_info_status_full" msgid="2824614753861462808">"पूरी"</string> <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"व्यवस्थापक के द्वारा अक्षम किया गया"</string> <string name="home" msgid="8263346537524314127">"होम"</string> + <string name="charge_length_format" msgid="8978516217024434156">"<xliff:g id="ID_1">%1$s</xliff:g> पहले"</string> + <string name="remaining_length_format" msgid="7886337596669190587">"<xliff:g id="ID_1">%1$s</xliff:g> शेष"</string> </resources> diff --git a/packages/SettingsLib/res/values-hr/strings.xml b/packages/SettingsLib/res/values-hr/strings.xml index 47a0d3a95607..37b5363dd0f1 100644 --- a/packages/SettingsLib/res/values-hr/strings.xml +++ b/packages/SettingsLib/res/values-hr/strings.xml @@ -296,6 +296,7 @@ <string name="accessibility_display_daltonizer_preference_title" msgid="5800761362678707872">"Korekcija boje"</string> <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"Ova je značajka eksperimentalna i može utjecati na performanse."</string> <string name="daltonizer_type_overridden" msgid="3116947244410245916">"Premošćeno postavkom <xliff:g id="TITLE">%1$s</xliff:g>"</string> + <string name="power_remaining_duration_only" msgid="4400068916452346544">"Još približno <xliff:g id="TIME">%2$s</xliff:g>"</string> <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> – još približno <xliff:g id="TIME">%2$s</xliff:g>"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="STATE">%2$s</xliff:g>"</string> <string name="power_charging_duration" msgid="2853265177761520490">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g> do napunjenosti"</string> @@ -312,4 +313,6 @@ <string name="battery_info_status_full" msgid="2824614753861462808">"Puna"</string> <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"Onemogućio administrator"</string> <string name="home" msgid="8263346537524314127">"Početni zaslon"</string> + <string name="charge_length_format" msgid="8978516217024434156">"Prije <xliff:g id="ID_1">%1$s</xliff:g>"</string> + <string name="remaining_length_format" msgid="7886337596669190587">"Još <xliff:g id="ID_1">%1$s</xliff:g>"</string> </resources> diff --git a/packages/SettingsLib/res/values-hu/strings.xml b/packages/SettingsLib/res/values-hu/strings.xml index 5b450d3b6808..9113ab336654 100644 --- a/packages/SettingsLib/res/values-hu/strings.xml +++ b/packages/SettingsLib/res/values-hu/strings.xml @@ -296,6 +296,7 @@ <string name="accessibility_display_daltonizer_preference_title" msgid="5800761362678707872">"Színkorrekció"</string> <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"Ez egy kísérleti funkció, és hatással lehet a teljesítményre."</string> <string name="daltonizer_type_overridden" msgid="3116947244410245916">"Felülírva erre: <xliff:g id="TITLE">%1$s</xliff:g>"</string> + <string name="power_remaining_duration_only" msgid="4400068916452346544">"Kb. <xliff:g id="TIME">%2$s</xliff:g> van hátra"</string> <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> – kb. <xliff:g id="TIME">%2$s</xliff:g> van hátra"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="STATE">%2$s</xliff:g>"</string> <string name="power_charging_duration" msgid="2853265177761520490">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g> a teljes töltöttség eléréséig"</string> @@ -312,4 +313,6 @@ <string name="battery_info_status_full" msgid="2824614753861462808">"Feltöltve"</string> <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"Letiltva a rendszergazda által"</string> <string name="home" msgid="8263346537524314127">"Főoldal"</string> + <string name="charge_length_format" msgid="8978516217024434156">"Ennyi ideje: <xliff:g id="ID_1">%1$s</xliff:g>"</string> + <string name="remaining_length_format" msgid="7886337596669190587">"<xliff:g id="ID_1">%1$s</xliff:g> van hátra"</string> </resources> diff --git a/packages/SettingsLib/res/values-hy-rAM/strings.xml b/packages/SettingsLib/res/values-hy-rAM/strings.xml index 8cb024129142..2baa160cf655 100644 --- a/packages/SettingsLib/res/values-hy-rAM/strings.xml +++ b/packages/SettingsLib/res/values-hy-rAM/strings.xml @@ -296,6 +296,8 @@ <string name="accessibility_display_daltonizer_preference_title" msgid="5800761362678707872">"Գունային կարգաբերում"</string> <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"Սա փորձնական գործառույթ է և կարող է ազդել աշխատանքի վրա:"</string> <string name="daltonizer_type_overridden" msgid="3116947244410245916">"Գերազանցված է <xliff:g id="TITLE">%1$s</xliff:g>-ից"</string> + <!-- no translation found for power_remaining_duration_only (4400068916452346544) --> + <skip /> <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> - մնաց մոտավորապես <xliff:g id="TIME">%2$s</xliff:g>"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATE">%2$s</xliff:g>"</string> <string name="power_charging_duration" msgid="2853265177761520490">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> մինչև լրիվ լիցքավորումը"</string> @@ -312,4 +314,8 @@ <string name="battery_info_status_full" msgid="2824614753861462808">"Լիցքավորված"</string> <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"Կասեցված է ադմինիստրատորի կողմից"</string> <string name="home" msgid="8263346537524314127">"Գլխավոր էջ"</string> + <!-- no translation found for charge_length_format (8978516217024434156) --> + <skip /> + <!-- no translation found for remaining_length_format (7886337596669190587) --> + <skip /> </resources> diff --git a/packages/SettingsLib/res/values-in/strings.xml b/packages/SettingsLib/res/values-in/strings.xml index 207aaa210e65..1a4757646269 100644 --- a/packages/SettingsLib/res/values-in/strings.xml +++ b/packages/SettingsLib/res/values-in/strings.xml @@ -296,6 +296,8 @@ <string name="accessibility_display_daltonizer_preference_title" msgid="5800761362678707872">"Koreksi warna"</string> <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"Fitur ini bersifat eksperimental dan dapat memengaruhi kinerja."</string> <string name="daltonizer_type_overridden" msgid="3116947244410245916">"Digantikan oleh <xliff:g id="TITLE">%1$s</xliff:g>"</string> + <!-- no translation found for power_remaining_duration_only (4400068916452346544) --> + <skip /> <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> - kira-kira tersisa. <xliff:g id="TIME">%2$s</xliff:g>"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATE">%2$s</xliff:g>"</string> <string name="power_charging_duration" msgid="2853265177761520490">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> sampai penuh"</string> @@ -312,4 +314,8 @@ <string name="battery_info_status_full" msgid="2824614753861462808">"Penuh"</string> <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"Dinonaktifkan oleh administrator"</string> <string name="home" msgid="8263346537524314127">"Layar Utama"</string> + <!-- no translation found for charge_length_format (8978516217024434156) --> + <skip /> + <!-- no translation found for remaining_length_format (7886337596669190587) --> + <skip /> </resources> diff --git a/packages/SettingsLib/res/values-is-rIS/strings.xml b/packages/SettingsLib/res/values-is-rIS/strings.xml index b321b6fc0d3c..558f7bc74f3d 100644 --- a/packages/SettingsLib/res/values-is-rIS/strings.xml +++ b/packages/SettingsLib/res/values-is-rIS/strings.xml @@ -296,6 +296,8 @@ <string name="accessibility_display_daltonizer_preference_title" msgid="5800761362678707872">"Litaleiðrétting"</string> <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"Þessi eiginleiki er á tilraunastigi og getur haft áhrif á frammistöðu."</string> <string name="daltonizer_type_overridden" msgid="3116947244410245916">"Hnekkt af <xliff:g id="TITLE">%1$s</xliff:g>"</string> + <!-- no translation found for power_remaining_duration_only (4400068916452346544) --> + <skip /> <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> – u.þ.b. <xliff:g id="TIME">%2$s</xliff:g> eftir"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="STATE">%2$s</xliff:g>"</string> <string name="power_charging_duration" msgid="2853265177761520490">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g> í fulla hleðslu"</string> @@ -312,4 +314,8 @@ <string name="battery_info_status_full" msgid="2824614753861462808">"Fullhlaðin"</string> <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"Stjórnandi gerði óvirkt"</string> <string name="home" msgid="8263346537524314127">"Heim"</string> + <!-- no translation found for charge_length_format (8978516217024434156) --> + <skip /> + <!-- no translation found for remaining_length_format (7886337596669190587) --> + <skip /> </resources> diff --git a/packages/SettingsLib/res/values-it/strings.xml b/packages/SettingsLib/res/values-it/strings.xml index 71ad532d4a6b..24564c164f38 100644 --- a/packages/SettingsLib/res/values-it/strings.xml +++ b/packages/SettingsLib/res/values-it/strings.xml @@ -296,6 +296,8 @@ <string name="accessibility_display_daltonizer_preference_title" msgid="5800761362678707872">"Correzione del colore"</string> <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"Questa funzione è sperimentale e potrebbe influire sulle prestazioni."</string> <string name="daltonizer_type_overridden" msgid="3116947244410245916">"Valore sostituito da <xliff:g id="TITLE">%1$s</xliff:g>"</string> + <!-- no translation found for power_remaining_duration_only (4400068916452346544) --> + <skip /> <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> – Tempo rimanente: <xliff:g id="TIME">%2$s</xliff:g> circa"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATE">%2$s</xliff:g>"</string> <string name="power_charging_duration" msgid="2853265177761520490">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> alla carica completa"</string> @@ -312,4 +314,8 @@ <string name="battery_info_status_full" msgid="2824614753861462808">"Carica"</string> <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"Disattivata dall\'amministratore"</string> <string name="home" msgid="8263346537524314127">"Home page"</string> + <!-- no translation found for charge_length_format (8978516217024434156) --> + <skip /> + <!-- no translation found for remaining_length_format (7886337596669190587) --> + <skip /> </resources> diff --git a/packages/SettingsLib/res/values-iw/strings.xml b/packages/SettingsLib/res/values-iw/strings.xml index 001bc7de931e..5dea0a2a7955 100644 --- a/packages/SettingsLib/res/values-iw/strings.xml +++ b/packages/SettingsLib/res/values-iw/strings.xml @@ -296,6 +296,8 @@ <string name="accessibility_display_daltonizer_preference_title" msgid="5800761362678707872">"תיקון צבע"</string> <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"תכונה זו היא ניסיונית ועשויה להשפיע על הביצועים."</string> <string name="daltonizer_type_overridden" msgid="3116947244410245916">"נעקף על ידי <xliff:g id="TITLE">%1$s</xliff:g>"</string> + <!-- no translation found for power_remaining_duration_only (4400068916452346544) --> + <skip /> <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> בקירוב עד לסיום"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATE">%2$s</xliff:g>"</string> <string name="power_charging_duration" msgid="2853265177761520490">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> עד למילוי"</string> @@ -312,4 +314,8 @@ <string name="battery_info_status_full" msgid="2824614753861462808">"מלא"</string> <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"הושבת על ידי מנהל המערכת"</string> <string name="home" msgid="8263346537524314127">"דף הבית"</string> + <!-- no translation found for charge_length_format (8978516217024434156) --> + <skip /> + <!-- no translation found for remaining_length_format (7886337596669190587) --> + <skip /> </resources> diff --git a/packages/SettingsLib/res/values-ja/strings.xml b/packages/SettingsLib/res/values-ja/strings.xml index 43746d2c5c9b..eb7f8af8f46a 100644 --- a/packages/SettingsLib/res/values-ja/strings.xml +++ b/packages/SettingsLib/res/values-ja/strings.xml @@ -296,6 +296,8 @@ <string name="accessibility_display_daltonizer_preference_title" msgid="5800761362678707872">"色補正"</string> <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"この機能は試験運用機能であり、パフォーマンスに影響することがあります。"</string> <string name="daltonizer_type_overridden" msgid="3116947244410245916">"<xliff:g id="TITLE">%1$s</xliff:g>によって上書き済み"</string> + <!-- no translation found for power_remaining_duration_only (4400068916452346544) --> + <skip /> <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> - 残り約<xliff:g id="TIME">%2$s</xliff:g>"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATE">%2$s</xliff:g>"</string> <string name="power_charging_duration" msgid="2853265177761520490">"<xliff:g id="LEVEL">%1$s</xliff:g> - フル充電まで<xliff:g id="TIME">%2$s</xliff:g>"</string> @@ -314,4 +316,8 @@ <skip /> <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"管理者によって無効にされています"</string> <string name="home" msgid="8263346537524314127">"ホーム"</string> + <!-- no translation found for charge_length_format (8978516217024434156) --> + <skip /> + <!-- no translation found for remaining_length_format (7886337596669190587) --> + <skip /> </resources> diff --git a/packages/SettingsLib/res/values-ka-rGE/strings.xml b/packages/SettingsLib/res/values-ka-rGE/strings.xml index afdb0de6f415..540dc816065f 100644 --- a/packages/SettingsLib/res/values-ka-rGE/strings.xml +++ b/packages/SettingsLib/res/values-ka-rGE/strings.xml @@ -296,6 +296,8 @@ <string name="accessibility_display_daltonizer_preference_title" msgid="5800761362678707872">"ფერის კორექცია"</string> <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"ეს ფუნქცია საცდელია და შეიძლება გავლენა იქონიოს შესრულებაზე."</string> <string name="daltonizer_type_overridden" msgid="3116947244410245916">"უკუგებულია <xliff:g id="TITLE">%1$s</xliff:g>-ის მიერ"</string> + <!-- no translation found for power_remaining_duration_only (4400068916452346544) --> + <skip /> <string name="power_discharging_duration" msgid="1605929174734600590">"დაახლ. <xliff:g id="LEVEL">%1$s</xliff:g> დარჩენილია <xliff:g id="TIME">%2$s</xliff:g>"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATE">%2$s</xliff:g>"</string> <string name="power_charging_duration" msgid="2853265177761520490">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> სრულ დატენვამდე"</string> @@ -312,4 +314,8 @@ <string name="battery_info_status_full" msgid="2824614753861462808">"ბატარეა დატენილია"</string> <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"გათიშულია ადმინისტრატორის მიერ"</string> <string name="home" msgid="8263346537524314127">"მთავარი"</string> + <!-- no translation found for charge_length_format (8978516217024434156) --> + <skip /> + <!-- no translation found for remaining_length_format (7886337596669190587) --> + <skip /> </resources> diff --git a/packages/SettingsLib/res/values-kk-rKZ/strings.xml b/packages/SettingsLib/res/values-kk-rKZ/strings.xml index b9ba8643c1c7..7f59d976001f 100644 --- a/packages/SettingsLib/res/values-kk-rKZ/strings.xml +++ b/packages/SettingsLib/res/values-kk-rKZ/strings.xml @@ -296,6 +296,8 @@ <string name="accessibility_display_daltonizer_preference_title" msgid="5800761362678707872">"Түсті түзету"</string> <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"Бұл мүмкіндік эксперименттік болып табылады және өнімділікке әсер етуі мүмкін."</string> <string name="daltonizer_type_overridden" msgid="3116947244410245916">"<xliff:g id="TITLE">%1$s</xliff:g> үстінен басқан"</string> + <!-- no translation found for power_remaining_duration_only (4400068916452346544) --> + <skip /> <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> - шамамен <xliff:g id="TIME">%2$s</xliff:g> қалды"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATE">%2$s</xliff:g>"</string> <string name="power_charging_duration" msgid="2853265177761520490">"<xliff:g id="LEVEL">%1$s</xliff:g> - толғанша <xliff:g id="TIME">%2$s</xliff:g>"</string> @@ -312,4 +314,8 @@ <string name="battery_info_status_full" msgid="2824614753861462808">"Толық"</string> <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"Әкімші өшірген"</string> <string name="home" msgid="8263346537524314127">"Негізгі бет"</string> + <!-- no translation found for charge_length_format (8978516217024434156) --> + <skip /> + <!-- no translation found for remaining_length_format (7886337596669190587) --> + <skip /> </resources> diff --git a/packages/SettingsLib/res/values-km-rKH/strings.xml b/packages/SettingsLib/res/values-km-rKH/strings.xml index 7ceed5d4b0b1..a949538de534 100644 --- a/packages/SettingsLib/res/values-km-rKH/strings.xml +++ b/packages/SettingsLib/res/values-km-rKH/strings.xml @@ -296,6 +296,8 @@ <string name="accessibility_display_daltonizer_preference_title" msgid="5800761362678707872">"ការកែពណ៌"</string> <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"លក្ខណៈនេះគឺជាការពិសោធន៍ ហើយអាចប៉ះពាល់ការអនុវត្ត។"</string> <string name="daltonizer_type_overridden" msgid="3116947244410245916">"បដិសេធដោយ <xliff:g id="TITLE">%1$s</xliff:g>"</string> + <!-- no translation found for power_remaining_duration_only (4400068916452346544) --> + <skip /> <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> - នៅសល់ប្រហែល <xliff:g id="TIME">%2$s</xliff:g>"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATE">%2$s</xliff:g>"</string> <string name="power_charging_duration" msgid="2853265177761520490">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> រហូតដល់ពេញ"</string> @@ -312,4 +314,8 @@ <string name="battery_info_status_full" msgid="2824614753861462808">"ពេញ"</string> <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"បានបិទដំណើរការដោយអ្នកគ្រប់គ្រង"</string> <string name="home" msgid="8263346537524314127">"ដើម"</string> + <!-- no translation found for charge_length_format (8978516217024434156) --> + <skip /> + <!-- no translation found for remaining_length_format (7886337596669190587) --> + <skip /> </resources> diff --git a/packages/SettingsLib/res/values-kn-rIN/strings.xml b/packages/SettingsLib/res/values-kn-rIN/strings.xml index 7445399d93f0..bfe0c1e8a1c8 100644 --- a/packages/SettingsLib/res/values-kn-rIN/strings.xml +++ b/packages/SettingsLib/res/values-kn-rIN/strings.xml @@ -296,6 +296,7 @@ <string name="accessibility_display_daltonizer_preference_title" msgid="5800761362678707872">"ಬಣ್ಣದ ತಿದ್ದುಪಡಿ"</string> <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"ಇದು ಪ್ರಾಯೋಗಿಕ ವೈಶಿಷ್ಟ್ಯವಾಗಿದೆ. ಕಾರ್ಯಕ್ಷಮತೆ ಮೇಲೆ ಪರಿಣಾಮ ಬೀರಬಹುದು."</string> <string name="daltonizer_type_overridden" msgid="3116947244410245916">"<xliff:g id="TITLE">%1$s</xliff:g> ಮೂಲಕ ಅತಿಕ್ರಮಿಸುತ್ತದೆ"</string> + <string name="power_remaining_duration_only" msgid="4400068916452346544">"ಸುಮಾರು <xliff:g id="TIME">%2$s</xliff:g> ಉಳಿದಿದೆ"</string> <string name="power_discharging_duration" msgid="1605929174734600590">"ಸುಮಾರು <xliff:g id="LEVEL">%1$s</xliff:g> <xliff:g id="TIME">%2$s</xliff:g> ಉಳಿದಿದೆ"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATE">%2$s</xliff:g>"</string> <string name="power_charging_duration" msgid="2853265177761520490">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> ಪೂರ್ಣವಾಗುವವರೆಗೆ"</string> @@ -312,4 +313,6 @@ <string name="battery_info_status_full" msgid="2824614753861462808">"ಭರ್ತಿ"</string> <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"ನಿರ್ವಾಹಕರಿಂದ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ"</string> <string name="home" msgid="8263346537524314127">"ಮುಖಪುಟ"</string> + <string name="charge_length_format" msgid="8978516217024434156">"<xliff:g id="ID_1">%1$s</xliff:g> ಹಿಂದೆ"</string> + <string name="remaining_length_format" msgid="7886337596669190587">"<xliff:g id="ID_1">%1$s</xliff:g> ಉಳಿದಿದೆ"</string> </resources> diff --git a/packages/SettingsLib/res/values-ko/strings.xml b/packages/SettingsLib/res/values-ko/strings.xml index 73911720b552..5d1176aaa83c 100644 --- a/packages/SettingsLib/res/values-ko/strings.xml +++ b/packages/SettingsLib/res/values-ko/strings.xml @@ -296,6 +296,8 @@ <string name="accessibility_display_daltonizer_preference_title" msgid="5800761362678707872">"색보정"</string> <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"실험실 기능이며 성능에 영향을 줄 수 있습니다."</string> <string name="daltonizer_type_overridden" msgid="3116947244410245916">"<xliff:g id="TITLE">%1$s</xliff:g> 우선 적용됨"</string> + <!-- no translation found for power_remaining_duration_only (4400068916452346544) --> + <skip /> <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> - 대략 <xliff:g id="TIME">%2$s</xliff:g> 남음"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATE">%2$s</xliff:g>"</string> <string name="power_charging_duration" msgid="2853265177761520490">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> 후 충전 완료"</string> @@ -312,4 +314,8 @@ <string name="battery_info_status_full" msgid="2824614753861462808">"충전 완료"</string> <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"관리자가 사용 중지함"</string> <string name="home" msgid="8263346537524314127">"홈"</string> + <!-- no translation found for charge_length_format (8978516217024434156) --> + <skip /> + <!-- no translation found for remaining_length_format (7886337596669190587) --> + <skip /> </resources> diff --git a/packages/SettingsLib/res/values-ky-rKG/strings.xml b/packages/SettingsLib/res/values-ky-rKG/strings.xml index 1fc721e83534..f0867f54eb0f 100644 --- a/packages/SettingsLib/res/values-ky-rKG/strings.xml +++ b/packages/SettingsLib/res/values-ky-rKG/strings.xml @@ -296,6 +296,8 @@ <string name="accessibility_display_daltonizer_preference_title" msgid="5800761362678707872">"Түсүн тууралоо"</string> <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"Бул сынамык мүмкүнчүлүк болгондуктан, иштин майнаптуулугуна таасир этиши мүмкүн."</string> <string name="daltonizer_type_overridden" msgid="3116947244410245916">"<xliff:g id="TITLE">%1$s</xliff:g> менен алмаштырылган"</string> + <!-- no translation found for power_remaining_duration_only (4400068916452346544) --> + <skip /> <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> - болжол менен <xliff:g id="TIME">%2$s</xliff:g> саат калды"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATE">%2$s</xliff:g>"</string> <string name="power_charging_duration" msgid="2853265177761520490">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> толгончо"</string> @@ -312,4 +314,8 @@ <string name="battery_info_status_full" msgid="2824614753861462808">"Толук"</string> <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"Администратор өчүрүп койгон"</string> <string name="home" msgid="8263346537524314127">"Башкы бет"</string> + <!-- no translation found for charge_length_format (8978516217024434156) --> + <skip /> + <!-- no translation found for remaining_length_format (7886337596669190587) --> + <skip /> </resources> diff --git a/packages/SettingsLib/res/values-lo-rLA/strings.xml b/packages/SettingsLib/res/values-lo-rLA/strings.xml index 1c56fddd4784..14194662e4be 100644 --- a/packages/SettingsLib/res/values-lo-rLA/strings.xml +++ b/packages/SettingsLib/res/values-lo-rLA/strings.xml @@ -296,6 +296,8 @@ <string name="accessibility_display_daltonizer_preference_title" msgid="5800761362678707872">"ການປັບແຕ່ງສີ"</string> <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"ຄຸນສົມບັດນີ້ກຳລັງຢູ່ໃນການທົດລອງແລະອາດມີຜົນຕໍ່ປະສິດທິພາບ."</string> <string name="daltonizer_type_overridden" msgid="3116947244410245916">"ຖືກແທນໂດຍ <xliff:g id="TITLE">%1$s</xliff:g>"</string> + <!-- no translation found for power_remaining_duration_only (4400068916452346544) --> + <skip /> <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> - ເຫຼືອປະມານ <xliff:g id="TIME">%2$s</xliff:g>"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATE">%2$s</xliff:g>"</string> <string name="power_charging_duration" msgid="2853265177761520490">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> ຈຶ່ງຈະເຕັມ"</string> @@ -312,4 +314,8 @@ <string name="battery_info_status_full" msgid="2824614753861462808">"ເຕັມ"</string> <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"ຖືກປິດໃຊ້ໂດຍຜູ້ເບິ່ງແຍງລະບົບ"</string> <string name="home" msgid="8263346537524314127">"ໜ້າຫຼັກ"</string> + <!-- no translation found for charge_length_format (8978516217024434156) --> + <skip /> + <!-- no translation found for remaining_length_format (7886337596669190587) --> + <skip /> </resources> diff --git a/packages/SettingsLib/res/values-lt/strings.xml b/packages/SettingsLib/res/values-lt/strings.xml index ce2ccde884ab..3f5493d9f4af 100644 --- a/packages/SettingsLib/res/values-lt/strings.xml +++ b/packages/SettingsLib/res/values-lt/strings.xml @@ -296,6 +296,8 @@ <string name="accessibility_display_daltonizer_preference_title" msgid="5800761362678707872">"Spalvų taisymas"</string> <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"Ši funkcija yra eksperimentinė ir ji gali turėti įtakos našumui."</string> <string name="daltonizer_type_overridden" msgid="3116947244410245916">"Nepaisyta naudojant nuostatą „<xliff:g id="TITLE">%1$s</xliff:g>“"</string> + <!-- no translation found for power_remaining_duration_only (4400068916452346544) --> + <skip /> <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> – liko maždaug <xliff:g id="TIME">%2$s</xliff:g>"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="STATE">%2$s</xliff:g>"</string> <string name="power_charging_duration" msgid="2853265177761520490">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g> iki visiško įkrovimo"</string> @@ -312,4 +314,8 @@ <string name="battery_info_status_full" msgid="2824614753861462808">"Visiškai įkrautas"</string> <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"Išjungė administratorius"</string> <string name="home" msgid="8263346537524314127">"Pagrindinis ekranas"</string> + <!-- no translation found for charge_length_format (8978516217024434156) --> + <skip /> + <!-- no translation found for remaining_length_format (7886337596669190587) --> + <skip /> </resources> diff --git a/packages/SettingsLib/res/values-lv/strings.xml b/packages/SettingsLib/res/values-lv/strings.xml index 0cf5086b0697..dd7070306608 100644 --- a/packages/SettingsLib/res/values-lv/strings.xml +++ b/packages/SettingsLib/res/values-lv/strings.xml @@ -296,6 +296,8 @@ <string name="accessibility_display_daltonizer_preference_title" msgid="5800761362678707872">"Krāsu korekcija"</string> <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"Šī funkcija ir eksperimentāla un var ietekmēt veiktspēju."</string> <string name="daltonizer_type_overridden" msgid="3116947244410245916">"Jaunā preference: <xliff:g id="TITLE">%1$s</xliff:g>"</string> + <!-- no translation found for power_remaining_duration_only (4400068916452346544) --> + <skip /> <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> — aptuvenais atlikušais laiks: <xliff:g id="TIME">%2$s</xliff:g>"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> — <xliff:g id="STATE">%2$s</xliff:g>"</string> <string name="power_charging_duration" msgid="2853265177761520490">"<xliff:g id="LEVEL">%1$s</xliff:g> — <xliff:g id="TIME">%2$s</xliff:g> līdz pilnai uzlādei"</string> @@ -312,4 +314,8 @@ <string name="battery_info_status_full" msgid="2824614753861462808">"Pilns"</string> <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"Atspējojis administrators"</string> <string name="home" msgid="8263346537524314127">"Sākums"</string> + <!-- no translation found for charge_length_format (8978516217024434156) --> + <skip /> + <!-- no translation found for remaining_length_format (7886337596669190587) --> + <skip /> </resources> diff --git a/packages/SettingsLib/res/values-mk-rMK/strings.xml b/packages/SettingsLib/res/values-mk-rMK/strings.xml index 5c763371193b..5bdfd01aa53d 100644 --- a/packages/SettingsLib/res/values-mk-rMK/strings.xml +++ b/packages/SettingsLib/res/values-mk-rMK/strings.xml @@ -296,6 +296,7 @@ <string name="accessibility_display_daltonizer_preference_title" msgid="5800761362678707872">"Корекција на боја"</string> <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"Функцијата е експериментална и може да влијае на изведбата."</string> <string name="daltonizer_type_overridden" msgid="3116947244410245916">"Прескокнато според <xliff:g id="TITLE">%1$s</xliff:g>"</string> + <string name="power_remaining_duration_only" msgid="4400068916452346544">"Преостанаа прибл. <xliff:g id="TIME">%2$s</xliff:g>"</string> <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> – преостанува приближно <xliff:g id="TIME">%2$s</xliff:g>"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="STATE">%2$s</xliff:g>"</string> <string name="power_charging_duration" msgid="2853265177761520490">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g> до целосно полна"</string> @@ -312,4 +313,6 @@ <string name="battery_info_status_full" msgid="2824614753861462808">"Целосна"</string> <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"Оневозможено од администраторот"</string> <string name="home" msgid="8263346537524314127">"Почетна страница"</string> + <string name="charge_length_format" msgid="8978516217024434156">"Пред <xliff:g id="ID_1">%1$s</xliff:g>"</string> + <string name="remaining_length_format" msgid="7886337596669190587">"Преостанаа <xliff:g id="ID_1">%1$s</xliff:g>"</string> </resources> diff --git a/packages/SettingsLib/res/values-ml-rIN/strings.xml b/packages/SettingsLib/res/values-ml-rIN/strings.xml index 5ab31bc3044d..38b4771d3957 100644 --- a/packages/SettingsLib/res/values-ml-rIN/strings.xml +++ b/packages/SettingsLib/res/values-ml-rIN/strings.xml @@ -296,6 +296,7 @@ <string name="accessibility_display_daltonizer_preference_title" msgid="5800761362678707872">"വർണ്ണം ക്രമീകരിക്കൽ"</string> <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"ഈ ഫീച്ചർ പരീക്ഷണാത്മകമായതിനാൽ പ്രകടനത്തെ ബാധിച്ചേക്കാം."</string> <string name="daltonizer_type_overridden" msgid="3116947244410245916">"<xliff:g id="TITLE">%1$s</xliff:g> ഉപയോഗിച്ച് അസാധുവാക്കി"</string> + <string name="power_remaining_duration_only" msgid="4400068916452346544">"ഏകദേശം <xliff:g id="TIME">%2$s</xliff:g> ശേഷിക്കുന്നു"</string> <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> - ഏകദേശം <xliff:g id="TIME">%2$s</xliff:g> ശേഷിക്കുന്നു"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATE">%2$s</xliff:g>"</string> <string name="power_charging_duration" msgid="2853265177761520490">"<xliff:g id="LEVEL">%1$s</xliff:g> - പൂർണ്ണമായും ചാർജ്ജാകുന്നതിന്, <xliff:g id="TIME">%2$s</xliff:g>"</string> @@ -312,4 +313,6 @@ <string name="battery_info_status_full" msgid="2824614753861462808">"നിറഞ്ഞു"</string> <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"അഡ്മിനിസ്ട്രേറ്റർ പ്രവർത്തനരഹിതമാക്കി"</string> <string name="home" msgid="8263346537524314127">"ഹോം"</string> + <string name="charge_length_format" msgid="8978516217024434156">"<xliff:g id="ID_1">%1$s</xliff:g> മുമ്പ്"</string> + <string name="remaining_length_format" msgid="7886337596669190587">"<xliff:g id="ID_1">%1$s</xliff:g> ശേഷിക്കുന്നു"</string> </resources> diff --git a/packages/SettingsLib/res/values-mn-rMN/strings.xml b/packages/SettingsLib/res/values-mn-rMN/strings.xml index 3d8d362eb3a6..3b5d5f196941 100644 --- a/packages/SettingsLib/res/values-mn-rMN/strings.xml +++ b/packages/SettingsLib/res/values-mn-rMN/strings.xml @@ -296,6 +296,8 @@ <string name="accessibility_display_daltonizer_preference_title" msgid="5800761362678707872">"Өнгө тохируулах"</string> <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"Энэ функц туршилтынх бөгөөд ажиллагаанд нөлөөлж болзошгүй."</string> <string name="daltonizer_type_overridden" msgid="3116947244410245916">"Давхарласан <xliff:g id="TITLE">%1$s</xliff:g>"</string> + <!-- no translation found for power_remaining_duration_only (4400068916452346544) --> + <skip /> <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> - ойролцоогоор <xliff:g id="TIME">%2$s</xliff:g> үлдсэн"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATE">%2$s</xliff:g>"</string> <string name="power_charging_duration" msgid="2853265177761520490">"дүүртэл <xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g>"</string> @@ -312,4 +314,8 @@ <string name="battery_info_status_full" msgid="2824614753861462808">"Дүүрэн"</string> <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"Админ идэвхгүй болгосон"</string> <string name="home" msgid="8263346537524314127">"Нүүр"</string> + <!-- no translation found for charge_length_format (8978516217024434156) --> + <skip /> + <!-- no translation found for remaining_length_format (7886337596669190587) --> + <skip /> </resources> diff --git a/packages/SettingsLib/res/values-mr-rIN/strings.xml b/packages/SettingsLib/res/values-mr-rIN/strings.xml index 19c47fb80aca..493f579a5ca2 100644 --- a/packages/SettingsLib/res/values-mr-rIN/strings.xml +++ b/packages/SettingsLib/res/values-mr-rIN/strings.xml @@ -296,6 +296,7 @@ <string name="accessibility_display_daltonizer_preference_title" msgid="5800761362678707872">"रंग सुधारणा"</string> <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"हे वैशिष्ट्य प्रायोगिक आहे आणि कदाचित कार्यप्रदर्शन प्रभावित करू शकते."</string> <string name="daltonizer_type_overridden" msgid="3116947244410245916">"<xliff:g id="TITLE">%1$s</xliff:g> द्वारे अधिलिखित"</string> + <string name="power_remaining_duration_only" msgid="4400068916452346544">"अंदाजे. <xliff:g id="TIME">%2$s</xliff:g> शिल्लक"</string> <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> - अंदाजे. <xliff:g id="TIME">%2$s</xliff:g> शिल्लक"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATE">%2$s</xliff:g>"</string> <string name="power_charging_duration" msgid="2853265177761520490">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> पूर्ण होण्यात"</string> @@ -312,4 +313,6 @@ <string name="battery_info_status_full" msgid="2824614753861462808">"पूर्ण"</string> <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"प्रशासकाद्वारे अक्षम केलेले"</string> <string name="home" msgid="8263346537524314127">"मुख्यपृष्ठ"</string> + <string name="charge_length_format" msgid="8978516217024434156">"<xliff:g id="ID_1">%1$s</xliff:g> पूर्वी"</string> + <string name="remaining_length_format" msgid="7886337596669190587">"<xliff:g id="ID_1">%1$s</xliff:g> शिल्लक"</string> </resources> diff --git a/packages/SettingsLib/res/values-ms-rMY/strings.xml b/packages/SettingsLib/res/values-ms-rMY/strings.xml index ad5eed444843..050915991b67 100644 --- a/packages/SettingsLib/res/values-ms-rMY/strings.xml +++ b/packages/SettingsLib/res/values-ms-rMY/strings.xml @@ -296,6 +296,8 @@ <string name="accessibility_display_daltonizer_preference_title" msgid="5800761362678707872">"Pembetulan warna"</string> <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"Ciri ini adalah percubaan dan boleh menjejaskan prestasi."</string> <string name="daltonizer_type_overridden" msgid="3116947244410245916">"Diatasi oleh <xliff:g id="TITLE">%1$s</xliff:g>"</string> + <!-- no translation found for power_remaining_duration_only (4400068916452346544) --> + <skip /> <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> - kira-kira. <xliff:g id="TIME">%2$s</xliff:g> yang tinggal"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATE">%2$s</xliff:g>"</string> <string name="power_charging_duration" msgid="2853265177761520490">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> sehingga penuh"</string> @@ -312,4 +314,8 @@ <string name="battery_info_status_full" msgid="2824614753861462808">"Penuh"</string> <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"Dilumpuhkan oleh pentadbir"</string> <string name="home" msgid="8263346537524314127">"Skrin Utama"</string> + <!-- no translation found for charge_length_format (8978516217024434156) --> + <skip /> + <!-- no translation found for remaining_length_format (7886337596669190587) --> + <skip /> </resources> diff --git a/packages/SettingsLib/res/values-my-rMM/strings.xml b/packages/SettingsLib/res/values-my-rMM/strings.xml index f833a0f1d0f7..9f56479b5040 100644 --- a/packages/SettingsLib/res/values-my-rMM/strings.xml +++ b/packages/SettingsLib/res/values-my-rMM/strings.xml @@ -296,6 +296,8 @@ <string name="accessibility_display_daltonizer_preference_title" msgid="5800761362678707872">"အရောင်ပြင်ဆင်မှု"</string> <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"ဒီအင်္ဂါရပ်မှာ စမ်းသပ်မှု ဖြစ်၍ လုပ်ကိုင်မှုကို အကျိုးသက်ရောက်နိုင်သည်။"</string> <string name="daltonizer_type_overridden" msgid="3116947244410245916">"<xliff:g id="TITLE">%1$s</xliff:g> မှ ကျော်၍ လုပ်ထားသည်။"</string> + <!-- no translation found for power_remaining_duration_only (4400068916452346544) --> + <skip /> <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> - ခန့်မှန်းခြေ။ <xliff:g id="TIME">%2$s</xliff:g> ကျန်ရှိနေ"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATE">%2$s</xliff:g>"</string> <string name="power_charging_duration" msgid="2853265177761520490">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> အပြည့်အထိ"</string> @@ -312,4 +314,8 @@ <string name="battery_info_status_full" msgid="2824614753861462808">"အပြည့်"</string> <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"စီမံခန့်ခွဲသူမှ ပိတ်ထားသည်"</string> <string name="home" msgid="8263346537524314127">"ပင်မ"</string> + <!-- no translation found for charge_length_format (8978516217024434156) --> + <skip /> + <!-- no translation found for remaining_length_format (7886337596669190587) --> + <skip /> </resources> diff --git a/packages/SettingsLib/res/values-nb/strings.xml b/packages/SettingsLib/res/values-nb/strings.xml index b8da6926c9d6..013fe26ab257 100644 --- a/packages/SettingsLib/res/values-nb/strings.xml +++ b/packages/SettingsLib/res/values-nb/strings.xml @@ -296,6 +296,8 @@ <string name="accessibility_display_daltonizer_preference_title" msgid="5800761362678707872">"Fargekorrigering"</string> <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"Denne funksjonen er eksperimentell og kan påvirke ytelsen."</string> <string name="daltonizer_type_overridden" msgid="3116947244410245916">"Overstyres av <xliff:g id="TITLE">%1$s</xliff:g>"</string> + <!-- no translation found for power_remaining_duration_only (4400068916452346544) --> + <skip /> <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> – ca. <xliff:g id="TIME">%2$s</xliff:g> igjen"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="STATE">%2$s</xliff:g>"</string> <string name="power_charging_duration" msgid="2853265177761520490">"<xliff:g id="LEVEL">%1$s</xliff:g> – fulladet om <xliff:g id="TIME">%2$s</xliff:g>"</string> @@ -312,4 +314,8 @@ <string name="battery_info_status_full" msgid="2824614753861462808">"Fullt"</string> <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"Avslått av administratoren"</string> <string name="home" msgid="8263346537524314127">"Startside"</string> + <!-- no translation found for charge_length_format (8978516217024434156) --> + <skip /> + <!-- no translation found for remaining_length_format (7886337596669190587) --> + <skip /> </resources> diff --git a/packages/SettingsLib/res/values-ne-rNP/strings.xml b/packages/SettingsLib/res/values-ne-rNP/strings.xml index 024a43336f2f..715f055f696d 100644 --- a/packages/SettingsLib/res/values-ne-rNP/strings.xml +++ b/packages/SettingsLib/res/values-ne-rNP/strings.xml @@ -296,6 +296,7 @@ <string name="accessibility_display_daltonizer_preference_title" msgid="5800761362678707872">"रङ्ग सुधार"</string> <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"यो सुविधा प्रयोगात्मक छ र प्रदर्शनमा असर गर्न सक्छ।"</string> <string name="daltonizer_type_overridden" msgid="3116947244410245916">"<xliff:g id="TITLE">%1$s</xliff:g> द्वारा अधिरोहित"</string> + <string name="power_remaining_duration_only" msgid="4400068916452346544">"लगभग <xliff:g id="TIME">%2$s</xliff:g> बाँकी छ"</string> <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> - लगभग। <xliff:g id="TIME">%2$s</xliff:g> बायाँ"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATE">%2$s</xliff:g>"</string> <string name="power_charging_duration" msgid="2853265177761520490">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> पूर्ण नभए सम्म"</string> @@ -312,4 +313,6 @@ <string name="battery_info_status_full" msgid="2824614753861462808">"पूर्ण"</string> <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"प्रशासकद्वारा असक्षम गरिएको"</string> <string name="home" msgid="8263346537524314127">"गृह"</string> + <string name="charge_length_format" msgid="8978516217024434156">"<xliff:g id="ID_1">%1$s</xliff:g> पहिले"</string> + <string name="remaining_length_format" msgid="7886337596669190587">"<xliff:g id="ID_1">%1$s</xliff:g> बाँकी"</string> </resources> diff --git a/packages/SettingsLib/res/values-nl/strings.xml b/packages/SettingsLib/res/values-nl/strings.xml index a51ef2a16095..bd2420131c07 100644 --- a/packages/SettingsLib/res/values-nl/strings.xml +++ b/packages/SettingsLib/res/values-nl/strings.xml @@ -296,6 +296,8 @@ <string name="accessibility_display_daltonizer_preference_title" msgid="5800761362678707872">"Kleurcorrectie"</string> <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"Deze functie is experimenteel en kan invloed hebben op de prestaties."</string> <string name="daltonizer_type_overridden" msgid="3116947244410245916">"Overschreven door <xliff:g id="TITLE">%1$s</xliff:g>"</string> + <!-- no translation found for power_remaining_duration_only (4400068916452346544) --> + <skip /> <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> - ca. <xliff:g id="TIME">%2$s</xliff:g> resterend"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATE">%2$s</xliff:g>"</string> <string name="power_charging_duration" msgid="2853265177761520490">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> tot vol"</string> @@ -312,4 +314,8 @@ <string name="battery_info_status_full" msgid="2824614753861462808">"Volledig"</string> <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"Uitgeschakeld door beheerder"</string> <string name="home" msgid="8263346537524314127">"Startpagina"</string> + <!-- no translation found for charge_length_format (8978516217024434156) --> + <skip /> + <!-- no translation found for remaining_length_format (7886337596669190587) --> + <skip /> </resources> diff --git a/packages/SettingsLib/res/values-pa-rIN/strings.xml b/packages/SettingsLib/res/values-pa-rIN/strings.xml index 433fe69d88ba..f9c0c11b6c7e 100644 --- a/packages/SettingsLib/res/values-pa-rIN/strings.xml +++ b/packages/SettingsLib/res/values-pa-rIN/strings.xml @@ -296,6 +296,7 @@ <string name="accessibility_display_daltonizer_preference_title" msgid="5800761362678707872">"ਰੰਗ ਸੰਸ਼ੋਧਨ"</string> <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"ਇਹ ਵਿਸ਼ੇਸ਼ਤਾ ਪ੍ਰਯੋਗਾਤਮਿਕ ਹੈ ਅਤੇ ਪ੍ਰਦਰਸ਼ਨ ਤੇ ਅਸਰ ਪਾ ਸਕਦੀ ਹੈ।"</string> <string name="daltonizer_type_overridden" msgid="3116947244410245916">"<xliff:g id="TITLE">%1$s</xliff:g> ਦੁਆਰਾ ਓਵਰਰਾਈਡ ਕੀਤਾ"</string> + <string name="power_remaining_duration_only" msgid="4400068916452346544">"ਲਗਭਗ <xliff:g id="TIME">%2$s</xliff:g> ਬਾਕੀ"</string> <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> - ਲਗਭਗ <xliff:g id="TIME">%2$s</xliff:g> ਬਾਕੀ"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATE">%2$s</xliff:g>"</string> <string name="power_charging_duration" msgid="2853265177761520490">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> ਪੂਰੀ ਹੋਣ ਤੱਕ"</string> @@ -312,4 +313,6 @@ <string name="battery_info_status_full" msgid="2824614753861462808">"ਪੂਰੀ"</string> <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"ਪ੍ਰਸ਼ਾਸਕ ਵੱਲੋਂ ਅਯੋਗ ਬਣਾਇਆ ਗਿਆ"</string> <string name="home" msgid="8263346537524314127">"ਮੁੱਖ ਸਕ੍ਰੀਨ"</string> + <string name="charge_length_format" msgid="8978516217024434156">"<xliff:g id="ID_1">%1$s</xliff:g> ਪਹਿਲਾਂ"</string> + <string name="remaining_length_format" msgid="7886337596669190587">"<xliff:g id="ID_1">%1$s</xliff:g> ਬਾਕੀ"</string> </resources> diff --git a/packages/SettingsLib/res/values-pl/strings.xml b/packages/SettingsLib/res/values-pl/strings.xml index f750bc9f152f..4ff0d03cc903 100644 --- a/packages/SettingsLib/res/values-pl/strings.xml +++ b/packages/SettingsLib/res/values-pl/strings.xml @@ -296,6 +296,8 @@ <string name="accessibility_display_daltonizer_preference_title" msgid="5800761362678707872">"Korekcja kolorów"</string> <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"To jest funkcja eksperymentalna i może wpływać na działanie urządzenia."</string> <string name="daltonizer_type_overridden" msgid="3116947244410245916">"Nadpisana przez <xliff:g id="TITLE">%1$s</xliff:g>"</string> + <!-- no translation found for power_remaining_duration_only (4400068916452346544) --> + <skip /> <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> – zostało ok. <xliff:g id="TIME">%2$s</xliff:g>"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="STATE">%2$s</xliff:g>"</string> <string name="power_charging_duration" msgid="2853265177761520490">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g> do pełnego naładowania"</string> @@ -312,4 +314,8 @@ <string name="battery_info_status_full" msgid="2824614753861462808">"Naładowana"</string> <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"Wyłączone przez administratora"</string> <string name="home" msgid="8263346537524314127">"Ekran główny"</string> + <!-- no translation found for charge_length_format (8978516217024434156) --> + <skip /> + <!-- no translation found for remaining_length_format (7886337596669190587) --> + <skip /> </resources> diff --git a/packages/SettingsLib/res/values-pt-rBR/strings.xml b/packages/SettingsLib/res/values-pt-rBR/strings.xml index 5ee9ef503b56..b4251a5387ab 100644 --- a/packages/SettingsLib/res/values-pt-rBR/strings.xml +++ b/packages/SettingsLib/res/values-pt-rBR/strings.xml @@ -296,6 +296,8 @@ <string name="accessibility_display_daltonizer_preference_title" msgid="5800761362678707872">"Correção de cor"</string> <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"Este recurso é experimental e pode afetar o desempenho."</string> <string name="daltonizer_type_overridden" msgid="3116947244410245916">"Substituído por <xliff:g id="TITLE">%1$s</xliff:g>"</string> + <!-- no translation found for power_remaining_duration_only (4400068916452346544) --> + <skip /> <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> - cerca de <xliff:g id="TIME">%2$s</xliff:g> restantes"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATE">%2$s</xliff:g>"</string> <string name="power_charging_duration" msgid="2853265177761520490">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> até concluir"</string> @@ -312,4 +314,8 @@ <string name="battery_info_status_full" msgid="2824614753861462808">"Cheio"</string> <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"Desativada pelo administrador"</string> <string name="home" msgid="8263346537524314127">"Início"</string> + <!-- no translation found for charge_length_format (8978516217024434156) --> + <skip /> + <!-- no translation found for remaining_length_format (7886337596669190587) --> + <skip /> </resources> diff --git a/packages/SettingsLib/res/values-pt-rPT/strings.xml b/packages/SettingsLib/res/values-pt-rPT/strings.xml index 5f5916ef1bca..3dd9561c50d0 100644 --- a/packages/SettingsLib/res/values-pt-rPT/strings.xml +++ b/packages/SettingsLib/res/values-pt-rPT/strings.xml @@ -296,6 +296,7 @@ <string name="accessibility_display_daltonizer_preference_title" msgid="5800761362678707872">"Correção da cor"</string> <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"Esta funcionalidade é experimental e pode afetar o desempenho."</string> <string name="daltonizer_type_overridden" msgid="3116947244410245916">"Substituído por <xliff:g id="TITLE">%1$s</xliff:g>"</string> + <string name="power_remaining_duration_only" msgid="4400068916452346544">"Resta(m) aproximadamente <xliff:g id="TIME">%2$s</xliff:g>"</string> <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> – resta(m) aprox. <xliff:g id="TIME">%2$s</xliff:g>"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="STATE">%2$s</xliff:g>"</string> <string name="power_charging_duration" msgid="2853265177761520490">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g> até ficar completa"</string> @@ -312,4 +313,6 @@ <string name="battery_info_status_full" msgid="2824614753861462808">"Completo"</string> <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"Desativado pelo administrador"</string> <string name="home" msgid="8263346537524314127">"Página inicial"</string> + <string name="charge_length_format" msgid="8978516217024434156">"Há <xliff:g id="ID_1">%1$s</xliff:g>"</string> + <string name="remaining_length_format" msgid="7886337596669190587">"Resta(m) <xliff:g id="ID_1">%1$s</xliff:g>"</string> </resources> diff --git a/packages/SettingsLib/res/values-pt/strings.xml b/packages/SettingsLib/res/values-pt/strings.xml index 5ee9ef503b56..b4251a5387ab 100644 --- a/packages/SettingsLib/res/values-pt/strings.xml +++ b/packages/SettingsLib/res/values-pt/strings.xml @@ -296,6 +296,8 @@ <string name="accessibility_display_daltonizer_preference_title" msgid="5800761362678707872">"Correção de cor"</string> <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"Este recurso é experimental e pode afetar o desempenho."</string> <string name="daltonizer_type_overridden" msgid="3116947244410245916">"Substituído por <xliff:g id="TITLE">%1$s</xliff:g>"</string> + <!-- no translation found for power_remaining_duration_only (4400068916452346544) --> + <skip /> <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> - cerca de <xliff:g id="TIME">%2$s</xliff:g> restantes"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATE">%2$s</xliff:g>"</string> <string name="power_charging_duration" msgid="2853265177761520490">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> até concluir"</string> @@ -312,4 +314,8 @@ <string name="battery_info_status_full" msgid="2824614753861462808">"Cheio"</string> <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"Desativada pelo administrador"</string> <string name="home" msgid="8263346537524314127">"Início"</string> + <!-- no translation found for charge_length_format (8978516217024434156) --> + <skip /> + <!-- no translation found for remaining_length_format (7886337596669190587) --> + <skip /> </resources> diff --git a/packages/SettingsLib/res/values-ro/strings.xml b/packages/SettingsLib/res/values-ro/strings.xml index 80ae14641d39..e883d0afc37d 100644 --- a/packages/SettingsLib/res/values-ro/strings.xml +++ b/packages/SettingsLib/res/values-ro/strings.xml @@ -296,6 +296,8 @@ <string name="accessibility_display_daltonizer_preference_title" msgid="5800761362678707872">"Corecția culorii"</string> <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"Această funcție este experimentală și poate afecta performanțele."</string> <string name="daltonizer_type_overridden" msgid="3116947244410245916">"Valoare înlocuită de <xliff:g id="TITLE">%1$s</xliff:g>"</string> + <!-- no translation found for power_remaining_duration_only (4400068916452346544) --> + <skip /> <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> – timp rămas: aproximativ <xliff:g id="TIME">%2$s</xliff:g>"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATE">%2$s</xliff:g>"</string> <string name="power_charging_duration" msgid="2853265177761520490">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> până la încărcare completă"</string> @@ -312,4 +314,8 @@ <string name="battery_info_status_full" msgid="2824614753861462808">"Complet"</string> <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"Dezactivată de administrator"</string> <string name="home" msgid="8263346537524314127">"Ecranul principal"</string> + <!-- no translation found for charge_length_format (8978516217024434156) --> + <skip /> + <!-- no translation found for remaining_length_format (7886337596669190587) --> + <skip /> </resources> diff --git a/packages/SettingsLib/res/values-ru/strings.xml b/packages/SettingsLib/res/values-ru/strings.xml index c746161a7a46..0f4eaa1366c7 100644 --- a/packages/SettingsLib/res/values-ru/strings.xml +++ b/packages/SettingsLib/res/values-ru/strings.xml @@ -296,6 +296,8 @@ <string name="accessibility_display_daltonizer_preference_title" msgid="5800761362678707872">"Коррекция цвета"</string> <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"Это экспериментальная функция, она может снизить производительность устройства."</string> <string name="daltonizer_type_overridden" msgid="3116947244410245916">"Новая настройка: <xliff:g id="TITLE">%1$s</xliff:g>"</string> + <!-- no translation found for power_remaining_duration_only (4400068916452346544) --> + <skip /> <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> – осталось около <xliff:g id="TIME">%2$s</xliff:g>"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="STATE">%2$s</xliff:g>"</string> <string name="power_charging_duration" msgid="2853265177761520490">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g> до полной зарядки"</string> @@ -312,4 +314,8 @@ <string name="battery_info_status_full" msgid="2824614753861462808">"Батарея заряжена"</string> <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"Отключено администратором"</string> <string name="home" msgid="8263346537524314127">"Главная"</string> + <!-- no translation found for charge_length_format (8978516217024434156) --> + <skip /> + <!-- no translation found for remaining_length_format (7886337596669190587) --> + <skip /> </resources> diff --git a/packages/SettingsLib/res/values-si-rLK/strings.xml b/packages/SettingsLib/res/values-si-rLK/strings.xml index 3449d04aaba0..6483b189efd0 100644 --- a/packages/SettingsLib/res/values-si-rLK/strings.xml +++ b/packages/SettingsLib/res/values-si-rLK/strings.xml @@ -296,6 +296,8 @@ <string name="accessibility_display_daltonizer_preference_title" msgid="5800761362678707872">"වර්ණ නිවැරදි කිරීම"</string> <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"මෙම විශේෂාංගය පරීක්ෂණාත්මක සහ ඇතැම් විට ක්රියාකාරිත්වයට බලපෑ හැක."</string> <string name="daltonizer_type_overridden" msgid="3116947244410245916">"<xliff:g id="TITLE">%1$s</xliff:g> මගින් ඉක්මවන ලදී"</string> + <!-- no translation found for power_remaining_duration_only (4400068916452346544) --> + <skip /> <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> - ආසන්න <xliff:g id="TIME">%2$s</xliff:g> වම"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATE">%2$s</xliff:g>"</string> <string name="power_charging_duration" msgid="2853265177761520490">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> සම්පුර්ණ වන තෙක්"</string> @@ -312,4 +314,8 @@ <string name="battery_info_status_full" msgid="2824614753861462808">"පූර්ණ"</string> <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"පරිපාලක විසින් අබල කරන ලදී"</string> <string name="home" msgid="8263346537524314127">"මුල් පිටුව"</string> + <!-- no translation found for charge_length_format (8978516217024434156) --> + <skip /> + <!-- no translation found for remaining_length_format (7886337596669190587) --> + <skip /> </resources> diff --git a/packages/SettingsLib/res/values-sk/strings.xml b/packages/SettingsLib/res/values-sk/strings.xml index 14f72b23f94a..d8e2389eb43e 100644 --- a/packages/SettingsLib/res/values-sk/strings.xml +++ b/packages/SettingsLib/res/values-sk/strings.xml @@ -296,6 +296,8 @@ <string name="accessibility_display_daltonizer_preference_title" msgid="5800761362678707872">"Úprava farieb"</string> <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"Funkcia je experimentálna a môže mať vplyv na výkonnosť."</string> <string name="daltonizer_type_overridden" msgid="3116947244410245916">"Prekonané predvoľbou <xliff:g id="TITLE">%1$s</xliff:g>"</string> + <!-- no translation found for power_remaining_duration_only (4400068916452346544) --> + <skip /> <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> – zostáva približne <xliff:g id="TIME">%2$s</xliff:g>"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="STATE">%2$s</xliff:g>"</string> <string name="power_charging_duration" msgid="2853265177761520490">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g> do úplného nabitia"</string> @@ -312,4 +314,8 @@ <string name="battery_info_status_full" msgid="2824614753861462808">"Nabitá"</string> <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"Zakázané správcom"</string> <string name="home" msgid="8263346537524314127">"Domov"</string> + <!-- no translation found for charge_length_format (8978516217024434156) --> + <skip /> + <!-- no translation found for remaining_length_format (7886337596669190587) --> + <skip /> </resources> diff --git a/packages/SettingsLib/res/values-sl/strings.xml b/packages/SettingsLib/res/values-sl/strings.xml index 61caea7f9d33..fa0e784bc2ca 100644 --- a/packages/SettingsLib/res/values-sl/strings.xml +++ b/packages/SettingsLib/res/values-sl/strings.xml @@ -296,6 +296,7 @@ <string name="accessibility_display_daltonizer_preference_title" msgid="5800761362678707872">"Popravljanje barv"</string> <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"To je preskusna funkcija in lahko vpliva na učinkovitost delovanja."</string> <string name="daltonizer_type_overridden" msgid="3116947244410245916">"Preglasila nastavitev: <xliff:g id="TITLE">%1$s</xliff:g>"</string> + <string name="power_remaining_duration_only" msgid="4400068916452346544">"Še približno <xliff:g id="TIME">%2$s</xliff:g>"</string> <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> – še približno <xliff:g id="TIME">%2$s</xliff:g>"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="STATE">%2$s</xliff:g>"</string> <string name="power_charging_duration" msgid="2853265177761520490">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g> do napolnjenosti"</string> @@ -312,4 +313,6 @@ <string name="battery_info_status_full" msgid="2824614753861462808">"Poln"</string> <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"Onemogočil skrbnik"</string> <string name="home" msgid="8263346537524314127">"Začetni zaslon"</string> + <string name="charge_length_format" msgid="8978516217024434156">"Pred toliko časa: <xliff:g id="ID_1">%1$s</xliff:g>"</string> + <string name="remaining_length_format" msgid="7886337596669190587">"Še <xliff:g id="ID_1">%1$s</xliff:g>"</string> </resources> diff --git a/packages/SettingsLib/res/values-sq-rAL/strings.xml b/packages/SettingsLib/res/values-sq-rAL/strings.xml index 49afa081ca19..f9b62fbdcfdf 100644 --- a/packages/SettingsLib/res/values-sq-rAL/strings.xml +++ b/packages/SettingsLib/res/values-sq-rAL/strings.xml @@ -296,6 +296,7 @@ <string name="accessibility_display_daltonizer_preference_title" msgid="5800761362678707872">"Korrigjimi i ngjyrës"</string> <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"Ky funksion është eksperimental dhe mund të ndikojë në veprimtari."</string> <string name="daltonizer_type_overridden" msgid="3116947244410245916">"Mbivendosur nga <xliff:g id="TITLE">%1$s</xliff:g>"</string> + <string name="power_remaining_duration_only" msgid="4400068916452346544">"Afërsisht <xliff:g id="TIME">%2$s</xliff:g> të mbetura"</string> <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> - afërsisht <xliff:g id="TIME">%2$s</xliff:g> të mbetura"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATE">%2$s</xliff:g>"</string> <string name="power_charging_duration" msgid="2853265177761520490">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> derisa të jetë e plotë"</string> @@ -312,4 +313,6 @@ <string name="battery_info_status_full" msgid="2824614753861462808">"E mbushur"</string> <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"Çaktivizuar nga administratori"</string> <string name="home" msgid="8263346537524314127">"Kreu"</string> + <string name="charge_length_format" msgid="8978516217024434156">"<xliff:g id="ID_1">%1$s</xliff:g> më parë"</string> + <string name="remaining_length_format" msgid="7886337596669190587">"<xliff:g id="ID_1">%1$s</xliff:g> të mbetura"</string> </resources> diff --git a/packages/SettingsLib/res/values-sr/strings.xml b/packages/SettingsLib/res/values-sr/strings.xml index 7904bf35f6ee..002e963fe4fc 100644 --- a/packages/SettingsLib/res/values-sr/strings.xml +++ b/packages/SettingsLib/res/values-sr/strings.xml @@ -296,6 +296,8 @@ <string name="accessibility_display_daltonizer_preference_title" msgid="5800761362678707872">"Корекција боја"</string> <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"Ова функција је експериментална и може да утиче на перформансе."</string> <string name="daltonizer_type_overridden" msgid="3116947244410245916">"Замењује га <xliff:g id="TITLE">%1$s</xliff:g>"</string> + <!-- no translation found for power_remaining_duration_only (4400068916452346544) --> + <skip /> <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> – преостало око <xliff:g id="TIME">%2$s</xliff:g>"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="STATE">%2$s</xliff:g>"</string> <string name="power_charging_duration" msgid="2853265177761520490">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g> док се не напуни"</string> @@ -312,4 +314,8 @@ <string name="battery_info_status_full" msgid="2824614753861462808">"Пуно"</string> <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"Онемогућио је администратор"</string> <string name="home" msgid="8263346537524314127">"Почетни"</string> + <!-- no translation found for charge_length_format (8978516217024434156) --> + <skip /> + <!-- no translation found for remaining_length_format (7886337596669190587) --> + <skip /> </resources> diff --git a/packages/SettingsLib/res/values-sv/strings.xml b/packages/SettingsLib/res/values-sv/strings.xml index 8f3121382876..9b6f3028d9f2 100644 --- a/packages/SettingsLib/res/values-sv/strings.xml +++ b/packages/SettingsLib/res/values-sv/strings.xml @@ -296,6 +296,8 @@ <string name="accessibility_display_daltonizer_preference_title" msgid="5800761362678707872">"Färgkorrigering"</string> <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"Den här funktionen är experimentell och kan påverka prestandan."</string> <string name="daltonizer_type_overridden" msgid="3116947244410245916">"Har åsidosatts av <xliff:g id="TITLE">%1$s</xliff:g>"</string> + <!-- no translation found for power_remaining_duration_only (4400068916452346544) --> + <skip /> <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> – ca <xliff:g id="TIME">%2$s</xliff:g> kvar"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="STATE">%2$s</xliff:g>"</string> <string name="power_charging_duration" msgid="2853265177761520490">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g> till fulladdat"</string> @@ -312,4 +314,8 @@ <string name="battery_info_status_full" msgid="2824614753861462808">"Fullt"</string> <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"Har inaktiverats av administratören"</string> <string name="home" msgid="8263346537524314127">"Startsida"</string> + <!-- no translation found for charge_length_format (8978516217024434156) --> + <skip /> + <!-- no translation found for remaining_length_format (7886337596669190587) --> + <skip /> </resources> diff --git a/packages/SettingsLib/res/values-sw/strings.xml b/packages/SettingsLib/res/values-sw/strings.xml index 0217a0b1e036..f9171ce1d8bb 100644 --- a/packages/SettingsLib/res/values-sw/strings.xml +++ b/packages/SettingsLib/res/values-sw/strings.xml @@ -296,6 +296,8 @@ <string name="accessibility_display_daltonizer_preference_title" msgid="5800761362678707872">"Usahihishaji wa rangi"</string> <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"Kipengele hiki ni cha majaribio na huenda kikaathiri utendaji."</string> <string name="daltonizer_type_overridden" msgid="3116947244410245916">"Imetanguliwa na <xliff:g id="TITLE">%1$s</xliff:g>"</string> + <!-- no translation found for power_remaining_duration_only (4400068916452346544) --> + <skip /> <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> - imesalia takriban <xliff:g id="TIME">%2$s</xliff:g>"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATE">%2$s</xliff:g>"</string> <string name="power_charging_duration" msgid="2853265177761520490">"<xliff:g id="LEVEL">%1$s</xliff:g> - imesalia <xliff:g id="TIME">%2$s</xliff:g> hadi ijae"</string> @@ -312,4 +314,8 @@ <string name="battery_info_status_full" msgid="2824614753861462808">"Imejaa"</string> <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"Msimamizi amezima mapendeleo ya mipangilio"</string> <string name="home" msgid="8263346537524314127">"Mwanzo"</string> + <!-- no translation found for charge_length_format (8978516217024434156) --> + <skip /> + <!-- no translation found for remaining_length_format (7886337596669190587) --> + <skip /> </resources> diff --git a/packages/SettingsLib/res/values-ta-rIN/strings.xml b/packages/SettingsLib/res/values-ta-rIN/strings.xml index 4490e8dbd317..56970a7e50bd 100644 --- a/packages/SettingsLib/res/values-ta-rIN/strings.xml +++ b/packages/SettingsLib/res/values-ta-rIN/strings.xml @@ -165,7 +165,7 @@ <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"எப்போதும் வைஃபை ரோமிங் ஸ்கேன்களை அனுமதி"</string> <string name="legacy_dhcp_client" msgid="694426978909127287">"அதிகாரப்பூர்வ DHCP க்ளையன்ட்டைப் பயன்படுத்து"</string> <string name="mobile_data_always_on" msgid="7745605759775320362">"செல்லுலார் தரவு எப்போதும் இயக்கத்தில்"</string> - <string name="bluetooth_disable_absolute_volume" msgid="2660673801947898809">"முழுமையான ஒலி அம்சத்தை முடக்கு"</string> + <string name="bluetooth_disable_absolute_volume" msgid="2660673801947898809">"அப்சல்யூட் ஒலியளவு அம்சத்தை முடக்கு"</string> <string name="wifi_display_certification_summary" msgid="1155182309166746973">"வயர்லெஸ் காட்சி சான்றுக்கான விருப்பங்களைக் காட்டு"</string> <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Wifi நுழைவு அளவை அதிகரித்து, வைஃபை தேர்வியில் ஒவ்வொன்றிற்கும் SSID RSSI ஐ காட்டுக"</string> <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"இயக்கப்பட்டதும், வைஃபை சிக்னல் குறையும் போது, வைஃபை முழுமையாக ஒத்துழைக்காமல் இருப்பதால் செல்லுலாரின் தரவு இணைப்புக்கு மாறும்"</string> @@ -186,7 +186,7 @@ <string name="dev_settings_warning_message" msgid="2298337781139097964">"இந்த அமைப்பு மேம்பட்டப் பயன்பாட்டிற்காக மட்டுமே. உங்கள் சாதனம் மற்றும் அதில் உள்ள பயன்பாடுகளைச் சிதைக்கும் அல்லது தவறாகச் செயல்படும் வகையில் பாதிப்பை ஏற்படுத்தும்."</string> <string name="verify_apps_over_usb_title" msgid="4177086489869041953">"USB பயன்பாடுகளை சரிபார்"</string> <string name="verify_apps_over_usb_summary" msgid="9164096969924529200">"தீங்கு விளைவிக்கும் செயல்பாட்டை அறிய ADB/ADT மூலம் நிறுவப்பட்டப் பயன்பாடுகளைச் சரிபார்."</string> - <string name="bluetooth_disable_absolute_volume_summary" msgid="6031284410786545957">"பேரிரைச்சல் அல்லது கட்டுப்பாடு இழப்பு போன்ற தொலைநிலைச் சாதனங்களில் ஏற்படும் ஒலி தொடர்பான சிக்கல்கள் இருக்கும் சமயங்களில், புளூடூத் முழுமையான ஒலி அம்சத்தை முடக்கும்."</string> + <string name="bluetooth_disable_absolute_volume_summary" msgid="6031284410786545957">"மிகவும் அதிகமான ஒலியளவு அல்லது கட்டுப்பாடு இழப்பு போன்ற தொலைநிலைச் சாதனங்களில் ஏற்படும் ஒலி தொடர்பான சிக்கல்கள் இருக்கும் சமயங்களில், புளூடூத் அப்சல்யூட் ஒலியளவு அம்சத்தை முடக்கும்."</string> <string name="enable_terminal_title" msgid="95572094356054120">"அக முனையம்"</string> <string name="enable_terminal_summary" msgid="67667852659359206">"அக ஷெல் அணுகலை வழங்கும் இறுதிப் பயன்பாட்டை இயக்கு"</string> <string name="hdcp_checking_title" msgid="8605478913544273282">"HDCP சரிபார்ப்பு"</string> @@ -296,6 +296,8 @@ <string name="accessibility_display_daltonizer_preference_title" msgid="5800761362678707872">"வண்ணத்திருத்தம்"</string> <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"இது சோதனை முறையிலான அம்சம், இது செயல்திறனைப் பாதிக்கலாம்."</string> <string name="daltonizer_type_overridden" msgid="3116947244410245916">"<xliff:g id="TITLE">%1$s</xliff:g> மூலம் மேலெழுதப்பட்டது"</string> + <!-- no translation found for power_remaining_duration_only (4400068916452346544) --> + <skip /> <string name="power_discharging_duration" msgid="1605929174734600590">"தோராயம்: <xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> உள்ளது"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATE">%2$s</xliff:g>"</string> <string name="power_charging_duration" msgid="2853265177761520490">"முழு சார்ஜிற்கு: <xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g>"</string> @@ -312,4 +314,8 @@ <string name="battery_info_status_full" msgid="2824614753861462808">"முழுமை"</string> <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"நிர்வாகி முடக்கியுள்ளார்"</string> <string name="home" msgid="8263346537524314127">"முகப்பு"</string> + <!-- no translation found for charge_length_format (8978516217024434156) --> + <skip /> + <!-- no translation found for remaining_length_format (7886337596669190587) --> + <skip /> </resources> diff --git a/packages/SettingsLib/res/values-te-rIN/strings.xml b/packages/SettingsLib/res/values-te-rIN/strings.xml index f95f6ead3d0e..5a8c824a776e 100644 --- a/packages/SettingsLib/res/values-te-rIN/strings.xml +++ b/packages/SettingsLib/res/values-te-rIN/strings.xml @@ -296,6 +296,7 @@ <string name="accessibility_display_daltonizer_preference_title" msgid="5800761362678707872">"రంగు సవరణ"</string> <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"ఈ లక్షణం ప్రయోగాత్మకమైనది మరియు పనితీరుపై ప్రభావం చూపవచ్చు."</string> <string name="daltonizer_type_overridden" msgid="3116947244410245916">"<xliff:g id="TITLE">%1$s</xliff:g> ద్వారా భర్తీ చేయబడింది"</string> + <string name="power_remaining_duration_only" msgid="4400068916452346544">"సుమారు <xliff:g id="TIME">%2$s</xliff:g> మిగిలి ఉంది"</string> <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> - సుమారు <xliff:g id="TIME">%2$s</xliff:g> మిగిలి ఉంది"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATE">%2$s</xliff:g>"</string> <string name="power_charging_duration" msgid="2853265177761520490">"<xliff:g id="LEVEL">%1$s</xliff:g> - పూర్తిగా నిండటానికి <xliff:g id="TIME">%2$s</xliff:g>"</string> @@ -312,4 +313,6 @@ <string name="battery_info_status_full" msgid="2824614753861462808">"నిండింది"</string> <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"నిర్వాహకుడు నిలిపివేసారు"</string> <string name="home" msgid="8263346537524314127">"హోమ్"</string> + <string name="charge_length_format" msgid="8978516217024434156">"<xliff:g id="ID_1">%1$s</xliff:g> క్రితం"</string> + <string name="remaining_length_format" msgid="7886337596669190587">"<xliff:g id="ID_1">%1$s</xliff:g> మిగిలి ఉంది"</string> </resources> diff --git a/packages/SettingsLib/res/values-th/strings.xml b/packages/SettingsLib/res/values-th/strings.xml index 3f5960ab43aa..5ef31682ce23 100644 --- a/packages/SettingsLib/res/values-th/strings.xml +++ b/packages/SettingsLib/res/values-th/strings.xml @@ -296,6 +296,8 @@ <string name="accessibility_display_daltonizer_preference_title" msgid="5800761362678707872">"การแก้สี"</string> <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"คุณลักษณะนี้เป็นแบบทดลองและอาจส่งผลต่อประสิทธิภาพการทำงาน"</string> <string name="daltonizer_type_overridden" msgid="3116947244410245916">"แทนที่โดย <xliff:g id="TITLE">%1$s</xliff:g>"</string> + <!-- no translation found for power_remaining_duration_only (4400068916452346544) --> + <skip /> <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> - เหลือประมาณ <xliff:g id="TIME">%2$s</xliff:g>"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATE">%2$s</xliff:g>"</string> <string name="power_charging_duration" msgid="2853265177761520490">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> จนกว่าจะเต็ม"</string> @@ -312,4 +314,8 @@ <string name="battery_info_status_full" msgid="2824614753861462808">"เต็ม"</string> <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"ปิดใช้โดยผู้ดูแลระบบ"</string> <string name="home" msgid="8263346537524314127">"หน้าแรก"</string> + <!-- no translation found for charge_length_format (8978516217024434156) --> + <skip /> + <!-- no translation found for remaining_length_format (7886337596669190587) --> + <skip /> </resources> diff --git a/packages/SettingsLib/res/values-tl/strings.xml b/packages/SettingsLib/res/values-tl/strings.xml index bb91da1b66b0..8a7d6aa3adf8 100644 --- a/packages/SettingsLib/res/values-tl/strings.xml +++ b/packages/SettingsLib/res/values-tl/strings.xml @@ -296,6 +296,8 @@ <string name="accessibility_display_daltonizer_preference_title" msgid="5800761362678707872">"Pagtatama ng kulay"</string> <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"Ang feature na ito ay pinag-eeksperimentuhan at maaaring makaapekto sa pagganap."</string> <string name="daltonizer_type_overridden" msgid="3116947244410245916">"Na-override ng <xliff:g id="TITLE">%1$s</xliff:g>"</string> + <!-- no translation found for power_remaining_duration_only (4400068916452346544) --> + <skip /> <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> - humigit kumulang <xliff:g id="TIME">%2$s</xliff:g> ang natitira"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATE">%2$s</xliff:g>"</string> <string name="power_charging_duration" msgid="2853265177761520490">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> bago mapuno"</string> @@ -312,4 +314,8 @@ <string name="battery_info_status_full" msgid="2824614753861462808">"Puno"</string> <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"Na-disable ng administrator"</string> <string name="home" msgid="8263346537524314127">"Home"</string> + <!-- no translation found for charge_length_format (8978516217024434156) --> + <skip /> + <!-- no translation found for remaining_length_format (7886337596669190587) --> + <skip /> </resources> diff --git a/packages/SettingsLib/res/values-tr/strings.xml b/packages/SettingsLib/res/values-tr/strings.xml index 5ed40c320e71..11b975ed1cf1 100644 --- a/packages/SettingsLib/res/values-tr/strings.xml +++ b/packages/SettingsLib/res/values-tr/strings.xml @@ -296,6 +296,8 @@ <string name="accessibility_display_daltonizer_preference_title" msgid="5800761362678707872">"Renk düzeltme"</string> <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"Bu özellik deneyseldir ve performansı etkileyebilir."</string> <string name="daltonizer_type_overridden" msgid="3116947244410245916">"<xliff:g id="TITLE">%1$s</xliff:g> tarafından geçersiz kılındı"</string> + <!-- no translation found for power_remaining_duration_only (4400068916452346544) --> + <skip /> <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> - yaklaşık <xliff:g id="TIME">%2$s</xliff:g> kaldı"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATE">%2$s</xliff:g>"</string> <string name="power_charging_duration" msgid="2853265177761520490">"<xliff:g id="LEVEL">%1$s</xliff:g> - tam şarj olmasına <xliff:g id="TIME">%2$s</xliff:g> var"</string> @@ -312,4 +314,8 @@ <string name="battery_info_status_full" msgid="2824614753861462808">"Dolu"</string> <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"Yönetici tarafından devre dışı bırakıldı"</string> <string name="home" msgid="8263346537524314127">"Ana Ekran"</string> + <!-- no translation found for charge_length_format (8978516217024434156) --> + <skip /> + <!-- no translation found for remaining_length_format (7886337596669190587) --> + <skip /> </resources> diff --git a/packages/SettingsLib/res/values-uk/strings.xml b/packages/SettingsLib/res/values-uk/strings.xml index 590090558eab..ad18d7f39f9e 100644 --- a/packages/SettingsLib/res/values-uk/strings.xml +++ b/packages/SettingsLib/res/values-uk/strings.xml @@ -296,6 +296,8 @@ <string name="accessibility_display_daltonizer_preference_title" msgid="5800761362678707872">"Корекція кольору"</string> <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"Це експериментальна функція. Вона може вплинути на продуктивність."</string> <string name="daltonizer_type_overridden" msgid="3116947244410245916">"Замінено на <xliff:g id="TITLE">%1$s</xliff:g>"</string> + <!-- no translation found for power_remaining_duration_only (4400068916452346544) --> + <skip /> <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> – залишилось близько <xliff:g id="TIME">%2$s</xliff:g>"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="STATE">%2$s</xliff:g>"</string> <string name="power_charging_duration" msgid="2853265177761520490">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g> до повного зарядження"</string> @@ -312,4 +314,8 @@ <string name="battery_info_status_full" msgid="2824614753861462808">"Акумулятор заряджено"</string> <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"Вимкнено адміністратором"</string> <string name="home" msgid="8263346537524314127">"Головний екран"</string> + <!-- no translation found for charge_length_format (8978516217024434156) --> + <skip /> + <!-- no translation found for remaining_length_format (7886337596669190587) --> + <skip /> </resources> diff --git a/packages/SettingsLib/res/values-ur-rPK/strings.xml b/packages/SettingsLib/res/values-ur-rPK/strings.xml index 757db0af7a45..670f2e66a8cb 100644 --- a/packages/SettingsLib/res/values-ur-rPK/strings.xml +++ b/packages/SettingsLib/res/values-ur-rPK/strings.xml @@ -296,6 +296,8 @@ <string name="accessibility_display_daltonizer_preference_title" msgid="5800761362678707872">"رنگ کی اصلاح"</string> <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"یہ خصوصیت تجرباتی ہے اور اس کی وجہ سے کاکردگی متاثر ہو سکتی ہے۔"</string> <string name="daltonizer_type_overridden" msgid="3116947244410245916">"<xliff:g id="TITLE">%1$s</xliff:g> کے ذریعہ منسوخ کردیا گیا"</string> + <!-- no translation found for power_remaining_duration_only (4400068916452346544) --> + <skip /> <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> - تقریبا <xliff:g id="TIME">%2$s</xliff:g> باقی"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATE">%2$s</xliff:g>"</string> <string name="power_charging_duration" msgid="2853265177761520490">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> پورا ہونے تک"</string> @@ -312,4 +314,8 @@ <string name="battery_info_status_full" msgid="2824614753861462808">"مکمل"</string> <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"منتظم نے غیر فعال کر دیا"</string> <string name="home" msgid="8263346537524314127">"ہوم"</string> + <!-- no translation found for charge_length_format (8978516217024434156) --> + <skip /> + <!-- no translation found for remaining_length_format (7886337596669190587) --> + <skip /> </resources> diff --git a/packages/SettingsLib/res/values-uz-rUZ/strings.xml b/packages/SettingsLib/res/values-uz-rUZ/strings.xml index 4f9e439fae25..e7dccae64604 100644 --- a/packages/SettingsLib/res/values-uz-rUZ/strings.xml +++ b/packages/SettingsLib/res/values-uz-rUZ/strings.xml @@ -296,6 +296,8 @@ <string name="accessibility_display_daltonizer_preference_title" msgid="5800761362678707872">"Rangni tuzatish"</string> <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"Bu funksiya tajribaviy bo‘lib, u qurilma unumdorligiga ta’sir qilishi mumkin."</string> <string name="daltonizer_type_overridden" msgid="3116947244410245916">"<xliff:g id="TITLE">%1$s</xliff:g> bilan almashtirildi"</string> + <!-- no translation found for power_remaining_duration_only (4400068916452346544) --> + <skip /> <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> – taxminan <xliff:g id="TIME">%2$s</xliff:g> qoldi"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="STATE">%2$s</xliff:g>"</string> <string name="power_charging_duration" msgid="2853265177761520490">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g>, to‘lguncha"</string> @@ -312,4 +314,8 @@ <string name="battery_info_status_full" msgid="2824614753861462808">"To‘la"</string> <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"Administrator tomonidan o‘chirib qo‘yilgan"</string> <string name="home" msgid="8263346537524314127">"Bosh ekran"</string> + <!-- no translation found for charge_length_format (8978516217024434156) --> + <skip /> + <!-- no translation found for remaining_length_format (7886337596669190587) --> + <skip /> </resources> diff --git a/packages/SettingsLib/res/values-vi/strings.xml b/packages/SettingsLib/res/values-vi/strings.xml index 00c10d58f86c..c803415959ac 100644 --- a/packages/SettingsLib/res/values-vi/strings.xml +++ b/packages/SettingsLib/res/values-vi/strings.xml @@ -296,6 +296,8 @@ <string name="accessibility_display_daltonizer_preference_title" msgid="5800761362678707872">"Sửa màu"</string> <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"Tính năng này là tính năng thử nghiệm và có thể ảnh hưởng đến hoạt động."</string> <string name="daltonizer_type_overridden" msgid="3116947244410245916">"Bị ghi đè bởi <xliff:g id="TITLE">%1$s</xliff:g>"</string> + <!-- no translation found for power_remaining_duration_only (4400068916452346544) --> + <skip /> <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> - còn khoảng <xliff:g id="TIME">%2$s</xliff:g>"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATE">%2$s</xliff:g>"</string> <string name="power_charging_duration" msgid="2853265177761520490">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> cho đến khi đầy"</string> @@ -312,4 +314,8 @@ <string name="battery_info_status_full" msgid="2824614753861462808">"Đầy"</string> <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"Bị tắt bởi quản trị viên"</string> <string name="home" msgid="8263346537524314127">"Màn hình chính"</string> + <!-- no translation found for charge_length_format (8978516217024434156) --> + <skip /> + <!-- no translation found for remaining_length_format (7886337596669190587) --> + <skip /> </resources> diff --git a/packages/SettingsLib/res/values-zh-rCN/strings.xml b/packages/SettingsLib/res/values-zh-rCN/strings.xml index 2ca27b14dfa0..54a6e7c6a1e0 100644 --- a/packages/SettingsLib/res/values-zh-rCN/strings.xml +++ b/packages/SettingsLib/res/values-zh-rCN/strings.xml @@ -296,6 +296,8 @@ <string name="accessibility_display_daltonizer_preference_title" msgid="5800761362678707872">"色彩校正"</string> <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"此功能为实验性功能，可能会影响性能。"</string> <string name="daltonizer_type_overridden" msgid="3116947244410245916">"已被“<xliff:g id="TITLE">%1$s</xliff:g>”覆盖"</string> + <!-- no translation found for power_remaining_duration_only (4400068916452346544) --> + <skip /> <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> - 还可用大约<xliff:g id="TIME">%2$s</xliff:g>"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATE">%2$s</xliff:g>"</string> <string name="power_charging_duration" msgid="2853265177761520490">"<xliff:g id="LEVEL">%1$s</xliff:g> - 还需<xliff:g id="TIME">%2$s</xliff:g>充满"</string> @@ -312,4 +314,8 @@ <string name="battery_info_status_full" msgid="2824614753861462808">"电量充足"</string> <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"已被管理员禁用"</string> <string name="home" msgid="8263346537524314127">"主屏幕"</string> + <!-- no translation found for charge_length_format (8978516217024434156) --> + <skip /> + <!-- no translation found for remaining_length_format (7886337596669190587) --> + <skip /> </resources> diff --git a/packages/SettingsLib/res/values-zh-rHK/strings.xml b/packages/SettingsLib/res/values-zh-rHK/strings.xml index 522961b5ff02..e95a3243d942 100644 --- a/packages/SettingsLib/res/values-zh-rHK/strings.xml +++ b/packages/SettingsLib/res/values-zh-rHK/strings.xml @@ -296,6 +296,8 @@ <string name="accessibility_display_daltonizer_preference_title" msgid="5800761362678707872">"色彩校正"</string> <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"這是一項實驗性功能，可能會影響效能。"</string> <string name="daltonizer_type_overridden" msgid="3116947244410245916">"已由「<xliff:g id="TITLE">%1$s</xliff:g>」覆寫"</string> + <!-- no translation found for power_remaining_duration_only (4400068916452346544) --> + <skip /> <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> - 尚餘大約 <xliff:g id="TIME">%2$s</xliff:g>"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATE">%2$s</xliff:g>"</string> <string name="power_charging_duration" msgid="2853265177761520490">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> 後完成充電"</string> @@ -312,4 +314,8 @@ <string name="battery_info_status_full" msgid="2824614753861462808">"電量已滿"</string> <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"管理員已停用此設定"</string> <string name="home" msgid="8263346537524314127">"主畫面"</string> + <!-- no translation found for charge_length_format (8978516217024434156) --> + <skip /> + <!-- no translation found for remaining_length_format (7886337596669190587) --> + <skip /> </resources> diff --git a/packages/SettingsLib/res/values-zh-rTW/strings.xml b/packages/SettingsLib/res/values-zh-rTW/strings.xml index 64542d7d272a..bf7ea4ed573f 100644 --- a/packages/SettingsLib/res/values-zh-rTW/strings.xml +++ b/packages/SettingsLib/res/values-zh-rTW/strings.xml @@ -296,6 +296,8 @@ <string name="accessibility_display_daltonizer_preference_title" msgid="5800761362678707872">"色彩校正"</string> <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"這是一項實驗性功能，可能會對效能造成影響。"</string> <string name="daltonizer_type_overridden" msgid="3116947244410245916">"已改為<xliff:g id="TITLE">%1$s</xliff:g>"</string> + <!-- no translation found for power_remaining_duration_only (4400068916452346544) --> + <skip /> <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> - 大約還剩 <xliff:g id="TIME">%2$s</xliff:g>"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATE">%2$s</xliff:g>"</string> <string name="power_charging_duration" msgid="2853265177761520490">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g>後充飽"</string> @@ -312,4 +314,8 @@ <string name="battery_info_status_full" msgid="2824614753861462808">"電力充足"</string> <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"已由管理員停用"</string> <string name="home" msgid="8263346537524314127">"主畫面"</string> + <!-- no translation found for charge_length_format (8978516217024434156) --> + <skip /> + <!-- no translation found for remaining_length_format (7886337596669190587) --> + <skip /> </resources> diff --git a/packages/SettingsLib/res/values-zu/strings.xml b/packages/SettingsLib/res/values-zu/strings.xml index de210c3eeee6..c450f7722a45 100644 --- a/packages/SettingsLib/res/values-zu/strings.xml +++ b/packages/SettingsLib/res/values-zu/strings.xml @@ -296,6 +296,8 @@ <string name="accessibility_display_daltonizer_preference_title" msgid="5800761362678707872">"Ukulungiswa kombala"</string> <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"Lesi sici esesilingo futhi singathinta ukusebenza."</string> <string name="daltonizer_type_overridden" msgid="3116947244410245916">"Igitshezwe ngaphezulu yi-<xliff:g id="TITLE">%1$s</xliff:g>"</string> + <!-- no translation found for power_remaining_duration_only (4400068916452346544) --> + <skip /> <string name="power_discharging_duration" msgid="1605929174734600590">"<xliff:g id="LEVEL">%1$s</xliff:g> - isilinganiso esingu-<xliff:g id="TIME">%2$s</xliff:g> esisele"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATE">%2$s</xliff:g>"</string> <string name="power_charging_duration" msgid="2853265177761520490">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> kuze igcwale"</string> @@ -312,4 +314,8 @@ <string name="battery_info_status_full" msgid="2824614753861462808">"Kugcwele"</string> <string name="disabled_by_admin_summary_text" msgid="7787027069207263048">"Ikhutshazwe umlawuli"</string> <string name="home" msgid="8263346537524314127">"Ekhaya"</string> + <!-- no translation found for charge_length_format (8978516217024434156) --> + <skip /> + <!-- no translation found for remaining_length_format (7886337596669190587) --> + <skip /> </resources> diff --git a/packages/SettingsLib/res/values/attrs.xml b/packages/SettingsLib/res/values/attrs.xml index 7aa422012a22..4484613d0ee2 100644 --- a/packages/SettingsLib/res/values/attrs.xml +++ b/packages/SettingsLib/res/values/attrs.xml @@ -29,6 +29,7 @@ <attr name="sideLabels" format="reference" /> <attr name="bottomLabels" format="reference" /> <attr name="textColor" format="color" /> + <attr name="android:gravity" /> </declare-styleable> </resources> diff --git a/packages/SettingsLib/res/values/dimens.xml b/packages/SettingsLib/res/values/dimens.xml index 84d3bff6c68c..9f78e87d1231 100644 --- a/packages/SettingsLib/res/values/dimens.xml +++ b/packages/SettingsLib/res/values/dimens.xml @@ -41,8 +41,7 @@ <!-- Usage graph dimens --> <dimen name="usage_graph_area_height">122dp</dimen> <dimen name="usage_graph_margin_top_bottom">9dp</dimen> - <dimen name="usage_graph_padding_end">24dp</dimen> - <dimen name="usage_graph_labels_width">72dp</dimen> + <dimen name="usage_graph_labels_width">56dp</dimen> <dimen name="usage_graph_labels_padding">16dp</dimen> <dimen name="usage_graph_divider_size">1dp</dimen> diff --git a/packages/SettingsLib/res/values/strings.xml b/packages/SettingsLib/res/values/strings.xml index 20e5ac9537c6..9650651267be 100644 --- a/packages/SettingsLib/res/values/strings.xml +++ b/packages/SettingsLib/res/values/strings.xml @@ -733,7 +733,7 @@ <string name="daltonizer_type_overridden">Overridden by <xliff:g id="title" example="Simulate color space">%1$s</xliff:g></string> <!-- [CHAR_LIMIT=40] Label for estimated remaining duration of battery charging/discharging --> - <string name="power_remaining_duration_only">Approx. <xliff:g id="time">%2$s</xliff:g> left</string> + <string name="power_remaining_duration_only">Approx. <xliff:g id="time">%1$s</xliff:g> left</string> <!-- [CHAR_LIMIT=40] Label for battery level chart when discharging with duration --> <string name="power_discharging_duration"><xliff:g id="level">%1$s</xliff:g> diff --git a/packages/SettingsLib/src/com/android/settingslib/BatteryInfo.java b/packages/SettingsLib/src/com/android/settingslib/BatteryInfo.java index aeb56a8179a4..b16b8ec57c72 100644 --- a/packages/SettingsLib/src/com/android/settingslib/BatteryInfo.java +++ b/packages/SettingsLib/src/com/android/settingslib/BatteryInfo.java @@ -149,7 +149,7 @@ public class BatteryInfo { String remaining = ""; if (remainingTimeUs != 0) { remaining = context.getString(R.string.remaining_length_format, - Formatter.formatShortElapsedTime(context, remainingTimeUs)); + Formatter.formatShortElapsedTime(context, remainingTimeUs / 1000)); } view.setBottomLabels(new CharSequence[] { timeString, remaining}); diff --git a/packages/SettingsLib/src/com/android/settingslib/graph/UsageView.java b/packages/SettingsLib/src/com/android/settingslib/graph/UsageView.java index 978f16ac9551..f95a97ad0072 100644 --- a/packages/SettingsLib/src/com/android/settingslib/graph/UsageView.java +++ b/packages/SettingsLib/src/com/android/settingslib/graph/UsageView.java @@ -18,8 +18,10 @@ import android.content.Context; import android.content.res.TypedArray; import android.util.AttributeSet; import android.util.SparseIntArray; +import android.view.Gravity; import android.view.LayoutInflater; import android.widget.FrameLayout; +import android.widget.LinearLayout; import android.widget.TextView; import com.android.settingslib.R; @@ -58,6 +60,24 @@ public class UsageView extends FrameLayout { v.setTextColor(color); } } + if (a.hasValue(R.styleable.UsageView_android_gravity)) { + int gravity = a.getInt(R.styleable.UsageView_android_gravity, 0); + if (gravity == Gravity.END) { + LinearLayout layout = (LinearLayout) findViewById(R.id.graph_label_group); + LinearLayout labels = (LinearLayout) findViewById(R.id.label_group); + // Swap the children order. + layout.removeView(labels); + layout.addView(labels); + // Set gravity. + labels.setGravity(Gravity.END); + // Swap the bottom label padding + LinearLayout bottomLabels = (LinearLayout) findViewById(R.id.bottom_label_group); + bottomLabels.setPadding(bottomLabels.getPaddingRight(), bottomLabels.getPaddingTop(), + bottomLabels.getPaddingLeft(), bottomLabels.getPaddingBottom()); + } else if (gravity != Gravity.START) { + throw new IllegalArgumentException("Unsupported gravity " + gravity); + } + } mUsageGraph.setAccentColor(a.getColor(R.styleable.UsageView_android_colorAccent, 0)); } diff --git a/packages/Shell/res/values-bs-rBA/strings.xml b/packages/Shell/res/values-bs-rBA/strings.xml index 4cf4f4f7a8fa..903c2ab05d72 100644 --- a/packages/Shell/res/values-bs-rBA/strings.xml +++ b/packages/Shell/res/values-bs-rBA/strings.xml @@ -16,32 +16,24 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="app_label" msgid="3701846017049540910">"Shell"</string> + <string name="app_label" msgid="3701846017049540910">"Ljuska"</string> <string name="bugreport_in_progress_title" msgid="4311705936714972757">"Izvještaj o grešci <xliff:g id="ID">#%d</xliff:g> se generira"</string> <string name="bugreport_finished_title" msgid="4429132808670114081">"Izvještaj o grešci <xliff:g id="ID">#%d</xliff:g> je snimljen"</string> <string name="bugreport_updating_title" msgid="4423539949559634214">"Dodavanje detalja u izvještaj o greškama"</string> <string name="bugreport_updating_wait" msgid="3322151947853929470">"Pričekajte..."</string> - <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Prevucite lijevo da biste podijelili izvještaj o greškama"</string> + <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Prevucite lijevo da podijelite izvještaj o greškama"</string> <string name="bugreport_finished_text" product="default" msgid="8353769438382138847">"Dodirnite da biste podijelili izvještaj o grešci"</string> - <string name="bugreport_confirm" msgid="5130698467795669780">"Izvještaji o greškama sadrže podatke iz raznih dnevnika sistema, uključujući lične i privatne informacije. Podijelite izvještaje o greškama samo sa aplikacijama i osobama kojima vjerujete."</string> + <string name="bugreport_confirm" msgid="5130698467795669780">"Izvještaji o greškama sadrže podatke iz raznih zapisnika sistema, uključujući lične i privatne informacije. Podijelite izvještaje o greškama samo sa aplikacijama i osobama kojima vjerujete."</string> <string name="bugreport_confirm_repeat" msgid="4926842460688645058">"Pokaži ovu poruku sljedeći put"</string> <string name="bugreport_storage_title" msgid="5332488144740527109">"Izvještaji o greškama"</string> - <!-- no translation found for bugreport_unreadable_text (586517851044535486) --> - <skip /> - <!-- no translation found for bugreport_unnamed (2800582406842092709) --> - <skip /> - <!-- no translation found for bugreport_info_action (2158204228510576227) --> - <skip /> - <!-- no translation found for bugreport_screenshot_action (8677781721940614995) --> - <skip /> + <string name="bugreport_unreadable_text" msgid="586517851044535486">"Nije moguće pročitati izvještaj o grešci"</string> + <string name="bugreport_unnamed" msgid="2800582406842092709">"neimenovano"</string> + <string name="bugreport_info_action" msgid="2158204228510576227">"Detalji"</string> + <string name="bugreport_screenshot_action" msgid="8677781721940614995">"Snimak ekrana"</string> <string name="bugreport_screenshot_taken" msgid="5684211273096253120">"Ekran je uspješno snimljen."</string> - <!-- no translation found for bugreport_screenshot_failed (5853049140806834601) --> - <skip /> + <string name="bugreport_screenshot_failed" msgid="5853049140806834601">"Ekran nije moguće snimiti."</string> <string name="bugreport_info_dialog_title" msgid="1355948594292983332">"Detalji izvještaja o grešci <xliff:g id="ID">#%d</xliff:g>"</string> - <!-- no translation found for bugreport_info_name (4414036021935139527) --> - <skip /> - <!-- no translation found for bugreport_info_title (5599558206004371052) --> - <skip /> - <!-- no translation found for bugreport_info_description (4117088998733546784) --> - <skip /> + <string name="bugreport_info_name" msgid="4414036021935139527">"Naziv fajla"</string> + <string name="bugreport_info_title" msgid="5599558206004371052">"Naslov"</string> + <string name="bugreport_info_description" msgid="4117088998733546784">"Detaljan opis"</string> </resources> diff --git a/packages/Shell/src/com/android/shell/BugreportProgressService.java b/packages/Shell/src/com/android/shell/BugreportProgressService.java index bad7e202e1d1..9926ae5e7ffc 100644 --- a/packages/Shell/src/com/android/shell/BugreportProgressService.java +++ b/packages/Shell/src/com/android/shell/BugreportProgressService.java @@ -158,7 +158,7 @@ public class BugreportProgressService extends Service { static final long POLLING_FREQUENCY = 2 * DateUtils.SECOND_IN_MILLIS; /** How long (in ms) a dumpstate process will be monitored if it didn't show progress. */ - private static final long INACTIVITY_TIMEOUT = 3 * DateUtils.MINUTE_IN_MILLIS; + private static final long INACTIVITY_TIMEOUT = 10 * DateUtils.MINUTE_IN_MILLIS; /** System properties used for monitoring progress. */ private static final String DUMPSTATE_PREFIX = "dumpstate."; @@ -586,6 +586,12 @@ public class BugreportProgressService extends Service { final String name, title, description; final BugreportInfo info = getInfo(id); if (info == null) { + // Most likely am killed Shell before user tapped the notification. Since system might + // be too busy anwyays, it's better to ignore the notification and switch back to the + // non-interactive mode (where the bugerport will be shared upon completion). + Log.d(TAG, "launchBugreportInfoDialog(" + id + "): cancel notification"); + // TODO: add test case to make sure notification is canceled. + NotificationManager.from(mContext).cancel(TAG, id); return; } @@ -604,6 +610,15 @@ public class BugreportProgressService extends Service { * upon receiving a {@link #INTENT_BUGREPORT_STARTED}. */ private void takeScreenshot(int id, boolean delayed) { + if (getInfo(id) == null) { + // Most likely am killed Shell before user tapped the notification. Since system might + // be too busy anwyays, it's better to ignore the notification and switch back to the + // non-interactive mode (where the bugerport will be shared upon completion). + Log.d(TAG, "takeScreenshot(" + id + ", " + delayed + "): cancel notification"); + // TODO: add test case to make sure notification is canceled. + NotificationManager.from(mContext).cancel(TAG, id); + return; + } setTakingScreenshot(true); if (delayed) { collapseNotificationBar(); @@ -1126,7 +1141,7 @@ public class BugreportProgressService extends Service { } info.title = title; info.description = description; - if (name != null && !info.name.equals(name)) { + if (name != null && !name.equals(info.name)) { info.name = name; updateProgress(info); } diff --git a/packages/Shell/src/com/android/shell/RemoteBugreportReceiver.java b/packages/Shell/src/com/android/shell/RemoteBugreportReceiver.java index 6f783a1fbabf..be54b43e0524 100644 --- a/packages/Shell/src/com/android/shell/RemoteBugreportReceiver.java +++ b/packages/Shell/src/com/android/shell/RemoteBugreportReceiver.java @@ -30,6 +30,7 @@ import android.content.Context; import android.content.Intent; import android.net.Uri; import android.os.UserHandle; +import android.text.format.DateUtils; /** * Receiver that handles finished remote bugreports, by re-sending @@ -43,12 +44,16 @@ public class RemoteBugreportReceiver extends BroadcastReceiver { private static final String EXTRA_REMOTE_BUGREPORT_HASH = "android.intent.extra.REMOTE_BUGREPORT_HASH"; - /** Always keep just the last remote bugreport zip file */ - private static final int MIN_KEEP_COUNT = 1; + /** Always keep just the last remote bugreport's files around. */ + private static final int REMOTE_BUGREPORT_FILES_AMOUNT = 3; + + /** Always keep remote bugreport files created in the last day. */ + private static final long MIN_KEEP_AGE = DateUtils.DAY_IN_MILLIS; @Override public void onReceive(Context context, Intent intent) { - cleanupOldFiles(this, intent, INTENT_REMOTE_BUGREPORT_FINISHED, MIN_KEEP_COUNT, 0); + cleanupOldFiles(this, intent, INTENT_REMOTE_BUGREPORT_FINISHED, + REMOTE_BUGREPORT_FILES_AMOUNT, MIN_KEEP_AGE); final File bugreportFile = getFileExtra(intent, EXTRA_BUGREPORT); final Uri bugreportUri = getUri(context, bugreportFile); diff --git a/packages/SystemUI/res/layout/battery_detail.xml b/packages/SystemUI/res/layout/battery_detail.xml index ded69be41e56..99121a9966d6 100644 --- a/packages/SystemUI/res/layout/battery_detail.xml +++ b/packages/SystemUI/res/layout/battery_detail.xml @@ -34,6 +34,8 @@ android:id="@+id/battery_usage" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_marginStart="16dp" + android:layout_marginEnd="24dp" systemui:sideLabels="@array/battery_labels" android:colorAccent="?android:attr/colorAccent" systemui:textColor="#66FFFFFF" /> diff --git a/packages/SystemUI/res/layout/qs_detail.xml b/packages/SystemUI/res/layout/qs_detail.xml index ddff0f031fb6..bed8f1be54fe 100644 --- a/packages/SystemUI/res/layout/qs_detail.xml +++ b/packages/SystemUI/res/layout/qs_detail.xml @@ -14,12 +14,35 @@ See the License for the specific language governing permissions and limitations under the License. --> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" +<!-- Extends LinearLayout --> +<com.android.systemui.qs.QSDetail + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:systemui="http://schemas.android.com/apk/res-auto" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="@drawable/qs_detail_background" + android:paddingBottom="8dp" + android:clickable="true" + android:visibility="invisible" + android:orientation="vertical"> + + <include + android:id="@+id/qs_detail_header" + layout="@layout/qs_detail_header" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="28dp" + /> + + <com.android.systemui.statusbar.AlphaOptimizedImageView + android:id="@+id/qs_detail_header_progress" + android:src="@drawable/indeterminate_anim" + android:alpha="0" + android:background="@color/qs_detail_progress_track" android:layout_width="match_parent" - android:layout_height="match_parent" - android:background="@drawable/qs_detail_background" - android:paddingBottom="8dp" - android:orientation="vertical"> + android:layout_height="wrap_content" + systemui:hasOverlappingRendering="false" + /> <FrameLayout android:id="@android:id/content" @@ -53,4 +76,4 @@ android:focusable="true"/> </LinearLayout> -</LinearLayout> +</com.android.systemui.qs.QSDetail> diff --git a/packages/SystemUI/res/layout/qs_detail_header.xml b/packages/SystemUI/res/layout/qs_detail_header.xml index 153e35f1f675..df46271b5d64 100644 --- a/packages/SystemUI/res/layout/qs_detail_header.xml +++ b/packages/SystemUI/res/layout/qs_detail_header.xml @@ -19,7 +19,6 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingEnd="@dimen/qs_panel_padding" - android:visibility="invisible" android:background="@drawable/btn_borderless_rect" android:gravity="center"> diff --git a/packages/SystemUI/res/layout/qs_panel.xml b/packages/SystemUI/res/layout/qs_panel.xml index 45236a075e72..9f90af231b20 100644 --- a/packages/SystemUI/res/layout/qs_panel.xml +++ b/packages/SystemUI/res/layout/qs_panel.xml @@ -30,4 +30,6 @@ <include layout="@layout/quick_status_bar_expanded_header" /> + <include android:id="@+id/qs_detail" layout="@layout/qs_detail" /> + </com.android.systemui.qs.QSContainer> diff --git a/packages/SystemUI/res/layout/quick_status_bar_expanded_header.xml b/packages/SystemUI/res/layout/quick_status_bar_expanded_header.xml index 07ac6a58e351..84df0d643e58 100644 --- a/packages/SystemUI/res/layout/quick_status_bar_expanded_header.xml +++ b/packages/SystemUI/res/layout/quick_status_bar_expanded_header.xml @@ -159,14 +159,6 @@ android:clipChildren="false" android:clipToPadding="false" /> - <include - android:id="@+id/qs_detail_header" - layout="@layout/qs_detail_header" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginTop="28dp" - /> - <com.android.systemui.statusbar.AlphaOptimizedImageView android:id="@+id/qs_detail_header_progress" android:src="@drawable/indeterminate_anim" diff --git a/packages/SystemUI/res/values-af/strings.xml b/packages/SystemUI/res/values-af/strings.xml index a2d38b323faf..8d37e74fd79c 100644 --- a/packages/SystemUI/res/values-af/strings.xml +++ b/packages/SystemUI/res/values-af/strings.xml @@ -301,8 +301,7 @@ <string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"skermvaspen"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"soek"</string> <string name="recents_launch_error_message" msgid="2969287838120550506">"Kon nie <xliff:g id="APP">%s</xliff:g> begin nie."</string> - <!-- no translation found for recents_launch_disabled_message (1624523193008871793) --> - <skip /> + <string name="recents_launch_disabled_message" msgid="1624523193008871793">"<xliff:g id="APP">%s</xliff:g> is in veiligmodus gedeaktiveer."</string> <string name="recents_history_button_label" msgid="5153358867807604821">"Geskiedenis"</string> <string name="recents_history_clear_all_button_label" msgid="5905258334958006953">"Vee uit"</string> <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Verdeel horisontaal"</string> @@ -479,7 +478,7 @@ <string name="color_apply" msgid="9212602012641034283">"Pas toe"</string> <string name="color_revert_title" msgid="4746666545480534663">"Bevestig instellings"</string> <string name="color_revert_message" msgid="9116001069397996691">"Sommige kleurinstellings kan hierdie toestel onbruikbaar maak. Klik OK om hierdie kleurinstellings te bevestig; andersins sal hierdie instellings ná 10 sekondes teruggestel word."</string> - <string name="battery_panel_title" msgid="3476715163685592453">"Battery (<xliff:g id="ID_1">%1$d</xliff:g>%%)"</string> + <string name="battery_panel_title" msgid="7944156115535366613">"Batterygebruik"</string> <string name="battery_detail_charging_summary" msgid="1279095653533044008">"Batterybespaarder is nie beskikbaar wanneer gelaai word nie"</string> <string name="battery_detail_switch_title" msgid="6285872470260795421">"Batterybespaarder"</string> <string name="battery_detail_switch_summary" msgid="9049111149407626804">"Verminder werkverrigting en agtergronddata"</string> diff --git a/packages/SystemUI/res/values-am/strings.xml b/packages/SystemUI/res/values-am/strings.xml index 9f2bc1d890c4..2b31ecea620f 100644 --- a/packages/SystemUI/res/values-am/strings.xml +++ b/packages/SystemUI/res/values-am/strings.xml @@ -479,7 +479,8 @@ <string name="color_apply" msgid="9212602012641034283">"ተግብር"</string> <string name="color_revert_title" msgid="4746666545480534663">"ቅንብሮችን ያረጋግጡ"</string> <string name="color_revert_message" msgid="9116001069397996691">"አንዳንድ የቀለም ቅንብሮች ይህን መሣሪያ የማይጠቅም ሊያደርጉት ይችላሉ። እነዚህን የቀለም ቅንብሮች ለማረጋገጥ እሺ የሚለውን ጠቅ ያድርጉ፣ አለበለዚያ እነዚህ ቅንብሮች ከ10 ሰከንዶች በኋላ ዳግም ይጀምራሉ።"</string> - <string name="battery_panel_title" msgid="3476715163685592453">"ባትሪ (<xliff:g id="ID_1">%1$d</xliff:g>%%)"</string> + <!-- no translation found for battery_panel_title (7944156115535366613) --> + <skip /> <string name="battery_detail_charging_summary" msgid="1279095653533044008">"ኃይል በሚሞላበት ጊዜ ባትሪ ቆጣቢ አይገኝም"</string> <string name="battery_detail_switch_title" msgid="6285872470260795421">"ባትሪ ቆጣቢ"</string> <string name="battery_detail_switch_summary" msgid="9049111149407626804">"አፈጻጸምን እና የጀርባ ውሂብን ይቀንሳል"</string> diff --git a/packages/SystemUI/res/values-ar/strings.xml b/packages/SystemUI/res/values-ar/strings.xml index 0dab4a5c6978..1a1fc2b3c233 100644 --- a/packages/SystemUI/res/values-ar/strings.xml +++ b/packages/SystemUI/res/values-ar/strings.xml @@ -483,7 +483,8 @@ <string name="color_apply" msgid="9212602012641034283">"تطبيق"</string> <string name="color_revert_title" msgid="4746666545480534663">"تأكيد الإعدادات"</string> <string name="color_revert_message" msgid="9116001069397996691">"يمكن أن تتسبب بعض إعدادات الألوان في تعطيل إمكانية استخدام الجهاز. يمكنك النقر على \"موافق\" لتأكيد إعدادات الألوان هذه، وإلا فستتم إعادة تعيين هذه الإعدادات بعد 10 ثوانٍ."</string> - <string name="battery_panel_title" msgid="3476715163685592453">"البطارية (<xliff:g id="ID_1">%1$d</xliff:g>%%)"</string> + <!-- no translation found for battery_panel_title (7944156115535366613) --> + <skip /> <string name="battery_detail_charging_summary" msgid="1279095653533044008">"وضع توفير شحن البطارية غير متاح أثناء الشحن."</string> <string name="battery_detail_switch_title" msgid="6285872470260795421">"توفير شحن البطارية"</string> <string name="battery_detail_switch_summary" msgid="9049111149407626804">"لخفض مستوى الأداء وبيانات الخلفية"</string> diff --git a/packages/SystemUI/res/values-az-rAZ/strings.xml b/packages/SystemUI/res/values-az-rAZ/strings.xml index 2c3082ba7dba..690317f7ef89 100644 --- a/packages/SystemUI/res/values-az-rAZ/strings.xml +++ b/packages/SystemUI/res/values-az-rAZ/strings.xml @@ -301,8 +301,7 @@ <string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"ekran sancağı"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"axtarış"</string> <string name="recents_launch_error_message" msgid="2969287838120550506">"<xliff:g id="APP">%s</xliff:g> başlana bilmir."</string> - <!-- no translation found for recents_launch_disabled_message (1624523193008871793) --> - <skip /> + <string name="recents_launch_disabled_message" msgid="1624523193008871793">"<xliff:g id="APP">%s</xliff:g> güvənli rejimdə deaktiv edildi."</string> <string name="recents_history_button_label" msgid="5153358867807604821">"Tarixçə"</string> <string name="recents_history_clear_all_button_label" msgid="5905258334958006953">"Təmizləyin"</string> <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Üfüqi Böl"</string> @@ -479,7 +478,7 @@ <string name="color_apply" msgid="9212602012641034283">"Tətbiq edin"</string> <string name="color_revert_title" msgid="4746666545480534663">"Ayarları təsdiq edin"</string> <string name="color_revert_message" msgid="9116001069397996691">"Bəzi renk ayarları bu cihazı yararsız edə bilər. Bu rənk ayarlarını təsdiq etmək üçün OK basın, əks halda bu ayarlar 10 saniyə sonra sıfırlanacaq."</string> - <string name="battery_panel_title" msgid="3476715163685592453">"Enerji (<xliff:g id="ID_1">%1$d</xliff:g>%%)"</string> + <string name="battery_panel_title" msgid="7944156115535366613">"Batareya istifadəsi"</string> <string name="battery_detail_charging_summary" msgid="1279095653533044008">"Enerji Qənaəti doldurulma zamanı əlçatan deyil"</string> <string name="battery_detail_switch_title" msgid="6285872470260795421">"Enerji Qənaəti"</string> <string name="battery_detail_switch_summary" msgid="9049111149407626804">"Performansı azaldır və arxa fon datasını məhdudlaşdırır"</string> diff --git a/packages/SystemUI/res/values-b+sr+Latn/strings.xml b/packages/SystemUI/res/values-b+sr+Latn/strings.xml index 291f9129fe16..3ae995bb9d57 100644 --- a/packages/SystemUI/res/values-b+sr+Latn/strings.xml +++ b/packages/SystemUI/res/values-b+sr+Latn/strings.xml @@ -480,7 +480,8 @@ <string name="color_apply" msgid="9212602012641034283">"Primeni"</string> <string name="color_revert_title" msgid="4746666545480534663">"Potvrdite podešavanja"</string> <string name="color_revert_message" msgid="9116001069397996691">"Neka podešavanja boja mogu da učine uređaj neupotrebljivim. Kliknite na Potvrdi da biste potvrdili ova podešavanja boja, pošto će se u suprotnom ova podešavanja resetovati nakon 10 sekundi."</string> - <string name="battery_panel_title" msgid="3476715163685592453">"Baterija (<xliff:g id="ID_1">%1$d</xliff:g>%%)"</string> + <!-- no translation found for battery_panel_title (7944156115535366613) --> + <skip /> <string name="battery_detail_charging_summary" msgid="1279095653533044008">"Ušteda baterije nije dostupna tokom punjenja"</string> <string name="battery_detail_switch_title" msgid="6285872470260795421">"Ušteda baterije"</string> <string name="battery_detail_switch_summary" msgid="9049111149407626804">"Smanjuje performanse i pozadinske podatke"</string> diff --git a/packages/SystemUI/res/values-bg/strings.xml b/packages/SystemUI/res/values-bg/strings.xml index 7679d36977e4..f407ac18d600 100644 --- a/packages/SystemUI/res/values-bg/strings.xml +++ b/packages/SystemUI/res/values-bg/strings.xml @@ -479,7 +479,8 @@ <string name="color_apply" msgid="9212602012641034283">"Прилагане"</string> <string name="color_revert_title" msgid="4746666545480534663">"Потвърждаване на настройките"</string> <string name="color_revert_message" msgid="9116001069397996691">"Някои настройки за цветовете могат да направят това устройство неизползваемо. За да ги потвърдите, кликнете върху „OK“. В противен случай те ще бъдат нулирани след 10 секунди."</string> - <string name="battery_panel_title" msgid="3476715163685592453">"Батерия (<xliff:g id="ID_1">%1$d</xliff:g>%%)"</string> + <!-- no translation found for battery_panel_title (7944156115535366613) --> + <skip /> <string name="battery_detail_charging_summary" msgid="1279095653533044008">"Режимът за запазване на батерията не е налице при зареждане"</string> <string name="battery_detail_switch_title" msgid="6285872470260795421">"Режим за запазване на батерията"</string> <string name="battery_detail_switch_summary" msgid="9049111149407626804">"Намалява ефективността и данните на заден план"</string> diff --git a/packages/SystemUI/res/values-bn-rBD/strings.xml b/packages/SystemUI/res/values-bn-rBD/strings.xml index 1209559ee4da..988e02ed879f 100644 --- a/packages/SystemUI/res/values-bn-rBD/strings.xml +++ b/packages/SystemUI/res/values-bn-rBD/strings.xml @@ -301,8 +301,7 @@ <string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"স্ক্রীন পিন করা"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"অনুসন্ধান"</string> <string name="recents_launch_error_message" msgid="2969287838120550506">"<xliff:g id="APP">%s</xliff:g> শুরু করা যায়নি৷"</string> - <!-- no translation found for recents_launch_disabled_message (1624523193008871793) --> - <skip /> + <string name="recents_launch_disabled_message" msgid="1624523193008871793">"নিরাপদ মোডে <xliff:g id="APP">%s</xliff:g> অক্ষম করা হয়েছে৷"</string> <string name="recents_history_button_label" msgid="5153358867807604821">"ইতিহাস"</string> <string name="recents_history_clear_all_button_label" msgid="5905258334958006953">"সাফ করুন"</string> <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"অনুভূমিক স্প্লিট"</string> @@ -479,7 +478,7 @@ <string name="color_apply" msgid="9212602012641034283">"প্রয়োগ করুন"</string> <string name="color_revert_title" msgid="4746666545480534663">"সেটিংস নিশ্চিত করুন"</string> <string name="color_revert_message" msgid="9116001069397996691">"কিছু রঙের সেটিংস এই ডিভাইসকে ব্যবহারের অযোগ্য করে দিতে পারে৷ এই রঙের সেটিংস নিশ্চিত করতে ওকে এ ক্লিক করুন, অন্যথায় ১০ সেকেন্ড পরে এই সেটিংস পুনরায় সেট হবে৷"</string> - <string name="battery_panel_title" msgid="3476715163685592453">"ব্যাটারি (<xliff:g id="ID_1">%1$d</xliff:g>%%)"</string> + <string name="battery_panel_title" msgid="7944156115535366613">"ব্যাটারির ব্যবহার"</string> <string name="battery_detail_charging_summary" msgid="1279095653533044008">"চার্জ করার সময় ব্যাটারি সেভার উপলব্ধ নয়"</string> <string name="battery_detail_switch_title" msgid="6285872470260795421">"ব্যাটারি সেভার"</string> <string name="battery_detail_switch_summary" msgid="9049111149407626804">"কার্য-সম্পাদনা ও পশ্চাদপট ডেটাকে কমিয়ে দেয়"</string> diff --git a/packages/SystemUI/res/values-bs-rBA/strings.xml b/packages/SystemUI/res/values-bs-rBA/strings.xml index f7dab727f583..2be74a00c260 100644 --- a/packages/SystemUI/res/values-bs-rBA/strings.xml +++ b/packages/SystemUI/res/values-bs-rBA/strings.xml @@ -33,7 +33,7 @@ <string name="status_bar_no_notifications_title" msgid="4755261167193833213">"Nema obavještenja"</string> <string name="status_bar_ongoing_events_title" msgid="1682504513316879202">"U toku"</string> <string name="status_bar_latest_events_title" msgid="6594767438577593172">"Obavještenja"</string> - <string name="battery_low_title" msgid="6456385927409742437">"Baterija je slaba"</string> + <string name="battery_low_title" msgid="6456385927409742437">"Baterija je skoro prazna"</string> <string name="battery_low_percent_format" msgid="2900940511201380775">"Preostalo <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> <string name="battery_low_percent_format_saver_started" msgid="6859235584035338833">"Preostalo <xliff:g id="PERCENTAGE">%s</xliff:g>. Uključena je štednja baterije."</string> <string name="invalid_charger" msgid="4549105996740522523">"USB punjenje nije podržano.\nKoristite samo priloženi punjač."</string> @@ -65,8 +65,7 @@ <string name="usb_debugging_message" msgid="2220143855912376496">"RSA otisak prsta za otključavanje računara je: \n<xliff:g id="FINGERPRINT">%1$s</xliff:g>"</string> <string name="usb_debugging_always" msgid="303335496705863070">"Uvijek dozvoli sa ovog računara"</string> <string name="usb_debugging_secondary_user_title" msgid="6353808721761220421">"Uklanjanje pogreški putem USB-a nije dozvoljeno"</string> - <!-- no translation found for usb_debugging_secondary_user_message (8572228137833020196) --> - <skip /> + <string name="usb_debugging_secondary_user_message" msgid="8572228137833020196">"Korisnik koji je trenutno prijavljen na uređaju ne može uključiti opciju za otklanjanje grešaka koristeći USB. Da biste koristili ovu funkciju prebacite se na korisnika administratora."</string> <string name="compat_mode_on" msgid="6623839244840638213">"Uvećaj prikaz na ekran"</string> <string name="compat_mode_off" msgid="4434467572461327898">"Razvuci prikaz na ekran"</string> <string name="screenshot_saving_ticker" msgid="7403652894056693515">"Spašavanje snimka ekrana..."</string> @@ -164,16 +163,15 @@ <string name="accessibility_ringer_silent" msgid="9061243307939135383">"Zvuk zvona nečujan."</string> <!-- no translation found for accessibility_casting (6887382141726543668) --> <skip /> - <!-- no translation found for accessibility_work_mode (2478631941714607225) --> - <skip /> + <string name="accessibility_work_mode" msgid="2478631941714607225">"Poslovni režim"</string> <string name="accessibility_recents_item_will_be_dismissed" msgid="395770242498031481">"Odbaci aplikaciju <xliff:g id="APP">%s</xliff:g>."</string> <string name="accessibility_recents_item_dismissed" msgid="6803574935084867070">"Aplikacija <xliff:g id="APP">%s</xliff:g> uklonjena."</string> <string name="accessibility_recents_all_items_dismissed" msgid="4464697366179168836">"Sve nedavno korištene aplikacije su odbačene."</string> <string name="accessibility_recents_item_launched" msgid="7616039892382525203">"Pokrećem aplikaciju <xliff:g id="APP">%s</xliff:g>."</string> <string name="accessibility_recents_task_header" msgid="1437183540924535457">"<xliff:g id="APP">%1$s</xliff:g> <xliff:g id="ACTIVITY_LABEL">%2$s</xliff:g>"</string> <string name="accessibility_notification_dismissed" msgid="854211387186306927">"Obavještenje je uklonjeno."</string> - <string name="accessibility_desc_notification_shade" msgid="4690274844447504208">"Obavještenje sjenčenjem."</string> - <string name="accessibility_desc_quick_settings" msgid="6186378411582437046">"Brza podešavanja."</string> + <string name="accessibility_desc_notification_shade" msgid="4690274844447504208">"Obavještenja sa sjenčenjem."</string> + <string name="accessibility_desc_quick_settings" msgid="6186378411582437046">"Brze postavke."</string> <string name="accessibility_desc_lock_screen" msgid="5625143713611759164">"Zaključan ekran."</string> <string name="accessibility_desc_settings" msgid="3417884241751434521">"Postavke"</string> <string name="accessibility_desc_recent_apps" msgid="4876900986661819788">"Pregled."</string> @@ -205,7 +203,7 @@ <string name="accessibility_quick_settings_location_changed_off" msgid="8526845571503387376">"Javljanje lokacije je isključeno."</string> <string name="accessibility_quick_settings_location_changed_on" msgid="339403053079338468">"Javljanje lokacije je uključeno."</string> <string name="accessibility_quick_settings_alarm" msgid="3959908972897295660">"Alarm je podešen na <xliff:g id="TIME">%s</xliff:g>."</string> - <string name="accessibility_quick_settings_close" msgid="3115847794692516306">"Zatvori tablu."</string> + <string name="accessibility_quick_settings_close" msgid="3115847794692516306">"Zatvori ploču."</string> <string name="accessibility_quick_settings_more_time" msgid="3659274935356197708">"Više vremena."</string> <string name="accessibility_quick_settings_less_time" msgid="2404728746293515623">"Manje vremena."</string> <string name="accessibility_quick_settings_flashlight_off" msgid="4936432000069786988">"Svjetiljka isključena."</string> @@ -216,15 +214,11 @@ <string name="accessibility_quick_settings_color_inversion_changed_on" msgid="6897462320184911126">"Inverzija boja je uključena."</string> <string name="accessibility_quick_settings_hotspot_changed_off" msgid="5004708003447561394">"Mobilna pristupna tačka je isključena."</string> <string name="accessibility_quick_settings_hotspot_changed_on" msgid="2890951609226476206">"Mobilna pristupna tačka je uključena."</string> - <string name="accessibility_casting_turned_off" msgid="1430668982271976172">"Emitiranje ekrana je zaustavljeno."</string> - <!-- no translation found for accessibility_quick_settings_work_mode_off (7045417396436552890) --> - <skip /> - <!-- no translation found for accessibility_quick_settings_work_mode_on (7650588553988014341) --> - <skip /> - <!-- no translation found for accessibility_quick_settings_work_mode_changed_off (5605534876107300711) --> - <skip /> - <!-- no translation found for accessibility_quick_settings_work_mode_changed_on (249840330756998612) --> - <skip /> + <string name="accessibility_casting_turned_off" msgid="1430668982271976172">"Prebacivanje ekrana je zaustavljeno."</string> + <string name="accessibility_quick_settings_work_mode_off" msgid="7045417396436552890">"Poslovni režim isključen."</string> + <string name="accessibility_quick_settings_work_mode_on" msgid="7650588553988014341">"Poslovni režim uključen."</string> + <string name="accessibility_quick_settings_work_mode_changed_off" msgid="5605534876107300711">"Poslovni režim je isključen."</string> + <string name="accessibility_quick_settings_work_mode_changed_on" msgid="249840330756998612">"Poslovni režim je uključen."</string> <string name="accessibility_brightness" msgid="8003681285547803095">"Osvjetljenje ekrana"</string> <string name="data_usage_disabled_dialog_3g_title" msgid="5281770593459841889">"2G–3G prijenos podataka je pauzirano"</string> <string name="data_usage_disabled_dialog_4g_title" msgid="1601769736881078016">"4G prijenos podataka je pauzirano"</string> @@ -241,12 +235,12 @@ <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"Postavke obavještenja"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"Postavke aplikacije <xliff:g id="APP_NAME">%s</xliff:g>"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"Ekran će se automatski rotirati."</string> - <string name="accessibility_rotation_lock_on_landscape" msgid="6731197337665366273">"Ekran je zaključan u položenom prikazu."</string> + <string name="accessibility_rotation_lock_on_landscape" msgid="6731197337665366273">"Ekran je zaključan u vodoravnom prikazu."</string> <string name="accessibility_rotation_lock_on_portrait" msgid="5809367521644012115">"Ekran je zaključan u uspravnom prikazu."</string> <string name="accessibility_rotation_lock_off_changed" msgid="8134601071026305153">"Ekran će se sada automatski rotirati."</string> <string name="accessibility_rotation_lock_on_landscape_changed" msgid="3135965553707519743">"Ekran je sada zaključan u vodoravnom položaju."</string> <string name="accessibility_rotation_lock_on_portrait_changed" msgid="8922481981834012126">"Ekran je sada zaključan u uspravnom položaju."</string> - <string name="dessert_case" msgid="1295161776223959221">"Dessert Case"</string> + <string name="dessert_case" msgid="1295161776223959221">"Slika sa desertima"</string> <string name="start_dreams" msgid="7219575858348719790">"Sanjarenje"</string> <string name="ethernet_label" msgid="7967563676324087464">"Ethernet"</string> <string name="quick_settings_dnd_label" msgid="8735855737575028208">"Ne ometaj"</string> @@ -265,7 +259,7 @@ <string name="quick_settings_ime_label" msgid="7073463064369468429">"Način unosa"</string> <string name="quick_settings_location_label" msgid="5011327048748762257">"Lokacija"</string> <string name="quick_settings_location_off_label" msgid="7464544086507331459">"Utvrđivanje lokacije isključeno"</string> - <string name="quick_settings_media_device_label" msgid="1302906836372603762">"Uređaj medija"</string> + <string name="quick_settings_media_device_label" msgid="1302906836372603762">"Medijski uređaj"</string> <string name="quick_settings_rssi_label" msgid="7725671335550695589">"RSSI"</string> <string name="quick_settings_rssi_emergency_only" msgid="2713774041672886750">"Samo pozivi za hitne slučajeve"</string> <string name="quick_settings_settings_label" msgid="5326556592578065401">"Postavke"</string> @@ -279,9 +273,9 @@ <string name="quick_settings_wifi_off_label" msgid="7558778100843885864">"Wi-Fi isključen"</string> <string name="quick_settings_wifi_detail_empty_text" msgid="269990350383909226">"Nema dostupnih Wi-Fi mreža"</string> <string name="quick_settings_cast_title" msgid="7709016546426454729">"Prebacivanje"</string> - <string name="quick_settings_casting" msgid="6601710681033353316">"Emitiranje"</string> + <string name="quick_settings_casting" msgid="6601710681033353316">"Prebacivanje"</string> <string name="quick_settings_cast_device_default_name" msgid="5367253104742382945">"Neimenovani uređaj"</string> - <string name="quick_settings_cast_device_default_description" msgid="2484573682378634413">"Spreman za emitiranje"</string> + <string name="quick_settings_cast_device_default_description" msgid="2484573682378634413">"Spreman za prebacivanje"</string> <string name="quick_settings_cast_detail_empty_text" msgid="311785821261640623">"Nema dostupnih uređaja"</string> <string name="quick_settings_brightness_dialog_title" msgid="8599674057673605368">"Osvjetljenje"</string> <string name="quick_settings_brightness_dialog_auto_brightness_label" msgid="5064982743784071218">"AUTO"</string> @@ -302,8 +296,7 @@ <string name="quick_settings_cellular_detail_data_used" msgid="1476810587475761478">"Iskorišteno <xliff:g id="DATA_USED">%s</xliff:g>"</string> <string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"Ograničenje <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string> <string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"Upozorenje <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string> - <!-- no translation found for quick_settings_work_mode_label (6244915274350490429) --> - <skip /> + <string name="quick_settings_work_mode_label" msgid="6244915274350490429">"Poslovni režim"</string> <string name="recents_empty_message" msgid="8682129509540827999">"Ovdje se pojavljuju nedavno korišteni ekrani"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"Informacije o aplikaciji"</string> <string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"kačenje ekrana"</string> @@ -329,9 +322,9 @@ <string name="zen_silence_introduction_voice" msgid="2284540992298200729">"Ovim se blokiraju SVI zvukovi i vibracije, uključujući alarme, muziku, videozapise i igre. I dalje ćete moći obavljati pozive."</string> <string name="zen_silence_introduction" msgid="3137882381093271568">"Ovim se blokiraju SVI zvukovi i vibracije, uključujući alarme, muziku, video zapise i igre."</string> <string name="keyguard_more_overflow_text" msgid="9195222469041601365">"+<xliff:g id="NUMBER_OF_NOTIFICATIONS">%d</xliff:g>"</string> - <string name="speed_bump_explanation" msgid="1288875699658819755">"Stavi manje važna obavještenja ispod"</string> - <string name="notification_tap_again" msgid="8524949573675922138">"Dodirnite ponovo da biste otvorili"</string> - <string name="keyguard_unlock" msgid="8043466894212841998">"Prevucite prema gore da biste otključali"</string> + <string name="speed_bump_explanation" msgid="1288875699658819755">"Prikaži manje važna obavještenja ispod"</string> + <string name="notification_tap_again" msgid="8524949573675922138">"Dodirnite ponovo da otvorite"</string> + <string name="keyguard_unlock" msgid="8043466894212841998">"Prevucite prema gore da otključate"</string> <string name="phone_hint" msgid="4872890986869209950">"Prevucite preko ikone da otvorite telefon"</string> <string name="voice_hint" msgid="8939888732119726665">"Prevucite preko ikone za glasovnu pomoć"</string> <string name="camera_hint" msgid="7939688436797157483">"Prevucite od ikone da otvorite kameru"</string> @@ -342,10 +335,8 @@ <string name="interruption_level_none_twoline" msgid="3957581548190765889">"Potpuna\ntišina"</string> <string name="interruption_level_priority_twoline" msgid="1564715335217164124">"Samo\nprioritetni prekidi"</string> <string name="interruption_level_alarms_twoline" msgid="3266909566410106146">"Samo\nalarmi"</string> - <!-- no translation found for interruption_level_all (1330581184930945764) --> - <skip /> - <!-- no translation found for interruption_level_all_twoline (3719402899156124780) --> - <skip /> + <string name="interruption_level_all" msgid="1330581184930945764">"Svi"</string> + <string name="interruption_level_all_twoline" msgid="3719402899156124780">"Svi \n"</string> <string name="keyguard_indication_charging_time" msgid="1757251776872835768">"Punjenje (do kraja preostalo <xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g>)"</string> <string name="keyguard_indication_charging_time_fast" msgid="9018981952053914986">"Brzo punjenje (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> do pune baterije)"</string> <string name="keyguard_indication_charging_time_slowly" msgid="955252797961724952">"Sporo punjenje (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> do pune baterije)"</string> @@ -361,29 +352,23 @@ <string name="guest_exit_guest_dialog_title" msgid="8480693520521766688">"Želite li ukloniti gosta?"</string> <string name="guest_exit_guest_dialog_message" msgid="4155503224769676625">"Sve aplikacije i svi podaci iz ove sesije bit će izbrisani."</string> <string name="guest_exit_guest_dialog_remove" msgid="7402231963862520531">"Ukloni"</string> - <string name="guest_wipe_session_title" msgid="6419439912885956132">"Dobrodošli opet, goste!"</string> + <string name="guest_wipe_session_title" msgid="6419439912885956132">"Zdravo! Lijepo je opet vidjeti goste."</string> <string name="guest_wipe_session_message" msgid="8476238178270112811">"Želite li nastaviti sesiju?"</string> <string name="guest_wipe_session_wipe" msgid="5065558566939858884">"Počni ispočetka"</string> <string name="guest_wipe_session_dontwipe" msgid="1401113462524894716">"Da, nastavi"</string> <string name="guest_notification_title" msgid="1585278533840603063">"Korisnik koji je gost"</string> <string name="guest_notification_text" msgid="335747957734796689">"Da izbrišete aplikacije i podatke, uklonite gosta"</string> <string name="guest_notification_remove_action" msgid="8820670703892101990">"UKLONI GOSTA"</string> - <!-- no translation found for user_logout_notification_title (1453960926437240727) --> - <skip /> - <!-- no translation found for user_logout_notification_text (3350262809611876284) --> - <skip /> - <!-- no translation found for user_logout_notification_action (1195428991423425062) --> - <skip /> + <string name="user_logout_notification_title" msgid="1453960926437240727">"Odjavi korisnika"</string> + <string name="user_logout_notification_text" msgid="3350262809611876284">"Odjavi trenutnog korisnika"</string> + <string name="user_logout_notification_action" msgid="1195428991423425062">"ODJAVI KORISNIKA"</string> <string name="user_add_user_title" msgid="4553596395824132638">"Želite dodati novog korisnika?"</string> <string name="user_add_user_message_short" msgid="2161624834066214559">"Kada dodate novog korisnika, ta osoba treba uspostaviti svoj prostor.\n\nSvaki korisnik može ažurirati aplikacije za sve ostale korisnike."</string> - <!-- no translation found for user_remove_user_title (4681256956076895559) --> - <skip /> - <!-- no translation found for user_remove_user_message (1453218013959498039) --> - <skip /> - <!-- no translation found for user_remove_user_remove (7479275741742178297) --> - <skip /> + <string name="user_remove_user_title" msgid="4681256956076895559">"Zaista želite ukloniti korisnika?"</string> + <string name="user_remove_user_message" msgid="1453218013959498039">"Sve aplikacije i podaci ovog korisnika bit će izbrisani."</string> + <string name="user_remove_user_remove" msgid="7479275741742178297">"Ukloni"</string> <string name="battery_saver_notification_title" msgid="237918726750955859">"Štednja baterije je uključena"</string> - <string name="battery_saver_notification_text" msgid="820318788126672692">"Reducira rad i prijenos podataka u pozadini"</string> + <string name="battery_saver_notification_text" msgid="820318788126672692">"Minimizira rad i prijenos podataka u pozadini"</string> <string name="battery_saver_notification_action_text" msgid="109158658238110382">"Isključi štednju baterije"</string> <string name="media_projection_dialog_text" msgid="3071431025448218928">"Aplikacija <xliff:g id="APP_SEEKING_PERMISSION">%s</xliff:g> će početi snimati sve što se prikaže na ekranu."</string> <string name="media_projection_remember_text" msgid="3103510882172746752">"Ne prikazuj opet"</string> @@ -418,12 +403,11 @@ <string name="accessibility_volume_expand" msgid="5946812790999244205">"Proširi"</string> <string name="accessibility_volume_collapse" msgid="3609549593031810875">"Skupi"</string> <string name="screen_pinning_title" msgid="3273740381976175811">"Ekran je prikačen"</string> - <!-- no translation found for screen_pinning_description (3577937698406151604) --> - <skip /> + <string name="screen_pinning_description" msgid="3577937698406151604">"Ovim ekran ostaje prikazan dok ga ne otkačite. Da biste ga otkačili dodirnite i držite Nazad."</string> <string name="screen_pinning_positive" msgid="3783985798366751226">"Jasno mi je"</string> <string name="screen_pinning_negative" msgid="3741602308343880268">"Ne, hvala"</string> <string name="quick_settings_reset_confirmation_title" msgid="748792586749897883">"Želite li sakriti <xliff:g id="TILE_LABEL">%1$s</xliff:g>?"</string> - <string name="quick_settings_reset_confirmation_message" msgid="2235970126803317374">"Pojavit će se sljedeći put kada ga uključite u postavkama."</string> + <string name="quick_settings_reset_confirmation_message" msgid="2235970126803317374">"Pojavit će se sljedeći put kada opciju uključite u postavkama."</string> <string name="quick_settings_reset_confirmation_button" msgid="2660339101868367515">"Sakrij"</string> <string name="volumeui_prompt_message" msgid="918680947433389110">"<xliff:g id="APP_NAME">%1$s</xliff:g> želi funkcionirati kao dijaloški okvir za jačinu zvuka."</string> <string name="volumeui_prompt_allow" msgid="7954396902482228786">"Dozvoli"</string> @@ -436,8 +420,7 @@ <string name="show_battery_percentage_summary" msgid="3215025775576786037">"Prikazuje postotak nivoa baterije unutar ikone na statusnoj traci kada se baterija ne puni"</string> <string name="quick_settings" msgid="10042998191725428">"Brze postavke"</string> <string name="status_bar" msgid="4877645476959324760">"Statusna traka"</string> - <!-- no translation found for overview (4018602013895926956) --> - <skip /> + <string name="overview" msgid="4018602013895926956">"Pregled"</string> <string name="demo_mode" msgid="2389163018533514619">"Način demonstracije"</string> <string name="enable_demo_mode" msgid="4844205668718636518">"Omogući način demonstracije"</string> <string name="show_demo_mode" msgid="2018336697782464029">"Prikaži način demonstracije"</string> @@ -461,110 +444,62 @@ <string name="tuner_toast" msgid="603429811084428439">"Čestitamo! Podešavač za korisničko sučelje sistema je dodan u Postavke"</string> <string name="remove_from_settings" msgid="8389591916603406378">"Ukloni iz Postavki"</string> <string name="remove_from_settings_prompt" msgid="6069085993355887748">"Želite li ukloniti Podešavač za korisničko sučelje sistema iz Postavki i prestati koristiti sve njegove funkcije?"</string> - <!-- no translation found for activity_not_found (348423244327799974) --> - <skip /> - <!-- no translation found for clock_seconds (7689554147579179507) --> - <skip /> - <!-- no translation found for clock_seconds_desc (6282693067130470675) --> - <skip /> - <!-- no translation found for qs_rearrange (8060918697551068765) --> - <skip /> - <!-- no translation found for show_brightness (6613930842805942519) --> - <skip /> + <string name="activity_not_found" msgid="348423244327799974">"Aplikacija nije instalirana na uređaju"</string> + <string name="clock_seconds" msgid="7689554147579179507">"Prikaži sekunde"</string> + <string name="clock_seconds_desc" msgid="6282693067130470675">"Prikaži sekunde na statusnoj traci. Može skratiti trajanje baterije."</string> + <string name="qs_rearrange" msgid="8060918697551068765">"Preuredi \"Brze postavke\""</string> + <string name="show_brightness" msgid="6613930842805942519">"Prikaži osvjetljenje u opciji \"Brze postavke\""</string> <string name="overview_nav_bar_gesture" msgid="1852503363271291341">"Uključi akcelerator za dijeljenje ekrana prevlačenjem nagore"</string> <string name="overview_nav_bar_gesture_desc" msgid="6329167382305102615">"Uključite pokrete prstima da biste ušli u podijeljeni ekran tako što ćete od dugmeta Pregled prevući prstom prema gore"</string> - <!-- no translation found for experimental (6198182315536726162) --> - <skip /> + <string name="experimental" msgid="6198182315536726162">"Eksperimentalno"</string> <string name="enable_bluetooth_title" msgid="5027037706500635269">"Želiti li uključiti Bluetooth?"</string> <string name="enable_bluetooth_message" msgid="9106595990708985385">"Da povežete tastaturu sa tabletom, prvo morate uključiti Bluetooth."</string> <string name="enable_bluetooth_confirmation_ok" msgid="6258074250948309715">"Uključi"</string> - <!-- no translation found for apply_to_topic (3641403489318659666) --> - <skip /> - <!-- no translation found for apply_to_app (363016783939815960) --> - <skip /> - <!-- no translation found for blocked_importance (5198578988978234161) --> - <skip /> - <!-- no translation found for low_importance (4109929986107147930) --> - <skip /> - <!-- no translation found for default_importance (8192107689995742653) --> - <skip /> - <!-- no translation found for high_importance (1527066195614050263) --> - <skip /> - <!-- no translation found for max_importance (5089005872719563894) --> - <skip /> - <!-- no translation found for notification_importance_blocked (2397192642657872872) --> - <skip /> - <!-- no translation found for notification_importance_low (4383563267370859725) --> - <skip /> - <!-- no translation found for notification_importance_default (4926529615920610817) --> - <skip /> - <!-- no translation found for notification_importance_high (3222680136612408223) --> - <skip /> - <!-- no translation found for notification_importance_max (5236987171904756134) --> - <skip /> - <!-- no translation found for notification_more_settings (816306283396553571) --> - <skip /> - <!-- no translation found for notification_done (5279426047273930175) --> - <skip /> - <!-- no translation found for color_matrix_none (2121957926040543148) --> - <skip /> - <!-- no translation found for color_matrix_night (5943817622105307072) --> - <skip /> - <!-- no translation found for color_matrix_custom (3655576492322298713) --> - <skip /> + <string name="apply_to_topic" msgid="3641403489318659666">"Primijeni na obavještenja koja se odnose na temu <xliff:g id="TOPIC_NAME">%1$s</xliff:g>"</string> + <string name="apply_to_app" msgid="363016783939815960">"Primijeni na sva obavještenja ove aplikacije"</string> + <string name="blocked_importance" msgid="5198578988978234161">"Blokirano"</string> + <string name="low_importance" msgid="4109929986107147930">"Mali značaj"</string> + <string name="default_importance" msgid="8192107689995742653">"Normalan značaj"</string> + <string name="high_importance" msgid="1527066195614050263">"Visok značaj"</string> + <string name="max_importance" msgid="5089005872719563894">"Hitan značaj"</string> + <string name="notification_importance_blocked" msgid="2397192642657872872">"Nikada ne prikazuj ova obavještenja"</string> + <string name="notification_importance_low" msgid="4383563267370859725">"Nečujno pokaži na dnu spiska obavještenja"</string> + <string name="notification_importance_default" msgid="4926529615920610817">"Nečujno prikaži ova obavještenja"</string> + <string name="notification_importance_high" msgid="3222680136612408223">"Pokaži na vrhu spiska obavještanja uz zvuk"</string> + <string name="notification_importance_max" msgid="5236987171904756134">"Kratki prikaz na ekranu uz zvuk"</string> + <string name="notification_more_settings" msgid="816306283396553571">"Više postavki"</string> + <string name="notification_done" msgid="5279426047273930175">"Gotovo"</string> + <string name="color_matrix_none" msgid="2121957926040543148">"Standardne boje"</string> + <string name="color_matrix_night" msgid="5943817622105307072">"Boje za noćni rad"</string> + <string name="color_matrix_custom" msgid="3655576492322298713">"Prilagođene boje"</string> <string name="color_matrix_auto" msgid="4896624757412029265">"Automatski"</string> - <!-- no translation found for color_matrix_unknown (2709202104256265107) --> - <skip /> - <!-- no translation found for color_transform (6985460408079086090) --> - <skip /> - <!-- no translation found for color_matrix_show_qs (1763244354399276679) --> - <skip /> - <!-- no translation found for color_enable_custom (6729001308217347501) --> - <skip /> - <!-- no translation found for color_apply (9212602012641034283) --> - <skip /> - <!-- no translation found for color_revert_title (4746666545480534663) --> - <skip /> - <!-- no translation found for color_revert_message (9116001069397996691) --> - <skip /> - <!-- no translation found for battery_panel_title (3476715163685592453) --> - <skip /> - <!-- no translation found for battery_detail_charging_summary (1279095653533044008) --> - <skip /> - <!-- no translation found for battery_detail_switch_title (6285872470260795421) --> - <skip /> - <!-- no translation found for battery_detail_switch_summary (9049111149407626804) --> - <skip /> - <!-- no translation found for keyboard_shortcut_group_system (6472647649616541064) --> - <skip /> - <!-- no translation found for keyboard_shortcut_group_system_home (3054369431319891965) --> - <skip /> - <!-- no translation found for keyboard_shortcut_group_system_recents (3154851905021926744) --> - <skip /> - <!-- no translation found for keyboard_shortcut_group_system_back (2207004531216446378) --> - <skip /> - <!-- no translation found for tuner_full_zen_title (5905081395132280054) --> - <skip /> - <!-- no translation found for tuner_full_zen_summary (6883568374520596402) --> - <skip /> - <!-- no translation found for volume_and_do_not_disturb (3114580364524650941) --> - <skip /> - <!-- no translation found for volume_down_silent (66962568467719591) --> - <skip /> - <!-- no translation found for volume_up_silent (7141255269783588286) --> - <skip /> - <!-- no translation found for battery (7498329822413202973) --> - <skip /> - <!-- no translation found for clock (7416090374234785905) --> - <skip /> - <!-- no translation found for headset (4534219457597457353) --> - <skip /> - <!-- no translation found for accessibility_status_bar_headphones (9156307120060559989) --> - <skip /> - <!-- no translation found for accessibility_status_bar_headset (8666419213072449202) --> - <skip /> - <!-- no translation found for tuner_status_bar_explanation (9032196769944137864) --> - <skip /> + <string name="color_matrix_unknown" msgid="2709202104256265107">"Nepoznate boje"</string> + <string name="color_transform" msgid="6985460408079086090">"Izmjena boja"</string> + <string name="color_matrix_show_qs" msgid="1763244354399276679">"Prikaži polje \"Brze postavke\""</string> + <string name="color_enable_custom" msgid="6729001308217347501">"Uključi prilagođenu transformaciju"</string> + <string name="color_apply" msgid="9212602012641034283">"Prihvati"</string> + <string name="color_revert_title" msgid="4746666545480534663">"Potvrdi postavke"</string> + <string name="color_revert_message" msgid="9116001069397996691">"S nekim postavkama boja ovaj uređaj može biti neupotrebljiv. Kliknite U redu da biste potvrdili ove postavke boja ili sačekajte 10 sekundi da se postavke vrate na početnu vrijednost."</string> + <!-- no translation found for battery_panel_title (7944156115535366613) --> + <skip /> + <string name="battery_detail_charging_summary" msgid="1279095653533044008">"Ušteda baterije je isključena prilikom punjenja"</string> + <string name="battery_detail_switch_title" msgid="6285872470260795421">"Ušteda baterije"</string> + <string name="battery_detail_switch_summary" msgid="9049111149407626804">"Ograničava rad i prijenos podataka u pozadini"</string> + <string name="keyboard_shortcut_group_system" msgid="6472647649616541064">"Sistem"</string> + <string name="keyboard_shortcut_group_system_home" msgid="3054369431319891965">"Početak"</string> + <string name="keyboard_shortcut_group_system_recents" msgid="3154851905021926744">"Nedavni ekrani"</string> + <string name="keyboard_shortcut_group_system_back" msgid="2207004531216446378">"Nazad"</string> + <string name="tuner_full_zen_title" msgid="5905081395132280054">"Prikaži režim Ne ometaj u dijalogu za jačinu zvuka."</string> + <string name="tuner_full_zen_summary" msgid="6883568374520596402">"Dopusti punu kontrolu režima Ne ometaj u dijalogu za jačinu zvuka."</string> + <string name="volume_and_do_not_disturb" msgid="3114580364524650941">"Jačina zvuka i režim Ne ometaj"</string> + <string name="volume_down_silent" msgid="66962568467719591">"Aktiviraj režim Ne ometaj kada se zvuk utiša"</string> + <string name="volume_up_silent" msgid="7141255269783588286">"Deaktiviraj režim Ne ometaj kada se zvuk pojača"</string> + <string name="battery" msgid="7498329822413202973">"Baterija"</string> + <string name="clock" msgid="7416090374234785905">"Sat"</string> + <string name="headset" msgid="4534219457597457353">"Slušalice s mikrofonom"</string> + <string name="accessibility_status_bar_headphones" msgid="9156307120060559989">"Slušalice su priključene"</string> + <string name="accessibility_status_bar_headset" msgid="8666419213072449202">"Slušalice s mikrofonom su priključene"</string> + <string name="tuner_status_bar_explanation" msgid="9032196769944137864">"Uključite ili isključite prikaz ikona na statusnoj traci."</string> <string name="data_saver" msgid="5037565123367048522">"Ušteda podataka"</string> <string name="accessibility_data_saver_on" msgid="8454111686783887148">"Ušteda podataka je uključena"</string> <string name="accessibility_data_saver_off" msgid="8841582529453005337">"Ušteda podataka je isključena"</string> diff --git a/packages/SystemUI/res/values-ca/strings.xml b/packages/SystemUI/res/values-ca/strings.xml index f671ce990169..55ab02ad52ab 100644 --- a/packages/SystemUI/res/values-ca/strings.xml +++ b/packages/SystemUI/res/values-ca/strings.xml @@ -479,7 +479,8 @@ <string name="color_apply" msgid="9212602012641034283">"Aplica"</string> <string name="color_revert_title" msgid="4746666545480534663">"Confirma la configuració"</string> <string name="color_revert_message" msgid="9116001069397996691">"Algunes opcions de configuració de color poden deixar el dispositiu inservible. Fes clic a D\'acord per confirmar la configuració de color; en cas contrari, la configuració es restablirà al cap de 10 segons."</string> - <string name="battery_panel_title" msgid="3476715163685592453">"Bateria (<xliff:g id="ID_1">%1$d</xliff:g>%%)"</string> + <!-- no translation found for battery_panel_title (7944156115535366613) --> + <skip /> <string name="battery_detail_charging_summary" msgid="1279095653533044008">"La funció Estalvi de bateria no està disponible durant la càrrega"</string> <string name="battery_detail_switch_title" msgid="6285872470260795421">"Estalvi de bateria"</string> <string name="battery_detail_switch_summary" msgid="9049111149407626804">"Redueix el rendiment i les dades en segon pla"</string> diff --git a/packages/SystemUI/res/values-cs/strings.xml b/packages/SystemUI/res/values-cs/strings.xml index 7a3948476fb4..a1423cb6d8ae 100644 --- a/packages/SystemUI/res/values-cs/strings.xml +++ b/packages/SystemUI/res/values-cs/strings.xml @@ -481,7 +481,8 @@ <string name="color_apply" msgid="9212602012641034283">"Použít"</string> <string name="color_revert_title" msgid="4746666545480534663">"Ověření nastavení"</string> <string name="color_revert_message" msgid="9116001069397996691">"Některá nastavení barev mohou způsobit, že zařízení nebude použitelné. Kliknutím na OK toto nastavení barev potvrdíte, v opačném případě se nastavení po 10 sekundách resetuje."</string> - <string name="battery_panel_title" msgid="3476715163685592453">"Baterie (<xliff:g id="ID_1">%1$d</xliff:g> %%)"</string> + <!-- no translation found for battery_panel_title (7944156115535366613) --> + <skip /> <string name="battery_detail_charging_summary" msgid="1279095653533044008">"Spořič baterie při nabíjení není k dispozici."</string> <string name="battery_detail_switch_title" msgid="6285872470260795421">"Spořič baterie"</string> <string name="battery_detail_switch_summary" msgid="9049111149407626804">"Omezuje výkon a data na pozadí"</string> diff --git a/packages/SystemUI/res/values-da/strings.xml b/packages/SystemUI/res/values-da/strings.xml index a26272e1ccb4..b509dfacfeb2 100644 --- a/packages/SystemUI/res/values-da/strings.xml +++ b/packages/SystemUI/res/values-da/strings.xml @@ -301,8 +301,7 @@ <string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"bliv i app"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"søg"</string> <string name="recents_launch_error_message" msgid="2969287838120550506">"<xliff:g id="APP">%s</xliff:g> kunne ikke startes."</string> - <!-- no translation found for recents_launch_disabled_message (1624523193008871793) --> - <skip /> + <string name="recents_launch_disabled_message" msgid="1624523193008871793">"<xliff:g id="APP">%s</xliff:g> er deaktiveret i sikker tilstand."</string> <string name="recents_history_button_label" msgid="5153358867807604821">"Historik"</string> <string name="recents_history_clear_all_button_label" msgid="5905258334958006953">"Ryd"</string> <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Opdel vandret"</string> @@ -479,7 +478,7 @@ <string name="color_apply" msgid="9212602012641034283">"Anvend"</string> <string name="color_revert_title" msgid="4746666545480534663">"Bekræft indstillingerne"</string> <string name="color_revert_message" msgid="9116001069397996691">"Nogle farveindstillinger kan medføre, at du ikke kan bruge enheden. Klik på OK for at bekræfte disse farveindstillinger. Ellers nulstilles disse indstillinger efter ti sekunder."</string> - <string name="battery_panel_title" msgid="3476715163685592453">"Batteri (<xliff:g id="ID_1">%1$d</xliff:g> %%)"</string> + <string name="battery_panel_title" msgid="7944156115535366613">"Batteriforbrug"</string> <string name="battery_detail_charging_summary" msgid="1279095653533044008">"Batterisparefunktionen er ikke tilgængelig under opladning"</string> <string name="battery_detail_switch_title" msgid="6285872470260795421">"Batterisparefunktion"</string> <string name="battery_detail_switch_summary" msgid="9049111149407626804">"Reducerer ydeevne og baggrundsdata"</string> diff --git a/packages/SystemUI/res/values-de/strings.xml b/packages/SystemUI/res/values-de/strings.xml index 176e47ed4ee1..541f03eac05e 100644 --- a/packages/SystemUI/res/values-de/strings.xml +++ b/packages/SystemUI/res/values-de/strings.xml @@ -479,7 +479,8 @@ <string name="color_apply" msgid="9212602012641034283">"Übernehmen"</string> <string name="color_revert_title" msgid="4746666545480534663">"Einstellungen bestätigen"</string> <string name="color_revert_message" msgid="9116001069397996691">"Einige Farbeinstellungen können dazu führen, dass das Gerät nicht mehr genutzt werden kann. Klicke auf \"OK\", um diese Farbeinstellungen zu bestätigen. Anderenfalls werden diese Einstellungen in 10 Sekunden zurückgesetzt."</string> - <string name="battery_panel_title" msgid="3476715163685592453">"Akku (<xliff:g id="ID_1">%1$d</xliff:g> %%)"</string> + <!-- no translation found for battery_panel_title (7944156115535366613) --> + <skip /> <string name="battery_detail_charging_summary" msgid="1279095653533044008">"Der Energiesparmodus ist beim Aufladen nicht verfügbar."</string> <string name="battery_detail_switch_title" msgid="6285872470260795421">"Energiesparmodus"</string> <string name="battery_detail_switch_summary" msgid="9049111149407626804">"Reduzierung der Leistung und Hintergrunddaten"</string> diff --git a/packages/SystemUI/res/values-el/strings.xml b/packages/SystemUI/res/values-el/strings.xml index a25660a811f9..ca354dc7cb6e 100644 --- a/packages/SystemUI/res/values-el/strings.xml +++ b/packages/SystemUI/res/values-el/strings.xml @@ -479,7 +479,8 @@ <string name="color_apply" msgid="9212602012641034283">"Εφαρμογή"</string> <string name="color_revert_title" msgid="4746666545480534663">"Επιβεβαίωση ρυθμίσεων"</string> <string name="color_revert_message" msgid="9116001069397996691">"Ορισμένες ρυθμίσεις χρωμάτων μπορεί να μην επιτρέπουν τη χρήση αυτής της συσκευής. Κάντε κλικ στην επιλογή OK για να επιβεβαιώσετε αυτές τις ρυθμίσεις χρωμάτων, διαφορετικά θα γίνει επαναφορά αυτών των ρυθμίσεων μετά από 10 δευτερόλεπτα."</string> - <string name="battery_panel_title" msgid="3476715163685592453">"Μπαταρία (<xliff:g id="ID_1">%1$d</xliff:g>%%)"</string> + <!-- no translation found for battery_panel_title (7944156115535366613) --> + <skip /> <string name="battery_detail_charging_summary" msgid="1279095653533044008">"Η εξοικονόμηση μπαταρίας δεν είναι διαθέσιμη κατά τη διάρκεια της φόρτισης"</string> <string name="battery_detail_switch_title" msgid="6285872470260795421">"Εξοικονόμηση μπαταρίας"</string> <string name="battery_detail_switch_summary" msgid="9049111149407626804">"Μειώνει την απόδοση και τα δεδομένα παρασκηνίου"</string> diff --git a/packages/SystemUI/res/values-en-rAU/strings.xml b/packages/SystemUI/res/values-en-rAU/strings.xml index 8059a8b49f83..14f930192857 100644 --- a/packages/SystemUI/res/values-en-rAU/strings.xml +++ b/packages/SystemUI/res/values-en-rAU/strings.xml @@ -301,8 +301,7 @@ <string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"screen pinning"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"search"</string> <string name="recents_launch_error_message" msgid="2969287838120550506">"Could not start <xliff:g id="APP">%s</xliff:g>."</string> - <!-- no translation found for recents_launch_disabled_message (1624523193008871793) --> - <skip /> + <string name="recents_launch_disabled_message" msgid="1624523193008871793">"<xliff:g id="APP">%s</xliff:g> is disabled in safe-mode."</string> <string name="recents_history_button_label" msgid="5153358867807604821">"History"</string> <string name="recents_history_clear_all_button_label" msgid="5905258334958006953">"Clear"</string> <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Split Horizontal"</string> @@ -479,7 +478,7 @@ <string name="color_apply" msgid="9212602012641034283">"Apply"</string> <string name="color_revert_title" msgid="4746666545480534663">"Confirm Settings"</string> <string name="color_revert_message" msgid="9116001069397996691">"Some colour settings can make this device unusable. Click OK to confirm these colour settings, otherwise these settings will reset after 10 seconds."</string> - <string name="battery_panel_title" msgid="3476715163685592453">"Battery (<xliff:g id="ID_1">%1$d</xliff:g>%%)"</string> + <string name="battery_panel_title" msgid="7944156115535366613">"Battery usage"</string> <string name="battery_detail_charging_summary" msgid="1279095653533044008">"Battery Saver not available during charging"</string> <string name="battery_detail_switch_title" msgid="6285872470260795421">"Battery Saver"</string> <string name="battery_detail_switch_summary" msgid="9049111149407626804">"Reduces performance and background data"</string> diff --git a/packages/SystemUI/res/values-en-rGB/strings.xml b/packages/SystemUI/res/values-en-rGB/strings.xml index 8059a8b49f83..14f930192857 100644 --- a/packages/SystemUI/res/values-en-rGB/strings.xml +++ b/packages/SystemUI/res/values-en-rGB/strings.xml @@ -301,8 +301,7 @@ <string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"screen pinning"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"search"</string> <string name="recents_launch_error_message" msgid="2969287838120550506">"Could not start <xliff:g id="APP">%s</xliff:g>."</string> - <!-- no translation found for recents_launch_disabled_message (1624523193008871793) --> - <skip /> + <string name="recents_launch_disabled_message" msgid="1624523193008871793">"<xliff:g id="APP">%s</xliff:g> is disabled in safe-mode."</string> <string name="recents_history_button_label" msgid="5153358867807604821">"History"</string> <string name="recents_history_clear_all_button_label" msgid="5905258334958006953">"Clear"</string> <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Split Horizontal"</string> @@ -479,7 +478,7 @@ <string name="color_apply" msgid="9212602012641034283">"Apply"</string> <string name="color_revert_title" msgid="4746666545480534663">"Confirm Settings"</string> <string name="color_revert_message" msgid="9116001069397996691">"Some colour settings can make this device unusable. Click OK to confirm these colour settings, otherwise these settings will reset after 10 seconds."</string> - <string name="battery_panel_title" msgid="3476715163685592453">"Battery (<xliff:g id="ID_1">%1$d</xliff:g>%%)"</string> + <string name="battery_panel_title" msgid="7944156115535366613">"Battery usage"</string> <string name="battery_detail_charging_summary" msgid="1279095653533044008">"Battery Saver not available during charging"</string> <string name="battery_detail_switch_title" msgid="6285872470260795421">"Battery Saver"</string> <string name="battery_detail_switch_summary" msgid="9049111149407626804">"Reduces performance and background data"</string> diff --git a/packages/SystemUI/res/values-en-rIN/strings.xml b/packages/SystemUI/res/values-en-rIN/strings.xml index 8059a8b49f83..14f930192857 100644 --- a/packages/SystemUI/res/values-en-rIN/strings.xml +++ b/packages/SystemUI/res/values-en-rIN/strings.xml @@ -301,8 +301,7 @@ <string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"screen pinning"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"search"</string> <string name="recents_launch_error_message" msgid="2969287838120550506">"Could not start <xliff:g id="APP">%s</xliff:g>."</string> - <!-- no translation found for recents_launch_disabled_message (1624523193008871793) --> - <skip /> + <string name="recents_launch_disabled_message" msgid="1624523193008871793">"<xliff:g id="APP">%s</xliff:g> is disabled in safe-mode."</string> <string name="recents_history_button_label" msgid="5153358867807604821">"History"</string> <string name="recents_history_clear_all_button_label" msgid="5905258334958006953">"Clear"</string> <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Split Horizontal"</string> @@ -479,7 +478,7 @@ <string name="color_apply" msgid="9212602012641034283">"Apply"</string> <string name="color_revert_title" msgid="4746666545480534663">"Confirm Settings"</string> <string name="color_revert_message" msgid="9116001069397996691">"Some colour settings can make this device unusable. Click OK to confirm these colour settings, otherwise these settings will reset after 10 seconds."</string> - <string name="battery_panel_title" msgid="3476715163685592453">"Battery (<xliff:g id="ID_1">%1$d</xliff:g>%%)"</string> + <string name="battery_panel_title" msgid="7944156115535366613">"Battery usage"</string> <string name="battery_detail_charging_summary" msgid="1279095653533044008">"Battery Saver not available during charging"</string> <string name="battery_detail_switch_title" msgid="6285872470260795421">"Battery Saver"</string> <string name="battery_detail_switch_summary" msgid="9049111149407626804">"Reduces performance and background data"</string> diff --git a/packages/SystemUI/res/values-es-rUS/strings.xml b/packages/SystemUI/res/values-es-rUS/strings.xml index 9511c3e83460..4031204cc935 100644 --- a/packages/SystemUI/res/values-es-rUS/strings.xml +++ b/packages/SystemUI/res/values-es-rUS/strings.xml @@ -479,7 +479,8 @@ <string name="color_apply" msgid="9212602012641034283">"Aplicar"</string> <string name="color_revert_title" msgid="4746666545480534663">"Confirmar la configuración"</string> <string name="color_revert_message" msgid="9116001069397996691">"Algunas opciones de configuración de color pueden provocar que el dispositivo quede inutilizable. Haz clic en Aceptar para confirmar estos parámetros de color. De lo contrario, la configuración se restablecerá en diez segundos."</string> - <string name="battery_panel_title" msgid="3476715163685592453">"Batería (<xliff:g id="ID_1">%1$d</xliff:g>%%)"</string> + <!-- no translation found for battery_panel_title (7944156115535366613) --> + <skip /> <string name="battery_detail_charging_summary" msgid="1279095653533044008">"Ahorro de batería no está disponible durante la carga"</string> <string name="battery_detail_switch_title" msgid="6285872470260795421">"Ahorro de batería"</string> <string name="battery_detail_switch_summary" msgid="9049111149407626804">"Reduce el rendimiento y el uso de datos en segundo plano"</string> diff --git a/packages/SystemUI/res/values-es/strings.xml b/packages/SystemUI/res/values-es/strings.xml index faf4aad6d8d3..f531294297bf 100644 --- a/packages/SystemUI/res/values-es/strings.xml +++ b/packages/SystemUI/res/values-es/strings.xml @@ -479,7 +479,8 @@ <string name="color_apply" msgid="9212602012641034283">"Aplicar"</string> <string name="color_revert_title" msgid="4746666545480534663">"Confirmar configuración"</string> <string name="color_revert_message" msgid="9116001069397996691">"Algunas opciones de configuración de color pueden hacer que el dispositivo no se pueda utilizar. Haz clic en Aceptar para confirmar esta configuración. Si no lo haces, se restablecerá esta configuración cuando transcurran 10 segundos."</string> - <string name="battery_panel_title" msgid="3476715163685592453">"Batería (<xliff:g id="ID_1">%1$d</xliff:g>%%)"</string> + <!-- no translation found for battery_panel_title (7944156115535366613) --> + <skip /> <string name="battery_detail_charging_summary" msgid="1279095653533044008">"Ahorro de batería no disponible mientras se carga el dispositivo"</string> <string name="battery_detail_switch_title" msgid="6285872470260795421">"Ahorro de batería"</string> <string name="battery_detail_switch_summary" msgid="9049111149407626804">"Reduce el rendimiento y las conexiones automáticas"</string> diff --git a/packages/SystemUI/res/values-et-rEE/strings.xml b/packages/SystemUI/res/values-et-rEE/strings.xml index e196e2a3fc4e..a7e34e6fb455 100644 --- a/packages/SystemUI/res/values-et-rEE/strings.xml +++ b/packages/SystemUI/res/values-et-rEE/strings.xml @@ -301,8 +301,7 @@ <string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"ekraanikuva kinnitamine"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"otsing"</string> <string name="recents_launch_error_message" msgid="2969287838120550506">"Rakendust <xliff:g id="APP">%s</xliff:g> ei saanud käivitada."</string> - <!-- no translation found for recents_launch_disabled_message (1624523193008871793) --> - <skip /> + <string name="recents_launch_disabled_message" msgid="1624523193008871793">"Rakendus <xliff:g id="APP">%s</xliff:g> on turvarežiimis keelatud."</string> <string name="recents_history_button_label" msgid="5153358867807604821">"Ajalugu"</string> <string name="recents_history_clear_all_button_label" msgid="5905258334958006953">"Kustuta"</string> <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Horisontaalne poolitamine"</string> @@ -479,7 +478,7 @@ <string name="color_apply" msgid="9212602012641034283">"Rakenda"</string> <string name="color_revert_title" msgid="4746666545480534663">"Seadete kinnitamine"</string> <string name="color_revert_message" msgid="9116001069397996691">"Mõni värviseade ei saa seadet võib-olla kasutada. Nende värviseadete kinnitamiseks klõpsake OK, muidu lähtestatakse need seaded 10 sekundi pärast."</string> - <string name="battery_panel_title" msgid="3476715163685592453">"Aku (<xliff:g id="ID_1">%1$d</xliff:g>%%)"</string> + <string name="battery_panel_title" msgid="7944156115535366613">"Akukasutus"</string> <string name="battery_detail_charging_summary" msgid="1279095653533044008">"Akusäästja pole laadimise ajal saadaval"</string> <string name="battery_detail_switch_title" msgid="6285872470260795421">"Akusäästja"</string> <string name="battery_detail_switch_summary" msgid="9049111149407626804">"Vähendab jõudlust ja taustaandmeid"</string> diff --git a/packages/SystemUI/res/values-eu-rES/strings.xml b/packages/SystemUI/res/values-eu-rES/strings.xml index eee6427fa21d..dcb8ef9431c4 100644 --- a/packages/SystemUI/res/values-eu-rES/strings.xml +++ b/packages/SystemUI/res/values-eu-rES/strings.xml @@ -479,7 +479,8 @@ <string name="color_apply" msgid="9212602012641034283">"Aplikatu"</string> <string name="color_revert_title" msgid="4746666545480534663">"Berretsi ezarpenak"</string> <string name="color_revert_message" msgid="9116001069397996691">"Baliteke gailua kolore-ezarpen batzuekin ezin erabili izatea. Kolore-ezarpenak berresteko, sakatu Ados. Bestela, hamar segundoren buruan berrezarriko dira ezarpenak."</string> - <string name="battery_panel_title" msgid="3476715163685592453">"Bateria (%% <xliff:g id="ID_1">%1$d</xliff:g>)"</string> + <!-- no translation found for battery_panel_title (7944156115535366613) --> + <skip /> <string name="battery_detail_charging_summary" msgid="1279095653533044008">"Bateria-aurrezlea ez dago erabilgarri gailua kargatzen ari denean"</string> <string name="battery_detail_switch_title" msgid="6285872470260795421">"Bateria-aurrezlea"</string> <string name="battery_detail_switch_summary" msgid="9049111149407626804">"Errendimendua eta atzeko planoko datuen erabilera murrizten ditu"</string> diff --git a/packages/SystemUI/res/values-fa/strings.xml b/packages/SystemUI/res/values-fa/strings.xml index 28b7171ec6bd..851a6cbb9119 100644 --- a/packages/SystemUI/res/values-fa/strings.xml +++ b/packages/SystemUI/res/values-fa/strings.xml @@ -479,7 +479,8 @@ <string name="color_apply" msgid="9212602012641034283">"اعمال کردن"</string> <string name="color_revert_title" msgid="4746666545480534663">"تأیید تنظیمات"</string> <string name="color_revert_message" msgid="9116001069397996691">"بعضی از تنظیمات رنگ میتوانند این دستگاه را غیرقابل استفاده کنند. برای تأیید این تنظیمات رنگ روی «تأیید» کلیک کنید، در غیر این صورت این تغییرات بعد از ۱۰ ثانیه بازنشانی میشوند."</string> - <string name="battery_panel_title" msgid="3476715163685592453">"باتری (<xliff:g id="ID_1">%1$d</xliff:g>٪٪)"</string> + <!-- no translation found for battery_panel_title (7944156115535366613) --> + <skip /> <string name="battery_detail_charging_summary" msgid="1279095653533044008">"هنگام شارژ شدن، «بهینهسازی باتری» در دسترس نیست"</string> <string name="battery_detail_switch_title" msgid="6285872470260795421">"بهینهسازی باتری"</string> <string name="battery_detail_switch_summary" msgid="9049111149407626804">"عملکرد و اطلاعات پسزمینه را کاهش میدهد"</string> diff --git a/packages/SystemUI/res/values-fi/strings.xml b/packages/SystemUI/res/values-fi/strings.xml index 9f264f548e8e..d44bd7522679 100644 --- a/packages/SystemUI/res/values-fi/strings.xml +++ b/packages/SystemUI/res/values-fi/strings.xml @@ -479,7 +479,8 @@ <string name="color_apply" msgid="9212602012641034283">"Käytä"</string> <string name="color_revert_title" msgid="4746666545480534663">"Vahvista asetukset"</string> <string name="color_revert_message" msgid="9116001069397996691">"Jotkin väriasetukset voivat häiritä laitteen käyttöä. Vahvista uudet väriasetukset valitsemalla OK. Muussa tapauksessa aiemmat asetukset palautetaan 10 sekunnin kuluttua."</string> - <string name="battery_panel_title" msgid="3476715163685592453">"Akku (<xliff:g id="ID_1">%1$d</xliff:g> %%)"</string> + <!-- no translation found for battery_panel_title (7944156115535366613) --> + <skip /> <string name="battery_detail_charging_summary" msgid="1279095653533044008">"Virransäästö ei ole käytettävissä latauksen aikana."</string> <string name="battery_detail_switch_title" msgid="6285872470260795421">"Virransäästö"</string> <string name="battery_detail_switch_summary" msgid="9049111149407626804">"Rajoittaa suorituskykyä ja taustatiedonsiirtoa."</string> diff --git a/packages/SystemUI/res/values-fr-rCA/strings.xml b/packages/SystemUI/res/values-fr-rCA/strings.xml index 8b3981c5d6a6..d34723f3c24b 100644 --- a/packages/SystemUI/res/values-fr-rCA/strings.xml +++ b/packages/SystemUI/res/values-fr-rCA/strings.xml @@ -479,7 +479,8 @@ <string name="color_apply" msgid="9212602012641034283">"Appliquer"</string> <string name="color_revert_title" msgid="4746666545480534663">"Confirmer les paramètres"</string> <string name="color_revert_message" msgid="9116001069397996691">"Certains paramètres de couleurs peuvent rendre cet appareil inutilisable. Cliquez sur « OK » pour valider ces paramètres, sinon ils seront réinitialisés après 10 secondes."</string> - <string name="battery_panel_title" msgid="3476715163685592453">"Pile (<xliff:g id="ID_1">%1$d</xliff:g> %%)"</string> + <!-- no translation found for battery_panel_title (7944156115535366613) --> + <skip /> <string name="battery_detail_charging_summary" msgid="1279095653533044008">"Le mode Économie d\'énergie n\'est pas accessible pendant la charge"</string> <string name="battery_detail_switch_title" msgid="6285872470260795421">"Économie d\'énergie"</string> <string name="battery_detail_switch_summary" msgid="9049111149407626804">"Réduit les performances et les données en arrière-plan"</string> diff --git a/packages/SystemUI/res/values-fr/strings.xml b/packages/SystemUI/res/values-fr/strings.xml index c3bcbba34260..241d34c6e219 100644 --- a/packages/SystemUI/res/values-fr/strings.xml +++ b/packages/SystemUI/res/values-fr/strings.xml @@ -479,7 +479,8 @@ <string name="color_apply" msgid="9212602012641034283">"Appliquer"</string> <string name="color_revert_title" msgid="4746666545480534663">"Vérifier les paramètres"</string> <string name="color_revert_message" msgid="9116001069397996691">"Certains paramètres de couleurs peuvent rendre cet appareil inutilisable. Cliquez sur \"OK\" pour valider ces paramètres, sans quoi ils seront réinitialisés après 10 secondes."</string> - <string name="battery_panel_title" msgid="3476715163685592453">"Batterie (<xliff:g id="ID_1">%1$d</xliff:g> %%)"</string> + <!-- no translation found for battery_panel_title (7944156115535366613) --> + <skip /> <string name="battery_detail_charging_summary" msgid="1279095653533044008">"L\'économiseur de batterie n\'est pas disponible lorsque l\'appareil est en charge."</string> <string name="battery_detail_switch_title" msgid="6285872470260795421">"Économiseur de batterie"</string> <string name="battery_detail_switch_summary" msgid="9049111149407626804">"Limite les performances et les données en arrière-plan."</string> diff --git a/packages/SystemUI/res/values-gl-rES/strings.xml b/packages/SystemUI/res/values-gl-rES/strings.xml index b8decfff8825..75e47a57a34c 100644 --- a/packages/SystemUI/res/values-gl-rES/strings.xml +++ b/packages/SystemUI/res/values-gl-rES/strings.xml @@ -479,7 +479,8 @@ <string name="color_apply" msgid="9212602012641034283">"Aplicar"</string> <string name="color_revert_title" msgid="4746666545480534663">"Confirmar configuración"</string> <string name="color_revert_message" msgid="9116001069397996691">"Algunhas opcións de configuración de cor poden facer que este dispositivo sexa inutilizable. Fai clic en Aceptar para confirmar esta configuración de cor; en caso contrario, a configuración restablecerase tras 10 segundos."</string> - <string name="battery_panel_title" msgid="3476715163685592453">"Batería (<xliff:g id="ID_1">%1$d</xliff:g> %%)"</string> + <!-- no translation found for battery_panel_title (7944156115535366613) --> + <skip /> <string name="battery_detail_charging_summary" msgid="1279095653533044008">"A función aforro de batería non está dispoñible durante a carga"</string> <string name="battery_detail_switch_title" msgid="6285872470260795421">"Aforro de batería"</string> <string name="battery_detail_switch_summary" msgid="9049111149407626804">"Reduce o rendemento e os datos en segundo plano"</string> diff --git a/packages/SystemUI/res/values-gu-rIN/strings.xml b/packages/SystemUI/res/values-gu-rIN/strings.xml index 53bd6cd66255..45a4eafd2046 100644 --- a/packages/SystemUI/res/values-gu-rIN/strings.xml +++ b/packages/SystemUI/res/values-gu-rIN/strings.xml @@ -479,7 +479,8 @@ <string name="color_apply" msgid="9212602012641034283">"લાગુ કરો"</string> <string name="color_revert_title" msgid="4746666545480534663">"સેટિંગ્સની પુષ્ટિ કરો"</string> <string name="color_revert_message" msgid="9116001069397996691">"કેટલીક રંગ સેટિંગ્સ આ ઉપકરણને બિનઉપયોગી બનાવી શકે છે. આ રંગ સેટિંગ્સની પુષ્ટિ કરવા માટે ઑકે ક્લિક કરો, અન્યથા 10 સેકંડ પછી આ સેટિંગ્સ ફરીથી સેટ થશે."</string> - <string name="battery_panel_title" msgid="3476715163685592453">"બૅટરી (<xliff:g id="ID_1">%1$d</xliff:g>%%)"</string> + <!-- no translation found for battery_panel_title (7944156115535366613) --> + <skip /> <string name="battery_detail_charging_summary" msgid="1279095653533044008">"ચાર્જિંગ દરમિયાન બૅટરી બચતકર્તા ઉપલબ્ધ નથી"</string> <string name="battery_detail_switch_title" msgid="6285872470260795421">"બૅટરી બચતકર્તા"</string> <string name="battery_detail_switch_summary" msgid="9049111149407626804">"પ્રદર્શન અને પૃષ્ઠભૂમિ ડેટા ઘટાડે છે"</string> diff --git a/packages/SystemUI/res/values-hi/strings.xml b/packages/SystemUI/res/values-hi/strings.xml index a91917e01800..7349827505fb 100644 --- a/packages/SystemUI/res/values-hi/strings.xml +++ b/packages/SystemUI/res/values-hi/strings.xml @@ -301,8 +301,7 @@ <string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"स्क्रीन पिन करना"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"खोज"</string> <string name="recents_launch_error_message" msgid="2969287838120550506">"<xliff:g id="APP">%s</xliff:g> प्रारंभ नहीं किया जा सका."</string> - <!-- no translation found for recents_launch_disabled_message (1624523193008871793) --> - <skip /> + <string name="recents_launch_disabled_message" msgid="1624523193008871793">"<xliff:g id="APP">%s</xliff:g> को सुरक्षित-मोड में अक्षम किया गया."</string> <string name="recents_history_button_label" msgid="5153358867807604821">"इतिहास"</string> <string name="recents_history_clear_all_button_label" msgid="5905258334958006953">"साफ़ करें"</string> <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"क्षैतिज रूप से विभाजित करें"</string> @@ -479,7 +478,7 @@ <string name="color_apply" msgid="9212602012641034283">"लागू करें"</string> <string name="color_revert_title" msgid="4746666545480534663">"सेेटिंग की पुष्टि करें"</string> <string name="color_revert_message" msgid="9116001069397996691">"कुछ रंग सेटिंग इस डिवाइस को अनुपयोगी बना सकती हैं. इन रंग सेटिंग की पुष्टि करने के लिए ठीक क्लिक करें, अन्यथा 10 सेकंड के बाद ये सेटिंग रीसेट हो जाएंगी."</string> - <string name="battery_panel_title" msgid="3476715163685592453">"बैटरी (<xliff:g id="ID_1">%1$d</xliff:g>%%)"</string> + <string name="battery_panel_title" msgid="7944156115535366613">"बैटरी उपयोग"</string> <string name="battery_detail_charging_summary" msgid="1279095653533044008">"चार्ज किए जाने के दौरान बैटरी सेवर उपलब्ध नहीं है"</string> <string name="battery_detail_switch_title" msgid="6285872470260795421">"बैटरी सेवर"</string> <string name="battery_detail_switch_summary" msgid="9049111149407626804">"निष्पादन और पृष्ठभूमि डेटा को कम करता है"</string> diff --git a/packages/SystemUI/res/values-hr/strings.xml b/packages/SystemUI/res/values-hr/strings.xml index 0a50a47f2504..067211747e65 100644 --- a/packages/SystemUI/res/values-hr/strings.xml +++ b/packages/SystemUI/res/values-hr/strings.xml @@ -480,7 +480,7 @@ <string name="color_apply" msgid="9212602012641034283">"Primijeni"</string> <string name="color_revert_title" msgid="4746666545480534663">"Potvrdite postavke"</string> <string name="color_revert_message" msgid="9116001069397996691">"Neke postavke boja mogu učiniti uređaj neupotrebljivim. Kliknite U redu da biste potvrdili postavke boja jer će se u suprotnom poništiti za 10 sekundi."</string> - <string name="battery_panel_title" msgid="3476715163685592453">"Baterija (<xliff:g id="ID_1">%1$d</xliff:g>%%)"</string> + <string name="battery_panel_title" msgid="7944156115535366613">"Potrošnja baterije"</string> <string name="battery_detail_charging_summary" msgid="1279095653533044008">"Štednja baterije nije dostupna tijekom punjenja"</string> <string name="battery_detail_switch_title" msgid="6285872470260795421">"Štednja baterije"</string> <string name="battery_detail_switch_summary" msgid="9049111149407626804">"Smanjuje količinu rada i pozadinske podatke"</string> diff --git a/packages/SystemUI/res/values-hu/strings.xml b/packages/SystemUI/res/values-hu/strings.xml index e2cdf3c6f1e1..0dd5d45fc739 100644 --- a/packages/SystemUI/res/values-hu/strings.xml +++ b/packages/SystemUI/res/values-hu/strings.xml @@ -301,8 +301,7 @@ <string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"képernyő rögzítése"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"keresés"</string> <string name="recents_launch_error_message" msgid="2969287838120550506">"Nem lehet elindítani a következőt: <xliff:g id="APP">%s</xliff:g>."</string> - <!-- no translation found for recents_launch_disabled_message (1624523193008871793) --> - <skip /> + <string name="recents_launch_disabled_message" msgid="1624523193008871793">"A(z) <xliff:g id="APP">%s</xliff:g> csökkentett módban ki van kapcsolva."</string> <string name="recents_history_button_label" msgid="5153358867807604821">"Előzmények"</string> <string name="recents_history_clear_all_button_label" msgid="5905258334958006953">"Törlés"</string> <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Osztott vízszintes"</string> @@ -479,7 +478,7 @@ <string name="color_apply" msgid="9212602012641034283">"Alkalmaz"</string> <string name="color_revert_title" msgid="4746666545480534663">"Beállítások megerősítése"</string> <string name="color_revert_message" msgid="9116001069397996691">"Bizonyos színbeállítások használhatatlanná tehetik ezt az eszközt. A színbeállítás megerősítéséhez kattintson az OK lehetőségre, máskülönben a rendszer 10 másodpercen belül visszaáll a korábbira."</string> - <string name="battery_panel_title" msgid="3476715163685592453">"Akkumulátor (<xliff:g id="ID_1">%1$d</xliff:g>%%)"</string> + <string name="battery_panel_title" msgid="7944156115535366613">"Akkumulátorhasználat"</string> <string name="battery_detail_charging_summary" msgid="1279095653533044008">"Az Akkumulátorkímélő módot töltés közben nem lehet használni"</string> <string name="battery_detail_switch_title" msgid="6285872470260795421">"Akkumulátorkímélő mód"</string> <string name="battery_detail_switch_summary" msgid="9049111149407626804">"Csökkenti a teljesítményt és a háttéradatok használatát"</string> diff --git a/packages/SystemUI/res/values-hy-rAM/strings.xml b/packages/SystemUI/res/values-hy-rAM/strings.xml index 77b615461299..4f4af55e6303 100644 --- a/packages/SystemUI/res/values-hy-rAM/strings.xml +++ b/packages/SystemUI/res/values-hy-rAM/strings.xml @@ -479,7 +479,8 @@ <string name="color_apply" msgid="9212602012641034283">"Կիրառել"</string> <string name="color_revert_title" msgid="4746666545480534663">"Հաստատել կարգավորումները"</string> <string name="color_revert_message" msgid="9116001069397996691">"Գունային որոշ կարգավորումները կարող են այս սարքը օգտագործման համար ոչ պիտանի դարձնել: Սեղմեք Լավ կոճակը՝ գունային այս կարգավորումները հաստատելու համար: Հակառակ դեպքում այս կարգավորումները կվերակայվեն 10 վայրկյան հետո:"</string> - <string name="battery_panel_title" msgid="3476715163685592453">"Մարտկոց (<xliff:g id="ID_1">%1$d</xliff:g>%%)"</string> + <!-- no translation found for battery_panel_title (7944156115535366613) --> + <skip /> <string name="battery_detail_charging_summary" msgid="1279095653533044008">"Մարտկոցի տնտեսումը լիցքավորման ժամանակ հասանելի չէ"</string> <string name="battery_detail_switch_title" msgid="6285872470260795421">"Մարտկոցի տնտեսում"</string> <string name="battery_detail_switch_summary" msgid="9049111149407626804">"Նվազեցնում է ծանրաբեռնվածությունը և ֆոնային տվյալները"</string> diff --git a/packages/SystemUI/res/values-in/strings.xml b/packages/SystemUI/res/values-in/strings.xml index 747e362b9a6d..fa359addc594 100644 --- a/packages/SystemUI/res/values-in/strings.xml +++ b/packages/SystemUI/res/values-in/strings.xml @@ -479,7 +479,8 @@ <string name="color_apply" msgid="9212602012641034283">"Terapkan"</string> <string name="color_revert_title" msgid="4746666545480534663">"Konfirmasi setelan"</string> <string name="color_revert_message" msgid="9116001069397996691">"Beberapa setelan warna dapat membuat perangkat ini tidak dapat digunakan. Klik OKE untuk mengonfirmasi setelan warna ini. Jika tidak, setelan ini akan disetel ulang setelah 10 detik."</string> - <string name="battery_panel_title" msgid="3476715163685592453">"Baterai (<xliff:g id="ID_1">%1$d</xliff:g>%%)"</string> + <!-- no translation found for battery_panel_title (7944156115535366613) --> + <skip /> <string name="battery_detail_charging_summary" msgid="1279095653533044008">"Penghemat Baterai tidak tersedia selama pengisian daya"</string> <string name="battery_detail_switch_title" msgid="6285872470260795421">"Penghemat Baterai"</string> <string name="battery_detail_switch_summary" msgid="9049111149407626804">"Mengurangi performa dan data latar belakang"</string> diff --git a/packages/SystemUI/res/values-is-rIS/strings.xml b/packages/SystemUI/res/values-is-rIS/strings.xml index 3d363a60fcb3..2fca674b0896 100644 --- a/packages/SystemUI/res/values-is-rIS/strings.xml +++ b/packages/SystemUI/res/values-is-rIS/strings.xml @@ -479,7 +479,8 @@ <string name="color_apply" msgid="9212602012641034283">"Nota"</string> <string name="color_revert_title" msgid="4746666545480534663">"Staðfesta stillingar"</string> <string name="color_revert_message" msgid="9116001069397996691">"Sumar litastillingar kunna að bitna á notagildi tækisins. Veldu „Í lagi“ til að staðfesta þessar litastillingar, að öðrum kosti verða litirnir endurstilltir eftir tíu sekúndur."</string> - <string name="battery_panel_title" msgid="3476715163685592453">"Rafhlaða (<xliff:g id="ID_1">%1$d</xliff:g>%%)"</string> + <!-- no translation found for battery_panel_title (7944156115535366613) --> + <skip /> <string name="battery_detail_charging_summary" msgid="1279095653533044008">"Ekki er hægt að nota rafhlöðusparnað meðan á hleðslu stendur"</string> <string name="battery_detail_switch_title" msgid="6285872470260795421">"Rafhlöðusparnaður"</string> <string name="battery_detail_switch_summary" msgid="9049111149407626804">"Dregur úr afköstum og bakgrunnsgögnum"</string> diff --git a/packages/SystemUI/res/values-it/strings.xml b/packages/SystemUI/res/values-it/strings.xml index 06176049a4ad..c2c05b4f887f 100644 --- a/packages/SystemUI/res/values-it/strings.xml +++ b/packages/SystemUI/res/values-it/strings.xml @@ -479,7 +479,8 @@ <string name="color_apply" msgid="9212602012641034283">"Applica"</string> <string name="color_revert_title" msgid="4746666545480534663">"Conferma le impostazioni"</string> <string name="color_revert_message" msgid="9116001069397996691">"Alcune impostazioni relative ai colori potrebbero rendere inutilizzabile il dispositivo. Fai clic su OK per confermare queste impostazioni; in caso contrario, le impostazioni verranno reimpostate dopo 10 secondi."</string> - <string name="battery_panel_title" msgid="3476715163685592453">"Batteria (<xliff:g id="ID_1">%1$d</xliff:g>%%)"</string> + <!-- no translation found for battery_panel_title (7944156115535366613) --> + <skip /> <string name="battery_detail_charging_summary" msgid="1279095653533044008">"Risparmio energetico non disponibile durante la ricarica"</string> <string name="battery_detail_switch_title" msgid="6285872470260795421">"Risparmio energetico"</string> <string name="battery_detail_switch_summary" msgid="9049111149407626804">"Riduce le prestazioni e i dati in background"</string> diff --git a/packages/SystemUI/res/values-iw/strings.xml b/packages/SystemUI/res/values-iw/strings.xml index 8f60c7b96359..2601d36f4358 100644 --- a/packages/SystemUI/res/values-iw/strings.xml +++ b/packages/SystemUI/res/values-iw/strings.xml @@ -481,7 +481,8 @@ <string name="color_apply" msgid="9212602012641034283">"החל"</string> <string name="color_revert_title" msgid="4746666545480534663">"אישור הגדרות"</string> <string name="color_revert_message" msgid="9116001069397996691">"הגדרות צבע מסוימות עלולות להפוך את המכשיר הזה לבלתי שמיש. לחץ על אישור כדי לאשר את הגדרות הצבע האלה, אחרת הגדרות אלה יתאפסו לאחר 10 שניות."</string> - <string name="battery_panel_title" msgid="3476715163685592453">"סוללה (<xliff:g id="ID_1">%1$d</xliff:g>%%)"</string> + <!-- no translation found for battery_panel_title (7944156115535366613) --> + <skip /> <string name="battery_detail_charging_summary" msgid="1279095653533044008">"תכונת החיסכון בסוללה אינה זמינה בעת טעינת המכשיר"</string> <string name="battery_detail_switch_title" msgid="6285872470260795421">"חיסכון בסוללה"</string> <string name="battery_detail_switch_summary" msgid="9049111149407626804">"מפחית את רמת הביצועים ואת נתוני הרקע"</string> diff --git a/packages/SystemUI/res/values-ja/strings.xml b/packages/SystemUI/res/values-ja/strings.xml index ed453080dcdf..27b3854b46a8 100644 --- a/packages/SystemUI/res/values-ja/strings.xml +++ b/packages/SystemUI/res/values-ja/strings.xml @@ -479,7 +479,8 @@ <string name="color_apply" msgid="9212602012641034283">"適用"</string> <string name="color_revert_title" msgid="4746666545480534663">"設定の確認"</string> <string name="color_revert_message" msgid="9116001069397996691">"一部の色設定を適用すると、この端末を使用できなくなることがあります。この色設定を確認するには、[OK] をクリックしてください。確認しない場合、10 秒後に設定はリセットされます。"</string> - <string name="battery_panel_title" msgid="3476715163685592453">"バッテリー（<xliff:g id="ID_1">%1$d</xliff:g>%%）"</string> + <!-- no translation found for battery_panel_title (7944156115535366613) --> + <skip /> <string name="battery_detail_charging_summary" msgid="1279095653533044008">"充電中はバッテリー セーバーは利用できません"</string> <string name="battery_detail_switch_title" msgid="6285872470260795421">"バッテリー セーバー"</string> <string name="battery_detail_switch_summary" msgid="9049111149407626804">"パフォーマンスとバックグラウンド データを制限します"</string> diff --git a/packages/SystemUI/res/values-ka-rGE/strings.xml b/packages/SystemUI/res/values-ka-rGE/strings.xml index f0164d55e953..dc48079e43c9 100644 --- a/packages/SystemUI/res/values-ka-rGE/strings.xml +++ b/packages/SystemUI/res/values-ka-rGE/strings.xml @@ -479,7 +479,8 @@ <string name="color_apply" msgid="9212602012641034283">"გამოყენება"</string> <string name="color_revert_title" msgid="4746666545480534663">"პარამეტრების დადასტურება"</string> <string name="color_revert_message" msgid="9116001069397996691">"ფერთა ზოგიერთ პარამეტრს ამ მოწყობილობასთან მუშაობის გართულება შეუძლია. ფერთა ამჟამინდელი პარამეტრების დასადასტურებლად, დააწკაპუნეთ „კარგი“-ზე. წინააღმდეგ შემთხვევაში, პარამეტრები 10 წამის შემდეგ ჩამოიყრება."</string> - <string name="battery_panel_title" msgid="3476715163685592453">"ბატარეა (<xliff:g id="ID_1">%1$d</xliff:g>%%)"</string> + <!-- no translation found for battery_panel_title (7944156115535366613) --> + <skip /> <string name="battery_detail_charging_summary" msgid="1279095653533044008">"ბატარეის დამზოგი დატენვისას მიწვდომელია"</string> <string name="battery_detail_switch_title" msgid="6285872470260795421">"ბატარეის დამზოგი"</string> <string name="battery_detail_switch_summary" msgid="9049111149407626804">"ამცირებს წარმადობას და ფონურ მონაცემებს"</string> diff --git a/packages/SystemUI/res/values-kk-rKZ/strings.xml b/packages/SystemUI/res/values-kk-rKZ/strings.xml index 4e856ad68834..1268e41aaed5 100644 --- a/packages/SystemUI/res/values-kk-rKZ/strings.xml +++ b/packages/SystemUI/res/values-kk-rKZ/strings.xml @@ -479,7 +479,8 @@ <string name="color_apply" msgid="9212602012641034283">"Қолдану"</string> <string name="color_revert_title" msgid="4746666545480534663">"Параметрлерді растау"</string> <string name="color_revert_message" msgid="9116001069397996691">"Кейбір түс параметрлері бұл құрылғыны пайдалану мүмкін емес етуі мүмкін. Бұл түс параметрлерін растау үшін OK түймесін басыңыз, әйтпесе параметрлер 10 секундтан кейін ысырылады."</string> - <string name="battery_panel_title" msgid="3476715163685592453">"Батарея (<xliff:g id="ID_1">%1$d</xliff:g>%%)"</string> + <!-- no translation found for battery_panel_title (7944156115535366613) --> + <skip /> <string name="battery_detail_charging_summary" msgid="1279095653533044008">"Зарядтау кезінде Батарея үнемдегіш қол жетімді емес"</string> <string name="battery_detail_switch_title" msgid="6285872470260795421">"Батарея үнемдегіш"</string> <string name="battery_detail_switch_summary" msgid="9049111149407626804">"Өнімділікті және фондық деректерді азайтады"</string> diff --git a/packages/SystemUI/res/values-km-rKH/strings.xml b/packages/SystemUI/res/values-km-rKH/strings.xml index 37ffa167e2f3..74b1fafc550a 100644 --- a/packages/SystemUI/res/values-km-rKH/strings.xml +++ b/packages/SystemUI/res/values-km-rKH/strings.xml @@ -479,7 +479,8 @@ <string name="color_apply" msgid="9212602012641034283">"អនុវត្ត"</string> <string name="color_revert_title" msgid="4746666545480534663">"បញ្ជាក់ការកំណត់"</string> <string name="color_revert_message" msgid="9116001069397996691">"ការកំណត់ពណ៌មួយចំនួនអាចធ្វើឲ្យឧបករណ៍នេះមិនអាចប្រើបាន។ សូមចុច យល់ព្រម ដើម្បីបញ្ជាក់ការកំណត់ពណ៌ទាំងនេះ បើមិនដូច្នេះទេការកំណត់ទាំងនេះនឹងកំណត់ឡើងវិញក្នុងរយៈពេល 10 វិនាទីបន្ទាប់។"</string> - <string name="battery_panel_title" msgid="3476715163685592453">"ថ្ម (<xliff:g id="ID_1">%1$d</xliff:g>%%)"</string> + <!-- no translation found for battery_panel_title (7944156115535366613) --> + <skip /> <string name="battery_detail_charging_summary" msgid="1279095653533044008">"កម្មវិធីសន្សំថ្មមិនអាចប្រើបានអំឡុងពេលសាកថ្មទេ"</string> <string name="battery_detail_switch_title" msgid="6285872470260795421">"កម្មវិធីសន្សំថ្ម"</string> <string name="battery_detail_switch_summary" msgid="9049111149407626804">"កាត់បន្ថយប្រតិបត្តិការ និងទិន្នន័យផ្ទៃខាងក្រោយ"</string> diff --git a/packages/SystemUI/res/values-kn-rIN/strings.xml b/packages/SystemUI/res/values-kn-rIN/strings.xml index 9709b7b4e196..5ab6e317d870 100644 --- a/packages/SystemUI/res/values-kn-rIN/strings.xml +++ b/packages/SystemUI/res/values-kn-rIN/strings.xml @@ -301,8 +301,7 @@ <string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"ಸ್ಕ್ರೀನ್ ಪಿನ್ನಿಂಗ್"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"ಹುಡುಕಾಟ"</string> <string name="recents_launch_error_message" msgid="2969287838120550506">"<xliff:g id="APP">%s</xliff:g> ಪ್ರಾರಂಭಿಸಲು ಸಾದ್ಯವಿಲ್ಲ."</string> - <!-- no translation found for recents_launch_disabled_message (1624523193008871793) --> - <skip /> + <string name="recents_launch_disabled_message" msgid="1624523193008871793">"<xliff:g id="APP">%s</xliff:g> ಅನ್ನು ಸುರಕ್ಷಿತ ಮೋಡ್ನಲ್ಲಿ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ."</string> <string name="recents_history_button_label" msgid="5153358867807604821">"ಇತಿಹಾಸ"</string> <string name="recents_history_clear_all_button_label" msgid="5905258334958006953">"ತೆರವುಗೊಳಿಸು"</string> <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"ಅಡ್ಡಲಾಗಿ ವಿಭಜಿಸಿದ"</string> @@ -479,7 +478,7 @@ <string name="color_apply" msgid="9212602012641034283">"ಅನ್ವಯಿಸು"</string> <string name="color_revert_title" msgid="4746666545480534663">"ಸೆಟ್ಟಿಂಗ್ಗಳನ್ನು ಖಚಿತಪಡಿಸಿ"</string> <string name="color_revert_message" msgid="9116001069397996691">"ಕೆಲವು ಬಣ್ಣ ಸೆಟ್ಟಿಂಗ್ಗಳು ಈ ಸಾಧನವನ್ನು ಅನುಪಯುಕ್ತಗೊಳಿಸಬಹುದು. ಈ ಬಣ್ಣ ಸೆಟ್ಟಿಂಗ್ಗಳನ್ನು ಖಚಿತಪಡಿಸಲು ಸರಿ ಕ್ಲಿಕ್ ಮಾಡಿ, ಇಲ್ಲವಾದರೆ ಈ ಸೆಟ್ಟಿಂಗ್ಗಳನ್ನು 10 ಸೆಕೆಂಡುಗಳ ನಂತರ ಮರುಹೊಂದಿಸಿ."</string> - <string name="battery_panel_title" msgid="3476715163685592453">"ಬ್ಯಾಟರಿ (<xliff:g id="ID_1">%1$d</xliff:g>%%)"</string> + <string name="battery_panel_title" msgid="7944156115535366613">"ಬ್ಯಾಟರಿ ಬಳಕೆ"</string> <string name="battery_detail_charging_summary" msgid="1279095653533044008">"ಚಾರ್ಜಿಂಗ್ ಸಮಯದಲ್ಲಿ ಬ್ಯಾಟರಿ ಸೇವರ್ ಲಭ್ಯವಿರುವುದಿಲ್ಲ"</string> <string name="battery_detail_switch_title" msgid="6285872470260795421">"ಬ್ಯಾಟರಿ ಸೇವರ್"</string> <string name="battery_detail_switch_summary" msgid="9049111149407626804">"ಕಾರ್ಯಕ್ಷಮತೆ ಮತ್ತು ಹಿನ್ನೆಲೆ ಡೇಟಾವನ್ನು ಕಡಿಮೆ ಮಾಡುತ್ತದೆ"</string> diff --git a/packages/SystemUI/res/values-ko/strings.xml b/packages/SystemUI/res/values-ko/strings.xml index d7f667a4f949..5e6f65ab2080 100644 --- a/packages/SystemUI/res/values-ko/strings.xml +++ b/packages/SystemUI/res/values-ko/strings.xml @@ -479,7 +479,8 @@ <string name="color_apply" msgid="9212602012641034283">"적용"</string> <string name="color_revert_title" msgid="4746666545480534663">"설정 확인"</string> <string name="color_revert_message" msgid="9116001069397996691">"일부 색상 설정으로 인해 이 기기를 사용하지 못할 수 있습니다. 확인을 클릭하여 이러한 색상 설정을 확인하지 않으면 10초 후에 설정이 초기화됩니다."</string> - <string name="battery_panel_title" msgid="3476715163685592453">"배터리(<xliff:g id="ID_1">%1$d</xliff:g>%%)"</string> + <!-- no translation found for battery_panel_title (7944156115535366613) --> + <skip /> <string name="battery_detail_charging_summary" msgid="1279095653533044008">"충전하는 동안 배터리 세이버는 사용할 수 없습니다."</string> <string name="battery_detail_switch_title" msgid="6285872470260795421">"배터리 세이버"</string> <string name="battery_detail_switch_summary" msgid="9049111149407626804">"성능 및 백그라운드 데이터를 줄입니다."</string> diff --git a/packages/SystemUI/res/values-ky-rKG/strings.xml b/packages/SystemUI/res/values-ky-rKG/strings.xml index 5475a8309e2c..7819f40c7930 100644 --- a/packages/SystemUI/res/values-ky-rKG/strings.xml +++ b/packages/SystemUI/res/values-ky-rKG/strings.xml @@ -479,7 +479,8 @@ <string name="color_apply" msgid="9212602012641034283">"Колдонуу"</string> <string name="color_revert_title" msgid="4746666545480534663">"Жөндөөлөрдү ырастоо"</string> <string name="color_revert_message" msgid="9116001069397996691">"Айрым түс жөндөөлөрү бул түзмөктү колдонулгус кылып коюшу мүмкүн. Бул түс жөндөөлөрүн ырастоо үчүн OK баскычын чыкылдатыңыз, болбосо бул жөндөөлөр 10 секунддан кийин баштапкы абалына келтирилет."</string> - <string name="battery_panel_title" msgid="3476715163685592453">"Батарея (<xliff:g id="ID_1">%1$d</xliff:g>%%)"</string> + <!-- no translation found for battery_panel_title (7944156115535366613) --> + <skip /> <string name="battery_detail_charging_summary" msgid="1279095653533044008">"Батареяны үнөмдөгүч түзмөк кубатталып жатканда иштебейт"</string> <string name="battery_detail_switch_title" msgid="6285872470260795421">"Батареяны үнөмдөгүч"</string> <string name="battery_detail_switch_summary" msgid="9049111149407626804">"Иштин майнаптуулугун начарлатып, фондук дайындарды чектейт"</string> diff --git a/packages/SystemUI/res/values-lo-rLA/strings.xml b/packages/SystemUI/res/values-lo-rLA/strings.xml index 7c4739b66585..622e1e502140 100644 --- a/packages/SystemUI/res/values-lo-rLA/strings.xml +++ b/packages/SystemUI/res/values-lo-rLA/strings.xml @@ -479,7 +479,8 @@ <string name="color_apply" msgid="9212602012641034283">"ນຳໃຊ້"</string> <string name="color_revert_title" msgid="4746666545480534663">"ຢືນຢັນການຕັ້ງຄ່າ"</string> <string name="color_revert_message" msgid="9116001069397996691">"ບາງການຕັ້ງຄ່າສີສາມາດເຮັດໃຫ້ອຸປະກອນນີ້ບໍ່ສາມາດໃຊ້ໄດ້. ຄລິກ ຕົກລົງ ເພື່ອຢືນຢັນການຕັ້ງຄ່າສີເຫຼົ່ານີ້, ຖ້າບໍ່ດັ່ງນັ້ນ ການຕັ້ງຄ່າເຫຼົ່ານີ້ຈະຕັ້ງຄືນໃໝ່ ຫຼັງຈາກ 10 ວິນາທີ."</string> - <string name="battery_panel_title" msgid="3476715163685592453">"ແບັດເຕີຣີ (<xliff:g id="ID_1">%1$d</xliff:g>%%)"</string> + <!-- no translation found for battery_panel_title (7944156115535366613) --> + <skip /> <string name="battery_detail_charging_summary" msgid="1279095653533044008">"ຕົວປະຢັດແບັດເຕີຣີບໍ່ມີໃຫ້ນຳໃຊ້ໃນລະຫວ່າງການສາກ"</string> <string name="battery_detail_switch_title" msgid="6285872470260795421">"ຕົວປະຢັດແບັດເຕີຣີ"</string> <string name="battery_detail_switch_summary" msgid="9049111149407626804">"ຫຼຸດປະສິທິພາບການໃຊ້ງານ ແລະ ຂໍ້ມູນພື້ນຫຼັງ"</string> diff --git a/packages/SystemUI/res/values-lt/strings.xml b/packages/SystemUI/res/values-lt/strings.xml index d6965e017cf8..34decce7030e 100644 --- a/packages/SystemUI/res/values-lt/strings.xml +++ b/packages/SystemUI/res/values-lt/strings.xml @@ -481,7 +481,8 @@ <string name="color_apply" msgid="9212602012641034283">"Taikyti"</string> <string name="color_revert_title" msgid="4746666545480534663">"Nustatymų patvirtinimas"</string> <string name="color_revert_message" msgid="9116001069397996691">"Dėl kai kurių spalvų nustatymų įrenginys gali būti netinkamas naudoti. Spustelėkite „Gerai“, kad patvirtintumėte šiuos spalvų nustatymus. Kitaip šie nustatymai bus nustatyti iš naujo po 10 sekundžių."</string> - <string name="battery_panel_title" msgid="3476715163685592453">"Akumuliatorius (<xliff:g id="ID_1">%1$d</xliff:g> %%)"</string> + <!-- no translation found for battery_panel_title (7944156115535366613) --> + <skip /> <string name="battery_detail_charging_summary" msgid="1279095653533044008">"Akumuliatoriaus tausojimo priemonė nepasiekiama įkraunant"</string> <string name="battery_detail_switch_title" msgid="6285872470260795421">"Akumuliatoriaus tausojimo priemonė"</string> <string name="battery_detail_switch_summary" msgid="9049111149407626804">"Sumažinamas našumas ir foninių duomenų naudojimas"</string> diff --git a/packages/SystemUI/res/values-lv/strings.xml b/packages/SystemUI/res/values-lv/strings.xml index ecf827e7816c..c667f3585133 100644 --- a/packages/SystemUI/res/values-lv/strings.xml +++ b/packages/SystemUI/res/values-lv/strings.xml @@ -480,7 +480,8 @@ <string name="color_apply" msgid="9212602012641034283">"Lietot"</string> <string name="color_revert_title" msgid="4746666545480534663">"Iestatījumu apstiprināšana"</string> <string name="color_revert_message" msgid="9116001069397996691">"Noteiktu krāsu iestatījumu dēļ šī ierīce var kļūt nelietojama. Lai apstiprinātu šos krāsu iestatījumus, noklikšķiniet uz Labi. Ja to neizdarīsiet, pēc 10 sekundēm šie iestatījumi tiks atiestatīti."</string> - <string name="battery_panel_title" msgid="3476715163685592453">"Akumulators (<xliff:g id="ID_1">%1$d</xliff:g>%%)"</string> + <!-- no translation found for battery_panel_title (7944156115535366613) --> + <skip /> <string name="battery_detail_charging_summary" msgid="1279095653533044008">"Akumulatora jaudas taupīšanas režīms uzlādes laikā nav pieejams."</string> <string name="battery_detail_switch_title" msgid="6285872470260795421">"Akumulatora jaudas taupīšanas režīms"</string> <string name="battery_detail_switch_summary" msgid="9049111149407626804">"Samazina veiktspēju un fona datus."</string> diff --git a/packages/SystemUI/res/values-mk-rMK/strings.xml b/packages/SystemUI/res/values-mk-rMK/strings.xml index 1cd2f0e72ad8..8051ec0c89aa 100644 --- a/packages/SystemUI/res/values-mk-rMK/strings.xml +++ b/packages/SystemUI/res/values-mk-rMK/strings.xml @@ -301,8 +301,7 @@ <string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"прикачување екран"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"пребарај"</string> <string name="recents_launch_error_message" msgid="2969287838120550506">"<xliff:g id="APP">%s</xliff:g> не може да се вклучи."</string> - <!-- no translation found for recents_launch_disabled_message (1624523193008871793) --> - <skip /> + <string name="recents_launch_disabled_message" msgid="1624523193008871793">"<xliff:g id="APP">%s</xliff:g> е оневозможен во безбеден режим."</string> <string name="recents_history_button_label" msgid="5153358867807604821">"Историја"</string> <string name="recents_history_clear_all_button_label" msgid="5905258334958006953">"Исчисти"</string> <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Раздели хоризонтално"</string> @@ -479,7 +478,7 @@ <string name="color_apply" msgid="9212602012641034283">"Примени"</string> <string name="color_revert_title" msgid="4746666545480534663">"Потврдете ги поставките"</string> <string name="color_revert_message" msgid="9116001069397996691">"Некои поставки на боите може да го направат уредот неупотреблив. Кликнете на Во ред за да ги потврдите овие поставки на боите, инаку тие поставки ќе се ресетираат по 10 секунди."</string> - <string name="battery_panel_title" msgid="3476715163685592453">"Батерија (<xliff:g id="ID_1">%1$d</xliff:g>%%)"</string> + <string name="battery_panel_title" msgid="7944156115535366613">"Користење батерија"</string> <string name="battery_detail_charging_summary" msgid="1279095653533044008">"Штедачот на батерија не е достапен при полнење"</string> <string name="battery_detail_switch_title" msgid="6285872470260795421">"Штедач на батерија"</string> <string name="battery_detail_switch_summary" msgid="9049111149407626804">"Ја намалува изведбата и податоците во заднина"</string> diff --git a/packages/SystemUI/res/values-ml-rIN/strings.xml b/packages/SystemUI/res/values-ml-rIN/strings.xml index 2954542eb5a4..4cb8c2e493f2 100644 --- a/packages/SystemUI/res/values-ml-rIN/strings.xml +++ b/packages/SystemUI/res/values-ml-rIN/strings.xml @@ -301,8 +301,7 @@ <string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"സ്ക്രീൻ പിൻ ചെയ്യൽ"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"തിരയുക"</string> <string name="recents_launch_error_message" msgid="2969287838120550506">"<xliff:g id="APP">%s</xliff:g> ആരംഭിക്കാനായില്ല."</string> - <!-- no translation found for recents_launch_disabled_message (1624523193008871793) --> - <skip /> + <string name="recents_launch_disabled_message" msgid="1624523193008871793">"സുരക്ഷിത മോഡിൽ <xliff:g id="APP">%s</xliff:g> പ്രവർത്തനരഹിതമാക്കിയിരിക്കുന്നു."</string> <string name="recents_history_button_label" msgid="5153358867807604821">"ചരിത്രം"</string> <string name="recents_history_clear_all_button_label" msgid="5905258334958006953">"മായ്ക്കുക"</string> <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"തിരശ്ചീനമായി വേർതിരിക്കുക"</string> @@ -479,7 +478,7 @@ <string name="color_apply" msgid="9212602012641034283">"ബാധകമാക്കുക"</string> <string name="color_revert_title" msgid="4746666545480534663">"ക്രമീകരണം സ്ഥിരീകരിക്കുക"</string> <string name="color_revert_message" msgid="9116001069397996691">"ചില വർണ്ണ ക്രമീകരണത്തിന് ഈ ഉപകരണത്തെ ഉപയോഗരഹിതമാക്കാനാകും. ഈ വർണ്ണ ക്രമീകരണം സ്ഥിരീകരിക്കുന്നതിന് ശരി എന്നതിൽ ക്ലിക്കുചെയ്യുക, അല്ലെങ്കിൽ 10 സെക്കൻഡിന് ശേഷം ഈ ക്രമീകരണം പുനഃക്രമീകരിക്കപ്പെടും."</string> - <string name="battery_panel_title" msgid="3476715163685592453">"ബാറ്ററി (<xliff:g id="ID_1">%1$d</xliff:g>%%)"</string> + <string name="battery_panel_title" msgid="7944156115535366613">"ബാറ്ററി ഉപയോഗം"</string> <string name="battery_detail_charging_summary" msgid="1279095653533044008">"ചാർജുചെയ്യുന്ന സമയത്ത് ബാറ്ററി സേവർ ലഭ്യമല്ല"</string> <string name="battery_detail_switch_title" msgid="6285872470260795421">"ബാറ്ററി സേവർ"</string> <string name="battery_detail_switch_summary" msgid="9049111149407626804">"പ്രവർത്തനവും പശ്ചാത്തല ഡാറ്റയും കുറയ്ക്കുന്നു"</string> diff --git a/packages/SystemUI/res/values-mn-rMN/strings.xml b/packages/SystemUI/res/values-mn-rMN/strings.xml index 833e495622cf..f22e315c728e 100644 --- a/packages/SystemUI/res/values-mn-rMN/strings.xml +++ b/packages/SystemUI/res/values-mn-rMN/strings.xml @@ -477,7 +477,8 @@ <string name="color_apply" msgid="9212602012641034283">"Хэрэгжүүлэх"</string> <string name="color_revert_title" msgid="4746666545480534663">"Тохиргоог баталгаажуулах"</string> <string name="color_revert_message" msgid="9116001069397996691">"Зарим өнгөний тохиргоо энэ төхөөрөмжийг ашиглах боломжгүй болгож болзошгүй. OK товчлуурыг дарж эдгээр өнгөний тохиргоог зөвшөөрөхгүй бол энэ тохиргоо нь 10 секундын дараа шинэчлэгдэх болно."</string> - <string name="battery_panel_title" msgid="3476715163685592453">"Тэжээл (<xliff:g id="ID_1">%1$d</xliff:g>%%)"</string> + <!-- no translation found for battery_panel_title (7944156115535366613) --> + <skip /> <string name="battery_detail_charging_summary" msgid="1279095653533044008">"Цэнэглэх үед тэжээл хэмнэгч ажиллахгүй"</string> <string name="battery_detail_switch_title" msgid="6285872470260795421">"Тэжээл хэмнэгч"</string> <string name="battery_detail_switch_summary" msgid="9049111149407626804">"Гүйцэтгэл болон дэвсгэрийн датаг багасгадаг"</string> diff --git a/packages/SystemUI/res/values-mr-rIN/strings.xml b/packages/SystemUI/res/values-mr-rIN/strings.xml index 47be732e1ca9..ff36be250324 100644 --- a/packages/SystemUI/res/values-mr-rIN/strings.xml +++ b/packages/SystemUI/res/values-mr-rIN/strings.xml @@ -301,8 +301,7 @@ <string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"स्क्रीन पिन करणे"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"शोधा"</string> <string name="recents_launch_error_message" msgid="2969287838120550506">"<xliff:g id="APP">%s</xliff:g> प्रारंभ करणे शक्य झाले नाही."</string> - <!-- no translation found for recents_launch_disabled_message (1624523193008871793) --> - <skip /> + <string name="recents_launch_disabled_message" msgid="1624523193008871793">"<xliff:g id="APP">%s</xliff:g> सुरक्षित-मोडमध्ये अक्षम केला आहे."</string> <string name="recents_history_button_label" msgid="5153358867807604821">"इतिहास"</string> <string name="recents_history_clear_all_button_label" msgid="5905258334958006953">"साफ करा"</string> <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"क्षैतिज विभाजित करा"</string> @@ -479,7 +478,7 @@ <string name="color_apply" msgid="9212602012641034283">"लागू करा"</string> <string name="color_revert_title" msgid="4746666545480534663">"सेटिंग्जची पुष्टी करा"</string> <string name="color_revert_message" msgid="9116001069397996691">"काही रंग सेटिंग्ज या डिव्हाइसला निरुपयोगी करू शकतात. या रंग सेटिंग्जची पुष्टी करण्यासाठी ठीक आहे दाबा अन्यथा या सेटिंग्ज 10 सेकंदांनंतर रीसेट होतील."</string> - <string name="battery_panel_title" msgid="3476715163685592453">"बॅटरी (<xliff:g id="ID_1">%1$d</xliff:g>%%)"</string> + <string name="battery_panel_title" msgid="7944156115535366613">"बॅटरी वापर"</string> <string name="battery_detail_charging_summary" msgid="1279095653533044008">"चार्ज करताना बॅटरी बचतकर्ता उपलब्ध नाही"</string> <string name="battery_detail_switch_title" msgid="6285872470260795421">"बॅटरी बचतकर्ता"</string> <string name="battery_detail_switch_summary" msgid="9049111149407626804">"कार्यप्रदर्शन आणि पार्श्वभूमी डेटा कमी करते"</string> diff --git a/packages/SystemUI/res/values-ms-rMY/strings.xml b/packages/SystemUI/res/values-ms-rMY/strings.xml index 7508981529a7..13a1f002edc6 100644 --- a/packages/SystemUI/res/values-ms-rMY/strings.xml +++ b/packages/SystemUI/res/values-ms-rMY/strings.xml @@ -479,7 +479,8 @@ <string name="color_apply" msgid="9212602012641034283">"Gunakan"</string> <string name="color_revert_title" msgid="4746666545480534663">"Sahkan tetapan"</string> <string name="color_revert_message" msgid="9116001069397996691">"Sesetengah tetapan warna boleh menjadikan peranti ini tidak dapat digunakan. Klik OK untuk mengesahkan tetapan warna ini, jika tidak, tetapan ini akan ditetapkan semula selepas 10 saat."</string> - <string name="battery_panel_title" msgid="3476715163685592453">"Bateri (<xliff:g id="ID_1">%1$d</xliff:g>%%)"</string> + <!-- no translation found for battery_panel_title (7944156115535366613) --> + <skip /> <string name="battery_detail_charging_summary" msgid="1279095653533044008">"Penjimat Bateri tidak tersedia semasa mengecas"</string> <string name="battery_detail_switch_title" msgid="6285872470260795421">"Penjimat Bateri"</string> <string name="battery_detail_switch_summary" msgid="9049111149407626804">"Mengurangkan prestasi dan data latar belakang"</string> diff --git a/packages/SystemUI/res/values-my-rMM/strings.xml b/packages/SystemUI/res/values-my-rMM/strings.xml index 368b06dff62d..60e2812db75a 100644 --- a/packages/SystemUI/res/values-my-rMM/strings.xml +++ b/packages/SystemUI/res/values-my-rMM/strings.xml @@ -479,7 +479,8 @@ <string name="color_apply" msgid="9212602012641034283">"အသုံးပြုပါ"</string> <string name="color_revert_title" msgid="4746666545480534663">"ဆက်တင်များကို အတည်ပြုပါ"</string> <string name="color_revert_message" msgid="9116001069397996691">"အချို့သော အရောင်ဆက်တက်များက ဤကိရိယာကို သုံးမရအောင် လုပ်ပစ်နိုင်ပါသည်။ ဤအရောင် ဆက်တင်များကို အတည်ပြုရန် အိုကေကို နှိပ်ပါ၊ သို့မဟုတ် ဤဆက်တင်များကို ၁၀ စက္ကန့် အကြာတွင် ပြန်ညှိလိုက်ပါမည်။"</string> - <string name="battery_panel_title" msgid="3476715163685592453">"ဘက်ထရီ ( <xliff:g id="ID_1">%1$d</xliff:g> %%)"</string> + <!-- no translation found for battery_panel_title (7944156115535366613) --> + <skip /> <string name="battery_detail_charging_summary" msgid="1279095653533044008">"အားသွင်းနေချိန်မှာ Battery Saver ကို သုံးမရပါ"</string> <string name="battery_detail_switch_title" msgid="6285872470260795421">"Battery Saver"</string> <string name="battery_detail_switch_summary" msgid="9049111149407626804">"လုပ်ဆောင်မှု နှင့် နောက်ခံ ဒေတာကို လျော့နည်းစေပါသည်"</string> diff --git a/packages/SystemUI/res/values-nb/strings.xml b/packages/SystemUI/res/values-nb/strings.xml index a7cb7d1d46e7..f326a018ff8e 100644 --- a/packages/SystemUI/res/values-nb/strings.xml +++ b/packages/SystemUI/res/values-nb/strings.xml @@ -479,7 +479,8 @@ <string name="color_apply" msgid="9212602012641034283">"Bruk"</string> <string name="color_revert_title" msgid="4746666545480534663">"Bekreft innstillingene"</string> <string name="color_revert_message" msgid="9116001069397996691">"Noen fargeinnstillinger kan gjøre denne enheten ubrukelig. Klikk på OK for å bekrefte disse fargeinnstillingene, ellers blir de tilbakestilt etter ti sekunder."</string> - <string name="battery_panel_title" msgid="3476715163685592453">"Batteri (<xliff:g id="ID_1">%1$d</xliff:g> %%)"</string> + <!-- no translation found for battery_panel_title (7944156115535366613) --> + <skip /> <string name="battery_detail_charging_summary" msgid="1279095653533044008">"Batterisparing er ikke tilgjengelig under lading"</string> <string name="battery_detail_switch_title" msgid="6285872470260795421">"Batterisparing"</string> <string name="battery_detail_switch_summary" msgid="9049111149407626804">"Reduserer ytelsen og begrenser bakgrunnsdataene"</string> diff --git a/packages/SystemUI/res/values-ne-rNP/strings.xml b/packages/SystemUI/res/values-ne-rNP/strings.xml index d843917bd37e..9b67d9cefd25 100644 --- a/packages/SystemUI/res/values-ne-rNP/strings.xml +++ b/packages/SystemUI/res/values-ne-rNP/strings.xml @@ -479,7 +479,7 @@ <string name="color_apply" msgid="9212602012641034283">"लागू गर्नुहोस्"</string> <string name="color_revert_title" msgid="4746666545480534663">"सेटिङहरूको पुष्टि गर्नुहोस्"</string> <string name="color_revert_message" msgid="9116001069397996691">"केही रङ सेटिङहरूले यस यन्त्रलाई अनुपयोगी बनाउन सक्छन्। यी रङ सेटिङहरू पुष्टि गर्न ठीक छ मा क्लिक गर्नुहोस्, अन्यथा यी सेटिङहरू १० सेकेण्डपछि रिसेट हुनेछन्।"</string> - <string name="battery_panel_title" msgid="3476715163685592453">"ब्याट्री (<xliff:g id="ID_1">%1$d</xliff:g>%%)"</string> + <string name="battery_panel_title" msgid="7944156115535366613">"ब्याट्रि उपयोग"</string> <string name="battery_detail_charging_summary" msgid="1279095653533044008">"चार्ज गर्ने समयमा ब्याट्री सेभर उपलब्ध छैन"</string> <string name="battery_detail_switch_title" msgid="6285872470260795421">"ब्याट्री सेभर"</string> <string name="battery_detail_switch_summary" msgid="9049111149407626804">"कार्यसम्पादन र पृष्ठभूमि डेटा घटाउँछ"</string> diff --git a/packages/SystemUI/res/values-nl/strings.xml b/packages/SystemUI/res/values-nl/strings.xml index 2011ee2fced5..23455d82675e 100644 --- a/packages/SystemUI/res/values-nl/strings.xml +++ b/packages/SystemUI/res/values-nl/strings.xml @@ -301,8 +301,7 @@ <string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"scherm vastzetten"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"zoeken"</string> <string name="recents_launch_error_message" msgid="2969287838120550506">"Kan <xliff:g id="APP">%s</xliff:g> niet starten."</string> - <!-- no translation found for recents_launch_disabled_message (1624523193008871793) --> - <skip /> + <string name="recents_launch_disabled_message" msgid="1624523193008871793">"<xliff:g id="APP">%s</xliff:g> is uitgeschakeld in de veilige modus"</string> <string name="recents_history_button_label" msgid="5153358867807604821">"Geschiedenis"</string> <string name="recents_history_clear_all_button_label" msgid="5905258334958006953">"Wissen"</string> <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Horizontaal splitsen"</string> @@ -479,7 +478,7 @@ <string name="color_apply" msgid="9212602012641034283">"Toepassen"</string> <string name="color_revert_title" msgid="4746666545480534663">"Instellingen bevestigen"</string> <string name="color_revert_message" msgid="9116001069397996691">"Bij sommige kleurinstellingen kan het apparaat onbruikbaar worden. Klik op OK om deze kleurinstellingen te bevestigen, anders worden deze instellingen na tien seconden gereset."</string> - <string name="battery_panel_title" msgid="3476715163685592453">"Accu (<xliff:g id="ID_1">%1$d</xliff:g>%%)"</string> + <string name="battery_panel_title" msgid="7944156115535366613">"Accugebruik"</string> <string name="battery_detail_charging_summary" msgid="1279095653533044008">"Accubesparing niet beschikbaar tijdens opladen"</string> <string name="battery_detail_switch_title" msgid="6285872470260795421">"Accubesparing"</string> <string name="battery_detail_switch_summary" msgid="9049111149407626804">"Vermindert de prestaties en achtergrondgegevens"</string> diff --git a/packages/SystemUI/res/values-pa-rIN/strings.xml b/packages/SystemUI/res/values-pa-rIN/strings.xml index 638def8bab5d..0d8ab1931f8c 100644 --- a/packages/SystemUI/res/values-pa-rIN/strings.xml +++ b/packages/SystemUI/res/values-pa-rIN/strings.xml @@ -301,8 +301,7 @@ <string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"ਸਕ੍ਰੀਨ ਪਿਨਿੰਗ"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"ਖੋਜੋ"</string> <string name="recents_launch_error_message" msgid="2969287838120550506">"<xliff:g id="APP">%s</xliff:g> ਨੂੰ ਚਾਲੂ ਨਹੀਂ ਕਰ ਸਕਿਆ।"</string> - <!-- no translation found for recents_launch_disabled_message (1624523193008871793) --> - <skip /> + <string name="recents_launch_disabled_message" msgid="1624523193008871793">"<xliff:g id="APP">%s</xliff:g> ਨੂੰ ਸੁਰੱਖਿਅਤ-ਮੋਡ ਵਿੱਚ ਅਯੋਗ ਬਣਾਇਆ ਗਿਆ ਹੈ।"</string> <string name="recents_history_button_label" msgid="5153358867807604821">"ਇਤਿਹਾਸ"</string> <string name="recents_history_clear_all_button_label" msgid="5905258334958006953">"ਸਾਫ਼ ਕਰੋ"</string> <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"ਹੌਰੀਜ਼ੌਂਟਲ ਸਪਲਿਟ"</string> @@ -479,7 +478,7 @@ <string name="color_apply" msgid="9212602012641034283">"ਲਾਗੂ ਕਰੋ"</string> <string name="color_revert_title" msgid="4746666545480534663">"ਸੈਟਿੰਗਾਂ ਦੀ ਪੁਸ਼ਟੀ ਕਰੋ"</string> <string name="color_revert_message" msgid="9116001069397996691">"ਕੁਝ ਰੰਗ ਸੈਟਿੰਗਾਂ ਇਸ ਡੀਵਾਈਸ ਨੂੰ ਬੇਕਾਰ ਕਰ ਸਕਦੀਆਂ ਹਨ। ਇਹਨਾਂ ਰੰਗ ਸੈਟਿੰਗਾਂ ਦੀ ਪੁਸ਼ਟੀ ਕਰਨ ਲਈ ਠੀਕ \'ਤੇ ਕਲਿੱਕ ਕਰੋ, ਨਹੀਂ ਤਾਂ ਇਹ ਸੈਟਿੰਗਾਂ 10 ਸਕਿੰਟ ਬਾਅਦ ਮੁੜ-ਸੈੱਟ ਹੋ ਜਾਣਗੀਆਂ।"</string> - <string name="battery_panel_title" msgid="3476715163685592453">"ਬੈਟਰੀ (<xliff:g id="ID_1">%1$d</xliff:g>%%)"</string> + <string name="battery_panel_title" msgid="7944156115535366613">"ਬੈਟਰੀ ਵਰਤੋਂ"</string> <string name="battery_detail_charging_summary" msgid="1279095653533044008">"ਬੈਟਰੀ ਸੇਵਰ ਚਾਰਜਿੰਗ ਦੌਰਾਨ ਉਪਲਬਧ ਨਹੀਂ ਹੈ"</string> <string name="battery_detail_switch_title" msgid="6285872470260795421">"ਬੈਟਰੀ ਸੇਵਰ"</string> <string name="battery_detail_switch_summary" msgid="9049111149407626804">"ਕਾਰਗੁਜ਼ਾਰੀ ਅਤੇ ਬੈਕਗ੍ਰਾਊਂਡ ਡੈਟੇ ਨੂੰ ਘਟਾਉਂਦਾ ਹੈ"</string> diff --git a/packages/SystemUI/res/values-pl/strings.xml b/packages/SystemUI/res/values-pl/strings.xml index 52a4e2744d44..2eae56a9192a 100644 --- a/packages/SystemUI/res/values-pl/strings.xml +++ b/packages/SystemUI/res/values-pl/strings.xml @@ -481,7 +481,8 @@ <string name="color_apply" msgid="9212602012641034283">"Zastosuj"</string> <string name="color_revert_title" msgid="4746666545480534663">"Potwierdź ustawienia"</string> <string name="color_revert_message" msgid="9116001069397996691">"Niektóre ustawienia kolorów mogą utrudniać korzystanie z urządzenia. Kliknij OK, by potwierdzić te ustawienia kolorów. Jeśli tego nie zrobisz, zostaną one zresetowane po 10 sekundach."</string> - <string name="battery_panel_title" msgid="3476715163685592453">"Bateria (<xliff:g id="ID_1">%1$d</xliff:g>%%)"</string> + <!-- no translation found for battery_panel_title (7944156115535366613) --> + <skip /> <string name="battery_detail_charging_summary" msgid="1279095653533044008">"Oszczędzanie baterii nie jest dostępne podczas ładowania"</string> <string name="battery_detail_switch_title" msgid="6285872470260795421">"Oszczędzanie baterii"</string> <string name="battery_detail_switch_summary" msgid="9049111149407626804">"Zmniejsza wydajność i ogranicza dane w tle"</string> diff --git a/packages/SystemUI/res/values-pt-rBR/strings.xml b/packages/SystemUI/res/values-pt-rBR/strings.xml index 0802d9622caa..5219454b22a4 100644 --- a/packages/SystemUI/res/values-pt-rBR/strings.xml +++ b/packages/SystemUI/res/values-pt-rBR/strings.xml @@ -479,7 +479,8 @@ <string name="color_apply" msgid="9212602012641034283">"Aplicar"</string> <string name="color_revert_title" msgid="4746666545480534663">"Confirmar configurações"</string> <string name="color_revert_message" msgid="9116001069397996691">"Algumas configurações de cor podem tornar o dispositivo inutilizável. Clique em \"OK\" para confirmar essas configurações de cor; caso contrário, essas configurações serão redefinidas após 10 segundos."</string> - <string name="battery_panel_title" msgid="3476715163685592453">"Bateria (<xliff:g id="ID_1">%1$d</xliff:g>%%)"</string> + <!-- no translation found for battery_panel_title (7944156115535366613) --> + <skip /> <string name="battery_detail_charging_summary" msgid="1279095653533044008">"A Economia de bateria não fica disponível durante o carregamento"</string> <string name="battery_detail_switch_title" msgid="6285872470260795421">"Economia de bateria"</string> <string name="battery_detail_switch_summary" msgid="9049111149407626804">"Reduz o desempenho e os dados em segundo plano"</string> diff --git a/packages/SystemUI/res/values-pt-rPT/strings.xml b/packages/SystemUI/res/values-pt-rPT/strings.xml index a7d08cdccbe1..064e56541bbd 100644 --- a/packages/SystemUI/res/values-pt-rPT/strings.xml +++ b/packages/SystemUI/res/values-pt-rPT/strings.xml @@ -301,8 +301,7 @@ <string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"fixação no ecrã"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"pesquisar"</string> <string name="recents_launch_error_message" msgid="2969287838120550506">"Não foi possível iniciar o <xliff:g id="APP">%s</xliff:g>."</string> - <!-- no translation found for recents_launch_disabled_message (1624523193008871793) --> - <skip /> + <string name="recents_launch_disabled_message" msgid="1624523193008871793">"O <xliff:g id="APP">%s</xliff:g> está desativado no modo de segurança."</string> <string name="recents_history_button_label" msgid="5153358867807604821">"Histórico"</string> <string name="recents_history_clear_all_button_label" msgid="5905258334958006953">"Limpar"</string> <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Divisão horizontal"</string> @@ -479,7 +478,7 @@ <string name="color_apply" msgid="9212602012641034283">"Aplicar"</string> <string name="color_revert_title" msgid="4746666545480534663">"Confirmar as definições"</string> <string name="color_revert_message" msgid="9116001069397996691">"Algumas definições de cor podem tornar este dispositivo instável. Clique em OK para confirmar estas definições de cor. Caso contrário, estas definições serão repostas após 10 segundos."</string> - <string name="battery_panel_title" msgid="3476715163685592453">"Bateria (<xliff:g id="ID_1">%1$d</xliff:g>%%)"</string> + <string name="battery_panel_title" msgid="7944156115535366613">"Utiliz. da bateria"</string> <string name="battery_detail_charging_summary" msgid="1279095653533044008">"Poupança de bateria não disponível durante o carregamento"</string> <string name="battery_detail_switch_title" msgid="6285872470260795421">"Poupança de bateria"</string> <string name="battery_detail_switch_summary" msgid="9049111149407626804">"Reduz o desempenho e os dados de segundo plano"</string> diff --git a/packages/SystemUI/res/values-pt/strings.xml b/packages/SystemUI/res/values-pt/strings.xml index 0802d9622caa..5219454b22a4 100644 --- a/packages/SystemUI/res/values-pt/strings.xml +++ b/packages/SystemUI/res/values-pt/strings.xml @@ -479,7 +479,8 @@ <string name="color_apply" msgid="9212602012641034283">"Aplicar"</string> <string name="color_revert_title" msgid="4746666545480534663">"Confirmar configurações"</string> <string name="color_revert_message" msgid="9116001069397996691">"Algumas configurações de cor podem tornar o dispositivo inutilizável. Clique em \"OK\" para confirmar essas configurações de cor; caso contrário, essas configurações serão redefinidas após 10 segundos."</string> - <string name="battery_panel_title" msgid="3476715163685592453">"Bateria (<xliff:g id="ID_1">%1$d</xliff:g>%%)"</string> + <!-- no translation found for battery_panel_title (7944156115535366613) --> + <skip /> <string name="battery_detail_charging_summary" msgid="1279095653533044008">"A Economia de bateria não fica disponível durante o carregamento"</string> <string name="battery_detail_switch_title" msgid="6285872470260795421">"Economia de bateria"</string> <string name="battery_detail_switch_summary" msgid="9049111149407626804">"Reduz o desempenho e os dados em segundo plano"</string> diff --git a/packages/SystemUI/res/values-ro/strings.xml b/packages/SystemUI/res/values-ro/strings.xml index a5adb2a510e0..1af5b42cceed 100644 --- a/packages/SystemUI/res/values-ro/strings.xml +++ b/packages/SystemUI/res/values-ro/strings.xml @@ -31,7 +31,7 @@ <item quantity="one">Un ecran în Recente</item> </plurals> <string name="status_bar_no_notifications_title" msgid="4755261167193833213">"Nicio notificare"</string> - <string name="status_bar_ongoing_events_title" msgid="1682504513316879202">"În desfăşurare"</string> + <string name="status_bar_ongoing_events_title" msgid="1682504513316879202">"În desfășurare"</string> <string name="status_bar_latest_events_title" msgid="6594767438577593172">"Notificări"</string> <string name="battery_low_title" msgid="6456385927409742437">"Bateria este aproape descărcată"</string> <string name="battery_low_percent_format" msgid="2900940511201380775">"Procent rămas din baterie: <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> @@ -58,7 +58,7 @@ <string name="usb_accessory_confirm_prompt" msgid="3808984931830229888">"Deschideţi <xliff:g id="ACTIVITY">%1$s</xliff:g> la conectarea acestui accesoriu USB?"</string> <string name="usb_accessory_uri_prompt" msgid="513450621413733343">"Aplic. instal. nu funcţ. cu acest acces. USB. Aflați despre acest accesoriu la <xliff:g id="URL">%1$s</xliff:g>"</string> <string name="title_usb_accessory" msgid="4966265263465181372">"Accesoriu USB"</string> - <string name="label_view" msgid="6304565553218192990">"Afişaţi"</string> + <string name="label_view" msgid="6304565553218192990">"Afișați"</string> <string name="always_use_device" msgid="1450287437017315906">"Utilizaţi în mod prestabilit pt. acest dispoz. USB"</string> <string name="always_use_accessory" msgid="1210954576979621596">"Utiliz. în mod prestabilit pt. acest accesoriu USB"</string> <string name="usb_debugging_title" msgid="4513918393387141949">"Permiteți depanarea USB?"</string> @@ -480,7 +480,8 @@ <string name="color_apply" msgid="9212602012641034283">"Aplicați"</string> <string name="color_revert_title" msgid="4746666545480534663">"Confirmați setările"</string> <string name="color_revert_message" msgid="9116001069397996691">"Unele setări pentru culori pot face dispozitivul să nu mai funcționeze. Dați clic pe OK pentru a confirma aceste setări pentru culori. În caz contrar, acestea se vor reseta după 10 secunde."</string> - <string name="battery_panel_title" msgid="3476715163685592453">"Baterie (<xliff:g id="ID_1">%1$d</xliff:g>%%)"</string> + <!-- no translation found for battery_panel_title (7944156115535366613) --> + <skip /> <string name="battery_detail_charging_summary" msgid="1279095653533044008">"Economisirea bateriei nu este disponibilă pe durata încărcării"</string> <string name="battery_detail_switch_title" msgid="6285872470260795421">"Economisirea bateriei"</string> <string name="battery_detail_switch_summary" msgid="9049111149407626804">"Reduce performanța și datele de fundal"</string> diff --git a/packages/SystemUI/res/values-ru/strings.xml b/packages/SystemUI/res/values-ru/strings.xml index f5194548e802..ba1373f961b0 100644 --- a/packages/SystemUI/res/values-ru/strings.xml +++ b/packages/SystemUI/res/values-ru/strings.xml @@ -481,7 +481,8 @@ <string name="color_apply" msgid="9212602012641034283">"Применить"</string> <string name="color_revert_title" msgid="4746666545480534663">"Подтвердите настройки"</string> <string name="color_revert_message" msgid="9116001069397996691">"Некоторые цветовые настройки могут затруднить работу с устройством. Чтобы применить выбранные параметры, нажмите \"ОК\". В противном случае они будут сброшены через 10 секунд."</string> - <string name="battery_panel_title" msgid="3476715163685592453">"Батарея (<xliff:g id="ID_1">%1$d</xliff:g>%%)"</string> + <!-- no translation found for battery_panel_title (7944156115535366613) --> + <skip /> <string name="battery_detail_charging_summary" msgid="1279095653533044008">"Режим энергосбережения нельзя включить во время зарядки"</string> <string name="battery_detail_switch_title" msgid="6285872470260795421">"Режим энергосбережения"</string> <string name="battery_detail_switch_summary" msgid="9049111149407626804">"Ограничивает производительность и фоновую передачу данных"</string> diff --git a/packages/SystemUI/res/values-si-rLK/strings.xml b/packages/SystemUI/res/values-si-rLK/strings.xml index 3da663930c00..b15137e3427a 100644 --- a/packages/SystemUI/res/values-si-rLK/strings.xml +++ b/packages/SystemUI/res/values-si-rLK/strings.xml @@ -479,7 +479,8 @@ <string name="color_apply" msgid="9212602012641034283">"යොදන්න"</string> <string name="color_revert_title" msgid="4746666545480534663">"සැකසීම් තහවුරු කරන්න"</string> <string name="color_revert_message" msgid="9116001069397996691">"සමහර වර්ණ සැකසීම් මෙම උපාංගය භාවිත කළ නොහැකි තත්ත්වයට පත් කළ හැකිය. මෙම වර්ණ සැකසීම් තහවුරු කිරීමට හරි ක්ලික් කරන්න, නැතහොත් මෙම සැකසීම් තත්පර 10කට පසුව යළි සකසනු ඇත."</string> - <string name="battery_panel_title" msgid="3476715163685592453">"බැටරිය (<xliff:g id="ID_1">%1$d</xliff:g>%%)"</string> + <!-- no translation found for battery_panel_title (7944156115535366613) --> + <skip /> <string name="battery_detail_charging_summary" msgid="1279095653533044008">"ආරෝපණය අතරතුර බැටරි සුරැකුම ලබා ගත නොහැකිය."</string> <string name="battery_detail_switch_title" msgid="6285872470260795421">"බැටරි සුරැකුම"</string> <string name="battery_detail_switch_summary" msgid="9049111149407626804">"ක්රියාකාරිත්වය සහ පසුබිම් දත්ත අඩු කරන්න"</string> diff --git a/packages/SystemUI/res/values-sk/strings.xml b/packages/SystemUI/res/values-sk/strings.xml index 1b868809cc9c..199bd906b26e 100644 --- a/packages/SystemUI/res/values-sk/strings.xml +++ b/packages/SystemUI/res/values-sk/strings.xml @@ -481,7 +481,8 @@ <string name="color_apply" msgid="9212602012641034283">"Použiť"</string> <string name="color_revert_title" msgid="4746666545480534663">"Potvrdenie nastavení"</string> <string name="color_revert_message" msgid="9116001069397996691">"Niektoré nastavenia farieb môžu toto zariadenie znefunkčniť. Tieto nastavenia farieb potvrdíte kliknutím na tlačidlo OK, ináč sa tieto nastavenia o 10 sekúnd obnovia."</string> - <string name="battery_panel_title" msgid="3476715163685592453">"Batéria (<xliff:g id="ID_1">%1$d</xliff:g> %%)"</string> + <!-- no translation found for battery_panel_title (7944156115535366613) --> + <skip /> <string name="battery_detail_charging_summary" msgid="1279095653533044008">"Počas nabíjania nie je Šetrič batérie k dispozícii"</string> <string name="battery_detail_switch_title" msgid="6285872470260795421">"Šetrič batérie"</string> <string name="battery_detail_switch_summary" msgid="9049111149407626804">"Obmedzí výkonnosť a údaje na pozadí"</string> diff --git a/packages/SystemUI/res/values-sl/strings.xml b/packages/SystemUI/res/values-sl/strings.xml index cdd3de4e7770..9ebb19dc4cb7 100644 --- a/packages/SystemUI/res/values-sl/strings.xml +++ b/packages/SystemUI/res/values-sl/strings.xml @@ -303,8 +303,7 @@ <string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"pripenjanje zaslona"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"iskanje"</string> <string name="recents_launch_error_message" msgid="2969287838120550506">"Aplikacije <xliff:g id="APP">%s</xliff:g> ni bilo mogoče zagnati."</string> - <!-- no translation found for recents_launch_disabled_message (1624523193008871793) --> - <skip /> + <string name="recents_launch_disabled_message" msgid="1624523193008871793">"Aplikacija <xliff:g id="APP">%s</xliff:g> je v varnem načinu onemogočena."</string> <string name="recents_history_button_label" msgid="5153358867807604821">"Zgodovina"</string> <string name="recents_history_clear_all_button_label" msgid="5905258334958006953">"Izbriši"</string> <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Razdeli vodoravno"</string> @@ -481,7 +480,7 @@ <string name="color_apply" msgid="9212602012641034283">"Uporabi"</string> <string name="color_revert_title" msgid="4746666545480534663">"Potrditev nastavitev"</string> <string name="color_revert_message" msgid="9116001069397996691">"Zaradi nekaterih barvnih nastavitev lahko postane ta naprava neuporabna. Kliknite »V redu«, če želite potrditi te barvne nastavitve. V nasprotnem primeru se bodo čez 10 sekund ponastavile na prvotno vrednost."</string> - <string name="battery_panel_title" msgid="3476715163685592453">"Akumulator (<xliff:g id="ID_1">%1$d</xliff:g> %%)"</string> + <string name="battery_panel_title" msgid="7944156115535366613">"Poraba akumulatorja"</string> <string name="battery_detail_charging_summary" msgid="1279095653533044008">"Varčevanje z energijo akumulatorja med polnjenjem ni na voljo"</string> <string name="battery_detail_switch_title" msgid="6285872470260795421">"Varčevanje z energijo akumulatorja"</string> <string name="battery_detail_switch_summary" msgid="9049111149407626804">"Omeji zmogljivost delovanja in prenos podatkov v ozadju"</string> diff --git a/packages/SystemUI/res/values-sq-rAL/strings.xml b/packages/SystemUI/res/values-sq-rAL/strings.xml index 48cdd9f639b1..3f25e7d94808 100644 --- a/packages/SystemUI/res/values-sq-rAL/strings.xml +++ b/packages/SystemUI/res/values-sq-rAL/strings.xml @@ -301,8 +301,7 @@ <string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"gozhdimi i ekranit"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"kërko"</string> <string name="recents_launch_error_message" msgid="2969287838120550506">"<xliff:g id="APP">%s</xliff:g> nuk mundi të nisej."</string> - <!-- no translation found for recents_launch_disabled_message (1624523193008871793) --> - <skip /> + <string name="recents_launch_disabled_message" msgid="1624523193008871793">"<xliff:g id="APP">%s</xliff:g> është i çaktivizuar në modalitetin e sigurt."</string> <string name="recents_history_button_label" msgid="5153358867807604821">"Historiku"</string> <string name="recents_history_clear_all_button_label" msgid="5905258334958006953">"Pastro"</string> <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Ndaje horizontalisht"</string> @@ -479,7 +478,7 @@ <string name="color_apply" msgid="9212602012641034283">"Zbato"</string> <string name="color_revert_title" msgid="4746666545480534663">"Konfirmo cilësimet"</string> <string name="color_revert_message" msgid="9116001069397996691">"Disa cilësime ngjyrash mund ta bëjnë këtë pajisje të papërdorshme. Kliko OK për të konfirmuar këto cilësime ngjyrash, përndryshe këto cilësime do të rivendosen pas 10 sekondash."</string> - <string name="battery_panel_title" msgid="3476715163685592453">"Bateria (<xliff:g id="ID_1">%1$d</xliff:g>%%)"</string> + <string name="battery_panel_title" msgid="7944156115535366613">"Përdorimi i baterisë"</string> <string name="battery_detail_charging_summary" msgid="1279095653533044008">"\"Kursyesi i baterisë\" nuk është i disponueshëm gjatë karikimit"</string> <string name="battery_detail_switch_title" msgid="6285872470260795421">"Kursyesi i baterisë"</string> <string name="battery_detail_switch_summary" msgid="9049111149407626804">"Pakëson veprimtarinë dhe të dhënat në sfond"</string> diff --git a/packages/SystemUI/res/values-sr/strings.xml b/packages/SystemUI/res/values-sr/strings.xml index c75b67797d71..8d54ca202ce9 100644 --- a/packages/SystemUI/res/values-sr/strings.xml +++ b/packages/SystemUI/res/values-sr/strings.xml @@ -480,7 +480,8 @@ <string name="color_apply" msgid="9212602012641034283">"Примени"</string> <string name="color_revert_title" msgid="4746666545480534663">"Потврдите подешавања"</string> <string name="color_revert_message" msgid="9116001069397996691">"Нека подешавања боја могу да учине уређај неупотребљивим. Кликните на Потврди да бисте потврдили ова подешавања боја, пошто ће се у супротном ова подешавања ресетовати након 10 секунди."</string> - <string name="battery_panel_title" msgid="3476715163685592453">"Батерија (<xliff:g id="ID_1">%1$d</xliff:g>%%)"</string> + <!-- no translation found for battery_panel_title (7944156115535366613) --> + <skip /> <string name="battery_detail_charging_summary" msgid="1279095653533044008">"Уштеда батерије није доступна током пуњења"</string> <string name="battery_detail_switch_title" msgid="6285872470260795421">"Уштеда батерије"</string> <string name="battery_detail_switch_summary" msgid="9049111149407626804">"Смањује перформансе и позадинске податке"</string> diff --git a/packages/SystemUI/res/values-sv/strings.xml b/packages/SystemUI/res/values-sv/strings.xml index bc142c18673e..2a919620f27d 100644 --- a/packages/SystemUI/res/values-sv/strings.xml +++ b/packages/SystemUI/res/values-sv/strings.xml @@ -479,7 +479,8 @@ <string name="color_apply" msgid="9212602012641034283">"Verkställ"</string> <string name="color_revert_title" msgid="4746666545480534663">"Bekräfta inställningarna"</string> <string name="color_revert_message" msgid="9116001069397996691">"Vissa färginställningar kan göra den här enheten oanvändbar. Klicka på OK om du vill bekräfta färginställningarna, annars återställs inställningarna efter 10 sekunder."</string> - <string name="battery_panel_title" msgid="3476715163685592453">"Batteri (<xliff:g id="ID_1">%1$d</xliff:g> %%)"</string> + <!-- no translation found for battery_panel_title (7944156115535366613) --> + <skip /> <string name="battery_detail_charging_summary" msgid="1279095653533044008">"Batterisparläget är inte tillgängligt vid laddning"</string> <string name="battery_detail_switch_title" msgid="6285872470260795421">"Batterisparläge"</string> <string name="battery_detail_switch_summary" msgid="9049111149407626804">"Minskar prestanda och bakgrundsdata"</string> diff --git a/packages/SystemUI/res/values-sw/strings.xml b/packages/SystemUI/res/values-sw/strings.xml index 81e03508e772..55f021359e66 100644 --- a/packages/SystemUI/res/values-sw/strings.xml +++ b/packages/SystemUI/res/values-sw/strings.xml @@ -479,7 +479,8 @@ <string name="color_apply" msgid="9212602012641034283">"Tumia"</string> <string name="color_revert_title" msgid="4746666545480534663">"Thibitisha mipangilio"</string> <string name="color_revert_message" msgid="9116001069397996691">"Baadhi ya mipangilio ya rangi inaweza kufanya kifaa hiki kisitumike. Bofya Sawa ili uthibitishe mipangilio hii ya rangi, vinginevyo, mipangilio hii itajiweka upya baada ya sekunde 10."</string> - <string name="battery_panel_title" msgid="3476715163685592453">"Betri (<xliff:g id="ID_1">%1$d</xliff:g>%%)"</string> + <!-- no translation found for battery_panel_title (7944156115535366613) --> + <skip /> <string name="battery_detail_charging_summary" msgid="1279095653533044008">"Kiokoa Betri hakipatikani unapochaji betri"</string> <string name="battery_detail_switch_title" msgid="6285872470260795421">"Kiokoa Betri"</string> <string name="battery_detail_switch_summary" msgid="9049111149407626804">"Hupunguza data ya chini chini na utendaji"</string> diff --git a/packages/SystemUI/res/values-ta-rIN/strings.xml b/packages/SystemUI/res/values-ta-rIN/strings.xml index 813858e7b8be..ecfc446dafbe 100644 --- a/packages/SystemUI/res/values-ta-rIN/strings.xml +++ b/packages/SystemUI/res/values-ta-rIN/strings.xml @@ -479,7 +479,8 @@ <string name="color_apply" msgid="9212602012641034283">"பயன்படுத்து"</string> <string name="color_revert_title" msgid="4746666545480534663">"அமைப்புகளை உறுதிப்படுத்து"</string> <string name="color_revert_message" msgid="9116001069397996691">"சில வண்ண அமைப்புகள் இந்தச் சாதனத்தைப் பயன்படுத்த முடியாதபடி செய்யலாம். இந்த வண்ண அமைப்புகளை உறுதிப்படுத்த, சரி என்பதைக் கிளிக் செய்யவும், இல்லையெனில் இந்த அமைப்புகள் 10 வினாடிகளுக்குப் பின் மீட்டமைக்கப்படும்."</string> - <string name="battery_panel_title" msgid="3476715163685592453">"பேட்டரி (<xliff:g id="ID_1">%1$d</xliff:g>%%)"</string> + <!-- no translation found for battery_panel_title (7944156115535366613) --> + <skip /> <string name="battery_detail_charging_summary" msgid="1279095653533044008">"சார்ஜ் செய்யும் போது பேட்டரி சேமிப்பானைப் பயன்படுத்த முடியாது"</string> <string name="battery_detail_switch_title" msgid="6285872470260795421">"பேட்டரி சேமிப்பான்"</string> <string name="battery_detail_switch_summary" msgid="9049111149407626804">"செயல்திறனையும் பின்புலத்தில் தரவு செயலாக்கப்படுவதையும் குறைக்கும்"</string> diff --git a/packages/SystemUI/res/values-te-rIN/strings.xml b/packages/SystemUI/res/values-te-rIN/strings.xml index 47fd3f2648b2..4f702b6c405d 100644 --- a/packages/SystemUI/res/values-te-rIN/strings.xml +++ b/packages/SystemUI/res/values-te-rIN/strings.xml @@ -301,8 +301,7 @@ <string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"స్క్రీన్ పిన్నింగ్"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"శోధించు"</string> <string name="recents_launch_error_message" msgid="2969287838120550506">"<xliff:g id="APP">%s</xliff:g>ని ప్రారంభించడం సాధ్యపడలేదు."</string> - <!-- no translation found for recents_launch_disabled_message (1624523193008871793) --> - <skip /> + <string name="recents_launch_disabled_message" msgid="1624523193008871793">"<xliff:g id="APP">%s</xliff:g> సురక్షిత-మోడ్లో నిలిపివేయబడింది."</string> <string name="recents_history_button_label" msgid="5153358867807604821">"చరిత్ర"</string> <string name="recents_history_clear_all_button_label" msgid="5905258334958006953">"తీసివేయి"</string> <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"సమతలంగా విభజించు"</string> @@ -479,7 +478,7 @@ <string name="color_apply" msgid="9212602012641034283">"వర్తింపజేయి"</string> <string name="color_revert_title" msgid="4746666545480534663">"సెట్టింగ్లను నిర్ధారించండి"</string> <string name="color_revert_message" msgid="9116001069397996691">"కొన్ని రంగు సెట్టింగ్ల వలన ఈ పరికరం ఉపయోగించలేని విధంగా అయిపోవచ్చు. ఈ రంగు సెట్టింగ్లను నిర్ధారించడానికి సరే క్లిక్ చేయండి లేదంటే ఈ సెట్టింగ్లు 10 సెకన్ల తర్వాత రీసెట్ చేయబడతాయి."</string> - <string name="battery_panel_title" msgid="3476715163685592453">"బ్యాటరీ (<xliff:g id="ID_1">%1$d</xliff:g>%%)"</string> + <string name="battery_panel_title" msgid="7944156115535366613">"బ్యాటరీ వినియోగం"</string> <string name="battery_detail_charging_summary" msgid="1279095653533044008">"ఛార్జ్ అవుతున్న సమయంలో బ్యాటరీ సేవర్ అందుబాటులో ఉండదు"</string> <string name="battery_detail_switch_title" msgid="6285872470260795421">"బ్యాటరీ సేవర్"</string> <string name="battery_detail_switch_summary" msgid="9049111149407626804">"పనితీరుని మరియు నేపథ్య డేటాను తగ్గిస్తుంది"</string> diff --git a/packages/SystemUI/res/values-th/strings.xml b/packages/SystemUI/res/values-th/strings.xml index 3b5ff686f777..bc7e26fd5247 100644 --- a/packages/SystemUI/res/values-th/strings.xml +++ b/packages/SystemUI/res/values-th/strings.xml @@ -479,7 +479,8 @@ <string name="color_apply" msgid="9212602012641034283">"ใช้"</string> <string name="color_revert_title" msgid="4746666545480534663">"ยืนยันการตั้งค่า"</string> <string name="color_revert_message" msgid="9116001069397996691">"การตั้งค่าสีบางอย่างอาจทำให้อุปกรณ์นี้ใช้งานไม่ได้ คลิกตกลงเพื่อยืนยันการตั้งค่าสีเหล่านี้ มิฉะนั้นระบบจะรีเซ็ตการตั้งค่าหลังจาก 10 วินาที"</string> - <string name="battery_panel_title" msgid="3476715163685592453">"แบตเตอรี่ (<xliff:g id="ID_1">%1$d</xliff:g>%%)"</string> + <!-- no translation found for battery_panel_title (7944156115535366613) --> + <skip /> <string name="battery_detail_charging_summary" msgid="1279095653533044008">"ไม่สามารถใช้โหมดประหยัดแบตเตอรี่ระหว่างการชาร์จ"</string> <string name="battery_detail_switch_title" msgid="6285872470260795421">"โหมดประหยัดแบตเตอรี่"</string> <string name="battery_detail_switch_summary" msgid="9049111149407626804">"ลดประสิทธิภาพการทำงานและข้อมูลแบ็กกราวด์"</string> diff --git a/packages/SystemUI/res/values-tl/strings.xml b/packages/SystemUI/res/values-tl/strings.xml index 19ef14d367fe..ab800d48aed2 100644 --- a/packages/SystemUI/res/values-tl/strings.xml +++ b/packages/SystemUI/res/values-tl/strings.xml @@ -479,7 +479,8 @@ <string name="color_apply" msgid="9212602012641034283">"Ilapat"</string> <string name="color_revert_title" msgid="4746666545480534663">"Kumpirmahin ang mga setting"</string> <string name="color_revert_message" msgid="9116001069397996691">"Maaaring hindi magamit ang device na ito dahil sa ilang setting ng kulay. I-click ang OK upang kumpirmahin ang mga setting ng kulay na ito, kung hindi ay mare-reset ang mga setting na ito pagkatapos ng 10 segundo."</string> - <string name="battery_panel_title" msgid="3476715163685592453">"Baterya (<xliff:g id="ID_1">%1$d</xliff:g>%%)"</string> + <!-- no translation found for battery_panel_title (7944156115535366613) --> + <skip /> <string name="battery_detail_charging_summary" msgid="1279095653533044008">"Hindi available ang Pangtipid sa Baterya kapag nagcha-charge"</string> <string name="battery_detail_switch_title" msgid="6285872470260795421">"Pangtipid sa Baterya"</string> <string name="battery_detail_switch_summary" msgid="9049111149407626804">"Binabawasan ang pagganap at data sa background"</string> diff --git a/packages/SystemUI/res/values-tr/strings.xml b/packages/SystemUI/res/values-tr/strings.xml index 90a2f28bed42..1acffad7ebff 100644 --- a/packages/SystemUI/res/values-tr/strings.xml +++ b/packages/SystemUI/res/values-tr/strings.xml @@ -479,7 +479,8 @@ <string name="color_apply" msgid="9212602012641034283">"Uygula"</string> <string name="color_revert_title" msgid="4746666545480534663">"Ayarları onaylayın"</string> <string name="color_revert_message" msgid="9116001069397996691">"Bazı renkler bu cihazı kullanılmaz yapabilir. Bu renkleri onaylamak için Tamam\'ı tıklayın. Tıklamazsanız bu ayarlar 10 saniye sonra sıfırlanacaktır."</string> - <string name="battery_panel_title" msgid="3476715163685592453">"Pil (%%<xliff:g id="ID_1">%1$d</xliff:g>)"</string> + <!-- no translation found for battery_panel_title (7944156115535366613) --> + <skip /> <string name="battery_detail_charging_summary" msgid="1279095653533044008">"Şarj sırasında Pil Tasarrufu özelliği kullanılamaz"</string> <string name="battery_detail_switch_title" msgid="6285872470260795421">"Pil Tasarrufu"</string> <string name="battery_detail_switch_summary" msgid="9049111149407626804">"Performansı ve arka plan verilerini azaltır"</string> diff --git a/packages/SystemUI/res/values-uk/strings.xml b/packages/SystemUI/res/values-uk/strings.xml index 7046d57bc33d..0a00467cf052 100644 --- a/packages/SystemUI/res/values-uk/strings.xml +++ b/packages/SystemUI/res/values-uk/strings.xml @@ -481,7 +481,8 @@ <string name="color_apply" msgid="9212602012641034283">"Застосувати"</string> <string name="color_revert_title" msgid="4746666545480534663">"Підтвердити налаштування"</string> <string name="color_revert_message" msgid="9116001069397996691">"Деякі налаштування кольорів можуть зробити цей пристрій непридатним для використання. Натисніть OK, щоб підтвердити налаштування, інакше їх буде скинуто через 10 секунд."</string> - <string name="battery_panel_title" msgid="3476715163685592453">"Акумулятор (<xliff:g id="ID_1">%1$d</xliff:g>%%)"</string> + <!-- no translation found for battery_panel_title (7944156115535366613) --> + <skip /> <string name="battery_detail_charging_summary" msgid="1279095653533044008">"Режим економії заряду акумулятора недоступний під час заряджання"</string> <string name="battery_detail_switch_title" msgid="6285872470260795421">"Режим економії заряду акумулятора"</string> <string name="battery_detail_switch_summary" msgid="9049111149407626804">"Знижується продуктивність і обмежується обмін даними у фоновому режимі"</string> diff --git a/packages/SystemUI/res/values-ur-rPK/strings.xml b/packages/SystemUI/res/values-ur-rPK/strings.xml index 3923a556d9db..0e1d78f430b7 100644 --- a/packages/SystemUI/res/values-ur-rPK/strings.xml +++ b/packages/SystemUI/res/values-ur-rPK/strings.xml @@ -479,7 +479,8 @@ <string name="color_apply" msgid="9212602012641034283">"لاگو کریں"</string> <string name="color_revert_title" msgid="4746666545480534663">"ترتیبات کی توثیق کریں"</string> <string name="color_revert_message" msgid="9116001069397996691">"رنگوں کی کچھ ترتیبات اس آلے کو ناقابل استعمال بنا سکتی ہیں۔ رنگوں کی ان ترتیبات کی توثیق کرنے کیلئے ٹھیک ہے پر کلک کریں، بصورت دیگر 10 سیکنڈ بعد یہ ترتیبات ری سیٹ ہو جائیں گی۔"</string> - <string name="battery_panel_title" msgid="3476715163685592453">"بیٹری (%%<xliff:g id="ID_1">%1$d</xliff:g>)"</string> + <!-- no translation found for battery_panel_title (7944156115535366613) --> + <skip /> <string name="battery_detail_charging_summary" msgid="1279095653533044008">"چارجنگ کے دوران بیٹری سیور دستیاب نہیں ہے"</string> <string name="battery_detail_switch_title" msgid="6285872470260795421">"بیٹری سیور"</string> <string name="battery_detail_switch_summary" msgid="9049111149407626804">"کارکردگی اور پس منظر کا ڈیٹا کم کر دیتا ہے"</string> diff --git a/packages/SystemUI/res/values-uz-rUZ/strings.xml b/packages/SystemUI/res/values-uz-rUZ/strings.xml index 9ed2ae3cfdd5..68393ffb0cb9 100644 --- a/packages/SystemUI/res/values-uz-rUZ/strings.xml +++ b/packages/SystemUI/res/values-uz-rUZ/strings.xml @@ -376,7 +376,7 @@ <string name="empty_shade_text" msgid="708135716272867002">"Bildirishnomalar yo‘q"</string> <string name="device_owned_footer" msgid="3802752663326030053">"Qurilma kuzatilishi mumkin"</string> <string name="profile_owned_footer" msgid="8021888108553696069">"Profil kuzatilishi mumkin"</string> - <string name="vpn_footer" msgid="2388611096129106812">"Tarmoq kuzatuv ostida bo‘lishi mumkin"</string> + <string name="vpn_footer" msgid="2388611096129106812">"Tarmoqni kuzatish mumkin"</string> <string name="monitoring_title_device_owned" msgid="7121079311903859610">"Qurilmalarni kuzatish"</string> <string name="monitoring_title_profile_owned" msgid="6790109874733501487">"Profilni kuzatish"</string> <string name="monitoring_title" msgid="169206259253048106">"Tarmoqlarni kuzatish"</string> @@ -479,7 +479,8 @@ <string name="color_apply" msgid="9212602012641034283">"Qo‘llash"</string> <string name="color_revert_title" msgid="4746666545480534663">"Sozlamalarni tasdiqlang"</string> <string name="color_revert_message" msgid="9116001069397996691">"Ba’zi rang sozlamalari qurilmadan foydalanishni qiyinlashtirish mumkin. Tanlgan parametrlarni tasdiqlash uchun “OK” tugmasini bosing. Aks holda, ular 10 soniyadan so‘ng qayta tiklanadi."</string> - <string name="battery_panel_title" msgid="3476715163685592453">"Quvvat (<xliff:g id="ID_1">%1$d</xliff:g>%%)"</string> + <!-- no translation found for battery_panel_title (7944156115535366613) --> + <skip /> <string name="battery_detail_charging_summary" msgid="1279095653533044008">"Quvvat tejash rejimidan quvvatlash vaqtida foydalanib bo‘lmaydi"</string> <string name="battery_detail_switch_title" msgid="6285872470260795421">"Quvvat tejash rejimi"</string> <string name="battery_detail_switch_summary" msgid="9049111149407626804">"Unumdorlikni pasaytiradi va fonda internetdan foydalanishni cheklaydi"</string> diff --git a/packages/SystemUI/res/values-vi/strings.xml b/packages/SystemUI/res/values-vi/strings.xml index 45ca0b21f94e..d4c7317dd5cc 100644 --- a/packages/SystemUI/res/values-vi/strings.xml +++ b/packages/SystemUI/res/values-vi/strings.xml @@ -479,7 +479,8 @@ <string name="color_apply" msgid="9212602012641034283">"Áp dụng"</string> <string name="color_revert_title" msgid="4746666545480534663">"Xác nhận cài đặt"</string> <string name="color_revert_message" msgid="9116001069397996691">"Một số cài đặt màu có thể khiến thiết bị này không sử dụng được. Hãy nhấp vào OK để xác nhận các cài đặt màu này, nếu không những cài đặt này sẽ được đặt lại sau 10 giây."</string> - <string name="battery_panel_title" msgid="3476715163685592453">"Pin (<xliff:g id="ID_1">%1$d</xliff:g>%%)"</string> + <!-- no translation found for battery_panel_title (7944156115535366613) --> + <skip /> <string name="battery_detail_charging_summary" msgid="1279095653533044008">"Trình tiết kiệm pin không khả dụng trong khi sạc"</string> <string name="battery_detail_switch_title" msgid="6285872470260795421">"Trình tiết kiệm pin"</string> <string name="battery_detail_switch_summary" msgid="9049111149407626804">"Giảm hiệu suất và dữ liệu nền"</string> diff --git a/packages/SystemUI/res/values-zh-rCN/strings.xml b/packages/SystemUI/res/values-zh-rCN/strings.xml index e5932d32593e..8a3723a7e3e2 100644 --- a/packages/SystemUI/res/values-zh-rCN/strings.xml +++ b/packages/SystemUI/res/values-zh-rCN/strings.xml @@ -479,7 +479,8 @@ <string name="color_apply" msgid="9212602012641034283">"应用"</string> <string name="color_revert_title" msgid="4746666545480534663">"确认设置"</string> <string name="color_revert_message" msgid="9116001069397996691">"部分颜色设置可能会导致此设备无法使用。请点击“确定”确认这些颜色设置，否则，系统将在 10 秒后重置这些设置。"</string> - <string name="battery_panel_title" msgid="3476715163685592453">"电池 (<xliff:g id="ID_1">%1$d</xliff:g>%%)"</string> + <!-- no translation found for battery_panel_title (7944156115535366613) --> + <skip /> <string name="battery_detail_charging_summary" msgid="1279095653533044008">"充电过程中无法使用节电助手"</string> <string name="battery_detail_switch_title" msgid="6285872470260795421">"节电助手"</string> <string name="battery_detail_switch_summary" msgid="9049111149407626804">"降低性能并限制后台流量"</string> diff --git a/packages/SystemUI/res/values-zh-rHK/strings.xml b/packages/SystemUI/res/values-zh-rHK/strings.xml index 660420518b4b..675d0f320007 100644 --- a/packages/SystemUI/res/values-zh-rHK/strings.xml +++ b/packages/SystemUI/res/values-zh-rHK/strings.xml @@ -479,7 +479,8 @@ <string name="color_apply" msgid="9212602012641034283">"套用"</string> <string name="color_revert_title" msgid="4746666545480534663">"確認設定"</string> <string name="color_revert_message" msgid="9116001069397996691">"部分顏色設定會令此裝置無法使用。請按一下 [確定] 加以確認，否則這些顏色設定將於 10 秒後重設。"</string> - <string name="battery_panel_title" msgid="3476715163685592453">"電池電量 (<xliff:g id="ID_1">%1$d</xliff:g>%%)"</string> + <!-- no translation found for battery_panel_title (7944156115535366613) --> + <skip /> <string name="battery_detail_charging_summary" msgid="1279095653533044008">"充電時無法使用「省電模式」"</string> <string name="battery_detail_switch_title" msgid="6285872470260795421">"省電模式"</string> <string name="battery_detail_switch_summary" msgid="9049111149407626804">"降低效能並限制背景數據傳輸"</string> diff --git a/packages/SystemUI/res/values-zh-rTW/strings.xml b/packages/SystemUI/res/values-zh-rTW/strings.xml index 1132ff40939e..08cbb17bec23 100644 --- a/packages/SystemUI/res/values-zh-rTW/strings.xml +++ b/packages/SystemUI/res/values-zh-rTW/strings.xml @@ -479,7 +479,8 @@ <string name="color_apply" msgid="9212602012641034283">"套用"</string> <string name="color_revert_title" msgid="4746666545480534663">"確認設定"</string> <string name="color_revert_message" msgid="9116001069397996691">"部分顏色設定可能會造成這部裝置無法使用。請按一下 [確定] 來確認您要使用這類顏色設定，否則系統將在 10 秒後重設這些設定。"</string> - <string name="battery_panel_title" msgid="3476715163685592453">"電池 (<xliff:g id="ID_1">%1$d</xliff:g>%%)"</string> + <!-- no translation found for battery_panel_title (7944156115535366613) --> + <skip /> <string name="battery_detail_charging_summary" msgid="1279095653533044008">"充電時無法使用節約耗電量模式"</string> <string name="battery_detail_switch_title" msgid="6285872470260795421">"節約耗電量"</string> <string name="battery_detail_switch_summary" msgid="9049111149407626804">"降低效能並限制背景資料傳輸"</string> diff --git a/packages/SystemUI/res/values-zu/strings.xml b/packages/SystemUI/res/values-zu/strings.xml index e6fb0cb16a55..df58a628ea84 100644 --- a/packages/SystemUI/res/values-zu/strings.xml +++ b/packages/SystemUI/res/values-zu/strings.xml @@ -479,7 +479,8 @@ <string name="color_apply" msgid="9212602012641034283">"Sebenzisa"</string> <string name="color_revert_title" msgid="4746666545480534663">"Qinisekisa izilungiselelo"</string> <string name="color_revert_message" msgid="9116001069397996691">"Ezinye izilungiselelo zombala zingenza le divayisi ingasebenziseki. Chofoza ku-KULUNGILE ukuze uqinisekise lezi zilungiselelo zombala, uma kungenjalo lezi zilungiselelo zizosethwa kabusha ngemuva kwamasekhondi angu-10."</string> - <string name="battery_panel_title" msgid="3476715163685592453">"Ibhethri (<xliff:g id="ID_1">%1$d</xliff:g>%%)"</string> + <!-- no translation found for battery_panel_title (7944156115535366613) --> + <skip /> <string name="battery_detail_charging_summary" msgid="1279095653533044008">"Isilondolozi sebhethri asitholakali ngesikhathi sokushaja"</string> <string name="battery_detail_switch_title" msgid="6285872470260795421">"Isilondolozi sebhethri"</string> <string name="battery_detail_switch_summary" msgid="9049111149407626804">"Sehlisa ukusebenza nedatha yasemuva"</string> diff --git a/packages/SystemUI/src/com/android/systemui/EventLogConstants.java b/packages/SystemUI/src/com/android/systemui/EventLogConstants.java index 43a1be1d0642..9238928de9e2 100644 --- a/packages/SystemUI/src/com/android/systemui/EventLogConstants.java +++ b/packages/SystemUI/src/com/android/systemui/EventLogConstants.java @@ -40,4 +40,15 @@ public class EventLogConstants { public static final int SYSUI_SHADE_GESTURE_SWIPE_DOWN_QS = 9; /** The user tapped on the status bar to open quick settings, from shade. */ public static final int SYSUI_TAP_TO_OPEN_QS = 10; + + /** Secondary user tries binding to the system sysui service */ + public static final int SYSUI_RECENTS_CONNECTION_USER_BIND_SERVICE = 1; + /** Secondary user is bound to the system sysui service */ + public static final int SYSUI_RECENTS_CONNECTION_USER_SYSTEM_BOUND = 2; + /** Secondary user loses connection after system sysui has died */ + public static final int SYSUI_RECENTS_CONNECTION_USER_SYSTEM_UNBOUND = 3; + /** System sysui registers secondary user's callbacks */ + public static final int SYSUI_RECENTS_CONNECTION_SYSTEM_REGISTER_USER = 4; + /** System sysui unregisters secondary user's callbacks (after death) */ + public static final int SYSUI_RECENTS_CONNECTION_SYSTEM_UNREGISTER_USER = 5; } diff --git a/packages/SystemUI/src/com/android/systemui/EventLogTags.logtags b/packages/SystemUI/src/com/android/systemui/EventLogTags.logtags index a584cf638177..1601675197cb 100644 --- a/packages/SystemUI/src/com/android/systemui/EventLogTags.logtags +++ b/packages/SystemUI/src/com/android/systemui/EventLogTags.logtags @@ -51,3 +51,13 @@ option java_package com.android.systemui; # SearchPanelView.java # --------------------------- 36050 sysui_searchpanel_touch (type|1),(x|1),(y|1) + +# --------------------------- +# Recents.java, RecentsSystemUser.java +# --------------------------- +## type: 1: USER_BIND_SERVICE Secondary user tries binding to the system sysui service +## 2: USER_SYSTEM_BOUND Secondary user is bound to the system sysui service +## 3: USER_SYSTEM_UNBOUND Secondary user loses connection after system sysui has died +## 4: SYSTEM_REGISTER_USER System sysui registers user's callbacks +## 5: SYSTEM_UNREGISTER_USER System sysui unregisters user's callbacks (after death) +36060 sysui_recents_connection (type|1),(user|1)
\ No newline at end of file diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSContainer.java b/packages/SystemUI/src/com/android/systemui/qs/QSContainer.java index 32eeb0787113..34dfd6c55abd 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSContainer.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSContainer.java @@ -40,6 +40,7 @@ public class QSContainer extends FrameLayout { private int mHeightOverride = -1; private QSPanel mQSPanel; + private QSDetail mQSDetail; protected BaseStatusBarHeader mHeader; private float mQsExpansion; private boolean mQsExpanded; @@ -57,6 +58,8 @@ public class QSContainer extends FrameLayout { protected void onFinishInflate() { super.onFinishInflate(); mQSPanel = (QSPanel) findViewById(R.id.quick_settings_panel); + mQSDetail = (QSDetail) findViewById(R.id.qs_detail); + mQSDetail.setQsPanel(mQSPanel); mHeader = (BaseStatusBarHeader) findViewById(R.id.header); } @@ -82,7 +85,7 @@ public class QSContainer extends FrameLayout { * during closing the detail panel, this already returns the smaller height. */ public int getDesiredHeight() { - if (mQSPanel.isClosingDetail()) { + if (mQSDetail.isClosingDetail()) { return mQSPanel.getGridHeight() + mHeader.getCollapsedHeight() + getPaddingBottom(); } else { return getMeasuredHeight(); @@ -94,6 +97,7 @@ public class QSContainer extends FrameLayout { int height = (int) (mQsExpansion * (heightOverride - mHeader.getCollapsedHeight())) + mHeader.getCollapsedHeight(); setBottom(getTop() + height); + mQSDetail.setBottom(getTop() + height); } private void updateQsState() { @@ -115,6 +119,10 @@ public class QSContainer extends FrameLayout { return mQSPanel; } + public boolean isShowingDetail() { + return mQSPanel.isShowingCustomize() || mQSDetail.isShowingDetail(); + } + public void setHeaderClickable(boolean clickable) { if (DEBUG) Log.d(TAG, "setHeaderClickable " + clickable); mHeader.setClickable(clickable); @@ -154,6 +162,7 @@ public class QSContainer extends FrameLayout { } mHeader.setExpansion(mKeyguardShowing ? 1 : expansion); mQSPanel.setTranslationY(translationScaleY * mQSPanel.getHeight()); + mQSDetail.setFullyExpanded(expansion == 1); updateBottom(); } diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSDetail.java b/packages/SystemUI/src/com/android/systemui/qs/QSDetail.java new file mode 100644 index 000000000000..50c0cca8d8e7 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/qs/QSDetail.java @@ -0,0 +1,287 @@ +/* + * Copyright (C) 2016 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the + * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package com.android.systemui.qs; + +import android.animation.Animator; +import android.animation.Animator.AnimatorListener; +import android.animation.AnimatorListenerAdapter; +import android.annotation.Nullable; +import android.content.Context; +import android.content.Intent; +import android.content.res.Configuration; +import android.graphics.drawable.Animatable; +import android.util.AttributeSet; +import android.util.SparseArray; +import android.view.View; +import android.view.ViewGroup; +import android.view.accessibility.AccessibilityEvent; +import android.widget.ImageView; +import android.widget.LinearLayout; +import android.widget.Switch; +import android.widget.TextView; +import com.android.internal.logging.MetricsLogger; +import com.android.systemui.FontSizeUtils; +import com.android.systemui.R; +import com.android.systemui.qs.QSTile.DetailAdapter; +import com.android.systemui.statusbar.phone.QSTileHost; + +public class QSDetail extends LinearLayout { + + private static final String TAG = "QSDetail"; + private static final long FADE_DURATION = 300; + + private final SparseArray<View> mDetailViews = new SparseArray<>(); + + private ViewGroup mDetailContent; + private TextView mDetailSettingsButton; + private TextView mDetailDoneButton; + private QSDetailClipper mClipper; + private DetailAdapter mDetailAdapter; + private QSPanel mQsPanel; + + private View mQsDetailHeader; + private TextView mQsDetailHeaderTitle; + private Switch mQsDetailHeaderSwitch; + private ImageView mQsDetailHeaderProgress; + + private QSTileHost mHost; + + private boolean mScanState; + private boolean mClosingDetail; + private boolean mFullyExpanded; + private View mQsDetailHeaderBack; + + public QSDetail(Context context, @Nullable AttributeSet attrs) { + super(context, attrs); + } + + @Override + protected void onConfigurationChanged(Configuration newConfig) { + super.onConfigurationChanged(newConfig); + FontSizeUtils.updateFontSize(mDetailDoneButton, R.dimen.qs_detail_button_text_size); + FontSizeUtils.updateFontSize(mDetailSettingsButton, R.dimen.qs_detail_button_text_size); + + for (int i = 0; i < mDetailViews.size(); i++) { + mDetailViews.valueAt(i).dispatchConfigurationChanged(newConfig); + } + } + + @Override + protected void onFinishInflate() { + super.onFinishInflate(); + mDetailContent = (ViewGroup) findViewById(android.R.id.content); + mDetailSettingsButton = (TextView) findViewById(android.R.id.button2); + mDetailDoneButton = (TextView) findViewById(android.R.id.button1); + + mQsDetailHeader = findViewById(R.id.qs_detail_header); + mQsDetailHeaderBack = mQsDetailHeader.findViewById(com.android.internal.R.id.up); + mQsDetailHeaderTitle = (TextView) mQsDetailHeader.findViewById(android.R.id.title); + mQsDetailHeaderSwitch = (Switch) mQsDetailHeader.findViewById(android.R.id.toggle); + mQsDetailHeaderProgress = (ImageView) findViewById(R.id.qs_detail_header_progress); + + updateDetailText(); + + mClipper = new QSDetailClipper(this); + + final OnClickListener doneListener = new OnClickListener() { + @Override + public void onClick(View v) { + announceForAccessibility( + mContext.getString(R.string.accessibility_desc_quick_settings)); + mQsPanel.closeDetail(); + } + }; + mQsDetailHeaderBack.setOnClickListener(doneListener); + mDetailDoneButton.setOnClickListener(doneListener); + } + + public void setQsPanel(QSPanel panel) { + mQsPanel = panel; + mQsPanel.setCallback(mQsPanelCallback); + } + + public void setHost(QSTileHost host) { + mHost = host; + } + public boolean isShowingDetail() { + return mDetailAdapter != null; + } + + public void setFullyExpanded(boolean fullyExpanded) { + mFullyExpanded = fullyExpanded; + } + + private void updateDetailText() { + mDetailDoneButton.setText(R.string.quick_settings_done); + mDetailSettingsButton.setText(R.string.quick_settings_more_settings); + } + + public void updateResources() { + updateDetailText(); + } + + public boolean isClosingDetail() { + return mClosingDetail; + } + + private void handleShowingDetail(final QSTile.DetailAdapter adapter, int x, int y) { + final boolean showingDetail = adapter != null; + setClickable(showingDetail); + if (showingDetail) { + mQsDetailHeaderTitle.setText(adapter.getTitle()); + final Boolean toggleState = adapter.getToggleState(); + if (toggleState == null) { + mQsDetailHeaderSwitch.setVisibility(INVISIBLE); + mQsDetailHeader.setClickable(false); + } else { + mQsDetailHeaderSwitch.setVisibility(VISIBLE); + mQsDetailHeaderSwitch.setChecked(toggleState); + mQsDetailHeader.setClickable(true); + mQsDetailHeader.setOnClickListener(new OnClickListener() { + @Override + public void onClick(View v) { + boolean checked = !mQsDetailHeaderSwitch.isChecked(); + mQsDetailHeaderSwitch.setChecked(checked); + adapter.setToggleState(checked); + } + }); + } + } + + boolean visibleDiff = (mDetailAdapter != null) != (adapter != null); + if (!visibleDiff && mDetailAdapter == adapter) return; // already in right state + AnimatorListener listener = null; + if (adapter != null) { + int viewCacheIndex = adapter.getMetricsCategory(); + View detailView = adapter.createDetailView(mContext, mDetailViews.get(viewCacheIndex), + mDetailContent); + if (detailView == null) throw new IllegalStateException("Must return detail view"); + + final Intent settingsIntent = adapter.getSettingsIntent(); + mDetailSettingsButton.setVisibility(settingsIntent != null ? VISIBLE : GONE); + mDetailSettingsButton.setOnClickListener(new OnClickListener() { + @Override + public void onClick(View v) { + mHost.startActivityDismissingKeyguard(settingsIntent); + } + }); + + mDetailContent.removeAllViews(); + mDetailContent.addView(detailView); + mDetailViews.put(viewCacheIndex, detailView); + MetricsLogger.visible(mContext, adapter.getMetricsCategory()); + announceForAccessibility(mContext.getString( + R.string.accessibility_quick_settings_detail, + adapter.getTitle())); + mDetailAdapter = adapter; + listener = mHideGridContentWhenDone; + setVisibility(View.VISIBLE); + } else { + if (mDetailAdapter != null) { + MetricsLogger.hidden(mContext, mDetailAdapter.getMetricsCategory()); + } + mClosingDetail = true; + mDetailAdapter = null; + listener = mTeardownDetailWhenDone; + mQsPanel.setGridContentVisibility(true); + mQsPanelCallback.onScanStateChanged(false); + } + sendAccessibilityEvent(AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED); + if (visibleDiff) { + if (mFullyExpanded || mDetailAdapter != null) { + setAlpha(1); + mClipper.animateCircularClip(x, y, mDetailAdapter != null, listener); + } else { + animate().alpha(0) + .setDuration(FADE_DURATION) + .setListener(listener) + .start(); + } + } + } + + private void handleToggleStateChanged(boolean state) { + mQsDetailHeaderSwitch.setChecked(state); + } + + private void handleScanStateChanged(boolean state) { + if (mScanState == state) return; + mScanState = state; + final Animatable anim = (Animatable) mQsDetailHeaderProgress.getDrawable(); + if (state) { + mQsDetailHeaderProgress.animate().alpha(1f); + anim.start(); + } else { + mQsDetailHeaderProgress.animate().alpha(0f); + anim.stop(); + } + } + + private final QSPanel.Callback mQsPanelCallback = new QSPanel.Callback() { + @Override + public void onToggleStateChanged(final boolean state) { + post(new Runnable() { + @Override + public void run() { + handleToggleStateChanged(state); + } + }); + } + + @Override + public void onShowingDetail(final DetailAdapter detail, final int x, final int y) { + post(new Runnable() { + @Override + public void run() { + handleShowingDetail(detail, x, y); + } + }); + } + + @Override + public void onScanStateChanged(final boolean state) { + post(new Runnable() { + @Override + public void run() { + handleScanStateChanged(state); + } + }); + } + }; + + private final AnimatorListenerAdapter mHideGridContentWhenDone = new AnimatorListenerAdapter() { + public void onAnimationCancel(Animator animation) { + // If we have been cancelled, remove the listener so that onAnimationEnd doesn't get + // called, this will avoid accidentally turning off the grid when we don't want to. + animation.removeListener(this); + }; + + @Override + public void onAnimationEnd(Animator animation) { + // Only hide content if still in detail state. + if (mDetailAdapter != null) { + mQsPanel.setGridContentVisibility(false); + } + } + }; + + private final AnimatorListenerAdapter mTeardownDetailWhenDone = new AnimatorListenerAdapter() { + public void onAnimationEnd(Animator animation) { + mDetailContent.removeAllViews(); + setVisibility(View.INVISIBLE); + mClosingDetail = false; + }; + }; +} diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSPanel.java b/packages/SystemUI/src/com/android/systemui/qs/QSPanel.java index 4ffa527c6a42..53abe37d4752 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSPanel.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSPanel.java @@ -16,12 +16,8 @@ package com.android.systemui.qs; -import android.animation.Animator; -import android.animation.Animator.AnimatorListener; -import android.animation.AnimatorListenerAdapter; import android.content.ComponentName; import android.content.Context; -import android.content.Intent; import android.content.res.Configuration; import android.content.res.Resources; import android.os.Handler; @@ -29,16 +25,11 @@ import android.os.Message; import android.util.AttributeSet; import android.view.LayoutInflater; import android.view.View; -import android.view.ViewGroup; -import android.view.accessibility.AccessibilityEvent; import android.widget.FrameLayout; import android.widget.ImageView; import android.widget.LinearLayout; -import android.widget.TextView; - import com.android.internal.logging.MetricsLogger; import com.android.internal.logging.MetricsProto.MetricsEvent; -import com.android.systemui.FontSizeUtils; import com.android.systemui.R; import com.android.systemui.qs.QSTile.DetailAdapter; import com.android.systemui.qs.customize.QSCustomizer; @@ -60,21 +51,14 @@ public class QSPanel extends FrameLayout implements Tunable { protected final Context mContext; protected final ArrayList<TileRecord> mRecords = new ArrayList<TileRecord>(); - private final View mDetail; - private final ViewGroup mDetailContent; - private final TextView mDetailSettingsButton; - private final TextView mDetailDoneButton; protected final View mBrightnessView; - private final QSDetailClipper mClipper; private final H mHandler = new H(); private int mPanelPaddingBottom; private int mBrightnessPaddingTop; private boolean mExpanded; private boolean mListening; - private boolean mClosingDetail; - private Record mDetailRecord; private Callback mCallback; private BrightnessController mBrightnessController; protected QSTileHost mHost; @@ -86,6 +70,7 @@ public class QSPanel extends FrameLayout implements Tunable { protected QSTileLayout mTileLayout; private QSCustomizer mCustomizePanel; + private Record mDetailRecord; public QSPanel(Context context) { this(context, null); @@ -95,14 +80,6 @@ public class QSPanel extends FrameLayout implements Tunable { super(context, attrs); mContext = context; - mDetail = LayoutInflater.from(context).inflate(R.layout.qs_detail, this, false); - mDetailContent = (ViewGroup) mDetail.findViewById(android.R.id.content); - mDetailSettingsButton = (TextView) mDetail.findViewById(android.R.id.button2); - mDetailDoneButton = (TextView) mDetail.findViewById(android.R.id.button1); - updateDetailText(); - mDetail.setVisibility(GONE); - mDetail.setClickable(true); - addView(mDetail); mQsContainer = new LinearLayout(mContext); mQsContainer.setOrientation(LinearLayout.VERTICAL); @@ -132,21 +109,16 @@ public class QSPanel extends FrameLayout implements Tunable { mFooter = new QSFooter(this, context); mQsContainer.addView(mFooter.getView()); - mClipper = new QSDetailClipper(mDetail); updateResources(); mBrightnessController = new BrightnessController(getContext(), (ImageView) findViewById(R.id.brightness_icon), (ToggleSlider) findViewById(R.id.brightness_slider)); - mDetailDoneButton.setOnClickListener(new OnClickListener() { - @Override - public void onClick(View v) { - announceForAccessibility( - mContext.getString(R.string.accessibility_desc_quick_settings)); - closeDetail(); - } - }); + } + + public boolean isShowingCustomize() { + return mCustomizePanel != null && mCustomizePanel.isCustomizing(); } @Override @@ -189,11 +161,6 @@ public class QSPanel extends FrameLayout implements Tunable { mCustomizePanel.setHost(mHost); } - private void updateDetailText() { - mDetailDoneButton.setText(R.string.quick_settings_done); - mDetailSettingsButton.setText(R.string.quick_settings_more_settings); - } - public void setBrightnessMirror(BrightnessMirrorController c) { super.onFinishInflate(); ToggleSlider brightnessSlider = (ToggleSlider) findViewById(R.id.brightness_slider); @@ -227,7 +194,6 @@ public class QSPanel extends FrameLayout implements Tunable { if (mListening) { refreshAllTiles(); } - updateDetailText(); if (mTileLayout != null) { mTileLayout.updateResources(); } @@ -236,18 +202,6 @@ public class QSPanel extends FrameLayout implements Tunable { @Override protected void onConfigurationChanged(Configuration newConfig) { super.onConfigurationChanged(newConfig); - FontSizeUtils.updateFontSize(mDetailDoneButton, R.dimen.qs_detail_button_text_size); - FontSizeUtils.updateFontSize(mDetailSettingsButton, R.dimen.qs_detail_button_text_size); - - // We need to poke the detail views as well as they might not be attached to the view - // hierarchy but reused at a later point. - int count = mRecords.size(); - for (int i = 0; i < count; i++) { - View detailView = mRecords.get(i).detailView; - if (detailView != null) { - detailView.dispatchConfigurationChanged(newConfig); - } - } mFooter.onConfigurationChanged(); } @@ -295,7 +249,7 @@ public class QSPanel extends FrameLayout implements Tunable { public void showDetailAdapter(boolean show, DetailAdapter adapter, int[] locationInWindow) { int xInWindow = locationInWindow[0]; int yInWindow = locationInWindow[1]; - mDetail.getLocationInWindow(locationInWindow); + ((View) getParent()).getLocationInWindow(locationInWindow); Record r = new Record(); r.detailAdapter = adapter; @@ -320,9 +274,6 @@ public class QSPanel extends FrameLayout implements Tunable { for (QSTile<?> tile : tiles) { addTile(tile); } - if (isShowingDetail()) { - mDetail.bringToFront(); - } } private void drawTile(TileRecord r, QSTile.State state) { @@ -340,9 +291,7 @@ public class QSPanel extends FrameLayout implements Tunable { final QSTile.Callback callback = new QSTile.Callback() { @Override public void onStateChanged(QSTile.State state) { - if (!r.openingDetail) { - drawTile(r, state); - } + drawTile(r, state); } @Override @@ -417,11 +366,6 @@ public class QSPanel extends FrameLayout implements Tunable { tile.click(); } - public boolean isShowingDetail() { - return mDetailRecord != null - || (mCustomizePanel != null && mCustomizePanel.isCustomizing()); - } - public void closeDetail() { if (mCustomizePanel != null && mCustomizePanel.isCustomizing()) { // Treat this as a detail panel for now, to make things easy. @@ -431,10 +375,6 @@ public class QSPanel extends FrameLayout implements Tunable { showDetail(false, mDetailRecord); } - public boolean isClosingDetail() { - return mClosingDetail; - } - public int getGridHeight() { return mQsContainer.getMeasuredHeight(); } @@ -465,58 +405,25 @@ public class QSPanel extends FrameLayout implements Tunable { } r.tile.setDetailListening(show); int x = r.tileView.getLeft() + r.tileView.getWidth() / 2; - int y = r.tileView.getTop() + mTileLayout.getOffsetTop(r) + r.tileView.getHeight() / 2; + int y = r.tileView.getTop() + mTileLayout.getOffsetTop(r) + r.tileView.getHeight() / 2 + + getTop(); handleShowDetailImpl(r, show, x, y); } private void handleShowDetailImpl(Record r, boolean show, int x, int y) { - boolean visibleDiff = (mDetailRecord != null) != show; - if (!visibleDiff && mDetailRecord == r) return; // already in right state - DetailAdapter detailAdapter = null; - AnimatorListener listener = null; - if (show) { - detailAdapter = r.detailAdapter; - r.detailView = detailAdapter.createDetailView(mContext, r.detailView, mDetailContent); - if (r.detailView == null) throw new IllegalStateException("Must return detail view"); - - final Intent settingsIntent = detailAdapter.getSettingsIntent(); - mDetailSettingsButton.setVisibility(settingsIntent != null ? VISIBLE : GONE); - mDetailSettingsButton.setOnClickListener(new OnClickListener() { - @Override - public void onClick(View v) { - mHost.startActivityDismissingKeyguard(settingsIntent); - } - }); - - mDetailContent.removeAllViews(); - mDetail.bringToFront(); - mDetailContent.addView(r.detailView); - MetricsLogger.visible(mContext, detailAdapter.getMetricsCategory()); - announceForAccessibility(mContext.getString( - R.string.accessibility_quick_settings_detail, - detailAdapter.getTitle())); - setDetailRecord(r); - listener = mHideGridContentWhenDone; - if (r instanceof TileRecord && visibleDiff) { - ((TileRecord) r).openingDetail = true; - } - } else { - if (mDetailRecord != null) { - MetricsLogger.hidden(mContext, mDetailRecord.detailAdapter.getMetricsCategory()); - } - mClosingDetail = true; - setGridContentVisibility(true); - listener = mTeardownDetailWhenDone; - fireScanStateChanged(false); - } - sendAccessibilityEvent(AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED); - fireShowingDetail(show ? detailAdapter : null); - if (visibleDiff) { - mClipper.animateCircularClip(x, y, show, listener); - } + setDetailRecord(show ? r : null); + fireShowingDetail(show ? r.detailAdapter : null, x, y); } - private void setGridContentVisibility(boolean visible) { + private void setDetailRecord(Record r) { + if (r == mDetailRecord) return; + mDetailRecord = r; + final boolean scanState = mDetailRecord instanceof TileRecord + && ((TileRecord) mDetailRecord).scanState; + fireScanStateChanged(scanState); + } + + void setGridContentVisibility(boolean visible) { int newVis = visible ? VISIBLE : INVISIBLE; mQsContainer.setVisibility(newVis); if (mGridContentVisible != visible) { @@ -532,9 +439,9 @@ public class QSPanel extends FrameLayout implements Tunable { } } - private void fireShowingDetail(QSTile.DetailAdapter detail) { + private void fireShowingDetail(DetailAdapter detail, int x, int y) { if (mCallback != null) { - mCallback.onShowingDetail(detail); + mCallback.onShowingDetail(detail, x, y); } } @@ -550,14 +457,6 @@ public class QSPanel extends FrameLayout implements Tunable { } } - private void setDetailRecord(Record r) { - if (r == mDetailRecord) return; - mDetailRecord = r; - final boolean scanState = mDetailRecord instanceof TileRecord - && ((TileRecord) mDetailRecord).scanState; - fireScanStateChanged(scanState); - } - public void clickTile(ComponentName tile) { final String spec = CustomTile.toSpec(tile); final int N = mRecords.size(); @@ -581,7 +480,6 @@ public class QSPanel extends FrameLayout implements Tunable { } protected static class Record { - View detailView; DetailAdapter detailAdapter; int x; int y; @@ -591,45 +489,10 @@ public class QSPanel extends FrameLayout implements Tunable { public QSTile<?> tile; public QSTileBaseView tileView; public boolean scanState; - public boolean openingDetail; } - private final AnimatorListenerAdapter mTeardownDetailWhenDone = new AnimatorListenerAdapter() { - public void onAnimationEnd(Animator animation) { - mDetailContent.removeAllViews(); - setDetailRecord(null); - mClosingDetail = false; - }; - }; - - private final AnimatorListenerAdapter mHideGridContentWhenDone = new AnimatorListenerAdapter() { - public void onAnimationCancel(Animator animation) { - // If we have been cancelled, remove the listener so that onAnimationEnd doesn't get - // called, this will avoid accidentally turning off the grid when we don't want to. - animation.removeListener(this); - redrawTile(); - }; - - @Override - public void onAnimationEnd(Animator animation) { - // Only hide content if still in detail state. - if (mDetailRecord != null) { - setGridContentVisibility(false); - redrawTile(); - } - } - - private void redrawTile() { - if (mDetailRecord instanceof TileRecord) { - final TileRecord tileRecord = (TileRecord) mDetailRecord; - tileRecord.openingDetail = false; - drawTile(tileRecord, tileRecord.tile.getState()); - } - } - }; - public interface Callback { - void onShowingDetail(QSTile.DetailAdapter detail); + void onShowingDetail(DetailAdapter detail, int x, int y); void onToggleStateChanged(boolean state); void onScanStateChanged(boolean state); } diff --git a/packages/SystemUI/src/com/android/systemui/qs/customize/QSCustomizer.java b/packages/SystemUI/src/com/android/systemui/qs/customize/QSCustomizer.java index edcccaca2a14..81e15818aa1c 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/customize/QSCustomizer.java +++ b/packages/SystemUI/src/com/android/systemui/qs/customize/QSCustomizer.java @@ -90,16 +90,20 @@ public class QSCustomizer extends LinearLayout implements AnimatorListener, OnCl } public void show(int x, int y) { - isShown = true; - mPhoneStatusBar.getStatusBarWindow().addView(this); - setTileSpecs(); - mClipper.animateCircularClip(x, y, true, this); - new TileQueryHelper(mContext, mHost).setListener(mTileAdapter); + if (!isShown) { + isShown = true; + mPhoneStatusBar.getStatusBarWindow().addView(this); + setTileSpecs(); + mClipper.animateCircularClip(x, y, true, this); + new TileQueryHelper(mContext, mHost).setListener(mTileAdapter); + } } public void hide(int x, int y) { - isShown = false; - mClipper.animateCircularClip(x, y, false, this); + if (isShown) { + isShown = false; + mClipper.animateCircularClip(x, y, false, this); + } } public boolean isCustomizing() { diff --git a/packages/SystemUI/src/com/android/systemui/recents/Recents.java b/packages/SystemUI/src/com/android/systemui/recents/Recents.java index e4fd31d75ead..f5ae3514d780 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/Recents.java +++ b/packages/SystemUI/src/com/android/systemui/recents/Recents.java @@ -31,10 +31,13 @@ import android.os.RemoteException; import android.os.SystemProperties; import android.os.UserHandle; import android.provider.Settings; +import android.util.EventLog; import android.util.Log; import android.view.Display; import android.view.View; +import com.android.systemui.EventLogConstants; +import com.android.systemui.EventLogTags; import com.android.systemui.RecentsComponent; import com.android.systemui.SystemUI; import com.android.systemui.recents.events.EventBus; @@ -83,20 +86,23 @@ public class Recents extends SystemUI private int mDraggingInRecentsCurrentUser; // Only For system user, this is the callbacks instance we return to each secondary user - private RecentsSystemUser mSystemUserCallbacks; + private RecentsSystemUser mSystemToUserCallbacks; // Only for secondary users, this is the callbacks instance provided by the system user to make // calls back - private IRecentsSystemUserCallbacks mCallbacksToSystemUser; + private IRecentsSystemUserCallbacks mUserToSystemCallbacks; // The set of runnables to run after binding to the system user's service. private final ArrayList<Runnable> mOnConnectRunnables = new ArrayList<>(); // Only for secondary users, this is the death handler for the binder from the system user - private final IBinder.DeathRecipient mCallbacksToSystemUserDeathRcpt = new IBinder.DeathRecipient() { + private final IBinder.DeathRecipient mUserToSystemCallbacksDeathRcpt = new IBinder.DeathRecipient() { @Override public void binderDied() { - mCallbacksToSystemUser = null; + mUserToSystemCallbacks = null; + EventLog.writeEvent(EventLogTags.SYSUI_RECENTS_CONNECTION, + EventLogConstants.SYSUI_RECENTS_CONNECTION_USER_SYSTEM_UNBOUND, + sSystemServicesProxy.getProcessUser()); // Retry after a fixed duration mHandler.postDelayed(new Runnable() { @@ -109,16 +115,19 @@ public class Recents extends SystemUI }; // Only for secondary users, this is the service connection we use to connect to the system user - private final ServiceConnection mServiceConnectionToSystemUser = new ServiceConnection() { + private final ServiceConnection mUserToSystemServiceConnection = new ServiceConnection() { @Override public void onServiceConnected(ComponentName name, IBinder service) { if (service != null) { - mCallbacksToSystemUser = IRecentsSystemUserCallbacks.Stub.asInterface( + mUserToSystemCallbacks = IRecentsSystemUserCallbacks.Stub.asInterface( service); + EventLog.writeEvent(EventLogTags.SYSUI_RECENTS_CONNECTION, + EventLogConstants.SYSUI_RECENTS_CONNECTION_USER_SYSTEM_BOUND, + sSystemServicesProxy.getProcessUser()); // Listen for system user's death, so that we can reconnect later try { - service.linkToDeath(mCallbacksToSystemUserDeathRcpt, 0); + service.linkToDeath(mUserToSystemCallbacksDeathRcpt, 0); } catch (RemoteException e) { Log.e(TAG, "Lost connection to (System) SystemUI", e); } @@ -142,7 +151,7 @@ public class Recents extends SystemUI * Returns the callbacks interface that non-system users can call. */ public IBinder getSystemUserCallbacks() { - return mSystemUserCallbacks; + return mSystemToUserCallbacks; } public static RecentsTaskLoader getTaskLoader() { @@ -190,7 +199,7 @@ public class Recents extends SystemUI if (sSystemServicesProxy.isSystemUser(processUser)) { // For the system user, initialize an instance of the interface that we can pass to the // secondary user - mSystemUserCallbacks = new RecentsSystemUser(mContext, mImpl); + mSystemToUserCallbacks = new RecentsSystemUser(mContext, mImpl); } else { // For the secondary user, bind to the primary user's service to get a persistent // interface to register its implementation and to later update its state @@ -224,9 +233,9 @@ public class Recents extends SystemUI mImpl.showRecents(triggeredFromAltTab, false /* draggingInRecents */, true /* animate */, false /* reloadTasks */); } else { - if (mSystemUserCallbacks != null) { + if (mSystemToUserCallbacks != null) { IRecentsNonSystemUserCallbacks callbacks = - mSystemUserCallbacks.getNonSystemUserRecentsForUser(currentUser); + mSystemToUserCallbacks.getNonSystemUserRecentsForUser(currentUser); if (callbacks != null) { try { callbacks.showRecents(triggeredFromAltTab, false /* draggingInRecents */, @@ -260,9 +269,9 @@ public class Recents extends SystemUI if (sSystemServicesProxy.isSystemUser(currentUser)) { mImpl.hideRecents(triggeredFromAltTab, triggeredFromHomeKey); } else { - if (mSystemUserCallbacks != null) { + if (mSystemToUserCallbacks != null) { IRecentsNonSystemUserCallbacks callbacks = - mSystemUserCallbacks.getNonSystemUserRecentsForUser(currentUser); + mSystemToUserCallbacks.getNonSystemUserRecentsForUser(currentUser); if (callbacks != null) { try { callbacks.hideRecents(triggeredFromAltTab, triggeredFromHomeKey); @@ -295,9 +304,9 @@ public class Recents extends SystemUI if (sSystemServicesProxy.isSystemUser(currentUser)) { mImpl.toggleRecents(); } else { - if (mSystemUserCallbacks != null) { + if (mSystemToUserCallbacks != null) { IRecentsNonSystemUserCallbacks callbacks = - mSystemUserCallbacks.getNonSystemUserRecentsForUser(currentUser); + mSystemToUserCallbacks.getNonSystemUserRecentsForUser(currentUser); if (callbacks != null) { try { callbacks.toggleRecents(); @@ -326,9 +335,9 @@ public class Recents extends SystemUI if (sSystemServicesProxy.isSystemUser(currentUser)) { mImpl.preloadRecents(); } else { - if (mSystemUserCallbacks != null) { + if (mSystemToUserCallbacks != null) { IRecentsNonSystemUserCallbacks callbacks = - mSystemUserCallbacks.getNonSystemUserRecentsForUser(currentUser); + mSystemToUserCallbacks.getNonSystemUserRecentsForUser(currentUser); if (callbacks != null) { try { callbacks.preloadRecents(); @@ -354,9 +363,9 @@ public class Recents extends SystemUI if (sSystemServicesProxy.isSystemUser(currentUser)) { mImpl.cancelPreloadingRecents(); } else { - if (mSystemUserCallbacks != null) { + if (mSystemToUserCallbacks != null) { IRecentsNonSystemUserCallbacks callbacks = - mSystemUserCallbacks.getNonSystemUserRecentsForUser(currentUser); + mSystemToUserCallbacks.getNonSystemUserRecentsForUser(currentUser); if (callbacks != null) { try { callbacks.cancelPreloadingRecents(); @@ -387,9 +396,9 @@ public class Recents extends SystemUI if (sSystemServicesProxy.isSystemUser(currentUser)) { mImpl.dockTopTask(topTask.id, dragMode, stackCreateMode, initialBounds); } else { - if (mSystemUserCallbacks != null) { + if (mSystemToUserCallbacks != null) { IRecentsNonSystemUserCallbacks callbacks = - mSystemUserCallbacks.getNonSystemUserRecentsForUser(currentUser); + mSystemToUserCallbacks.getNonSystemUserRecentsForUser(currentUser); if (callbacks != null) { try { callbacks.dockTopTask(topTask.id, dragMode, stackCreateMode, @@ -413,9 +422,9 @@ public class Recents extends SystemUI if (sSystemServicesProxy.isSystemUser(mDraggingInRecentsCurrentUser)) { mImpl.onDraggingInRecents(distanceFromTop); } else { - if (mSystemUserCallbacks != null) { + if (mSystemToUserCallbacks != null) { IRecentsNonSystemUserCallbacks callbacks = - mSystemUserCallbacks.getNonSystemUserRecentsForUser( + mSystemToUserCallbacks.getNonSystemUserRecentsForUser( mDraggingInRecentsCurrentUser); if (callbacks != null) { try { @@ -436,9 +445,9 @@ public class Recents extends SystemUI if (sSystemServicesProxy.isSystemUser(mDraggingInRecentsCurrentUser)) { mImpl.onDraggingInRecentsEnded(velocity); } else { - if (mSystemUserCallbacks != null) { + if (mSystemToUserCallbacks != null) { IRecentsNonSystemUserCallbacks callbacks = - mSystemUserCallbacks.getNonSystemUserRecentsForUser( + mSystemToUserCallbacks.getNonSystemUserRecentsForUser( mDraggingInRecentsCurrentUser); if (callbacks != null) { try { @@ -484,9 +493,9 @@ public class Recents extends SystemUI if (sSystemServicesProxy.isSystemUser(currentUser)) { mImpl.onConfigurationChanged(); } else { - if (mSystemUserCallbacks != null) { + if (mSystemToUserCallbacks != null) { IRecentsNonSystemUserCallbacks callbacks = - mSystemUserCallbacks.getNonSystemUserRecentsForUser(currentUser); + mSystemToUserCallbacks.getNonSystemUserRecentsForUser(currentUser); if (callbacks != null) { try { callbacks.onConfigurationChanged(); @@ -512,7 +521,7 @@ public class Recents extends SystemUI @Override public void run() { try { - mCallbacksToSystemUser.updateRecentsVisibility(event.visible); + mUserToSystemCallbacks.updateRecentsVisibility(event.visible); } catch (RemoteException e) { Log.e(TAG, "Callback failed", e); } @@ -533,7 +542,7 @@ public class Recents extends SystemUI @Override public void run() { try { - mCallbacksToSystemUser.startScreenPinning(); + mUserToSystemCallbacks.startScreenPinning(); } catch (RemoteException e) { Log.e(TAG, "Callback failed", e); } @@ -549,7 +558,7 @@ public class Recents extends SystemUI @Override public void run() { try { - mCallbacksToSystemUser.sendRecentsDrawnEvent(); + mUserToSystemCallbacks.sendRecentsDrawnEvent(); } catch (RemoteException e) { Log.e(TAG, "Callback failed", e); } @@ -565,7 +574,7 @@ public class Recents extends SystemUI @Override public void run() { try { - mCallbacksToSystemUser.sendDockingTopTaskEvent(event.dragMode); + mUserToSystemCallbacks.sendDockingTopTaskEvent(event.dragMode); } catch (RemoteException e) { Log.e(TAG, "Callback failed", e); } @@ -581,7 +590,7 @@ public class Recents extends SystemUI @Override public void run() { try { - mCallbacksToSystemUser.sendLaunchRecentsEvent(); + mUserToSystemCallbacks.sendLaunchRecentsEvent(); } catch (RemoteException e) { Log.e(TAG, "Callback failed", e); } @@ -599,7 +608,7 @@ public class Recents extends SystemUI @Override public void run() { try { - mCallbacksToSystemUser.registerNonSystemUserCallbacks( + mUserToSystemCallbacks.registerNonSystemUserCallbacks( new RecentsImplProxy(mImpl), processUser); } catch (RemoteException e) { Log.e(TAG, "Failed to register", e); @@ -614,11 +623,14 @@ public class Recents extends SystemUI */ private void postToSystemUser(final Runnable onConnectRunnable) { mOnConnectRunnables.add(onConnectRunnable); - if (mCallbacksToSystemUser == null) { + if (mUserToSystemCallbacks == null) { Intent systemUserServiceIntent = new Intent(); systemUserServiceIntent.setClass(mContext, RecentsSystemUserService.class); boolean bound = mContext.bindServiceAsUser(systemUserServiceIntent, - mServiceConnectionToSystemUser, Context.BIND_AUTO_CREATE, UserHandle.SYSTEM); + mUserToSystemServiceConnection, Context.BIND_AUTO_CREATE, UserHandle.SYSTEM); + EventLog.writeEvent(EventLogTags.SYSUI_RECENTS_CONNECTION, + EventLogConstants.SYSUI_RECENTS_CONNECTION_USER_BIND_SERVICE, + sSystemServicesProxy.getProcessUser()); if (!bound) { // Retry after a fixed duration mHandler.postDelayed(new Runnable() { diff --git a/packages/SystemUI/src/com/android/systemui/recents/RecentsActivity.java b/packages/SystemUI/src/com/android/systemui/recents/RecentsActivity.java index 9d4f4256b761..c2a6108d931d 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/RecentsActivity.java +++ b/packages/SystemUI/src/com/android/systemui/recents/RecentsActivity.java @@ -230,7 +230,7 @@ public class RecentsActivity extends Activity implements ViewTreeObserver.OnPreD * Dismisses the history view back into the stack view. */ boolean dismissHistory() { - if (mRecentsView.isHistoryVisible()) { + if (RecentsDebugFlags.Static.EnableHistory && mRecentsView.isHistoryVisible()) { EventBus.getDefault().send(new HideHistoryEvent(true /* animate */)); return true; } @@ -447,7 +447,7 @@ public class RecentsActivity extends Activity implements ViewTreeObserver.OnPreD // Reset some states mIgnoreAltTabRelease = false; - if (mRecentsView.isHistoryVisible()) { + if (RecentsDebugFlags.Static.EnableHistory && mRecentsView.isHistoryVisible()) { EventBus.getDefault().send(new HideHistoryEvent(false /* animate */)); } @@ -503,13 +503,16 @@ public class RecentsActivity extends Activity implements ViewTreeObserver.OnPreD @Override protected void onSaveInstanceState(Bundle outState) { super.onSaveInstanceState(outState); - outState.putBoolean(KEY_SAVED_STATE_HISTORY_VISIBLE, mRecentsView.isHistoryVisible()); + if (RecentsDebugFlags.Static.EnableHistory) { + outState.putBoolean(KEY_SAVED_STATE_HISTORY_VISIBLE, mRecentsView.isHistoryVisible()); + } } @Override protected void onRestoreInstanceState(Bundle savedInstanceState) { super.onRestoreInstanceState(savedInstanceState); - if (savedInstanceState.getBoolean(KEY_SAVED_STATE_HISTORY_VISIBLE, false)) { + if (RecentsDebugFlags.Static.EnableHistory && + savedInstanceState.getBoolean(KEY_SAVED_STATE_HISTORY_VISIBLE, false)) { EventBus.getDefault().send(new ShowHistoryEvent()); } } @@ -603,7 +606,7 @@ public class RecentsActivity extends Activity implements ViewTreeObserver.OnPreD /**** EventBus events ****/ public final void onBusEvent(ToggleRecentsEvent event) { - if (!dismissHistory()) { + if (!RecentsDebugFlags.Static.EnableHistory || !dismissHistory()) { RecentsActivityLaunchState launchState = Recents.getConfiguration().getLaunchState(); if (launchState.launchedFromHome) { dismissRecentsToHome(true /* animateTaskViews */); @@ -614,7 +617,7 @@ public class RecentsActivity extends Activity implements ViewTreeObserver.OnPreD } public final void onBusEvent(IterateRecentsEvent event) { - if (!dismissHistory()) { + if (!RecentsDebugFlags.Static.EnableHistory || !dismissHistory()) { final RecentsDebugFlags debugFlags = Recents.getDebugFlags(); // Start dozing after the recents button is clicked @@ -651,7 +654,7 @@ public class RecentsActivity extends Activity implements ViewTreeObserver.OnPreD } } else if (event.triggeredFromHomeKey) { // Otherwise, dismiss Recents to Home - if (mRecentsView.isHistoryVisible()) { + if (RecentsDebugFlags.Static.EnableHistory && mRecentsView.isHistoryVisible()) { // If the history view is visible, then just cross-fade home ActivityOptions opts = ActivityOptions.makeCustomAnimation(RecentsActivity.this, R.anim.recents_to_launcher_enter, diff --git a/packages/SystemUI/src/com/android/systemui/recents/RecentsDebugFlags.java b/packages/SystemUI/src/com/android/systemui/recents/RecentsDebugFlags.java index 711d834cc07b..cd643230a167 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/RecentsDebugFlags.java +++ b/packages/SystemUI/src/com/android/systemui/recents/RecentsDebugFlags.java @@ -37,6 +37,8 @@ public class RecentsDebugFlags implements TunerService.Tunable { public static final boolean DisableBackgroundCache = false; // Enables the task affiliations public static final boolean EnableAffiliatedTaskGroups = true; + // Enables the history + public static final boolean EnableHistory = false; // Overrides the Tuner flags and enables the fast toggle and timeout public static final boolean EnableFastToggleTimeoutOverride = true; diff --git a/packages/SystemUI/src/com/android/systemui/recents/RecentsImpl.java b/packages/SystemUI/src/com/android/systemui/recents/RecentsImpl.java index e0efaa5ae38d..8de964b77f66 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/RecentsImpl.java +++ b/packages/SystemUI/src/com/android/systemui/recents/RecentsImpl.java @@ -406,9 +406,9 @@ public class RecentsImpl implements ActivityOptions.OnAnimationFinishedListener SystemServicesProxy ssp = Recents.getSystemServices(); ActivityManager.RunningTaskInfo topTask = ssp.getTopMostTask(); MutableBoolean topTaskHome = new MutableBoolean(true); - RecentsTaskLoader loader = Recents.getTaskLoader(); - sInstanceLoadPlan = loader.createLoadPlan(mContext); if (topTask != null && !ssp.isRecentsTopMost(topTask, topTaskHome)) { + RecentsTaskLoader loader = Recents.getTaskLoader(); + sInstanceLoadPlan = loader.createLoadPlan(mContext); sInstanceLoadPlan.preloadRawTasks(topTaskHome.value); loader.preloadTasks(sInstanceLoadPlan, topTask.id, topTaskHome.value); TaskStack stack = sInstanceLoadPlan.getTaskStack(); diff --git a/packages/SystemUI/src/com/android/systemui/recents/RecentsSystemUser.java b/packages/SystemUI/src/com/android/systemui/recents/RecentsSystemUser.java index ae0051cba04e..f8000b8990bf 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/RecentsSystemUser.java +++ b/packages/SystemUI/src/com/android/systemui/recents/RecentsSystemUser.java @@ -19,9 +19,12 @@ package com.android.systemui.recents; import android.content.Context; import android.os.IBinder; import android.os.RemoteException; +import android.util.EventLog; import android.util.Log; import android.util.SparseArray; +import com.android.systemui.EventLogConstants; +import com.android.systemui.EventLogTags; import com.android.systemui.recents.events.EventBus; import com.android.systemui.recents.events.activity.DockingTopTaskEvent; import com.android.systemui.recents.events.activity.RecentsActivityStartingEvent; @@ -46,7 +49,8 @@ public class RecentsSystemUser extends IRecentsSystemUserCallbacks.Stub { } @Override - public void registerNonSystemUserCallbacks(final IBinder nonSystemUserCallbacks, int userId) { + public void registerNonSystemUserCallbacks(final IBinder nonSystemUserCallbacks, + final int userId) { try { final IRecentsNonSystemUserCallbacks callback = IRecentsNonSystemUserCallbacks.Stub.asInterface(nonSystemUserCallbacks); @@ -54,9 +58,14 @@ public class RecentsSystemUser extends IRecentsSystemUserCallbacks.Stub { @Override public void binderDied() { mNonSystemUserRecents.removeAt(mNonSystemUserRecents.indexOfValue(callback)); + EventLog.writeEvent(EventLogTags.SYSUI_RECENTS_CONNECTION, + EventLogConstants.SYSUI_RECENTS_CONNECTION_SYSTEM_UNREGISTER_USER, + userId); } }, 0); mNonSystemUserRecents.put(userId, callback); + EventLog.writeEvent(EventLogTags.SYSUI_RECENTS_CONNECTION, + EventLogConstants.SYSUI_RECENTS_CONNECTION_SYSTEM_REGISTER_USER, userId); } catch (RemoteException e) { Log.e(TAG, "Failed to register NonSystemUserCallbacks", e); } diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/RecentsView.java b/packages/SystemUI/src/com/android/systemui/recents/views/RecentsView.java index c4db48552377..2e456277406a 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/views/RecentsView.java +++ b/packages/SystemUI/src/com/android/systemui/recents/views/RecentsView.java @@ -143,21 +143,24 @@ public class RecentsView extends FrameLayout { final float cornerRadius = context.getResources().getDimensionPixelSize( R.dimen.recents_task_view_rounded_corners_radius); LayoutInflater inflater = LayoutInflater.from(context); - mHistoryButton = (TextView) inflater.inflate(R.layout.recents_history_button, this, false); - mHistoryButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - EventBus.getDefault().send(new ToggleHistoryEvent()); - } - }); - addView(mHistoryButton); - mHistoryButton.setClipToOutline(true); - mHistoryButton.setOutlineProvider(new ViewOutlineProvider() { - @Override - public void getOutline(View view, Outline outline) { - outline.setRoundRect(0, 0, view.getWidth(), view.getHeight(), cornerRadius); - } - }); + if (RecentsDebugFlags.Static.EnableHistory) { + mHistoryButton = (TextView) inflater.inflate(R.layout.recents_history_button, this, + false); + mHistoryButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + EventBus.getDefault().send(new ToggleHistoryEvent()); + } + }); + addView(mHistoryButton); + mHistoryButton.setClipToOutline(true); + mHistoryButton.setOutlineProvider(new ViewOutlineProvider() { + @Override + public void getOutline(View view, Outline outline) { + outline.setRoundRect(0, 0, view.getWidth(), view.getHeight(), cornerRadius); + } + }); + } mEmptyView = inflater.inflate(R.layout.recents_empty, this, false); addView(mEmptyView); @@ -331,7 +334,9 @@ public class RecentsView extends FrameLayout { mTaskStackView.setVisibility(View.INVISIBLE); mEmptyView.setVisibility(View.VISIBLE); mEmptyView.bringToFront(); - mHistoryButton.bringToFront(); + if (RecentsDebugFlags.Static.EnableHistory) { + mHistoryButton.bringToFront(); + } } /** @@ -347,7 +352,9 @@ public class RecentsView extends FrameLayout { if (mSearchBar != null) { mSearchBar.bringToFront(); } - mHistoryButton.bringToFront(); + if (RecentsDebugFlags.Static.EnableHistory) { + mHistoryButton.bringToFront(); + } } @Override @@ -397,21 +404,23 @@ public class RecentsView extends FrameLayout { MeasureSpec.makeMeasureSpec(height, MeasureSpec.EXACTLY)); } - // Measure the history view - if (mHistoryView != null && mHistoryView.getVisibility() != GONE) { - measureChild(mHistoryView, MeasureSpec.makeMeasureSpec(width, MeasureSpec.EXACTLY), - MeasureSpec.makeMeasureSpec(height, MeasureSpec.EXACTLY)); - } + if (RecentsDebugFlags.Static.EnableHistory) { + // Measure the history view + if (mHistoryView != null && mHistoryView.getVisibility() != GONE) { + measureChild(mHistoryView, MeasureSpec.makeMeasureSpec(width, MeasureSpec.EXACTLY), + MeasureSpec.makeMeasureSpec(height, MeasureSpec.EXACTLY)); + } - // Measure the history button within the constraints of the space above the stack - Rect historyButtonRect = mTaskStackView.mLayoutAlgorithm.mHistoryButtonRect; - measureChild(mHistoryButton, - MeasureSpec.makeMeasureSpec(historyButtonRect.width(), MeasureSpec.AT_MOST), - MeasureSpec.makeMeasureSpec(historyButtonRect.height(), MeasureSpec.AT_MOST)); - if (mHistoryClearAllButton != null && mHistoryClearAllButton.getVisibility() != GONE) { - measureChild(mHistoryClearAllButton, + // Measure the history button within the constraints of the space above the stack + Rect historyButtonRect = mTaskStackView.mLayoutAlgorithm.mHistoryButtonRect; + measureChild(mHistoryButton, + MeasureSpec.makeMeasureSpec(historyButtonRect.width(), MeasureSpec.AT_MOST), + MeasureSpec.makeMeasureSpec(historyButtonRect.height(), MeasureSpec.AT_MOST)); + if (mHistoryClearAllButton != null && mHistoryClearAllButton.getVisibility() != GONE) { + measureChild(mHistoryClearAllButton, MeasureSpec.makeMeasureSpec(historyButtonRect.width(), MeasureSpec.AT_MOST), MeasureSpec.makeMeasureSpec(historyButtonRect.height(), MeasureSpec.AT_MOST)); + } } setMeasuredDimension(width, height); @@ -443,36 +452,39 @@ public class RecentsView extends FrameLayout { mEmptyView.layout(left, top, right, bottom); } - // Layout the history view - if (mHistoryView != null && mHistoryView.getVisibility() != GONE) { - mHistoryView.layout(left, top, right, bottom); - } - - // Layout the history button such that its drawable is start-aligned with the stack, - // vertically centered in the available space above the stack - Rect historyButtonRect = mTaskStackView.mLayoutAlgorithm.mHistoryButtonRect; - int historyLeft = isLayoutRtl() - ? historyButtonRect.right + mHistoryButton.getPaddingStart() - - mHistoryButton.getMeasuredWidth() - : historyButtonRect.left - mHistoryButton.getPaddingStart(); - int historyTop = historyButtonRect.top + - (historyButtonRect.height() - mHistoryButton.getMeasuredHeight()) / 2; - mHistoryButton.layout(historyLeft, historyTop, - historyLeft + mHistoryButton.getMeasuredWidth(), - historyTop + mHistoryButton.getMeasuredHeight()); - - // Layout the history clear all button such that it is end-aligned with the stack, - // vertically centered in the available space above the stack - if (mHistoryClearAllButton != null && mHistoryClearAllButton.getVisibility() != GONE) { - int clearAllLeft = isLayoutRtl() - ? historyButtonRect.left - mHistoryClearAllButton.getPaddingStart() - : historyButtonRect.right + mHistoryClearAllButton.getPaddingStart() - - mHistoryClearAllButton.getMeasuredWidth(); - int clearAllTop = historyButtonRect.top + - (historyButtonRect.height() - mHistoryClearAllButton.getMeasuredHeight()) / 2; - mHistoryClearAllButton.layout(clearAllLeft, clearAllTop, - clearAllLeft + mHistoryClearAllButton.getMeasuredWidth(), - clearAllTop + mHistoryClearAllButton.getMeasuredHeight()); + if (RecentsDebugFlags.Static.EnableHistory) { + // Layout the history view + if (mHistoryView != null && mHistoryView.getVisibility() != GONE) { + mHistoryView.layout(left, top, right, bottom); + } + + // Layout the history button such that its drawable is start-aligned with the stack, + // vertically centered in the available space above the stack + Rect historyButtonRect = mTaskStackView.mLayoutAlgorithm.mHistoryButtonRect; + int historyLeft = isLayoutRtl() + ? historyButtonRect.right + mHistoryButton.getPaddingStart() + - mHistoryButton.getMeasuredWidth() + : historyButtonRect.left - mHistoryButton.getPaddingStart(); + int historyTop = historyButtonRect.top + + (historyButtonRect.height() - mHistoryButton.getMeasuredHeight()) / 2; + mHistoryButton.layout(historyLeft, historyTop, + historyLeft + mHistoryButton.getMeasuredWidth(), + historyTop + mHistoryButton.getMeasuredHeight()); + + // Layout the history clear all button such that it is end-aligned with the stack, + // vertically centered in the available space above the stack + if (mHistoryClearAllButton != null && mHistoryClearAllButton.getVisibility() != GONE) { + int clearAllLeft = isLayoutRtl() + ? historyButtonRect.left - mHistoryClearAllButton.getPaddingStart() + : historyButtonRect.right + mHistoryClearAllButton.getPaddingStart() + - mHistoryClearAllButton.getMeasuredWidth(); + int clearAllTop = historyButtonRect.top + + (historyButtonRect.height() - mHistoryClearAllButton.getMeasuredHeight()) / + 2; + mHistoryClearAllButton.layout(clearAllLeft, clearAllTop, + clearAllLeft + mHistoryClearAllButton.getMeasuredWidth(), + clearAllTop + mHistoryClearAllButton.getMeasuredHeight()); + } } if (mAwaitingFirstLayout) { @@ -540,9 +552,11 @@ public class RecentsView extends FrameLayout { } public final void onBusEvent(DismissRecentsToHomeAnimationStarted event) { - // Hide the history button int taskViewExitToHomeDuration = TaskStackAnimationHelper.EXIT_TO_HOME_TRANSLATION_DURATION; - hideHistoryButton(taskViewExitToHomeDuration, false /* translate */); + if (RecentsDebugFlags.Static.EnableHistory) { + // Hide the history button + hideHistoryButton(taskViewExitToHomeDuration, false /* translate */); + } animateBackgroundScrim(0f, taskViewExitToHomeDuration); } @@ -675,11 +689,17 @@ public class RecentsView extends FrameLayout { // Reset the view state mAwaitingFirstLayout = true; mLastTaskLaunchedWasFreeform = false; - hideHistoryButton(0, false /* translate */); + if (RecentsDebugFlags.Static.EnableHistory) { + hideHistoryButton(0, false /* translate */); + } } } public final void onBusEvent(ToggleHistoryEvent event) { + if (!RecentsDebugFlags.Static.EnableHistory) { + return; + } + if (mHistoryView != null && mHistoryView.isVisible()) { EventBus.getDefault().send(new HideHistoryEvent(true /* animate */)); } else { @@ -688,6 +708,10 @@ public class RecentsView extends FrameLayout { } public final void onBusEvent(ShowHistoryEvent event) { + if (!RecentsDebugFlags.Static.EnableHistory) { + return; + } + if (mHistoryView == null) { LayoutInflater inflater = LayoutInflater.from(getContext()); mHistoryView = (RecentsHistoryView) inflater.inflate(R.layout.recents_history, this, @@ -746,6 +770,10 @@ public class RecentsView extends FrameLayout { } public final void onBusEvent(HideHistoryEvent event) { + if (!RecentsDebugFlags.Static.EnableHistory) { + return; + } + // Animate the empty view in parallel with the history view (the task view animations are // handled in TaskStackView) Rect stackRect = mTaskStackView.mLayoutAlgorithm.mStackRect; @@ -765,10 +793,18 @@ public class RecentsView extends FrameLayout { } public final void onBusEvent(ShowHistoryButtonEvent event) { + if (!RecentsDebugFlags.Static.EnableHistory) { + return; + } + showHistoryButton(150, event.translate); } public final void onBusEvent(HideHistoryButtonEvent event) { + if (!RecentsDebugFlags.Static.EnableHistory) { + return; + } + hideHistoryButton(100, true /* translate */); } @@ -776,6 +812,10 @@ public class RecentsView extends FrameLayout { * Shows the history button. */ private void showHistoryButton(final int duration, final boolean translate) { + if (!RecentsDebugFlags.Static.EnableHistory) { + return; + } + final ReferenceCountedTrigger postAnimationTrigger = new ReferenceCountedTrigger(); if (mHistoryButton.getVisibility() == View.INVISIBLE) { mHistoryButton.setVisibility(View.VISIBLE); @@ -808,6 +848,10 @@ public class RecentsView extends FrameLayout { * Hides the history button. */ private void hideHistoryButton(int duration, boolean translate) { + if (!RecentsDebugFlags.Static.EnableHistory) { + return; + } + final ReferenceCountedTrigger postAnimationTrigger = new ReferenceCountedTrigger(); hideHistoryButton(duration, translate, postAnimationTrigger); postAnimationTrigger.flushLastDecrementRunnables(); @@ -818,6 +862,10 @@ public class RecentsView extends FrameLayout { */ private void hideHistoryButton(int duration, boolean translate, final ReferenceCountedTrigger postAnimationTrigger) { + if (!RecentsDebugFlags.Static.EnableHistory) { + return; + } + if (mHistoryButton.getVisibility() == View.VISIBLE) { if (translate) { mHistoryButton.animate() diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackAnimationHelper.java b/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackAnimationHelper.java index 890b44513b8f..2cd0c19a4352 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackAnimationHelper.java +++ b/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackAnimationHelper.java @@ -467,12 +467,13 @@ public class TaskStackAnimationHelper { // Setup the end listener to return all the hidden views to the view pool after the // focus animation - AnimatorListenerAdapter endListener = new AnimatorListenerAdapter() { + ReferenceCountedTrigger postAnimTrigger = new ReferenceCountedTrigger(); + postAnimTrigger.addLastDecrementRunnable(new Runnable() { @Override - public void onAnimationEnd(Animator animation) { + public void run() { mStackView.bindVisibleTaskViews(newScroll); } - }; + }); List<TaskView> taskViews = mStackView.getTaskViews(); int taskViewCount = taskViews.size(); @@ -513,7 +514,8 @@ public class TaskStackAnimationHelper { AnimationProps anim = new AnimationProps() .setDuration(AnimationProps.BOUNDS, duration) .setInterpolator(AnimationProps.BOUNDS, interpolator) - .setListener(endListener); + .setListener(postAnimTrigger.decrementOnAnimationEnd()); + postAnimTrigger.increment(); mStackView.updateTaskViewToTransform(tv, toTransform, anim); } return willScroll; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/HeadsUpTouchHelper.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/HeadsUpTouchHelper.java index 79c21f348270..33315c58fb4a 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/HeadsUpTouchHelper.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/HeadsUpTouchHelper.java @@ -107,7 +107,7 @@ public class HeadsUpTouchHelper implements Gefingerpoken { mPanel.setPanelScrimMinFraction((float) expandedHeight / mPanel.getMaxPanelHeight()); mPanel.startExpandMotion(x, y, true /* startTracking */, expandedHeight); - mPanel.clearNotificattonEffects(); + mPanel.clearNotificationEffects(); return true; } break; 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 8f0f51f502b7..1a0acbe86c6c 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java @@ -89,13 +89,13 @@ public class NotificationPanelView extends PanelView implements private KeyguardAffordanceHelper mAfforanceHelper; private KeyguardUserSwitcher mKeyguardUserSwitcher; private KeyguardStatusBarView mKeyguardStatusBar; - private QSContainer mQsContainer; + protected QSContainer mQsContainer; private KeyguardStatusView mKeyguardStatusView; private TextView mClockView; private View mReserveNotificationSpace; private View mQsNavbarScrim; private NotificationsQuickSettingsContainer mNotificationContainerParent; - private NotificationStackScrollLayout mNotificationStackScroller; + protected NotificationStackScrollLayout mNotificationStackScroller; private boolean mAnimateNextTopPaddingChange; private int mTrackingPointer; @@ -126,9 +126,9 @@ public class NotificationPanelView extends PanelView implements private float mInitialTouchY; private float mLastTouchX; private float mLastTouchY; - private float mQsExpansionHeight; - private int mQsMinExpansionHeight; - private int mQsMaxExpansionHeight; + protected float mQsExpansionHeight; + protected int mQsMinExpansionHeight; + protected int mQsMaxExpansionHeight; private int mQsPeekHeight; private boolean mStackScrollerOverscrolling; private boolean mQsExpansionFromOverscroll; @@ -1072,8 +1072,8 @@ public class NotificationPanelView extends PanelView implements private void setKeyguardBottomAreaVisibility(int statusBarState, boolean goingToFullShade) { + mKeyguardBottomArea.animate().cancel(); if (goingToFullShade) { - mKeyguardBottomArea.animate().cancel(); mKeyguardBottomArea.animate() .alpha(0f) .setStartDelay(mStatusBar.getKeyguardFadingAwayDelay()) @@ -1083,13 +1083,11 @@ public class NotificationPanelView extends PanelView implements .start(); } else if (statusBarState == StatusBarState.KEYGUARD || statusBarState == StatusBarState.SHADE_LOCKED) { - mKeyguardBottomArea.animate().cancel(); if (!mDozing) { mKeyguardBottomArea.setVisibility(View.VISIBLE); } mKeyguardBottomArea.setAlpha(1f); } else { - mKeyguardBottomArea.animate().cancel(); mKeyguardBottomArea.setVisibility(View.GONE); mKeyguardBottomArea.setAlpha(1f); } @@ -1196,7 +1194,7 @@ public class NotificationPanelView extends PanelView implements } } - private void updateQsExpansion() { + protected void updateQsExpansion() { mQsContainer.setQsExpansion(getQsExpansionFraction(), getHeaderTranslation()); } @@ -1238,7 +1236,7 @@ public class NotificationPanelView extends PanelView implements } } - private void requestScrollerTopPaddingUpdate(boolean animate) { + protected void requestScrollerTopPaddingUpdate(boolean animate) { mNotificationStackScroller.updateTopPadding(calculateQsTopPadding(), mAnimateNextTopPaddingChange || animate, mKeyguardShowing @@ -1520,16 +1518,12 @@ public class NotificationPanelView extends PanelView implements updateQsExpansion(); } - private float getHeaderTranslation() { + protected float getHeaderTranslation() { if (mStatusBar.getBarState() == StatusBarState.KEYGUARD) { return 0; } if (mNotificationStackScroller.getNotGoneChildCount() == 0) { - if (mExpandedHeight / HEADER_RUBBERBAND_FACTOR >= mQsMinExpansionHeight) { - return 0; - } else { - return mExpandedHeight / HEADER_RUBBERBAND_FACTOR - mQsMinExpansionHeight; - } + return Math.min(0, mExpandedHeight / HEADER_RUBBERBAND_FACTOR - mQsMinExpansionHeight); } float stackTranslation = mNotificationStackScroller.getStackTranslation(); float translation = stackTranslation / HEADER_RUBBERBAND_FACTOR; @@ -1975,7 +1969,7 @@ public class NotificationPanelView extends PanelView implements } public boolean isQsDetailShowing() { - return mQsContainer.getQsPanel().isShowingDetail(); + return mQsContainer.isShowingDetail(); } public void closeQsDetail() { @@ -2191,7 +2185,7 @@ public class NotificationPanelView extends PanelView implements * * @param x the x-coordinate the touch event */ - private void updateVerticalPanelPosition(float x) { + protected void updateVerticalPanelPosition(float x) { if (mNotificationStackScroller.getWidth() * 1.75f > getWidth()) { resetVerticalPanelPosition(); return; @@ -2216,7 +2210,7 @@ public class NotificationPanelView extends PanelView implements mQsContainer.setTranslationX(translation); } - private void updateStackHeight(float stackHeight) { + protected void updateStackHeight(float stackHeight) { mNotificationStackScroller.setStackHeight(stackHeight); updateKeyguardBottomAreaAlpha(); } @@ -2225,7 +2219,7 @@ public class NotificationPanelView extends PanelView implements mBar.panelScrimMinFractionChanged(minFraction); } - public void clearNotificattonEffects() { + public void clearNotificationEffects() { mStatusBar.clearNotificationEffects(); } 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 17e43c406288..3aa576ffc0a1 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java @@ -69,7 +69,6 @@ import android.os.RemoteException; import android.os.ServiceManager; import android.os.SystemClock; import android.os.SystemProperties; -import android.os.Trace; import android.os.UserHandle; import android.os.UserManager; import android.os.Vibrator; @@ -89,7 +88,6 @@ import android.view.ThreadedRenderer; import android.view.View; import android.view.ViewGroup; import android.view.ViewGroup.LayoutParams; -import android.view.ViewParent; import android.view.ViewStub; import android.view.WindowManager; import android.view.WindowManagerGlobal; @@ -97,7 +95,6 @@ import android.view.animation.AccelerateInterpolator; import android.view.animation.Interpolator; import android.widget.ImageView; import android.widget.TextView; - import com.android.internal.logging.MetricsLogger; import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.internal.statusbar.NotificationVisibility; @@ -118,6 +115,7 @@ import com.android.systemui.classifier.FalsingManager; import com.android.systemui.doze.DozeHost; import com.android.systemui.doze.DozeLog; import com.android.systemui.keyguard.KeyguardViewMediator; +import com.android.systemui.qs.QSDetail; import com.android.systemui.qs.QSPanel; import com.android.systemui.recents.ScreenPinningRequest; import com.android.systemui.recents.events.EventBus; @@ -176,7 +174,6 @@ import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.TreeSet; import static android.app.StatusBarManager.NAVIGATION_HINT_BACK_ALT; import static android.app.StatusBarManager.NAVIGATION_HINT_IME_SHOWN; @@ -875,6 +872,8 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, mBrightnessMirrorController = new BrightnessMirrorController(mStatusBarWindow); mQSPanel.setBrightnessMirror(mBrightnessMirrorController); mHeader.setQSPanel(mQSPanel); + QSDetail qsDetail = (QSDetail) mStatusBarWindow.findViewById(R.id.qs_detail); + qsDetail.setHost(qsh); qsh.addCallback(new QSTileHost.Callback() { @Override public void onTilesChanged() { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickStatusBarHeader.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickStatusBarHeader.java index fe463855020a..11d99ffe97dc 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickStatusBarHeader.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickStatusBarHeader.java @@ -21,14 +21,12 @@ import android.app.PendingIntent; import android.content.Context; import android.content.Intent; import android.graphics.Rect; -import android.graphics.drawable.Animatable; import android.graphics.drawable.Drawable; import android.graphics.drawable.RippleDrawable; import android.util.AttributeSet; import android.view.View; import android.view.ViewGroup; import android.widget.ImageView; -import android.widget.Switch; import android.widget.TextView; import android.widget.Toast; import com.android.keyguard.KeyguardStatusView; @@ -50,17 +48,12 @@ public class QuickStatusBarHeader extends BaseStatusBarHeader implements private SettingsButton mSettingsButton; private View mSettingsContainer; private TextView mAlarmStatus; - private View mQsDetailHeader; - private ImageView mQsDetailHeaderProgress; private QSPanel mQsPanel; - private Switch mQsDetailHeaderSwitch; private boolean mExpanded; private boolean mAlarmShowing; - private boolean mShowingDetail; - private boolean mDetailTransitioning; private ViewGroup mExpandedGroup; private ViewGroup mDateTimeGroup; private View mEmergencyOnly; @@ -101,13 +94,6 @@ public class QuickStatusBarHeader extends BaseStatusBarHeader implements mAlarmStatus = (TextView) findViewById(R.id.alarm_status); mAlarmStatus.setOnClickListener(this); - mQsDetailHeader = findViewById(R.id.qs_detail_header); - mQsDetailHeader.setAlpha(0); - mQsDetailHeaderBack = mQsDetailHeader.findViewById(com.android.internal.R.id.up); - mQsDetailHeaderTitle = (TextView) mQsDetailHeader.findViewById(android.R.id.title); - mQsDetailHeaderSwitch = (Switch) mQsDetailHeader.findViewById(android.R.id.toggle); - mQsDetailHeaderProgress = (ImageView) findViewById(R.id.qs_detail_header_progress); - mMultiUserSwitch = (MultiUserSwitch) findViewById(R.id.multi_user_switch); mMultiUserAvatar = (ImageView) mMultiUserSwitch.findViewById(R.id.multi_user_avatar); @@ -179,7 +165,6 @@ public class QuickStatusBarHeader extends BaseStatusBarHeader implements private void updateVisibilities() { mAlarmStatus.setVisibility(mAlarmShowing ? View.VISIBLE : View.GONE); - mQsDetailHeader.setVisibility(mExpanded && mShowingDetail ? View.VISIBLE : View.INVISIBLE); mEmergencyOnly.setVisibility(mExpanded && mShowEmergencyCallsOnly ? View.VISIBLE : View.INVISIBLE); mSettingsContainer.findViewById(R.id.tuner_icon).setVisibility( @@ -188,10 +173,6 @@ public class QuickStatusBarHeader extends BaseStatusBarHeader implements : View.GONE); } - private boolean hasMultiUsers() { - return false; - } - private void updateListeners() { if (mListening) { mNextAlarmController.addStateChangedCallback(this); @@ -210,7 +191,6 @@ public class QuickStatusBarHeader extends BaseStatusBarHeader implements mQsPanel = qsPanel; setupHost(qsPanel.getHost()); if (mQsPanel != null) { - mQsPanel.setCallback(mQsPanelCallback); mMultiUserSwitch.setQsPanel(qsPanel); } } @@ -290,121 +270,4 @@ public class QuickStatusBarHeader extends BaseStatusBarHeader implements } } } - - private final QSPanel.Callback mQsPanelCallback = new QSPanel.Callback() { - private boolean mScanState; - - @Override - public void onShowingDetail(final QSTile.DetailAdapter detail) { - mDetailTransitioning = true; - post(new Runnable() { - @Override - public void run() { - handleShowingDetail(detail); - } - }); - } - - @Override - public void onToggleStateChanged(final boolean state) { - post(new Runnable() { - @Override - public void run() { - handleToggleStateChanged(state); - } - }); - - } - - @Override - public void onScanStateChanged(final boolean state) { - post(new Runnable() { - @Override - public void run() { - handleScanStateChanged(state); - } - }); - } - - private void handleToggleStateChanged(boolean state) { - mQsDetailHeaderSwitch.setChecked(state); - } - - private void handleScanStateChanged(boolean state) { - if (mScanState == state) return; - mScanState = state; - final Animatable anim = (Animatable) mQsDetailHeaderProgress.getDrawable(); - if (state) { - mQsDetailHeaderProgress.animate().alpha(1f); - anim.start(); - } else { - mQsDetailHeaderProgress.animate().alpha(0f); - anim.stop(); - } - } - - private void handleShowingDetail(final QSTile.DetailAdapter detail) { - final boolean showingDetail = detail != null; - transition(mDateTimeGroup, !showingDetail); - transition(mExpandedGroup, !showingDetail); - if (mAlarmShowing) { - transition(mAlarmStatus, !showingDetail); - } - transition(mQsDetailHeader, showingDetail); - mShowingDetail = showingDetail; - if (showingDetail) { - mQsDetailHeaderTitle.setText(detail.getTitle()); - final Boolean toggleState = detail.getToggleState(); - if (toggleState == null) { - mQsDetailHeaderSwitch.setVisibility(INVISIBLE); - mQsDetailHeader.setClickable(false); - } else { - mQsDetailHeaderSwitch.setVisibility(VISIBLE); - mQsDetailHeaderSwitch.setChecked(toggleState); - mQsDetailHeader.setClickable(true); - mQsDetailHeader.setOnClickListener(new OnClickListener() { - @Override - public void onClick(View v) { - boolean checked = !mQsDetailHeaderSwitch.isChecked(); - mQsDetailHeaderSwitch.setChecked(checked); - detail.setToggleState(checked); - } - }); - } - mQsDetailHeaderBack.setOnClickListener(new OnClickListener() { - @Override - public void onClick(View v) { - v.getLocationInWindow(mTmpInt2); - mTmpInt2[0] += v.getWidth() / 2; - mTmpInt2[1] += v.getHeight() / 2; - mQsPanel.showDetailAdapter(false, null, mTmpInt2); - } - }); - } else { - mQsDetailHeader.setClickable(false); - } - } - - private void transition(final View v, final boolean in) { - if (in) { - v.bringToFront(); - v.setVisibility(VISIBLE); - } - if (v.hasOverlappingRendering()) { - v.animate().withLayer(); - } - v.animate() - .alpha(in ? 1 : 0) - .withEndAction(new Runnable() { - @Override - public void run() { - if (!in) { - v.setVisibility(INVISIBLE); - } - mDetailTransitioning = false; - } - }) - .start(); - } - }; } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarHeaderView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarHeaderView.java index d2f1ca9630e2..3e3b16922f7a 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarHeaderView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarHeaderView.java @@ -46,6 +46,7 @@ import com.android.systemui.FontSizeUtils; import com.android.systemui.R; import com.android.systemui.qs.QSPanel; import com.android.systemui.qs.QSTile; +import com.android.systemui.qs.QSTile.DetailAdapter; import com.android.systemui.statusbar.policy.BatteryController; import com.android.systemui.statusbar.policy.NetworkControllerImpl.EmergencyListener; import com.android.systemui.statusbar.policy.NextAlarmController; @@ -742,7 +743,7 @@ public class StatusBarHeaderView extends BaseStatusBarHeader implements View.OnC } @Override - public void onShowingDetail(final QSTile.DetailAdapter detail) { + public void onShowingDetail(final DetailAdapter detail, int x, int y) { mDetailTransitioning = true; post(new Runnable() { @Override diff --git a/rs/jni/android_renderscript_RenderScript.cpp b/rs/jni/android_renderscript_RenderScript.cpp index 3dff37bb4505..3bef19e01e8e 100644 --- a/rs/jni/android_renderscript_RenderScript.cpp +++ b/rs/jni/android_renderscript_RenderScript.cpp @@ -2346,62 +2346,75 @@ nScriptGroupCreate(JNIEnv *_env, jobject _this, jlong con, jlongArray _kernels, ALOGD("nScriptGroupCreate, con(%p)", (RsContext)con); } + jlong id = 0; + + RsScriptKernelID* kernelsPtr; jint kernelsLen = _env->GetArrayLength(_kernels); jlong *jKernelsPtr = _env->GetLongArrayElements(_kernels, nullptr); + + RsScriptKernelID* srcPtr; + jint srcLen = _env->GetArrayLength(_src); + jlong *jSrcPtr = _env->GetLongArrayElements(_src, nullptr); + + RsScriptKernelID* dstkPtr; + jint dstkLen = _env->GetArrayLength(_dstk); + jlong *jDstkPtr = _env->GetLongArrayElements(_dstk, nullptr); + + RsScriptKernelID* dstfPtr; + jint dstfLen = _env->GetArrayLength(_dstf); + jlong *jDstfPtr = _env->GetLongArrayElements(_dstf, nullptr); + + RsType* typesPtr; + jint typesLen = _env->GetArrayLength(_types); + jlong *jTypesPtr = _env->GetLongArrayElements(_types, nullptr); + if (jKernelsPtr == nullptr) { ALOGE("Failed to get Java array elements: kernels"); - return 0; + goto cleanup; + } + if (jSrcPtr == nullptr) { + ALOGE("Failed to get Java array elements: src"); + goto cleanup; + } + if (jDstkPtr == nullptr) { + ALOGE("Failed to get Java array elements: dstk"); + goto cleanup; + } + if (jDstfPtr == nullptr) { + ALOGE("Failed to get Java array elements: dstf"); + goto cleanup; } - RsScriptKernelID* kernelsPtr = (RsScriptKernelID*) malloc(sizeof(RsScriptKernelID) * kernelsLen); + if (jTypesPtr == nullptr) { + ALOGE("Failed to get Java array elements: types"); + goto cleanup; + } + + kernelsPtr = (RsScriptKernelID*) malloc(sizeof(RsScriptKernelID) * kernelsLen); for(int i = 0; i < kernelsLen; ++i) { kernelsPtr[i] = (RsScriptKernelID)jKernelsPtr[i]; } - jint srcLen = _env->GetArrayLength(_src); - jlong *jSrcPtr = _env->GetLongArrayElements(_src, nullptr); - if (jSrcPtr == nullptr) { - ALOGE("Failed to get Java array elements: src"); - return 0; - } - RsScriptKernelID* srcPtr = (RsScriptKernelID*) malloc(sizeof(RsScriptKernelID) * srcLen); + srcPtr = (RsScriptKernelID*) malloc(sizeof(RsScriptKernelID) * srcLen); for(int i = 0; i < srcLen; ++i) { srcPtr[i] = (RsScriptKernelID)jSrcPtr[i]; } - jint dstkLen = _env->GetArrayLength(_dstk); - jlong *jDstkPtr = _env->GetLongArrayElements(_dstk, nullptr); - if (jDstkPtr == nullptr) { - ALOGE("Failed to get Java array elements: dstk"); - return 0; - } - RsScriptKernelID* dstkPtr = (RsScriptKernelID*) malloc(sizeof(RsScriptKernelID) * dstkLen); + dstkPtr = (RsScriptKernelID*) malloc(sizeof(RsScriptKernelID) * dstkLen); for(int i = 0; i < dstkLen; ++i) { dstkPtr[i] = (RsScriptKernelID)jDstkPtr[i]; } - jint dstfLen = _env->GetArrayLength(_dstf); - jlong *jDstfPtr = _env->GetLongArrayElements(_dstf, nullptr); - if (jDstfPtr == nullptr) { - ALOGE("Failed to get Java array elements: dstf"); - return 0; - } - RsScriptKernelID* dstfPtr = (RsScriptKernelID*) malloc(sizeof(RsScriptKernelID) * dstfLen); + dstfPtr = (RsScriptKernelID*) malloc(sizeof(RsScriptKernelID) * dstfLen); for(int i = 0; i < dstfLen; ++i) { dstfPtr[i] = (RsScriptKernelID)jDstfPtr[i]; } - jint typesLen = _env->GetArrayLength(_types); - jlong *jTypesPtr = _env->GetLongArrayElements(_types, nullptr); - if (jTypesPtr == nullptr) { - ALOGE("Failed to get Java array elements: types"); - return 0; - } - RsType* typesPtr = (RsType*) malloc(sizeof(RsType) * typesLen); + typesPtr = (RsType*) malloc(sizeof(RsType) * typesLen); for(int i = 0; i < typesLen; ++i) { typesPtr[i] = (RsType)jTypesPtr[i]; } - jlong id = (jlong)(uintptr_t)rsScriptGroupCreate((RsContext)con, + id = (jlong)(uintptr_t)rsScriptGroupCreate((RsContext)con, (RsScriptKernelID *)kernelsPtr, kernelsLen * sizeof(RsScriptKernelID), (RsScriptKernelID *)srcPtr, srcLen * sizeof(RsScriptKernelID), (RsScriptKernelID *)dstkPtr, dstkLen * sizeof(RsScriptKernelID), @@ -2413,11 +2426,24 @@ nScriptGroupCreate(JNIEnv *_env, jobject _this, jlong con, jlongArray _kernels, free(dstkPtr); free(dstfPtr); free(typesPtr); - _env->ReleaseLongArrayElements(_kernels, jKernelsPtr, 0); - _env->ReleaseLongArrayElements(_src, jSrcPtr, 0); - _env->ReleaseLongArrayElements(_dstk, jDstkPtr, 0); - _env->ReleaseLongArrayElements(_dstf, jDstfPtr, 0); - _env->ReleaseLongArrayElements(_types, jTypesPtr, 0); + +cleanup: + if (jKernelsPtr != nullptr) { + _env->ReleaseLongArrayElements(_kernels, jKernelsPtr, 0); + } + if (jSrcPtr != nullptr) { + _env->ReleaseLongArrayElements(_src, jSrcPtr, 0); + } + if (jDstkPtr != nullptr) { + _env->ReleaseLongArrayElements(_dstk, jDstkPtr, 0); + } + if (jDstfPtr != nullptr) { + _env->ReleaseLongArrayElements(_dstf, jDstfPtr, 0); + } + if (jTypesPtr != nullptr) { + _env->ReleaseLongArrayElements(_types, jTypesPtr, 0); + } + return id; } @@ -2662,45 +2688,61 @@ nMeshCreate(JNIEnv *_env, jobject _this, jlong con, jlongArray _vtx, jlongArray ALOGD("nMeshCreate, con(%p)", (RsContext)con); } + jlong id = 0; + + RsAllocation* vtxPtr; jint vtxLen = _env->GetArrayLength(_vtx); jlong *jVtxPtr = _env->GetLongArrayElements(_vtx, nullptr); + + RsAllocation* idxPtr; + jint idxLen = _env->GetArrayLength(_idx); + jlong *jIdxPtr = _env->GetLongArrayElements(_idx, nullptr); + + jint primLen = _env->GetArrayLength(_prim); + jint *primPtr = _env->GetIntArrayElements(_prim, nullptr); + if (jVtxPtr == nullptr) { ALOGE("Failed to get Java array elements: vtx"); - return 0; + goto cleanupMesh; + } + if (jIdxPtr == nullptr) { + ALOGE("Failed to get Java array elements: idx"); + goto cleanupMesh; + } + if (primPtr == nullptr) { + ALOGE("Failed to get Java array elements: prim"); + goto cleanupMesh; } - RsAllocation* vtxPtr = (RsAllocation*) malloc(sizeof(RsAllocation) * vtxLen); + + vtxPtr = (RsAllocation*) malloc(sizeof(RsAllocation) * vtxLen); for(int i = 0; i < vtxLen; ++i) { vtxPtr[i] = (RsAllocation)(uintptr_t)jVtxPtr[i]; } - jint idxLen = _env->GetArrayLength(_idx); - jlong *jIdxPtr = _env->GetLongArrayElements(_idx, nullptr); - if (jIdxPtr == nullptr) { - ALOGE("Failed to get Java array elements: idx"); - return 0; - } - RsAllocation* idxPtr = (RsAllocation*) malloc(sizeof(RsAllocation) * idxLen); + idxPtr = (RsAllocation*) malloc(sizeof(RsAllocation) * idxLen); for(int i = 0; i < idxLen; ++i) { idxPtr[i] = (RsAllocation)(uintptr_t)jIdxPtr[i]; } - jint primLen = _env->GetArrayLength(_prim); - jint *primPtr = _env->GetIntArrayElements(_prim, nullptr); - if (primPtr == nullptr) { - ALOGE("Failed to get Java array elements: prim"); - return 0; - } - - jlong id = (jlong)(uintptr_t)rsMeshCreate((RsContext)con, - (RsAllocation *)vtxPtr, vtxLen, - (RsAllocation *)idxPtr, idxLen, - (uint32_t *)primPtr, primLen); + id = (jlong)(uintptr_t)rsMeshCreate((RsContext)con, + (RsAllocation *)vtxPtr, vtxLen, + (RsAllocation *)idxPtr, idxLen, + (uint32_t *)primPtr, primLen); free(vtxPtr); free(idxPtr); - _env->ReleaseLongArrayElements(_vtx, jVtxPtr, 0); - _env->ReleaseLongArrayElements(_idx, jIdxPtr, 0); - _env->ReleaseIntArrayElements(_prim, primPtr, 0); + +cleanupMesh: + if (jVtxPtr != nullptr) { + _env->ReleaseLongArrayElements(_vtx, jVtxPtr, 0); + } + if (jIdxPtr != nullptr) { + _env->ReleaseLongArrayElements(_idx, jIdxPtr, 0); + } + if (primPtr != nullptr) { + _env->ReleaseIntArrayElements(_prim, primPtr, 0); + } + return id; } diff --git a/services/backup/java/com/android/server/backup/BackupManagerService.java b/services/backup/java/com/android/server/backup/BackupManagerService.java index f8bf59d29f48..eaee1d3e0602 100644 --- a/services/backup/java/com/android/server/backup/BackupManagerService.java +++ b/services/backup/java/com/android/server/backup/BackupManagerService.java @@ -3503,12 +3503,12 @@ public class BackupManagerService { class FullBackupEngine { OutputStream mOutput; FullBackupPreflight mPreflightHook; - IFullBackupRestoreObserver mObserver; IBackupAgent mAgent; File mFilesDir; File mManifestFile; File mMetadataFile; boolean mIncludeApks; + PackageInfo mPkg; class FullBackupRunner implements Runnable { PackageInfo mPackage; @@ -3520,8 +3520,8 @@ public class BackupManagerService { boolean mWriteManifest; FullBackupRunner(PackageInfo pack, IBackupAgent agent, ParcelFileDescriptor pipe, - int token, boolean sendApk, boolean writeManifest, byte[] widgetData) - throws IOException { + int token, boolean sendApk, boolean writeManifest, byte[] widgetData) + throws IOException { mPackage = pack; mWidgetData = widgetData; mAgent = agent; @@ -3577,76 +3577,78 @@ public class BackupManagerService { } } - FullBackupEngine(OutputStream output, String packageName, FullBackupPreflight preflightHook, - boolean alsoApks) { + FullBackupEngine(OutputStream output, FullBackupPreflight preflightHook, PackageInfo pkg, + boolean alsoApks) { mOutput = output; mPreflightHook = preflightHook; + mPkg = pkg; mIncludeApks = alsoApks; mFilesDir = new File("/data/system"); mManifestFile = new File(mFilesDir, BACKUP_MANIFEST_FILENAME); mMetadataFile = new File(mFilesDir, BACKUP_METADATA_FILENAME); } - public int backupOnePackage(PackageInfo pkg) throws RemoteException { - int result = BackupTransport.TRANSPORT_OK; - Slog.d(TAG, "Binding to full backup agent : " + pkg.packageName); + public int preflightCheck() throws RemoteException { + if (mPreflightHook == null) { + if (MORE_DEBUG) { + Slog.v(TAG, "No preflight check"); + } + return BackupTransport.TRANSPORT_OK; + } + if (initializeAgent()) { + int result = mPreflightHook.preflightFullBackup(mPkg, mAgent); + if (MORE_DEBUG) { + Slog.v(TAG, "preflight returned " + result); + } + return result; + } else { + Slog.w(TAG, "Unable to bind to full agent for " + mPkg.packageName); + return BackupTransport.AGENT_ERROR; + } + } - mAgent = bindToAgentSynchronous(pkg.applicationInfo, - IApplicationThread.BACKUP_MODE_FULL); - if (mAgent != null) { + public int backupOnePackage() throws RemoteException { + int result = BackupTransport.AGENT_ERROR; + + if (initializeAgent()) { ParcelFileDescriptor[] pipes = null; try { - // Call the preflight hook, if any - if (mPreflightHook != null) { - result = mPreflightHook.preflightFullBackup(pkg, mAgent); - if (MORE_DEBUG) { - Slog.v(TAG, "preflight returned " + result); - } - } - - // If we're still good to go after preflighting, start moving data - if (result == BackupTransport.TRANSPORT_OK) { - pipes = ParcelFileDescriptor.createPipe(); + pipes = ParcelFileDescriptor.createPipe(); - ApplicationInfo app = pkg.applicationInfo; - final boolean isSharedStorage = pkg.packageName.equals(SHARED_BACKUP_AGENT_PACKAGE); - final boolean sendApk = mIncludeApks - && !isSharedStorage - && ((app.privateFlags & ApplicationInfo.PRIVATE_FLAG_FORWARD_LOCK) == 0) - && ((app.flags & ApplicationInfo.FLAG_SYSTEM) == 0 || - (app.flags & ApplicationInfo.FLAG_UPDATED_SYSTEM_APP) != 0); + ApplicationInfo app = mPkg.applicationInfo; + final boolean isSharedStorage = + mPkg.packageName.equals(SHARED_BACKUP_AGENT_PACKAGE); + final boolean sendApk = mIncludeApks + && !isSharedStorage + && ((app.privateFlags & ApplicationInfo.PRIVATE_FLAG_FORWARD_LOCK) == 0) + && ((app.flags & ApplicationInfo.FLAG_SYSTEM) == 0 || + (app.flags & ApplicationInfo.FLAG_UPDATED_SYSTEM_APP) != 0); - // TODO: http://b/22388012 - byte[] widgetBlob = AppWidgetBackupBridge.getWidgetState(pkg.packageName, - UserHandle.USER_SYSTEM); + // TODO: http://b/22388012 + byte[] widgetBlob = AppWidgetBackupBridge.getWidgetState(mPkg.packageName, + UserHandle.USER_SYSTEM); - final int token = generateToken(); - FullBackupRunner runner = new FullBackupRunner(pkg, mAgent, pipes[1], - token, sendApk, !isSharedStorage, widgetBlob); - pipes[1].close(); // the runner has dup'd it - pipes[1] = null; - Thread t = new Thread(runner, "app-data-runner"); - t.start(); + final int token = generateToken(); + FullBackupRunner runner = new FullBackupRunner(mPkg, mAgent, pipes[1], + token, sendApk, !isSharedStorage, widgetBlob); + pipes[1].close(); // the runner has dup'd it + pipes[1] = null; + Thread t = new Thread(runner, "app-data-runner"); + t.start(); - // Now pull data from the app and stuff it into the output - try { - routeSocketDataToOutput(pipes[0], mOutput); - } catch (IOException e) { - Slog.i(TAG, "Caught exception reading from agent", e); - result = BackupTransport.AGENT_ERROR; - } + // Now pull data from the app and stuff it into the output + routeSocketDataToOutput(pipes[0], mOutput); - if (!waitUntilOperationComplete(token)) { - Slog.e(TAG, "Full backup failed on package " + pkg.packageName); - result = BackupTransport.AGENT_ERROR; - } else { - if (MORE_DEBUG) { - Slog.d(TAG, "Full package backup success: " + pkg.packageName); - } + if (!waitUntilOperationComplete(token)) { + Slog.e(TAG, "Full backup failed on package " + mPkg.packageName); + } else { + if (MORE_DEBUG) { + Slog.d(TAG, "Full package backup success: " + mPkg.packageName); } + result = BackupTransport.TRANSPORT_OK; } } catch (IOException e) { - Slog.e(TAG, "Error backing up " + pkg.packageName, e); + Slog.e(TAG, "Error backing up " + mPkg.packageName, e); result = BackupTransport.AGENT_ERROR; } finally { try { @@ -3662,15 +3664,14 @@ public class BackupManagerService { } } } else { - Slog.w(TAG, "Unable to bind to full agent for " + pkg.packageName); - result = BackupTransport.AGENT_ERROR; + Slog.w(TAG, "Unable to bind to full agent for " + mPkg.packageName); } - tearDown(pkg); + tearDown(); return result; } public void sendQuotaExceeded(final long backupDataBytes, final long quotaBytes) { - if (mAgent != null) { + if (initializeAgent()) { try { mAgent.doQuotaExceeded(backupDataBytes, quotaBytes); } catch (RemoteException e) { @@ -3679,6 +3680,17 @@ public class BackupManagerService { } } + private boolean initializeAgent() { + if (mAgent == null) { + if (MORE_DEBUG) { + Slog.d(TAG, "Binding to full backup agent : " + mPkg.packageName); + } + mAgent = bindToAgentSynchronous(mPkg.applicationInfo, + IApplicationThread.BACKUP_MODE_FULL); + } + return mAgent != null; + } + private void writeApkToBackup(PackageInfo pkg, FullBackupDataOutput output) { // Forward-locked apps, system-bundled .apks, etc are filtered out before we get here // TODO: handle backing up split APKs @@ -3795,9 +3807,9 @@ public class BackupManagerService { destination.setLastModified(0); } - private void tearDown(PackageInfo pkg) { - if (pkg != null) { - final ApplicationInfo app = pkg.applicationInfo; + private void tearDown() { + if (mPkg != null) { + final ApplicationInfo app = mPkg.applicationInfo; if (app != null) { tearDownAgentAndKill(app); } @@ -4166,9 +4178,10 @@ public class BackupManagerService { final boolean isSharedStorage = pkg.packageName.equals(SHARED_BACKUP_AGENT_PACKAGE); - mBackupEngine = new FullBackupEngine(out, pkg.packageName, null, mIncludeApks); + mBackupEngine = new FullBackupEngine(out, null, pkg, mIncludeApks); sendOnBackupPackage(isSharedStorage ? "Shared storage" : pkg.packageName); - mBackupEngine.backupOnePackage(pkg); + // Don't need to check preflight result as there is no preflight hook. + mBackupEngine.backupOnePackage(); // after the app's agent runs to handle its private filesystem // contents, back up any OBB content it has on its behalf. @@ -4314,12 +4327,11 @@ public class BackupManagerService { final byte[] buffer = new byte[8192]; for (int i = 0; i < N; i++) { PackageInfo currentPackage = mPackages.get(i); + String packageName = currentPackage.packageName; if (DEBUG) { - Slog.i(TAG, "Initiating full-data transport backup of " - + currentPackage.packageName); + Slog.i(TAG, "Initiating full-data transport backup of " + packageName); } - EventLog.writeEvent(EventLogTags.FULL_BACKUP_PACKAGE, - currentPackage.packageName); + EventLog.writeEvent(EventLogTags.FULL_BACKUP_PACKAGE, packageName); transportPipes = ParcelFileDescriptor.createPipe(); @@ -4335,10 +4347,9 @@ public class BackupManagerService { // Now set up the backup engine / data source end of things enginePipes = ParcelFileDescriptor.createPipe(); - CountDownLatch runnerLatch = new CountDownLatch(1); SinglePackageBackupRunner backupRunner = new SinglePackageBackupRunner(enginePipes[1], currentPackage, - transport, runnerLatch); + transport); // The runner dup'd the pipe half, so we close it here enginePipes[1].close(); enginePipes[1] = null; @@ -4354,44 +4365,50 @@ public class BackupManagerService { FileOutputStream out = new FileOutputStream( transportPipes[1].getFileDescriptor()); long totalRead = 0; - final long expectedSize = backupRunner.expectedSize(); - if (expectedSize < 0) { - backupPackageStatus = BackupTransport.AGENT_ERROR; - sendBackupOnPackageResult(mBackupObserver, currentPackage.packageName, - BackupManager.ERROR_AGENT_FAILURE); - } - int nRead = 0; - do { - if (!mKeepRunning.get()) { - if (DEBUG_SCHEDULING) { - Slog.i(TAG, "Full backup task told to stop"); - } - break; - } - nRead = in.read(buffer); + final long preflightResult = backupRunner.getPreflightResultBlocking(); + // Preflight result is negative if some error happened on preflight. + if (preflightResult < 0) { if (MORE_DEBUG) { - Slog.v(TAG, "in.read(buffer) from app: " + nRead); + Slog.d(TAG, "Backup error after preflight of package " + + packageName + ": " + preflightResult + + ", not running backup."); } - if (nRead > 0) { - out.write(buffer, 0, nRead); - backupPackageStatus = transport.sendBackupData(nRead); - totalRead += nRead; - if (mBackupObserver != null && expectedSize > 0) { - sendBackupOnUpdate(mBackupObserver, currentPackage.packageName, - new BackupProgress(expectedSize, totalRead)); + backupPackageStatus = (int) preflightResult; + } else { + int nRead = 0; + do { + if (!mKeepRunning.get()) { + if (DEBUG_SCHEDULING) { + Slog.i(TAG, "Full backup task told to stop"); + } + break; } - } - } while (nRead > 0 && backupPackageStatus == BackupTransport.TRANSPORT_OK); + nRead = in.read(buffer); + if (MORE_DEBUG) { + Slog.v(TAG, "in.read(buffer) from app: " + nRead); + } + if (nRead > 0) { + out.write(buffer, 0, nRead); + backupPackageStatus = transport.sendBackupData(nRead); + totalRead += nRead; + if (mBackupObserver != null && preflightResult > 0) { + sendBackupOnUpdate(mBackupObserver, packageName, + new BackupProgress(preflightResult, totalRead)); + } + } + } while (nRead > 0 + && backupPackageStatus == BackupTransport.TRANSPORT_OK); - if (backupPackageStatus == BackupTransport.TRANSPORT_QUOTA_EXCEEDED) { - long quota = transport.getBackupQuota(currentPackage.packageName, true); - if (MORE_DEBUG) { - Slog.d(TAG, "Package hit quota limit " + currentPackage.packageName + // Despite preflight succeeded, package still can hit quota on flight. + if (backupPackageStatus == BackupTransport.TRANSPORT_QUOTA_EXCEEDED) { + long quota = transport.getBackupQuota(packageName, true); + Slog.w(TAG, "Package hit quota limit in-flight " + packageName + ": " + totalRead + " of " + quota); + backupRunner.sendQuotaExceeded(totalRead, quota); } - backupRunner.sendQuotaExceeded(totalRead, quota); } + // If we've lost our running criteria, tell the transport to cancel // and roll back this (partial) backup payload; otherwise tell it // that we've reached the clean finish state. @@ -4409,14 +4426,23 @@ public class BackupManagerService { } } + // We still could fail in backup runner thread, getting result from there. + int backupRunnerResult = backupRunner.getBackupResultBlocking(); + if (backupPackageStatus != BackupTransport.TRANSPORT_ERROR + && backupRunnerResult != BackupTransport.TRANSPORT_OK) { + // If there was an error in runner thread and + // not TRANSPORT_ERROR here, overwrite it. + backupPackageStatus = backupRunnerResult; + } + if (MORE_DEBUG) { Slog.i(TAG, "Done trying to send backup data: result=" + backupPackageStatus); } if (backupPackageStatus != BackupTransport.TRANSPORT_OK) { - Slog.e(TAG, "Error " + backupPackageStatus - + " backing up " + currentPackage.packageName); + Slog.e(TAG, "Error " + backupPackageStatus + " backing up " + + packageName); } // Also ask the transport how long it wants us to wait before @@ -4431,34 +4457,37 @@ public class BackupManagerService { // Roll this package to the end of the backup queue if we're // in a queue-driven mode (regardless of success/failure) if (mUpdateSchedule) { - enqueueFullBackup(currentPackage.packageName, - System.currentTimeMillis()); + enqueueFullBackup(packageName, System.currentTimeMillis()); } if (backupPackageStatus == BackupTransport.TRANSPORT_PACKAGE_REJECTED) { - sendBackupOnPackageResult(mBackupObserver, currentPackage.packageName, + sendBackupOnPackageResult(mBackupObserver, packageName, BackupManager.ERROR_TRANSPORT_PACKAGE_REJECTED); if (DEBUG) { - Slog.i(TAG, "Transport rejected backup of " - + currentPackage.packageName + Slog.i(TAG, "Transport rejected backup of " + packageName + ", skipping"); } - EventLog.writeEvent(EventLogTags.FULL_BACKUP_AGENT_FAILURE, - currentPackage.packageName, "transport rejected"); + EventLog.writeEvent(EventLogTags.FULL_BACKUP_AGENT_FAILURE, packageName, + "transport rejected"); // Do nothing, clean up, and continue looping. } else if (backupPackageStatus == BackupTransport.TRANSPORT_QUOTA_EXCEEDED) { - sendBackupOnPackageResult(mBackupObserver, currentPackage.packageName, + sendBackupOnPackageResult(mBackupObserver, packageName, BackupManager.ERROR_TRANSPORT_QUOTA_EXCEEDED); if (DEBUG) { - Slog.i(TAG, "Transport quota exceeded for package: " - + currentPackage.packageName); + Slog.i(TAG, "Transport quota exceeded for package: " + packageName); + EventLog.writeEvent(EventLogTags.FULL_BACKUP_QUOTA_EXCEEDED, + packageName); } - EventLog.writeEvent(EventLogTags.FULL_BACKUP_QUOTA_EXCEEDED, - currentPackage.packageName); + // Do nothing, clean up, and continue looping. + } else if (backupPackageStatus == BackupTransport.AGENT_ERROR) { + sendBackupOnPackageResult(mBackupObserver, packageName, + BackupManager.ERROR_AGENT_FAILURE); + Slog.w(TAG, "Application failure for package: " + packageName); + EventLog.writeEvent(EventLogTags.BACKUP_AGENT_FAILURE, packageName); // Do nothing, clean up, and continue looping. } else if (backupPackageStatus != BackupTransport.TRANSPORT_OK) { - sendBackupOnPackageResult(mBackupObserver, currentPackage.packageName, - BackupManager.ERROR_TRANSPORT_ABORTED); + sendBackupOnPackageResult(mBackupObserver, packageName, + BackupManager.ERROR_TRANSPORT_ABORTED); Slog.w(TAG, "Transport failed; aborting backup: " + backupPackageStatus); EventLog.writeEvent(EventLogTags.FULL_BACKUP_TRANSPORT_FAILURE); // Abort entire backup pass. @@ -4466,11 +4495,10 @@ public class BackupManagerService { return; } else { // Success! - sendBackupOnPackageResult(mBackupObserver, currentPackage.packageName, + sendBackupOnPackageResult(mBackupObserver, packageName, BackupManager.SUCCESS); - EventLog.writeEvent(EventLogTags.FULL_BACKUP_SUCCESS, - currentPackage.packageName); - logBackupComplete(currentPackage.packageName); + EventLog.writeEvent(EventLogTags.FULL_BACKUP_SUCCESS, packageName); + logBackupComplete(packageName); } cleanUpPipes(transportPipes); cleanUpPipes(enginePipes); @@ -4621,28 +4649,41 @@ public class BackupManagerService { final ParcelFileDescriptor mOutput; final PackageInfo mTarget; final FullBackupPreflight mPreflight; - final CountDownLatch mLatch; + final CountDownLatch mPreflightLatch; + final CountDownLatch mBackupLatch; private FullBackupEngine mEngine; + private volatile int mPreflightResult; + private volatile int mBackupResult; SinglePackageBackupRunner(ParcelFileDescriptor output, PackageInfo target, - IBackupTransport transport, CountDownLatch latch) throws IOException { + IBackupTransport transport) throws IOException { mOutput = ParcelFileDescriptor.dup(output.getFileDescriptor()); mTarget = target; mPreflight = new SinglePackageBackupPreflight(transport); - mLatch = latch; + mPreflightLatch = new CountDownLatch(1); + mBackupLatch = new CountDownLatch(1); + mPreflightResult = BackupTransport.TRANSPORT_OK; + mBackupResult = BackupTransport.TRANSPORT_OK; } @Override public void run() { + FileOutputStream out = new FileOutputStream(mOutput.getFileDescriptor()); + mEngine = new FullBackupEngine(out, mPreflight, mTarget, false); try { - FileOutputStream out = new FileOutputStream(mOutput.getFileDescriptor()); - mEngine = new FullBackupEngine(out, mTarget.packageName, - mPreflight, false); - mEngine.backupOnePackage(mTarget); + try { + mPreflightResult = mEngine.preflightCheck(); + } finally { + mPreflightLatch.countDown(); + } + // If there is no error on preflight, continue backup. + if (mPreflightResult == BackupTransport.TRANSPORT_OK) { + mBackupResult = mEngine.backupOnePackage(); + } } catch (Exception e) { - Slog.e(TAG, "Exception during full package backup of " + mTarget); + Slog.e(TAG, "Exception during full package backup of " + mTarget.packageName); } finally { - mLatch.countDown(); + mBackupLatch.countDown(); try { mOutput.close(); } catch (IOException e) { @@ -4655,8 +4696,28 @@ public class BackupManagerService { mEngine.sendQuotaExceeded(backupDataBytes, quotaBytes); } - long expectedSize() { - return mPreflight.getExpectedSizeOrErrorCode(); + // If preflight succeeded, returns positive number - preflight size, + // otherwise return negative error code. + long getPreflightResultBlocking() { + try { + mPreflightLatch.await(); + if (mPreflightResult == BackupTransport.TRANSPORT_OK) { + return mPreflight.getExpectedSizeOrErrorCode(); + } else { + return mPreflightResult; + } + } catch (InterruptedException e) { + return BackupTransport.AGENT_ERROR; + } + } + + int getBackupResultBlocking() { + try { + mBackupLatch.await(); + return mBackupResult; + } catch (InterruptedException e) { + return BackupTransport.AGENT_ERROR; + } } } } diff --git a/services/core/java/com/android/server/InputMethodManagerService.java b/services/core/java/com/android/server/InputMethodManagerService.java index 4a9412ffb958..f522288884f8 100644 --- a/services/core/java/com/android/server/InputMethodManagerService.java +++ b/services/core/java/com/android/server/InputMethodManagerService.java @@ -857,7 +857,7 @@ public class InputMethodManagerService extends IInputMethodManager.Stub // mSettings should be created before buildInputMethodListLocked mSettings = new InputMethodSettings( - mRes, context.getContentResolver(), mMethodMap, mMethodList, userId); + mRes, context.getContentResolver(), mMethodMap, mMethodList, userId, !mSystemReady); // Let the package manager query which are the default imes // as they get certain permissions granted by default. @@ -872,7 +872,7 @@ public class InputMethodManagerService extends IInputMethodManager.Stub // TODO: We are switching the current user id in the settings // object to query it and then revert the user id. Ideally, we // should call a API in settings with the user id as an argument. - mSettings.setCurrentUserId(userId); + mSettings.switchCurrentUser(userId, true /* copyOnWrite */); List<InputMethodInfo> imes = mSettings .getEnabledInputMethodListLocked(); String[] packageNames = null; @@ -884,7 +884,9 @@ public class InputMethodManagerService extends IInputMethodManager.Stub packageNames[i] = ime.getPackageName(); } } - mSettings.setCurrentUserId(currentUserId); + // If the system is not ready, then we use copy-on-write mode. + final boolean useCopyOnWriteSettings = !mSystemReady; + mSettings.switchCurrentUser(currentUserId, useCopyOnWriteSettings); return packageNames; } } @@ -1020,7 +1022,10 @@ public class InputMethodManagerService extends IInputMethodManager.Stub // ContentObserver should be registered again when the user is changed mSettingsObserver.registerContentObserverLocked(newUserId); - mSettings.setCurrentUserId(newUserId); + + // If the system is not ready, then we use copy-on-write settings. + final boolean useCopyOnWriteSettings = !mSystemReady; + mSettings.switchCurrentUser(newUserId, useCopyOnWriteSettings); updateCurrentProfileIds(); // InputMethodFileManager should be reset when the user is changed mFileManager = new InputMethodFileManager(mMethodMap, newUserId); @@ -1079,6 +1084,8 @@ public class InputMethodManagerService extends IInputMethodManager.Stub } if (!mSystemReady) { mSystemReady = true; + final int currentUserId = mSettings.getCurrentUserId(); + mSettings.switchCurrentUser(currentUserId, false /* copyOnWrite */); mKeyguardManager = mContext.getSystemService(KeyguardManager.class); mNotificationManager = mContext.getSystemService(NotificationManager.class); mStatusBar = statusBar; @@ -3000,7 +3007,8 @@ public class InputMethodManagerService extends IInputMethodManager.Stub if (resetDefaultEnabledIme) { final ArrayList<InputMethodInfo> defaultEnabledIme = InputMethodUtils.getDefaultEnabledImes(mContext, mSystemReady, mMethodList); - for (int i = 0; i < defaultEnabledIme.size(); ++i) { + final int N = defaultEnabledIme.size(); + for (int i = 0; i < N; ++i) { final InputMethodInfo imi = defaultEnabledIme.get(i); if (DEBUG) { Slog.d(TAG, "--- enable ime = " + imi); @@ -3362,16 +3370,7 @@ public class InputMethodManagerService extends IInputMethodManager.Stub } } - // Workaround. - // ASEC is not ready in the IMMS constructor. Accordingly, forward-locked - // IMEs are not recognized and considered uninstalled. - // Actually, we can't move everything after SystemReady because - // IMMS needs to run in the encryption lock screen. So, we just skip changing - // the default IME here and try cheking the default IME again in systemReady(). - // TODO: Do nothing before system ready and implement a separated logic for - // the encryption lock screen. - // TODO: ASEC should be ready before IMMS is instantiated. - if (mSystemReady && !setSubtypeOnly) { + if (!setSubtypeOnly) { // Set InputMethod here mSettings.putSelectedInputMethod(imi != null ? imi.getId() : ""); } @@ -3852,6 +3851,8 @@ public class InputMethodManagerService extends IInputMethodManager.Stub p.println(" mSettingsObserver=" + mSettingsObserver); p.println(" mSwitchingController:"); mSwitchingController.dump(p); + p.println(" mSettings:"); + mSettings.dumpLocked(p, " "); } p.println(" "); diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index ad16c177446d..ccaa1d2ecb22 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -499,6 +499,9 @@ public final class ActivityManagerService extends ActivityManagerNative private static final int PERSISTENT_MASK = ApplicationInfo.FLAG_SYSTEM|ApplicationInfo.FLAG_PERSISTENT; + // Intent sent when remote bugreport collection has been completed + private static final String INTENT_REMOTE_BUGREPORT_FINISHED = + "android.intent.action.REMOTE_BUGREPORT_FINISHED"; // Delay to disable app launch boost static final int APP_BOOST_MESSAGE_DELAY = 3000; @@ -16797,10 +16800,12 @@ public final class ActivityManagerService extends ActivityManagerNative HashSet<ComponentName> singleUserReceivers = null; boolean scannedFirstReceivers = false; for (int user : users) { - // Skip users that have Shell restrictions + // Skip users that have Shell restrictions, with exception of always permitted + // Shell broadcasts if (callingUid == Process.SHELL_UID && mUserController.hasUserRestriction( - UserManager.DISALLOW_DEBUGGING_FEATURES, user)) { + UserManager.DISALLOW_DEBUGGING_FEATURES, user) + && !isPermittedShellBroadcast(intent)) { continue; } List<ResolveInfo> newReceivers = AppGlobals.getPackageManager() @@ -16867,6 +16872,11 @@ public final class ActivityManagerService extends ActivityManagerNative return receivers; } + private boolean isPermittedShellBroadcast(Intent intent) { + // remote bugreport should always be allowed to be taken + return INTENT_REMOTE_BUGREPORT_FINISHED.equals(intent.getAction()); + } + final int broadcastIntentLocked(ProcessRecord callerApp, String callerPackage, Intent intent, String resolvedType, IIntentReceiver resultTo, int resultCode, String resultData, diff --git a/services/core/java/com/android/server/am/ActivityStarter.java b/services/core/java/com/android/server/am/ActivityStarter.java index cca6fc5a85d5..1166ae18387a 100644 --- a/services/core/java/com/android/server/am/ActivityStarter.java +++ b/services/core/java/com/android/server/am/ActivityStarter.java @@ -1397,7 +1397,7 @@ class ActivityStarter { } intentActivity.deliverNewIntentLocked(mCallingUid, mStartActivity.intent, mStartActivity.launchedFromPackage); - } else if (!mStartActivity.intent.filterEquals(intentActivity.task.intent)) { + } else if (!mStartActivity.intent.filterEquals(intentActivity.intent)) { // In this case we are launching the root activity of the task, but with a // different intent. We should start a new instance on top. mAddingToTask = true; diff --git a/services/core/java/com/android/server/pm/LauncherAppsService.java b/services/core/java/com/android/server/pm/LauncherAppsService.java index c6613f54d63c..8d75f603928e 100644 --- a/services/core/java/com/android/server/pm/LauncherAppsService.java +++ b/services/core/java/com/android/server/pm/LauncherAppsService.java @@ -346,8 +346,7 @@ public class LauncherAppsService extends SystemService { String packageName = component.getPackageName(); Intent intent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS, Uri.fromParts("package", packageName, null)); - intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK | - Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS); + intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK); intent.setSourceBounds(sourceBounds); mContext.startActivityAsUser(intent, opts, user); } finally { diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index 195479468cbe..5db7e63d88da 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -10673,44 +10673,63 @@ public class PackageManagerService extends IPackageManager.Stub { } @Override - public boolean setPackageSuspendedAsUser(String packageName, boolean suspended, int userId) { + public String[] setPackagesSuspendedAsUser(String[] packageNames, boolean suspended, + int userId) { mContext.enforceCallingOrSelfPermission(android.Manifest.permission.MANAGE_USERS, null); enforceCrossUserPermission(Binder.getCallingUid(), userId, true, true, - "setPackageSuspended for user " + userId); + "setPackagesSuspended for user " + userId); - if (!canSuspendPackageForUser(packageName, userId)) { - return false; + if (ArrayUtils.isEmpty(packageNames)) { + return packageNames; } - long callingId = Binder.clearCallingIdentity(); - try { - boolean changed = false; - boolean success = false; - int appId = -1; - synchronized (mPackages) { - final PackageSetting pkgSetting = mSettings.mPackages.get(packageName); - if (pkgSetting != null) { + // List of package names for whom the suspended state has changed. + List<String> changedPackages = new ArrayList<>(packageNames.length); + // List of package names for whom the suspended state is not set as requested in this + // method. + List<String> unactionedPackages = new ArrayList<>(packageNames.length); + for (int i = 0; i < packageNames.length; i++) { + String packageName = packageNames[i]; + long callingId = Binder.clearCallingIdentity(); + try { + boolean changed = false; + final int appId; + synchronized (mPackages) { + final PackageSetting pkgSetting = mSettings.mPackages.get(packageName); + if (pkgSetting == null) { + Slog.w(TAG, "Could not find package setting for package \"" + packageName + + "\". Skipping suspending/un-suspending."); + unactionedPackages.add(packageName); + continue; + } + appId = pkgSetting.appId; if (pkgSetting.getSuspended(userId) != suspended) { + if (!canSuspendPackageForUser(packageName, userId)) { + unactionedPackages.add(packageName); + continue; + } pkgSetting.setSuspended(suspended, userId); mSettings.writePackageRestrictionsLPr(userId); - appId = pkgSetting.appId; changed = true; + changedPackages.add(packageName); } - success = true; } - } - if (changed) { - sendPackagesSuspendedForUser(new String[]{packageName}, userId, suspended); - if (suspended) { + if (changed && suspended) { killApplication(packageName, UserHandle.getUid(userId, appId), "suspending package"); } + } finally { + Binder.restoreCallingIdentity(callingId); } - return success; - } finally { - Binder.restoreCallingIdentity(callingId); } + + if (!changedPackages.isEmpty()) { + sendPackagesSuspendedForUser(changedPackages.toArray( + new String[changedPackages.size()]), userId, suspended); + } + + return unactionedPackages.toArray(new String[unactionedPackages.size()]); } @Override diff --git a/services/core/java/com/android/server/pm/PackageManagerShellCommand.java b/services/core/java/com/android/server/pm/PackageManagerShellCommand.java index 9a0d0ddbc69e..abee007f1c8a 100644 --- a/services/core/java/com/android/server/pm/PackageManagerShellCommand.java +++ b/services/core/java/com/android/server/pm/PackageManagerShellCommand.java @@ -178,7 +178,8 @@ class PackageManagerShellCommand extends ShellCommand { } try { - mInterface.setPackageSuspendedAsUser(packageName, suspendedState, userId); + mInterface.setPackagesSuspendedAsUser(new String[]{packageName}, suspendedState, + userId); pw.println("Package " + packageName + " new suspended state: " + mInterface.isPackageSuspendedForUser(packageName, userId)); return 0; diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index cec8119f434a..fa727d4dd1d7 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java @@ -6924,7 +6924,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { } @Override - public boolean setPackageSuspended(ComponentName who, String packageName, + public String[] setPackagesSuspended(ComponentName who, String[] packageNames, boolean suspended) { Preconditions.checkNotNull(who, "ComponentName is null"); int callingUserId = UserHandle.getCallingUserId(); @@ -6933,15 +6933,15 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { long id = mInjector.binderClearCallingIdentity(); try { - return mIPackageManager.setPackageSuspendedAsUser( - packageName, suspended, callingUserId); + return mIPackageManager.setPackagesSuspendedAsUser( + packageNames, suspended, callingUserId); } catch (RemoteException re) { // Shouldn't happen. Slog.e(LOG_TAG, "Failed talking to the package manager", re); } finally { mInjector.binderRestoreCallingIdentity(id); } - return false; + return packageNames; } } diff --git a/test-runner/src/android/test/mock/MockPackageManager.java b/test-runner/src/android/test/mock/MockPackageManager.java index e46189ff550c..da4346002110 100644 --- a/test-runner/src/android/test/mock/MockPackageManager.java +++ b/test-runner/src/android/test/mock/MockPackageManager.java @@ -859,7 +859,7 @@ public class MockPackageManager extends PackageManager { /** @hide */ @Override - public boolean setPackageSuspendedAsUser(String packageName, boolean hidden, int userId) { + public String[] setPackagesSuspendedAsUser(String[] packageNames, boolean hidden, int userId) { throw new UnsupportedOperationException(); } diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgePackageManager.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgePackageManager.java index dc949960958c..fcfbad2743ed 100644 --- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgePackageManager.java +++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgePackageManager.java @@ -784,8 +784,9 @@ public class BridgePackageManager extends PackageManager { } @Override - public boolean setPackageSuspendedAsUser(String packageName, boolean suspended, int userId) { - return false; + public String[] setPackagesSuspendedAsUser(String[] packageNames, boolean suspended, + int userId) { + return new String[]{}; } @Override |