diff options
238 files changed, 1856 insertions, 1496 deletions
diff --git a/compiled-classes-phone b/compiled-classes-phone index cf4b28b6ea8f..5f023bd8f010 100644 --- a/compiled-classes-phone +++ b/compiled-classes-phone @@ -441,7 +441,6 @@ android.app.ResourcesManager$1 android.app.ResourcesManager$ActivityResources android.app.ResultInfo android.app.ResultInfo$1 -android.app.RetailDemoModeServiceInternal android.app.SearchableInfo android.app.SearchableInfo$1 android.app.Service diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java index d59e99321e5b..531afa4c9b58 100644 --- a/core/java/android/app/Notification.java +++ b/core/java/android/app/Notification.java @@ -4551,11 +4551,16 @@ public class Notification implements Parcelable savedBundle.getBoolean(EXTRA_SHOW_CHRONOMETER)); publicExtras.putBoolean(EXTRA_CHRONOMETER_COUNT_DOWN, savedBundle.getBoolean(EXTRA_CHRONOMETER_COUNT_DOWN)); - publicExtras.putCharSequence(EXTRA_TITLE, - mContext.getString(com.android.internal.R.string.notification_hidden_text)); mN.extras = publicExtras; - final RemoteViews view = ambient ? makeAmbientNotification() - : applyStandardTemplate(getBaseLayoutResource()); + RemoteViews view; + if (ambient) { + publicExtras.putCharSequence(EXTRA_TITLE, + mContext.getString(com.android.internal.R.string.notification_hidden_text)); + view = makeAmbientNotification(); + } else{ + view = makeNotificationHeader(false /* ambient */); + view.setBoolean(R.id.notification_header, "setExpandOnlyOnButton", true); + } mN.extras = savedBundle; mN.mLargeIcon = largeIcon; mN.largeIcon = largeIconLegacy; diff --git a/core/java/android/app/NotificationManager.java b/core/java/android/app/NotificationManager.java index fe2168bc6d72..9d7e4a2867e0 100644 --- a/core/java/android/app/NotificationManager.java +++ b/core/java/android/app/NotificationManager.java @@ -415,16 +415,12 @@ public class NotificationManager { * Creates a notification channel that notifications can be posted to. * * This can also be used to restore a deleted channel and to update an existing channel's - * name, description, and/or importance. + * name and description. * * <p>The name and description should only be changed if the locale changes * or in response to the user renaming this channel. For example, if a user has a channel * named 'John Doe' that represents messages from a 'John Doe', and 'John Doe' changes his name * to 'John Smith,' the channel can be renamed to match. - * - * <p>The importance of an existing channel will only be changed if the new importance is lower - * than the current value and the user has not altered any settings on this channel. - * * All other fields are ignored for channels that already exist. * * @param channel the channel to create. Note that the created channel may differ from this diff --git a/core/java/android/content/AbstractThreadedSyncAdapter.java b/core/java/android/content/AbstractThreadedSyncAdapter.java index 58bd5cda825d..2629929e91ce 100644 --- a/core/java/android/content/AbstractThreadedSyncAdapter.java +++ b/core/java/android/content/AbstractThreadedSyncAdapter.java @@ -17,11 +17,12 @@ package android.content; import android.accounts.Account; +import android.os.Build; import android.os.Bundle; import android.os.IBinder; import android.os.Process; -import android.os.RemoteException; import android.os.Trace; +import android.util.Log; import java.util.HashMap; import java.util.concurrent.atomic.AtomicInteger; @@ -95,6 +96,8 @@ import java.util.concurrent.atomic.AtomicInteger; * </ul> */ public abstract class AbstractThreadedSyncAdapter { + private static final String TAG = "SyncAdapter"; + /** * Kernel event log tag. Also listed in data/etc/event-log-tags. * @deprecated Private constant. May go away in the next release. @@ -102,6 +105,8 @@ public abstract class AbstractThreadedSyncAdapter { @Deprecated public static final int LOG_SYNC_DETAILS = 2743; + private static final boolean ENABLE_LOG = Build.IS_DEBUGGABLE && Log.isLoggable(TAG, Log.DEBUG); + private final Context mContext; private final AtomicInteger mNumSyncStarts; private final ISyncAdapterImpl mISyncAdapterImpl; @@ -163,71 +168,104 @@ public abstract class AbstractThreadedSyncAdapter { @Override public void startSync(ISyncContext syncContext, String authority, Account account, Bundle extras) { - final SyncContext syncContextClient = new SyncContext(syncContext); - - boolean alreadyInProgress; - // synchronize to make sure that mSyncThreads doesn't change between when we - // check it and when we use it - final Account threadsKey = toSyncKey(account); - synchronized (mSyncThreadLock) { - if (!mSyncThreads.containsKey(threadsKey)) { - if (mAutoInitialize - && extras != null - && extras.getBoolean(ContentResolver.SYNC_EXTRAS_INITIALIZE, false)) { - try { - if (ContentResolver.getIsSyncable(account, authority) < 0) { - ContentResolver.setIsSyncable(account, authority, 1); + if (ENABLE_LOG) { + if (extras != null) { + extras.size(); // Unparcel so its toString() will show the contents. + } + Log.d(TAG, "startSync() start " + authority + " " + account + " " + extras); + } + try { + final SyncContext syncContextClient = new SyncContext(syncContext); + + boolean alreadyInProgress; + // synchronize to make sure that mSyncThreads doesn't change between when we + // check it and when we use it + final Account threadsKey = toSyncKey(account); + synchronized (mSyncThreadLock) { + if (!mSyncThreads.containsKey(threadsKey)) { + if (mAutoInitialize + && extras != null + && extras.getBoolean( + ContentResolver.SYNC_EXTRAS_INITIALIZE, false)) { + try { + if (ContentResolver.getIsSyncable(account, authority) < 0) { + ContentResolver.setIsSyncable(account, authority, 1); + } + } finally { + syncContextClient.onFinished(new SyncResult()); } - } finally { - syncContextClient.onFinished(new SyncResult()); + return; + } + SyncThread syncThread = new SyncThread( + "SyncAdapterThread-" + mNumSyncStarts.incrementAndGet(), + syncContextClient, authority, account, extras); + mSyncThreads.put(threadsKey, syncThread); + syncThread.start(); + alreadyInProgress = false; + } else { + if (ENABLE_LOG) { + Log.d(TAG, " alreadyInProgress"); } - return; + alreadyInProgress = true; } - SyncThread syncThread = new SyncThread( - "SyncAdapterThread-" + mNumSyncStarts.incrementAndGet(), - syncContextClient, authority, account, extras); - mSyncThreads.put(threadsKey, syncThread); - syncThread.start(); - alreadyInProgress = false; - } else { - alreadyInProgress = true; } - } - // do this outside since we don't want to call back into the syncContext while - // holding the synchronization lock - if (alreadyInProgress) { - syncContextClient.onFinished(SyncResult.ALREADY_IN_PROGRESS); + // do this outside since we don't want to call back into the syncContext while + // holding the synchronization lock + if (alreadyInProgress) { + syncContextClient.onFinished(SyncResult.ALREADY_IN_PROGRESS); + } + } catch (RuntimeException | Error th) { + if (ENABLE_LOG) { + Log.d(TAG, "startSync() caught exception", th); + } + throw th; + } finally { + if (ENABLE_LOG) { + Log.d(TAG, "startSync() finishing"); + } } } @Override public void cancelSync(ISyncContext syncContext) { - // synchronize to make sure that mSyncThreads doesn't change between when we - // check it and when we use it - SyncThread info = null; - synchronized (mSyncThreadLock) { - for (SyncThread current : mSyncThreads.values()) { - if (current.mSyncContext.getSyncContextBinder() == syncContext.asBinder()) { - info = current; - break; + try { + // synchronize to make sure that mSyncThreads doesn't change between when we + // check it and when we use it + SyncThread info = null; + synchronized (mSyncThreadLock) { + for (SyncThread current : mSyncThreads.values()) { + if (current.mSyncContext.getSyncContextBinder() == syncContext.asBinder()) { + info = current; + break; + } } } - } - if (info != null) { - if (mAllowParallelSyncs) { - onSyncCanceled(info); + if (info != null) { + if (ENABLE_LOG) { + Log.d(TAG, "cancelSync() " + info.mAuthority + " " + info.mAccount); + } + if (mAllowParallelSyncs) { + onSyncCanceled(info); + } else { + onSyncCanceled(); + } } else { - onSyncCanceled(); + if (ENABLE_LOG) { + Log.w(TAG, "cancelSync() unknown context"); + } + } + } catch (RuntimeException | Error th) { + if (ENABLE_LOG) { + Log.d(TAG, "cancelSync() caught exception", th); + } + throw th; + } finally { + if (ENABLE_LOG) { + Log.d(TAG, "cancelSync() finishing"); } } } - - public void initialize(Account account, String authority) throws RemoteException { - Bundle extras = new Bundle(); - extras.putBoolean(ContentResolver.SYNC_EXTRAS_INITIALIZE, true); - startSync(null, authority, account, extras); - } } /** @@ -256,6 +294,10 @@ public abstract class AbstractThreadedSyncAdapter { public void run() { Process.setThreadPriority(Process.THREAD_PRIORITY_BACKGROUND); + if (ENABLE_LOG) { + Log.d(TAG, "Thread started"); + } + // Trace this sync instance. Note, conceptually this should be in // SyncStorageEngine.insertStartSyncEvent(), but the trace functions require unique // threads in order to track overlapping operations, so we'll do it here for now. @@ -265,8 +307,15 @@ public abstract class AbstractThreadedSyncAdapter { ContentProviderClient provider = null; try { if (isCanceled()) { + if (ENABLE_LOG) { + Log.d(TAG, "Already canceled"); + } return; } + if (ENABLE_LOG) { + Log.d(TAG, "Calling onPerformSync..."); + } + provider = mContext.getContentResolver().acquireContentProviderClient(mAuthority); if (provider != null) { AbstractThreadedSyncAdapter.this.onPerformSync(mAccount, mExtras, @@ -274,10 +323,23 @@ public abstract class AbstractThreadedSyncAdapter { } else { syncResult.databaseError = true; } + + if (ENABLE_LOG) { + Log.d(TAG, "onPerformSync done"); + } + } catch (SecurityException e) { + if (ENABLE_LOG) { + Log.d(TAG, "SecurityException", e); + } AbstractThreadedSyncAdapter.this.onSecurityException(mAccount, mExtras, mAuthority, syncResult); syncResult.databaseError = true; + } catch (RuntimeException | Error th) { + if (ENABLE_LOG) { + Log.d(TAG, "caught exception", th); + } + throw th; } finally { Trace.traceEnd(Trace.TRACE_TAG_SYNC_MANAGER); @@ -292,6 +354,10 @@ public abstract class AbstractThreadedSyncAdapter { synchronized (mSyncThreadLock) { mSyncThreads.remove(mThreadsKey); } + + if (ENABLE_LOG) { + Log.d(TAG, "Thread finished"); + } } } diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java index ef6170359dda..7d2f8d18783e 100644 --- a/core/java/android/content/Context.java +++ b/core/java/android/content/Context.java @@ -126,8 +126,8 @@ public abstract class Context { * File creation mode: allow all other applications to have read access to * the created file. * <p> - * As of {@link android.os.Build.VERSION_CODES#N} attempting to use this - * mode will throw a {@link SecurityException}. + * Starting from {@link android.os.Build.VERSION_CODES#N}, attempting to use this + * mode throws a {@link SecurityException}. * * @deprecated Creating world-readable files is very dangerous, and likely * to cause security holes in applications. It is strongly @@ -146,7 +146,7 @@ public abstract class Context { * File creation mode: allow all other applications to have write access to * the created file. * <p> - * As of {@link android.os.Build.VERSION_CODES#N} attempting to use this + * Starting from {@link android.os.Build.VERSION_CODES#N}, attempting to use this * mode will throw a {@link SecurityException}. * * @deprecated Creating world-writable files is very dangerous, and likely @@ -1129,13 +1129,47 @@ public abstract class Context { * </ul> * <p> * Starting in {@link android.os.Build.VERSION_CODES#KITKAT}, no permissions - * are required to read or write to the returned path; it's always - * accessible to the calling app. This only applies to paths generated for - * package name of the calling application. To access paths belonging to - * other packages, - * {@link android.Manifest.permission#WRITE_EXTERNAL_STORAGE} and/or - * {@link android.Manifest.permission#READ_EXTERNAL_STORAGE} are required. + * are required to read or write to the path that this method returns. + * However, starting from {@link android.os.Build.VERSION_CODES#M}, + * to read the OBB expansion files, you must declare the + * {@link android.Manifest.permission#READ_EXTERNAL_STORAGE} permission in the app manifest and ask for + * permission at runtime as follows: + * </p> + * <p> + * {@code <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" + * android:maxSdkVersion="23" />} + * </p> * <p> + * Starting from {@link android.os.Build.VERSION_CODES#N}, + * {@link android.Manifest.permission#READ_EXTERNAL_STORAGE} + * permission is not required, so don’t ask for this + * permission at runtime. To handle both cases, your app must first try to read the OBB file, + * and if it fails, you must request + * {@link android.Manifest.permission#READ_EXTERNAL_STORAGE} permission at runtime. + * </p> + * + * <p> + * The following code snippet shows how to do this: + * </p> + * + * <pre> + * File obb = new File(obb_filename); + * boolean open_failed = false; + * + * try { + * BufferedReader br = new BufferedReader(new FileReader(obb)); + * open_failed = false; + * ReadObbFile(br); + * } catch (IOException e) { + * open_failed = true; + * } + * + * if (open_failed) { + * // request READ_EXTERNAL_STORAGE permission before reading OBB file + * ReadObbFileWithPermission(); + * } + * </pre> + * * On devices with multiple users (as described by {@link UserManager}), * multiple users may share the same OBB storage location. Applications * should ensure that multiple instances running under different users don't diff --git a/core/java/android/content/ISyncAdapter.aidl b/core/java/android/content/ISyncAdapter.aidl index dd9d14edc418..4660527925c5 100644 --- a/core/java/android/content/ISyncAdapter.aidl +++ b/core/java/android/content/ISyncAdapter.aidl @@ -44,12 +44,4 @@ oneway interface ISyncAdapter { * @param syncContext the ISyncContext that was passed to {@link #startSync} */ void cancelSync(ISyncContext syncContext); - - /** - * Initialize the SyncAdapter for this account and authority. - * - * @param account the account that should be synced - * @param authority the authority that should be synced - */ - void initialize(in Account account, String authority); } diff --git a/core/java/android/content/SyncStatusInfo.java b/core/java/android/content/SyncStatusInfo.java index 663e6e476c5a..abf9cc91dbda 100644 --- a/core/java/android/content/SyncStatusInfo.java +++ b/core/java/android/content/SyncStatusInfo.java @@ -26,7 +26,7 @@ import java.util.ArrayList; public class SyncStatusInfo implements Parcelable { private static final String TAG = "Sync"; - static final int VERSION = 3; + static final int VERSION = 4; private static final int MAX_EVENT_COUNT = 10; @@ -102,6 +102,7 @@ public class SyncStatusInfo implements Parcelable { parcel.writeLong(mLastEventTimes.get(i)); parcel.writeString(mLastEvents.get(i)); } + parcel.writeInt(numSourcePeriodic); } public SyncStatusInfo(Parcel parcel) { @@ -146,6 +147,16 @@ public class SyncStatusInfo implements Parcelable { } } } + if (version < 4) { + // Before version 4, numSourcePeriodic wasn't persisted. + numSourcePeriodic = numSyncs - numSourceLocal - numSourcePoll - numSourceServer + - numSourceUser; + if (numSourcePeriodic < 0) { // Sanity check. + numSourcePeriodic = 0; + } + } else { + numSourcePeriodic = parcel.readInt(); + } } public SyncStatusInfo(SyncStatusInfo other) { diff --git a/core/java/android/content/pm/ActivityInfo.java b/core/java/android/content/pm/ActivityInfo.java index f098f2a7c143..16c834d18b9e 100644 --- a/core/java/android/content/pm/ActivityInfo.java +++ b/core/java/android/content/pm/ActivityInfo.java @@ -28,8 +28,6 @@ import android.util.Printer; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; -import static android.view.WindowManager.LayoutParams.ROTATION_ANIMATION_ROTATE; - /** * Information you can retrieve about a particular application * activity or receiver. This corresponds to information collected @@ -775,6 +773,16 @@ public class ActivityInfo extends ComponentInfo * {@link Configuration}. */ public static final int CONFIG_ROTATION = 0x20000000; + /** + * Bit in {@link #configChanges} that indicates that the activity + * can itself handle changes to the app bounds. Set from the + * {@link android.R.attr#configChanges} attribute. This is + * not a core resource configuration, but a higher-level value, so its + * constant starts at the high bits. + * @hide We do not want apps to handle this. It will eventually be moved out of + * {@link Configuration}. + */ + public static final int CONFIG_APP_BOUNDS = 0x10000000; /** @hide * Unfortunately the constants for config changes in native code are diff --git a/core/java/android/content/res/Configuration.java b/core/java/android/content/res/Configuration.java index 68d4cd8c5f7d..7b96c6a3b5f5 100644 --- a/core/java/android/content/res/Configuration.java +++ b/core/java/android/content/res/Configuration.java @@ -1445,7 +1445,7 @@ public final class Configuration implements Parcelable, Comparable<Configuration if ((compareUndefined || delta.appBounds != null) && appBounds != delta.appBounds && (appBounds == null || !appBounds.equals(delta.appBounds))) { - changed |= ActivityInfo.CONFIG_SCREEN_SIZE; + changed |= ActivityInfo.CONFIG_APP_BOUNDS; } return changed; diff --git a/core/java/android/os/BatteryStats.java b/core/java/android/os/BatteryStats.java index 19fb15c56d40..4160ed74e3ea 100644 --- a/core/java/android/os/BatteryStats.java +++ b/core/java/android/os/BatteryStats.java @@ -201,7 +201,7 @@ public abstract class BatteryStats implements Parcelable { * New in version 22: * - BLE scan result background count, BLE unoptimized scan time */ - static final String CHECKIN_VERSION = "23"; + static final String CHECKIN_VERSION = "24"; /** * Old version, we hit 9 and ran out of room, need to remove. diff --git a/core/java/android/security/IKeystoreService.aidl b/core/java/android/security/IKeystoreService.aidl index bfc8636c70a4..42282ac2858b 100644 --- a/core/java/android/security/IKeystoreService.aidl +++ b/core/java/android/security/IKeystoreService.aidl @@ -48,7 +48,7 @@ interface IKeystoreService { byte[] sign(String name, in byte[] data); int verify(String name, in byte[] data, in byte[] signature); byte[] get_pubkey(String name); - int grant(String name, int granteeUid); + String grant(String name, int granteeUid); int ungrant(String name, int granteeUid); long getmtime(String name, int uid); int duplicate(String srcKey, int srcUid, String destKey, int destUid); diff --git a/core/java/android/view/HapticFeedbackConstants.java b/core/java/android/view/HapticFeedbackConstants.java index 71a3f7e2817e..c43132388b56 100644 --- a/core/java/android/view/HapticFeedbackConstants.java +++ b/core/java/android/view/HapticFeedbackConstants.java @@ -69,12 +69,7 @@ public class HapticFeedbackConstants { public static final int TEXT_HANDLE_MOVE = 8; /** - * This is a private constant. Feel free to renumber as desired. - * @hide - */ - public static final int SAFE_MODE_DISABLED = 10000; - - /** + * The phone has booted with safe mode enabled. * This is a private constant. Feel free to renumber as desired. * @hide */ diff --git a/core/java/android/view/NotificationHeaderView.java b/core/java/android/view/NotificationHeaderView.java index 568c40a02878..580456023d68 100644 --- a/core/java/android/view/NotificationHeaderView.java +++ b/core/java/android/view/NotificationHeaderView.java @@ -59,6 +59,7 @@ public class NotificationHeaderView extends ViewGroup { private Drawable mBackground; private int mHeaderBackgroundHeight; private boolean mEntireHeaderClickable; + private boolean mExpandOnlyOnButton; private boolean mAcceptAllTouches; ViewOutlineProvider mProvider = new ViewOutlineProvider() { @@ -315,6 +316,7 @@ public class NotificationHeaderView extends ViewGroup { public class HeaderTouchListener implements View.OnTouchListener { private final ArrayList<Rect> mTouchRects = new ArrayList<>(); + private Rect mExpandButtonRect; private int mTouchSlop; private boolean mTrackGesture; private float mDownX; @@ -326,7 +328,7 @@ public class NotificationHeaderView extends ViewGroup { public void bindTouchRects() { mTouchRects.clear(); addRectAroundView(mIcon); - addRectAroundView(mExpandButton); + mExpandButtonRect = addRectAroundView(mExpandButton); addWidthRect(); mTouchSlop = ViewConfiguration.get(getContext()).getScaledTouchSlop(); } @@ -340,9 +342,10 @@ public class NotificationHeaderView extends ViewGroup { mTouchRects.add(r); } - private void addRectAroundView(View view) { + private Rect addRectAroundView(View view) { final Rect r = getRectAroundView(view); mTouchRects.add(r); + return r; } private Rect getRectAroundView(View view) { @@ -395,6 +398,9 @@ public class NotificationHeaderView extends ViewGroup { if (mAcceptAllTouches) { return true; } + if (mExpandOnlyOnButton) { + return mExpandButtonRect.contains((int) x, (int) y); + } for (int i = 0; i < mTouchRects.size(); i++) { Rect r = mTouchRects.get(i); if (r.contains((int) x, (int) y)) { @@ -440,4 +446,12 @@ public class NotificationHeaderView extends ViewGroup { public void setAcceptAllTouches(boolean acceptAllTouches) { mAcceptAllTouches = mEntireHeaderClickable || acceptAllTouches; } + + /** + * Sets whether only the expand icon itself should serve as the expand target. + */ + @RemotableViewMethod + public void setExpandOnlyOnButton(boolean expandOnlyOnButton) { + mExpandOnlyOnButton = expandOnlyOnButton; + } } diff --git a/core/java/android/widget/EdgeEffect.java b/core/java/android/widget/EdgeEffect.java index 98d8a13d68b5..f9f5901a6651 100644 --- a/core/java/android/widget/EdgeEffect.java +++ b/core/java/android/widget/EdgeEffect.java @@ -59,7 +59,8 @@ public class EdgeEffect { // Time it will take in ms for a pulled glow to decay to partial strength before release private static final int PULL_DECAY_TIME = 2000; - private static final float MAX_ALPHA = 0.5f; + private static final float MAX_ALPHA = 0.15f; + private static final float GLOW_ALPHA_START = .09f; private static final float MAX_GLOW_SCALE = 2.f; @@ -75,6 +76,7 @@ public class EdgeEffect { private static final double ANGLE = Math.PI / 6; private static final float SIN = (float) Math.sin(ANGLE); private static final float COS = (float) Math.cos(ANGLE); + private static final float RADIUS_FACTOR = 0.6f; private float mGlowAlpha; private float mGlowScaleY; @@ -134,10 +136,10 @@ public class EdgeEffect { * @param height Effect height in pixels */ public void setSize(int width, int height) { - final float r = width * 0.75f / SIN; + final float r = width * RADIUS_FACTOR / SIN; final float y = COS * r; final float h = r - y; - final float or = height * 0.75f / SIN; + final float or = height * RADIUS_FACTOR / SIN; final float oy = COS * or; final float oh = or - oy; @@ -272,7 +274,7 @@ public class EdgeEffect { // The glow depends more on the velocity, and therefore starts out // nearly invisible. - mGlowAlphaStart = 0.3f; + mGlowAlphaStart = GLOW_ALPHA_START; mGlowScaleYStart = Math.max(mGlowScaleY, 0.f); diff --git a/core/java/com/android/internal/app/IBatteryStats.aidl b/core/java/com/android/internal/app/IBatteryStats.aidl index 04f7c76c8e74..a44fd675a709 100644 --- a/core/java/com/android/internal/app/IBatteryStats.aidl +++ b/core/java/com/android/internal/app/IBatteryStats.aidl @@ -130,7 +130,7 @@ interface IBatteryStats { long getAwakeTimePlugged(); void noteBleScanStarted(in WorkSource ws, boolean isUnoptimized); - void noteBleScanStopped(in WorkSource ws); + void noteBleScanStopped(in WorkSource ws, boolean isUnoptimized); void noteResetBleScan(); void noteBleScanResults(in WorkSource ws, int numNewResults); diff --git a/core/java/com/android/internal/colorextraction/ColorExtractor.java b/core/java/com/android/internal/colorextraction/ColorExtractor.java index 68cf5cd74431..477285e63f37 100644 --- a/core/java/com/android/internal/colorextraction/ColorExtractor.java +++ b/core/java/com/android/internal/colorextraction/ColorExtractor.java @@ -29,7 +29,9 @@ import com.android.internal.annotations.VisibleForTesting; import com.android.internal.colorextraction.types.ExtractionType; import com.android.internal.colorextraction.types.Tonal; +import java.lang.ref.WeakReference; import java.util.ArrayList; +import java.util.Iterator; /** * Class to process wallpaper colors and generate a tonal palette based on them. @@ -44,7 +46,7 @@ public class ColorExtractor implements WallpaperManager.OnColorsChangedListener private static final String TAG = "ColorExtractor"; private final SparseArray<GradientColors[]> mGradientColors; - private final ArrayList<OnColorsChangedListener> mOnColorsChangedListeners; + private final ArrayList<WeakReference<OnColorsChangedListener>> mOnColorsChangedListeners; private final Context mContext; private final ExtractionType mExtractionType; private WallpaperColors mSystemColors; @@ -167,8 +169,17 @@ public class ColorExtractor implements WallpaperManager.OnColorsChangedListener } protected void triggerColorsChanged(int which) { - for (OnColorsChangedListener listener: mOnColorsChangedListeners) { - listener.onColorsChanged(this, which); + ArrayList<WeakReference<OnColorsChangedListener>> references = + new ArrayList<>(mOnColorsChangedListeners); + final int size = references.size(); + for (int i = 0; i < size; i++) { + final WeakReference<OnColorsChangedListener> weakReference = references.get(i); + final OnColorsChangedListener listener = weakReference.get(); + if (listener == null) { + mOnColorsChangedListeners.remove(weakReference); + } else { + listener.onColorsChanged(this, which); + } } } @@ -187,11 +198,20 @@ public class ColorExtractor implements WallpaperManager.OnColorsChangedListener } public void addOnColorsChangedListener(@NonNull OnColorsChangedListener listener) { - mOnColorsChangedListeners.add(listener); + mOnColorsChangedListeners.add(new WeakReference<>(listener)); } public void removeOnColorsChangedListener(@NonNull OnColorsChangedListener listener) { - mOnColorsChangedListeners.remove(listener); + ArrayList<WeakReference<OnColorsChangedListener>> references = + new ArrayList<>(mOnColorsChangedListeners); + final int size = references.size(); + for (int i = 0; i < size; i++) { + final WeakReference<OnColorsChangedListener> weakReference = references.get(i); + if (weakReference.get() == listener) { + mOnColorsChangedListeners.remove(weakReference); + break; + } + } } public static class GradientColors { diff --git a/core/java/com/android/internal/os/BatteryStatsImpl.java b/core/java/com/android/internal/os/BatteryStatsImpl.java index 2363f6820da4..30875a86d30b 100644 --- a/core/java/com/android/internal/os/BatteryStatsImpl.java +++ b/core/java/com/android/internal/os/BatteryStatsImpl.java @@ -4852,7 +4852,7 @@ public class BatteryStatsImpl extends BatteryStats { } } - private void noteBluetoothScanStoppedLocked(int uid) { + private void noteBluetoothScanStoppedLocked(int uid, boolean isUnoptimized) { uid = mapUid(uid); final long elapsedRealtime = mClocks.elapsedRealtime(); final long uptime = mClocks.uptimeMillis(); @@ -4864,13 +4864,13 @@ public class BatteryStatsImpl extends BatteryStats { addHistoryRecordLocked(elapsedRealtime, uptime); mBluetoothScanTimer.stopRunningLocked(elapsedRealtime); } - getUidStatsLocked(uid).noteBluetoothScanStoppedLocked(elapsedRealtime); + getUidStatsLocked(uid).noteBluetoothScanStoppedLocked(elapsedRealtime, isUnoptimized); } - public void noteBluetoothScanStoppedFromSourceLocked(WorkSource ws) { + public void noteBluetoothScanStoppedFromSourceLocked(WorkSource ws, boolean isUnoptimized) { final int N = ws.size(); for (int i = 0; i < N; i++) { - noteBluetoothScanStoppedLocked(ws.get(i)); + noteBluetoothScanStoppedLocked(ws.get(i), isUnoptimized); } } @@ -6121,14 +6121,11 @@ public class BatteryStatsImpl extends BatteryStats { } } - public void noteBluetoothScanStoppedLocked(long elapsedRealtimeMs) { + public void noteBluetoothScanStoppedLocked(long elapsedRealtimeMs, boolean isUnoptimized) { if (mBluetoothScanTimer != null) { mBluetoothScanTimer.stopRunningLocked(elapsedRealtimeMs); } - // In the ble code, a scan cannot change types and nested starts are not possible. - // So if an unoptimizedScan is running, it is now being stopped. - if (mBluetoothUnoptimizedScanTimer != null - && mBluetoothUnoptimizedScanTimer.isRunningLocked()) { + if (isUnoptimized && mBluetoothUnoptimizedScanTimer != null) { mBluetoothUnoptimizedScanTimer.stopRunningLocked(elapsedRealtimeMs); } } @@ -6553,9 +6550,12 @@ public class BatteryStatsImpl extends BatteryStats { * inactive so can be dropped. */ @VisibleForTesting(visibility = VisibleForTesting.Visibility.PACKAGE) - public boolean reset() { + public boolean reset(long uptime, long realtime) { boolean active = false; + mOnBatteryBackgroundTimeBase.init(uptime, realtime); + mOnBatteryScreenOffBackgroundTimeBase.init(uptime, realtime); + if (mWifiRunningTimer != null) { active |= !mWifiRunningTimer.reset(false); active |= mWifiRunning; @@ -6741,11 +6741,6 @@ public class BatteryStatsImpl extends BatteryStats { mLastStepUserTime = mLastStepSystemTime = 0; mCurStepUserTime = mCurStepSystemTime = 0; - mOnBatteryBackgroundTimeBase.reset(mBsi.mClocks.elapsedRealtime() * 1000, - mBsi.mClocks.uptimeMillis() * 1000); - mOnBatteryScreenOffBackgroundTimeBase.reset(mBsi.mClocks.elapsedRealtime() * 1000, - mBsi.mClocks.uptimeMillis() * 1000); - if (!active) { if (mWifiRunningTimer != null) { mWifiRunningTimer.detach(); @@ -9337,7 +9332,7 @@ public class BatteryStatsImpl extends BatteryStats { mNumConnectivityChange = mLoadedNumConnectivityChange = mUnpluggedNumConnectivityChange = 0; for (int i=0; i<mUidStats.size(); i++) { - if (mUidStats.valueAt(i).reset()) { + if (mUidStats.valueAt(i).reset(uptimeMillis * 1000, elapsedRealtimeMillis * 1000)) { mUidStats.remove(mUidStats.keyAt(i)); i--; } diff --git a/core/java/com/android/internal/widget/MediaNotificationView.java b/core/java/com/android/internal/widget/MediaNotificationView.java index bbebcc21f80e..7609b67e492b 100644 --- a/core/java/com/android/internal/widget/MediaNotificationView.java +++ b/core/java/com/android/internal/widget/MediaNotificationView.java @@ -33,13 +33,13 @@ import android.widget.RemoteViews; @RemoteViews.RemoteView public class MediaNotificationView extends FrameLayout { - private final int mSmallImageSize; private final int mNotificationContentMarginEnd; private final int mNotificationContentImageMarginEnd; private ImageView mRightIcon; private View mActions; private View mHeader; private View mMainColumn; + private int mImagePushIn; public MediaNotificationView(Context context) { this(context, null); @@ -62,6 +62,7 @@ public class MediaNotificationView extends FrameLayout { super.onMeasure(widthMeasureSpec, heightMeasureSpec); int mode = MeasureSpec.getMode(widthMeasureSpec); boolean reMeasure = false; + mImagePushIn = 0; if (hasIcon && mode != MeasureSpec.UNSPECIFIED) { int size = MeasureSpec.getSize(widthMeasureSpec); size = size - mActions.getMeasuredWidth(); @@ -70,14 +71,15 @@ public class MediaNotificationView extends FrameLayout { int imageEndMargin = layoutParams.getMarginEnd(); size -= imageEndMargin; int fullHeight = getMeasuredHeight(); - if (size < fullHeight) { - size = mSmallImageSize; - } else { + if (size > fullHeight) { size = fullHeight; + } else if (size < fullHeight) { + size = Math.max(0, size); + mImagePushIn = fullHeight - size; } - if (layoutParams.width != size || layoutParams.height != size) { - layoutParams.width = size; - layoutParams.height = size; + if (layoutParams.width != fullHeight || layoutParams.height != fullHeight) { + layoutParams.width = fullHeight; + layoutParams.height = fullHeight; mRightIcon.setLayoutParams(layoutParams); reMeasure = true; } @@ -111,6 +113,15 @@ public class MediaNotificationView extends FrameLayout { } } + @Override + protected void onLayout(boolean changed, int left, int top, int right, int bottom) { + super.onLayout(changed, left, top, right, bottom); + if (mImagePushIn > 0) { + mRightIcon.layout(mRightIcon.getLeft() + mImagePushIn, mRightIcon.getTop(), + mRightIcon.getRight() + mImagePushIn, mRightIcon.getBottom()); + } + } + private void resetHeaderIndention() { if (mHeader.getPaddingEnd() != mNotificationContentMarginEnd) { mHeader.setPaddingRelative(mHeader.getPaddingStart(), @@ -130,8 +141,6 @@ public class MediaNotificationView extends FrameLayout { public MediaNotificationView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) { super(context, attrs, defStyleAttr, defStyleRes); - mSmallImageSize = context.getResources().getDimensionPixelSize( - com.android.internal.R.dimen.media_notification_expanded_image_small_size); mNotificationContentMarginEnd = context.getResources().getDimensionPixelSize( com.android.internal.R.dimen.notification_content_margin_end); mNotificationContentImageMarginEnd = context.getResources().getDimensionPixelSize( diff --git a/core/res/res/drawable-hdpi/toast_frame.9.png b/core/res/res/drawable-hdpi/toast_frame.9.png Binary files differdeleted file mode 100644 index a804a8a94564..000000000000 --- a/core/res/res/drawable-hdpi/toast_frame.9.png +++ /dev/null diff --git a/core/res/res/drawable-ldpi/toast_frame.9.png b/core/res/res/drawable-ldpi/toast_frame.9.png Binary files differdeleted file mode 100644 index e64dc7575051..000000000000 --- a/core/res/res/drawable-ldpi/toast_frame.9.png +++ /dev/null diff --git a/core/res/res/drawable-mdpi/toast_frame.9.png b/core/res/res/drawable-mdpi/toast_frame.9.png Binary files differdeleted file mode 100644 index 778e4e67653d..000000000000 --- a/core/res/res/drawable-mdpi/toast_frame.9.png +++ /dev/null diff --git a/core/res/res/drawable-xhdpi/toast_frame.9.png b/core/res/res/drawable-xhdpi/toast_frame.9.png Binary files differdeleted file mode 100644 index 77e69c72ab9a..000000000000 --- a/core/res/res/drawable-xhdpi/toast_frame.9.png +++ /dev/null diff --git a/core/res/res/drawable-xxhdpi/toast_frame.9.png b/core/res/res/drawable-xxhdpi/toast_frame.9.png Binary files differdeleted file mode 100644 index edecb6320de5..000000000000 --- a/core/res/res/drawable-xxhdpi/toast_frame.9.png +++ /dev/null diff --git a/core/res/res/drawable/toast_frame.xml b/core/res/res/drawable/toast_frame.xml new file mode 100644 index 000000000000..053b4f4fed5f --- /dev/null +++ b/core/res/res/drawable/toast_frame.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* Copyright 2017, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ +--> +<shape xmlns:android="http://schemas.android.com/apk/res/android" + android:shape="rectangle"> + <!-- background is material_grey_300 with .9 alpha --> + <solid android:color="#E6E0E0E0" /> + <corners android:radius="22dp" /> +</shape> + diff --git a/core/res/res/layout/transient_notification.xml b/core/res/res/layout/transient_notification.xml index daa9faf70bb2..2c08bf70491e 100644 --- a/core/res/res/layout/transient_notification.xml +++ b/core/res/res/layout/transient_notification.xml @@ -29,9 +29,11 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_weight="1" + android:layout_marginHorizontal="24dp" + android:layout_marginVertical="15dp" android:layout_gravity="center_horizontal" android:textAppearance="@style/TextAppearance.Toast" - android:textColor="@color/bright_foreground_dark" + android:textColor="@color/primary_text_default_material_light" android:shadowColor="#BB000000" android:shadowRadius="2.75" /> diff --git a/core/res/res/values-af/strings.xml b/core/res/res/values-af/strings.xml index ea777c5a06b4..291ccdec36ac 100644 --- a/core/res/res/values-af/strings.xml +++ b/core/res/res/values-af/strings.xml @@ -246,8 +246,8 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"Stembystand"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"Sluit nou"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <string name="notification_hidden_text" msgid="1135169301897151909">"Inhoud versteek"</string> - <string name="notification_hidden_by_policy_text" msgid="9004631276932584600">"Inhoud word versteek volgens beleid"</string> + <!-- no translation found for notification_hidden_text (6351207030447943784) --> + <skip /> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Virtuele sleutelbord"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"Fisieke sleutelbord"</string> <string name="notification_channel_security" msgid="7345516133431326347">"Sekuriteit"</string> @@ -1730,14 +1730,8 @@ <string name="unpin_target" msgid="3556545602439143442">"Ontspeld"</string> <string name="app_info" msgid="6856026610594615344">"Programinligting"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"Stel toestel terug?"</string> - <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"Tik om toestel terug te stel"</string> <string name="demo_starting_message" msgid="5268556852031489931">"Begin tans demonstrasie …"</string> <string name="demo_restarting_message" msgid="952118052531642451">"Stel toestel tans terug …"</string> - <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"Stel toestel terug?"</string> - <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"Jy sal enige veranderinge verloor en die demonstrasie sal oor <xliff:g id="TIMEOUT">%1$s</xliff:g> sekondes weer begin …"</string> - <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"Kanselleer"</string> - <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"Stel nou terug"</string> <string name="suspended_widget_accessibility" msgid="6712143096475264190">"Het <xliff:g id="LABEL">%1$s</xliff:g> gedeaktiveer"</string> <string name="conference_call" msgid="3751093130790472426">"Konferensie-oproep"</string> <string name="tooltip_popup_title" msgid="5253721848739260181">"Nutswenk"</string> diff --git a/core/res/res/values-am/strings.xml b/core/res/res/values-am/strings.xml index 1081014d0b10..6f2db2c6ce0f 100644 --- a/core/res/res/values-am/strings.xml +++ b/core/res/res/values-am/strings.xml @@ -246,8 +246,8 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"የድምጽ እርዳታ"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"አሁን ቆልፍ"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <string name="notification_hidden_text" msgid="1135169301897151909">"ይዘቶች ተደብቀዋል"</string> - <string name="notification_hidden_by_policy_text" msgid="9004631276932584600">"ይዘቶች በመመሪያ ተደብቀዋል"</string> + <!-- no translation found for notification_hidden_text (6351207030447943784) --> + <skip /> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"ምናባዊ የቁልፍ ሰሌዳ"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"አካላዊ ቁልፍ ሰሌዳ"</string> <string name="notification_channel_security" msgid="7345516133431326347">"ደህንነት"</string> @@ -1730,14 +1730,8 @@ <string name="unpin_target" msgid="3556545602439143442">"ንቀል"</string> <string name="app_info" msgid="6856026610594615344">"የመተግበሪያ መረጃ"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"መሣሪያ ዳግም ይጀመር?"</string> - <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"መሣሪያን ዳግም ለማስጀመር መታ ያድርጉ"</string> <string name="demo_starting_message" msgid="5268556852031489931">"ማሳያን በማስጀመር ላይ…"</string> <string name="demo_restarting_message" msgid="952118052531642451">"መሣሪያን ዳግም በማስጀመር ላይ…"</string> - <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"መሣሪያ ዳግም ይጀመር?"</string> - <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"ማንኛቸውም ለውጦች ይጠፋሉ፣ እና ማሳያው በ<xliff:g id="TIMEOUT">%1$s</xliff:g> ሰከንዶች ውስጥ እንደገና ይጀምራል…"</string> - <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"ይቅር"</string> - <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"አሁን ዳግም አስጀምር"</string> <string name="suspended_widget_accessibility" msgid="6712143096475264190">"<xliff:g id="LABEL">%1$s</xliff:g> ተሰናክሏል"</string> <string name="conference_call" msgid="3751093130790472426">"የስብሰባ ጥሪ"</string> <string name="tooltip_popup_title" msgid="5253721848739260181">"የመሣሪያ ጥቆማ"</string> diff --git a/core/res/res/values-ar/strings.xml b/core/res/res/values-ar/strings.xml index e3e90ea93e30..d1e3a54e91d8 100644 --- a/core/res/res/values-ar/strings.xml +++ b/core/res/res/values-ar/strings.xml @@ -258,8 +258,8 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"المساعد الصوتي"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"قفل الآن"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <string name="notification_hidden_text" msgid="1135169301897151909">"المحتويات مخفية"</string> - <string name="notification_hidden_by_policy_text" msgid="9004631276932584600">"تم إخفاء المحتويات بواسطة السياسة"</string> + <!-- no translation found for notification_hidden_text (6351207030447943784) --> + <skip /> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"لوحة المفاتيح الافتراضية"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"لوحة المفاتيح الفعلية"</string> <string name="notification_channel_security" msgid="7345516133431326347">"الأمان"</string> @@ -1862,14 +1862,8 @@ <string name="unpin_target" msgid="3556545602439143442">"إزالة تثبيت"</string> <string name="app_info" msgid="6856026610594615344">"معلومات عن التطبيق"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"هل تريد إعادة تعيين الجهاز؟"</string> - <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"انقر لإعادة تعيين الجهاز"</string> <string name="demo_starting_message" msgid="5268556852031489931">"جارٍ بدء العرض التوضيحي…"</string> <string name="demo_restarting_message" msgid="952118052531642451">"جارٍ إعادة تعيين الجهاز…"</string> - <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"هل تريد إعادة تعيين الجهاز؟"</string> - <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"ستفقد أي تغييرات وسيبدأ العرض التوضيحي مرة أخرى خلال <xliff:g id="TIMEOUT">%1$s</xliff:g> من الثواني…"</string> - <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"إلغاء"</string> - <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"إعادة التعيين الآن"</string> <string name="suspended_widget_accessibility" msgid="6712143096475264190">"تم تعطيل <xliff:g id="LABEL">%1$s</xliff:g>"</string> <string name="conference_call" msgid="3751093130790472426">"مكالمة جماعية"</string> <string name="tooltip_popup_title" msgid="5253721848739260181">"تلميح"</string> diff --git a/core/res/res/values-az/strings.xml b/core/res/res/values-az/strings.xml index bc7e89066f22..857c628df132 100644 --- a/core/res/res/values-az/strings.xml +++ b/core/res/res/values-az/strings.xml @@ -246,8 +246,8 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"Səs Yardımçısı"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"İndi kilidləyin"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <string name="notification_hidden_text" msgid="1135169301897151909">"Məzmun gizlidir"</string> - <string name="notification_hidden_by_policy_text" msgid="9004631276932584600">"Məzmun siyasət tərəfindən gizlədilib"</string> + <!-- no translation found for notification_hidden_text (6351207030447943784) --> + <skip /> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Virtual klaviatura"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"Fiziki klaviatura"</string> <string name="notification_channel_security" msgid="7345516133431326347">"Təhlükəsizlik"</string> @@ -1730,14 +1730,8 @@ <string name="unpin_target" msgid="3556545602439143442">"Çıxarın"</string> <string name="app_info" msgid="6856026610594615344">"Tətbiq məlumatı"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"Cihaz sıfırlansın?"</string> - <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"Cihazı sıfırlamaq üçün tıklayın"</string> <string name="demo_starting_message" msgid="5268556852031489931">"Demo başlayır…"</string> <string name="demo_restarting_message" msgid="952118052531642451">"Cihaz sıfırlanır…"</string> - <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"Cihaz sıfırlansın?"</string> - <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"Hər hansı dəyişikliyi itirəcəksiniz və demo <xliff:g id="TIMEOUT">%1$s</xliff:g> saniyəyə yenidən başlayacaq…"</string> - <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"Ləğv edin"</string> - <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"İndi sıfırlayın"</string> <string name="suspended_widget_accessibility" msgid="6712143096475264190">"<xliff:g id="LABEL">%1$s</xliff:g> deaktiv edildi"</string> <string name="conference_call" msgid="3751093130790472426">"Konfrans Zəngi"</string> <string name="tooltip_popup_title" msgid="5253721848739260181">"Tooltip"</string> diff --git a/core/res/res/values-b+sr+Latn/strings.xml b/core/res/res/values-b+sr+Latn/strings.xml index 7ec017b17cfc..5eafdd8f5de9 100644 --- a/core/res/res/values-b+sr+Latn/strings.xml +++ b/core/res/res/values-b+sr+Latn/strings.xml @@ -249,8 +249,8 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"Glasovna pomoć"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"Zaključaj odmah"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <string name="notification_hidden_text" msgid="1135169301897151909">"Sadržaj je sakriven"</string> - <string name="notification_hidden_by_policy_text" msgid="9004631276932584600">"Sadržaj je sakriven smernicama"</string> + <!-- no translation found for notification_hidden_text (6351207030447943784) --> + <skip /> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Virtuelna tastatura"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"Fizička tastatura"</string> <string name="notification_channel_security" msgid="7345516133431326347">"Bezbednost"</string> @@ -1763,14 +1763,8 @@ <string name="unpin_target" msgid="3556545602439143442">"Otkači"</string> <string name="app_info" msgid="6856026610594615344">"Informacije o aplikaciji"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"Želite li da resetujete uređaj?"</string> - <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"Dodirnite da biste resetovali uređaj"</string> <string name="demo_starting_message" msgid="5268556852031489931">"Pokrećemo demonstraciju..."</string> <string name="demo_restarting_message" msgid="952118052531642451">"Resetujemo uređaj..."</string> - <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"Želite li da resetujete uređaj?"</string> - <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"Izgubićete sve promene i demonstracija će ponovo početi za <xliff:g id="TIMEOUT">%1$s</xliff:g> sek…"</string> - <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"Otkaži"</string> - <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"Resetuj"</string> <string name="suspended_widget_accessibility" msgid="6712143096475264190">"Vidžet <xliff:g id="LABEL">%1$s</xliff:g> je onemogućen"</string> <string name="conference_call" msgid="3751093130790472426">"Konferencijski poziv"</string> <string name="tooltip_popup_title" msgid="5253721848739260181">"Objašnjenje"</string> diff --git a/core/res/res/values-be/strings.xml b/core/res/res/values-be/strings.xml index 99c17dc1ed15..1ac84b1dbcfe 100644 --- a/core/res/res/values-be/strings.xml +++ b/core/res/res/values-be/strings.xml @@ -252,8 +252,8 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"Галас. дапамога"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"Заблакір. зараз"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <string name="notification_hidden_text" msgid="1135169301897151909">"Змесціва схавана"</string> - <string name="notification_hidden_by_policy_text" msgid="9004631276932584600">"Змесціва, схаванае ў адпаведнасці з палітыкай"</string> + <!-- no translation found for notification_hidden_text (6351207030447943784) --> + <skip /> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Віртуальная клавіятура"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"Фізічная клавіятура"</string> <string name="notification_channel_security" msgid="7345516133431326347">"Бяспека"</string> @@ -1796,14 +1796,8 @@ <string name="unpin_target" msgid="3556545602439143442">"Адмацаваць"</string> <string name="app_info" msgid="6856026610594615344">"Інфармацыя пра праграму"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"Скінуць налады прылады?"</string> - <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"Дакраніцеся, каб скінуць налады прылады"</string> <string name="demo_starting_message" msgid="5268556852031489931">"Ідзе запуск дэманстрацыі…"</string> <string name="demo_restarting_message" msgid="952118052531642451">"Ідзе скід налад прылады…"</string> - <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"Скінуць налады прылады?"</string> - <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"Усе змены будуць страчаны, і дэманстрацыя пачнецца зноў праз <xliff:g id="TIMEOUT">%1$s</xliff:g> с…"</string> - <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"Скасаваць"</string> - <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"Выканаць скід"</string> <string name="suspended_widget_accessibility" msgid="6712143096475264190">"Адключаны <xliff:g id="LABEL">%1$s</xliff:g>"</string> <string name="conference_call" msgid="3751093130790472426">"Канферэнц-выклік"</string> <string name="tooltip_popup_title" msgid="5253721848739260181">"Падказка"</string> diff --git a/core/res/res/values-bg/strings.xml b/core/res/res/values-bg/strings.xml index e7b5adbbd02a..01e1aa5eaef1 100644 --- a/core/res/res/values-bg/strings.xml +++ b/core/res/res/values-bg/strings.xml @@ -246,8 +246,8 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"Гласова помощ"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"Заключване сега"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <string name="notification_hidden_text" msgid="1135169301897151909">"Скрито съдържание"</string> - <string name="notification_hidden_by_policy_text" msgid="9004631276932584600">"Съдържанието е скрито чрез правило"</string> + <!-- no translation found for notification_hidden_text (6351207030447943784) --> + <skip /> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Виртуална клавиатура"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"Физическа клавиатура"</string> <string name="notification_channel_security" msgid="7345516133431326347">"Сигурност"</string> @@ -1730,14 +1730,8 @@ <string name="unpin_target" msgid="3556545602439143442">"Освобождаване"</string> <string name="app_info" msgid="6856026610594615344">"Информация за приложението"</string> <string name="negative_duration" msgid="5688706061127375131">"-<xliff:g id="TIME">%1$s</xliff:g>"</string> - <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"Да се нулира ли устройството?"</string> - <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"Докоснете, за да нулирате устройството"</string> <string name="demo_starting_message" msgid="5268556852031489931">"Демонстрацията се стартира…"</string> <string name="demo_restarting_message" msgid="952118052531642451">"Устройството се нулира…"</string> - <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"Да се нулира ли устройството?"</string> - <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"Ще загубите всички промени и демонстрацията ще започне отново след <xliff:g id="TIMEOUT">%1$s</xliff:g> секунди…"</string> - <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"Отказ"</string> - <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"Нулиране сега"</string> <string name="suspended_widget_accessibility" msgid="6712143096475264190">"<xliff:g id="LABEL">%1$s</xliff:g>: Деактивирано"</string> <string name="conference_call" msgid="3751093130790472426">"Конферентно обаждане"</string> <string name="tooltip_popup_title" msgid="5253721848739260181">"Подсказка"</string> diff --git a/core/res/res/values-bn/strings.xml b/core/res/res/values-bn/strings.xml index 23309a5ced39..f97b4f0e18dc 100644 --- a/core/res/res/values-bn/strings.xml +++ b/core/res/res/values-bn/strings.xml @@ -246,8 +246,8 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"ভয়েস সহায়তা"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"এখনই লক করুন"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"৯৯৯+"</string> - <string name="notification_hidden_text" msgid="1135169301897151909">"লুকানো বিষয়বস্তু"</string> - <string name="notification_hidden_by_policy_text" msgid="9004631276932584600">"নীতির কারণে সামগ্রী লুকানো আছে"</string> + <!-- no translation found for notification_hidden_text (6351207030447943784) --> + <skip /> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"ভার্চুয়াল কীবোর্ড"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"ফিজিক্যাল কীবোর্ড"</string> <string name="notification_channel_security" msgid="7345516133431326347">"নিরাপত্তা"</string> @@ -1731,14 +1731,8 @@ <string name="unpin_target" msgid="3556545602439143442">"আনপিন করুন"</string> <string name="app_info" msgid="6856026610594615344">"অ্যাপ্লিকেশানের তথ্য"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"ডিভাইস আবার সেট করবেন?"</string> - <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"ডিভাইসটিকে আবার সেট করতে আলতো চাপুন"</string> <string name="demo_starting_message" msgid="5268556852031489931">"ডেমো শুরু করা হচ্ছে…"</string> <string name="demo_restarting_message" msgid="952118052531642451">"ডিভাইস আবার সেট করা হচ্ছে…"</string> - <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"ডিভাইস আবার সেট করবেন?"</string> - <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"আপনার করা যে কোনো পরিবর্তন মুছে যাবে এবং <xliff:g id="TIMEOUT">%1$s</xliff:g> সেকেন্ডের মধ্যে ডেমো আবার শুরু হবে…"</string> - <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"বাতিল করুন"</string> - <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"এখনই আবার সেট করুন"</string> <string name="suspended_widget_accessibility" msgid="6712143096475264190">"অক্ষম করা <xliff:g id="LABEL">%1$s</xliff:g>"</string> <string name="conference_call" msgid="3751093130790472426">"কনফারেন্স কল"</string> <string name="tooltip_popup_title" msgid="5253721848739260181">"টুলটিপ"</string> diff --git a/core/res/res/values-bs/strings.xml b/core/res/res/values-bs/strings.xml index 797335ff6f1e..66f5e21dd9f7 100644 --- a/core/res/res/values-bs/strings.xml +++ b/core/res/res/values-bs/strings.xml @@ -249,8 +249,8 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"Glasovna pomoć"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"Zaključaj odmah"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <string name="notification_hidden_text" msgid="1135169301897151909">"Sadržaj je sakriven"</string> - <string name="notification_hidden_by_policy_text" msgid="9004631276932584600">"Sadržaj skriven u skladu sa pravilima"</string> + <!-- no translation found for notification_hidden_text (6351207030447943784) --> + <skip /> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Virtuelna tastatura"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"Fizička tastatura"</string> <string name="notification_channel_security" msgid="7345516133431326347">"Sigurnost"</string> @@ -1769,14 +1769,8 @@ <string name="unpin_target" msgid="3556545602439143442">"Otkači"</string> <string name="app_info" msgid="6856026610594615344">"Informacije o aplikaciji"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"Želite li vratiti na početne postavke?"</string> - <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"Dodirnite da vratite uređaj na početne postavke"</string> <string name="demo_starting_message" msgid="5268556852031489931">"Pokretanje demonstracije…"</string> <string name="demo_restarting_message" msgid="952118052531642451">"Vraćanje uređaja na početne postavke…"</string> - <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"Želite li vratiti na početne postavke?"</string> - <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"Nestat će sve izmjene, a demonstracija će početi ponovo za <xliff:g id="TIMEOUT">%1$s</xliff:g> sek…"</string> - <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"Otkaži"</string> - <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"Vrati sada na početne postavke"</string> <string name="suspended_widget_accessibility" msgid="6712143096475264190">"Onemogućen <xliff:g id="LABEL">%1$s</xliff:g>"</string> <string name="conference_call" msgid="3751093130790472426">"Konferencijski poziv"</string> <string name="tooltip_popup_title" msgid="5253721848739260181">"Savjet za alat"</string> diff --git a/core/res/res/values-ca/strings.xml b/core/res/res/values-ca/strings.xml index 2290a2d9073c..80b38590e6ed 100644 --- a/core/res/res/values-ca/strings.xml +++ b/core/res/res/values-ca/strings.xml @@ -246,8 +246,8 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"Assist. per veu"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"Bloqueja ara"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"+999"</string> - <string name="notification_hidden_text" msgid="1135169301897151909">"Contingut amagat"</string> - <string name="notification_hidden_by_policy_text" msgid="9004631276932584600">"Contingut amagat de conformitat amb la política"</string> + <!-- no translation found for notification_hidden_text (6351207030447943784) --> + <skip /> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Teclat virtual"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"Teclat físic"</string> <string name="notification_channel_security" msgid="7345516133431326347">"Seguretat"</string> @@ -1730,14 +1730,8 @@ <string name="unpin_target" msgid="3556545602439143442">"No fixis"</string> <string name="app_info" msgid="6856026610594615344">"Informació de l\'aplicació"</string> <string name="negative_duration" msgid="5688706061127375131">"-<xliff:g id="TIME">%1$s</xliff:g>"</string> - <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"Vols restablir el dispositiu?"</string> - <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"Toca per restablir el dispositiu"</string> <string name="demo_starting_message" msgid="5268556852031489931">"S\'està iniciant la demostració…"</string> <string name="demo_restarting_message" msgid="952118052531642451">"S\'està restablint el dispositiu…"</string> - <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"Vols restablir el dispositiu?"</string> - <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"Perdràs els canvis, i la demostració tornarà a començar d\'aquí a <xliff:g id="TIMEOUT">%1$s</xliff:g> segons…"</string> - <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"Cancel·la"</string> - <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"Restableix ara"</string> <string name="suspended_widget_accessibility" msgid="6712143096475264190">"<xliff:g id="LABEL">%1$s</xliff:g> s\'ha desactivat"</string> <string name="conference_call" msgid="3751093130790472426">"Conferència"</string> <string name="tooltip_popup_title" msgid="5253721848739260181">"Descripció emergent"</string> diff --git a/core/res/res/values-cs/strings.xml b/core/res/res/values-cs/strings.xml index ce3e3afc1751..66e660e271d0 100644 --- a/core/res/res/values-cs/strings.xml +++ b/core/res/res/values-cs/strings.xml @@ -252,8 +252,8 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"Hlas. asistence"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"Zamknout"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <string name="notification_hidden_text" msgid="1135169301897151909">"Skrytý obsah"</string> - <string name="notification_hidden_by_policy_text" msgid="9004631276932584600">"Obsah skrytý zásadami"</string> + <!-- no translation found for notification_hidden_text (6351207030447943784) --> + <skip /> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Virtuální klávesnice"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"Fyzická klávesnice"</string> <string name="notification_channel_security" msgid="7345516133431326347">"Zabezpečení"</string> @@ -1796,14 +1796,8 @@ <string name="unpin_target" msgid="3556545602439143442">"Odepnout"</string> <string name="app_info" msgid="6856026610594615344">"Informace o aplikaci"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"Resetovat zařízení?"</string> - <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"Zařízení resetujete klepnutím"</string> <string name="demo_starting_message" msgid="5268556852031489931">"Spouštění ukázky…"</string> <string name="demo_restarting_message" msgid="952118052531642451">"Resetování zařízení…"</string> - <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"Resetovat zařízení?"</string> - <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"Ztratíte všechny provedené změny a ukázka se za <xliff:g id="TIMEOUT">%1$s</xliff:g> s spustí znovu…"</string> - <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"Zrušit"</string> - <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"Resetovat"</string> <string name="suspended_widget_accessibility" msgid="6712143096475264190">"<xliff:g id="LABEL">%1$s</xliff:g> – zakázáno"</string> <string name="conference_call" msgid="3751093130790472426">"Konferenční hovor"</string> <string name="tooltip_popup_title" msgid="5253721848739260181">"Popisek"</string> diff --git a/core/res/res/values-da/strings.xml b/core/res/res/values-da/strings.xml index 6b4ae572e474..66a1412d2d2f 100644 --- a/core/res/res/values-da/strings.xml +++ b/core/res/res/values-da/strings.xml @@ -246,8 +246,8 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"Taleassistent"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"Lås nu"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <string name="notification_hidden_text" msgid="1135169301897151909">"Indholdet er skjult"</string> - <string name="notification_hidden_by_policy_text" msgid="9004631276932584600">"Indholdet er skjult af politikken"</string> + <!-- no translation found for notification_hidden_text (6351207030447943784) --> + <skip /> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Virtuelt tastatur"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"Fysisk tastatur"</string> <string name="notification_channel_security" msgid="7345516133431326347">"Sikkerhed"</string> @@ -1730,14 +1730,8 @@ <string name="unpin_target" msgid="3556545602439143442">"Frigør"</string> <string name="app_info" msgid="6856026610594615344">"Oplysninger om appen"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"Vil du nulstille enheden?"</string> - <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"Tryk for at nulstille enheden"</string> <string name="demo_starting_message" msgid="5268556852031489931">"Starter demoen…"</string> <string name="demo_restarting_message" msgid="952118052531642451">"Nulstiller enheden…"</string> - <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"Vil du nulstille enheden?"</string> - <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"Du mister alle ændringer, og demoen starter igen om <xliff:g id="TIMEOUT">%1$s</xliff:g> sekunder…"</string> - <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"Annuller"</string> - <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"Nulstil nu"</string> <string name="suspended_widget_accessibility" msgid="6712143096475264190">"<xliff:g id="LABEL">%1$s</xliff:g> – deaktiveret"</string> <string name="conference_call" msgid="3751093130790472426">"Telefonmøde"</string> <string name="tooltip_popup_title" msgid="5253721848739260181">"Værktøjstip"</string> diff --git a/core/res/res/values-de/strings.xml b/core/res/res/values-de/strings.xml index 4d9a4f48839d..91f4c461d4fd 100644 --- a/core/res/res/values-de/strings.xml +++ b/core/res/res/values-de/strings.xml @@ -246,8 +246,8 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"Sprachassistent"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"Jetzt sperren"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <string name="notification_hidden_text" msgid="1135169301897151909">"Inhalte ausgeblendet"</string> - <string name="notification_hidden_by_policy_text" msgid="9004631276932584600">"Inhalte aufgrund der Richtlinien ausgeblendet"</string> + <!-- no translation found for notification_hidden_text (6351207030447943784) --> + <skip /> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Bildschirmtastatur"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"Physische Tastatur"</string> <string name="notification_channel_security" msgid="7345516133431326347">"Sicherheit"</string> @@ -1730,14 +1730,8 @@ <string name="unpin_target" msgid="3556545602439143442">"Markierung entfernen"</string> <string name="app_info" msgid="6856026610594615344">"App-Informationen"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"Gerät zurücksetzen?"</string> - <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"Zum Zurücksetzen des Geräts tippen"</string> <string name="demo_starting_message" msgid="5268556852031489931">"Demo wird gestartet…"</string> <string name="demo_restarting_message" msgid="952118052531642451">"Gerät wird zurückgesetzt…"</string> - <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"Gerät zurücksetzen?"</string> - <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"Alle Änderungen gehen verloren und Demo wird in <xliff:g id="TIMEOUT">%1$s</xliff:g> Sekunden neu gestartet…"</string> - <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"Abbrechen"</string> - <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"Jetzt zurücksetzen"</string> <string name="suspended_widget_accessibility" msgid="6712143096475264190">"<xliff:g id="LABEL">%1$s</xliff:g> deaktiviert"</string> <string name="conference_call" msgid="3751093130790472426">"Telefonkonferenz"</string> <string name="tooltip_popup_title" msgid="5253721848739260181">"Kurzinfo"</string> diff --git a/core/res/res/values-el/strings.xml b/core/res/res/values-el/strings.xml index b84b6d047dd6..28961bc4ba06 100644 --- a/core/res/res/values-el/strings.xml +++ b/core/res/res/values-el/strings.xml @@ -246,8 +246,8 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"Φων.υποβοηθ."</string> <string name="global_action_lockdown" msgid="8751542514724332873">"Κλείδωμα τώρα"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <string name="notification_hidden_text" msgid="1135169301897151909">"Κρυφό περιεχόμενο"</string> - <string name="notification_hidden_by_policy_text" msgid="9004631276932584600">"Το περιεχόμενο είναι κρυφό βάσει πολιτικής"</string> + <!-- no translation found for notification_hidden_text (6351207030447943784) --> + <skip /> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Εικονικό πληκτρολόγιο"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"Φυσικό πληκτρολόγιο"</string> <string name="notification_channel_security" msgid="7345516133431326347">"Ασφάλεια"</string> @@ -1730,14 +1730,8 @@ <string name="unpin_target" msgid="3556545602439143442">"Ξεκαρφίτσωμα"</string> <string name="app_info" msgid="6856026610594615344">"Πληροφορίες εφαρμογής"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"Να γίνει επαναφορά της συσκευής;"</string> - <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"Πατήστε για επαναφορά της συσκευής"</string> <string name="demo_starting_message" msgid="5268556852031489931">"Έναρξη επίδειξης…"</string> <string name="demo_restarting_message" msgid="952118052531642451">"Επαναφορά συσκευής…"</string> - <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"Να γίνει επαναφορά της συσκευής;"</string> - <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"Τυχόν αλλαγές που πραγματοποιήσατε θα χαθούν και η επίδειξη θα ξεκινήσει ξανά σε <xliff:g id="TIMEOUT">%1$s</xliff:g> δευτερόλεπτα…"</string> - <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"Ακύρωση"</string> - <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"Επαναφορά τώρα"</string> <string name="suspended_widget_accessibility" msgid="6712143096475264190">"Απενεργοποιημένο <xliff:g id="LABEL">%1$s</xliff:g>"</string> <string name="conference_call" msgid="3751093130790472426">"Κλήση συνδιάσκεψης"</string> <string name="tooltip_popup_title" msgid="5253721848739260181">"Επεξήγηση εργαλείου"</string> diff --git a/core/res/res/values-en-rAU/strings.xml b/core/res/res/values-en-rAU/strings.xml index ebe043a68b99..0fd0ec7299bf 100644 --- a/core/res/res/values-en-rAU/strings.xml +++ b/core/res/res/values-en-rAU/strings.xml @@ -246,8 +246,8 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"Voice Assist"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"Lock now"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <string name="notification_hidden_text" msgid="1135169301897151909">"Contents hidden"</string> - <string name="notification_hidden_by_policy_text" msgid="9004631276932584600">"Contents hidden by policy"</string> + <!-- no translation found for notification_hidden_text (6351207030447943784) --> + <skip /> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Virtual keyboard"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"Physical keyboard"</string> <string name="notification_channel_security" msgid="7345516133431326347">"Security"</string> @@ -1730,14 +1730,8 @@ <string name="unpin_target" msgid="3556545602439143442">"Unpin"</string> <string name="app_info" msgid="6856026610594615344">"App info"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"Reset device?"</string> - <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"Tap to reset device"</string> <string name="demo_starting_message" msgid="5268556852031489931">"Starting demo…"</string> <string name="demo_restarting_message" msgid="952118052531642451">"Resetting device…"</string> - <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"Reset device?"</string> - <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"You\'ll lose any changes and the demo will start again in <xliff:g id="TIMEOUT">%1$s</xliff:g> seconds…"</string> - <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"Cancel"</string> - <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"Reset now"</string> <string name="suspended_widget_accessibility" msgid="6712143096475264190">"Disabled <xliff:g id="LABEL">%1$s</xliff:g>"</string> <string name="conference_call" msgid="3751093130790472426">"Conference Call"</string> <string name="tooltip_popup_title" msgid="5253721848739260181">"Tooltip"</string> diff --git a/core/res/res/values-en-rGB/strings.xml b/core/res/res/values-en-rGB/strings.xml index ebe043a68b99..0fd0ec7299bf 100644 --- a/core/res/res/values-en-rGB/strings.xml +++ b/core/res/res/values-en-rGB/strings.xml @@ -246,8 +246,8 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"Voice Assist"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"Lock now"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <string name="notification_hidden_text" msgid="1135169301897151909">"Contents hidden"</string> - <string name="notification_hidden_by_policy_text" msgid="9004631276932584600">"Contents hidden by policy"</string> + <!-- no translation found for notification_hidden_text (6351207030447943784) --> + <skip /> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Virtual keyboard"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"Physical keyboard"</string> <string name="notification_channel_security" msgid="7345516133431326347">"Security"</string> @@ -1730,14 +1730,8 @@ <string name="unpin_target" msgid="3556545602439143442">"Unpin"</string> <string name="app_info" msgid="6856026610594615344">"App info"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"Reset device?"</string> - <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"Tap to reset device"</string> <string name="demo_starting_message" msgid="5268556852031489931">"Starting demo…"</string> <string name="demo_restarting_message" msgid="952118052531642451">"Resetting device…"</string> - <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"Reset device?"</string> - <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"You\'ll lose any changes and the demo will start again in <xliff:g id="TIMEOUT">%1$s</xliff:g> seconds…"</string> - <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"Cancel"</string> - <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"Reset now"</string> <string name="suspended_widget_accessibility" msgid="6712143096475264190">"Disabled <xliff:g id="LABEL">%1$s</xliff:g>"</string> <string name="conference_call" msgid="3751093130790472426">"Conference Call"</string> <string name="tooltip_popup_title" msgid="5253721848739260181">"Tooltip"</string> diff --git a/core/res/res/values-en-rIN/strings.xml b/core/res/res/values-en-rIN/strings.xml index ebe043a68b99..0fd0ec7299bf 100644 --- a/core/res/res/values-en-rIN/strings.xml +++ b/core/res/res/values-en-rIN/strings.xml @@ -246,8 +246,8 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"Voice Assist"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"Lock now"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <string name="notification_hidden_text" msgid="1135169301897151909">"Contents hidden"</string> - <string name="notification_hidden_by_policy_text" msgid="9004631276932584600">"Contents hidden by policy"</string> + <!-- no translation found for notification_hidden_text (6351207030447943784) --> + <skip /> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Virtual keyboard"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"Physical keyboard"</string> <string name="notification_channel_security" msgid="7345516133431326347">"Security"</string> @@ -1730,14 +1730,8 @@ <string name="unpin_target" msgid="3556545602439143442">"Unpin"</string> <string name="app_info" msgid="6856026610594615344">"App info"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"Reset device?"</string> - <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"Tap to reset device"</string> <string name="demo_starting_message" msgid="5268556852031489931">"Starting demo…"</string> <string name="demo_restarting_message" msgid="952118052531642451">"Resetting device…"</string> - <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"Reset device?"</string> - <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"You\'ll lose any changes and the demo will start again in <xliff:g id="TIMEOUT">%1$s</xliff:g> seconds…"</string> - <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"Cancel"</string> - <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"Reset now"</string> <string name="suspended_widget_accessibility" msgid="6712143096475264190">"Disabled <xliff:g id="LABEL">%1$s</xliff:g>"</string> <string name="conference_call" msgid="3751093130790472426">"Conference Call"</string> <string name="tooltip_popup_title" msgid="5253721848739260181">"Tooltip"</string> diff --git a/core/res/res/values-es-rUS/strings.xml b/core/res/res/values-es-rUS/strings.xml index 7cf679e2f82c..dd029bf60272 100644 --- a/core/res/res/values-es-rUS/strings.xml +++ b/core/res/res/values-es-rUS/strings.xml @@ -246,8 +246,8 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"Asistente voz"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"Bloquear ahora"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <string name="notification_hidden_text" msgid="1135169301897151909">"Contenidos ocultos"</string> - <string name="notification_hidden_by_policy_text" msgid="9004631276932584600">"Contenido oculto debido a la política"</string> + <!-- no translation found for notification_hidden_text (6351207030447943784) --> + <skip /> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Teclado virtual"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"Teclado físico"</string> <string name="notification_channel_security" msgid="7345516133431326347">"Seguridad"</string> @@ -1730,14 +1730,8 @@ <string name="unpin_target" msgid="3556545602439143442">"No fijar"</string> <string name="app_info" msgid="6856026610594615344">"Información de apps"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"¿Deseas restablecer el dispositivo?"</string> - <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"Presiona para restablecer el dispositivo"</string> <string name="demo_starting_message" msgid="5268556852031489931">"Iniciando demostración…"</string> <string name="demo_restarting_message" msgid="952118052531642451">"Restableciendo dispositivo…"</string> - <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"¿Deseas restablecer el dispositivo?"</string> - <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"Se perderán los cambios y la demostración volverá a iniciarse en <xliff:g id="TIMEOUT">%1$s</xliff:g> segundos…"</string> - <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"Cancelar"</string> - <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"Restablecer ahora"</string> <string name="suspended_widget_accessibility" msgid="6712143096475264190">"Se inhabilitó <xliff:g id="LABEL">%1$s</xliff:g>"</string> <string name="conference_call" msgid="3751093130790472426">"Conferencia"</string> <string name="tooltip_popup_title" msgid="5253721848739260181">"Información sobre la herramienta"</string> diff --git a/core/res/res/values-es/strings.xml b/core/res/res/values-es/strings.xml index db531b5dac61..aedb7d11c680 100644 --- a/core/res/res/values-es/strings.xml +++ b/core/res/res/values-es/strings.xml @@ -246,8 +246,8 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"Asistente voz"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"Bloquear ahora"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"> 999"</string> - <string name="notification_hidden_text" msgid="1135169301897151909">"Contenidos ocultos"</string> - <string name="notification_hidden_by_policy_text" msgid="9004631276932584600">"Contenidos ocultos por política"</string> + <!-- no translation found for notification_hidden_text (6351207030447943784) --> + <skip /> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Teclado virtual"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"Teclado físico"</string> <string name="notification_channel_security" msgid="7345516133431326347">"Seguridad"</string> @@ -1730,14 +1730,8 @@ <string name="unpin_target" msgid="3556545602439143442">"No fijar"</string> <string name="app_info" msgid="6856026610594615344">"Información de la aplicación"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"¿Restablecer el dispositivo?"</string> - <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"Toca para restablecer el dispositivo"</string> <string name="demo_starting_message" msgid="5268556852031489931">"Iniciando demostración…"</string> <string name="demo_restarting_message" msgid="952118052531642451">"Restableciendo dispositivo…"</string> - <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"¿Restablecer el dispositivo?"</string> - <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"Se perderán todos los cambios y la demostración volverá a empezar en <xliff:g id="TIMEOUT">%1$s</xliff:g> segundos…"</string> - <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"Cancelar"</string> - <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"Restablecer ahora"</string> <string name="suspended_widget_accessibility" msgid="6712143096475264190">"<xliff:g id="LABEL">%1$s</xliff:g> inhabilitado"</string> <string name="conference_call" msgid="3751093130790472426">"Conferencia"</string> <string name="tooltip_popup_title" msgid="5253721848739260181">"Descripción emergente"</string> diff --git a/core/res/res/values-et/strings.xml b/core/res/res/values-et/strings.xml index 591202282a10..4de3f1b349b0 100644 --- a/core/res/res/values-et/strings.xml +++ b/core/res/res/values-et/strings.xml @@ -246,8 +246,8 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"Häälabi"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"Lukusta kohe"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <string name="notification_hidden_text" msgid="1135169301897151909">"Sisu on peidetud"</string> - <string name="notification_hidden_by_policy_text" msgid="9004631276932584600">"Sisu on eeskirjadega peidetud"</string> + <!-- no translation found for notification_hidden_text (6351207030447943784) --> + <skip /> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Virtuaalne klaviatuur"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"Füüsiline klaviatuur"</string> <string name="notification_channel_security" msgid="7345516133431326347">"Turvalisus"</string> @@ -1730,14 +1730,8 @@ <string name="unpin_target" msgid="3556545602439143442">"Vabasta"</string> <string name="app_info" msgid="6856026610594615344">"Rakenduse teave"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"Kas soovite seadme lähtestada?"</string> - <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"Puudutage seadme lähtestamiseks"</string> <string name="demo_starting_message" msgid="5268556852031489931">"Demo käivitamine …"</string> <string name="demo_restarting_message" msgid="952118052531642451">"Seadme lähtestamine …"</string> - <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"Kas soovite seadme lähtestada?"</string> - <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"Kõik muudatused lähevad kaotsi ja demo käivitub uuesti <xliff:g id="TIMEOUT">%1$s</xliff:g> sekundi möödudes …"</string> - <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"Tühista"</string> - <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"Lähtesta kohe"</string> <string name="suspended_widget_accessibility" msgid="6712143096475264190">"Keelatud <xliff:g id="LABEL">%1$s</xliff:g>"</string> <string name="conference_call" msgid="3751093130790472426">"Konverentskõne"</string> <string name="tooltip_popup_title" msgid="5253721848739260181">"Tööriistavihje"</string> diff --git a/core/res/res/values-eu/strings.xml b/core/res/res/values-eu/strings.xml index 686bdf16d4b1..e46975731f65 100644 --- a/core/res/res/values-eu/strings.xml +++ b/core/res/res/values-eu/strings.xml @@ -246,8 +246,8 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"Ahots-laguntza"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"Blokeatu"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <string name="notification_hidden_text" msgid="1135169301897151909">"Edukiak ezkutatuta daude"</string> - <string name="notification_hidden_by_policy_text" msgid="9004631276932584600">"Gidalerro batzuk ezkutatu dira, gidalerroei jarraiki"</string> + <!-- no translation found for notification_hidden_text (6351207030447943784) --> + <skip /> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Teklatu birtuala"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"Teklatu fisikoa"</string> <string name="notification_channel_security" msgid="7345516133431326347">"Segurtasuna"</string> @@ -1731,14 +1731,8 @@ <string name="unpin_target" msgid="3556545602439143442">"Kendu aingura"</string> <string name="app_info" msgid="6856026610594615344">"Aplikazioari buruzko informazioa"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"Gailua berrezarri nahi duzu?"</string> - <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"Gailua berrezartzeko, sakatu hau"</string> <string name="demo_starting_message" msgid="5268556852031489931">"Demoa abiarazten…"</string> <string name="demo_restarting_message" msgid="952118052531642451">"Gailua berrezartzen…"</string> - <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"Gailua berrezarri nahi duzu?"</string> - <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"Aldaketak galduko dituzu eta <xliff:g id="TIMEOUT">%1$s</xliff:g> segundo barru hasiko da berriro demoa…"</string> - <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"Utzi"</string> - <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"Berrezarri"</string> <string name="suspended_widget_accessibility" msgid="6712143096475264190">"<xliff:g id="LABEL">%1$s</xliff:g> desgaituta dago"</string> <string name="conference_call" msgid="3751093130790472426">"Konferentzia-deia"</string> <string name="tooltip_popup_title" msgid="5253721848739260181">"Aholkua"</string> diff --git a/core/res/res/values-fa/strings.xml b/core/res/res/values-fa/strings.xml index 97da53d06c13..1777e59d4043 100644 --- a/core/res/res/values-fa/strings.xml +++ b/core/res/res/values-fa/strings.xml @@ -246,8 +246,8 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"دستیار صوتی"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"اکنون قفل شود"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"۹۹۹+"</string> - <string name="notification_hidden_text" msgid="1135169301897151909">"محتواها پنهان هستند"</string> - <string name="notification_hidden_by_policy_text" msgid="9004631276932584600">"محتوا بر اساس خطمشی پنهان شده است"</string> + <!-- no translation found for notification_hidden_text (6351207030447943784) --> + <skip /> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"صفحهکلید مجازی"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"صفحهکلید فیزیکی"</string> <string name="notification_channel_security" msgid="7345516133431326347">"امنیت"</string> @@ -1730,14 +1730,8 @@ <string name="unpin_target" msgid="3556545602439143442">"برداشتن پین"</string> <string name="app_info" msgid="6856026610594615344">"اطلاعات برنامه"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"دستگاه بازنشانی شود؟"</string> - <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"برای بازنشانی دستگاه، ضربه بزنید"</string> <string name="demo_starting_message" msgid="5268556852031489931">"در حال شروع نسخه نمایشی…"</string> <string name="demo_restarting_message" msgid="952118052531642451">"در حال بازنشانی دستگاه…"</string> - <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"دستگاه بازنشانی شود؟"</string> - <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"همه تغییرات را از دست خواهید داد و نسخه نمایشی دوباره تا <xliff:g id="TIMEOUT">%1$s</xliff:g> ثانیه دیگر شروع میشود…"</string> - <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"لغو"</string> - <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"بازنشانی در این لحظه"</string> <string name="suspended_widget_accessibility" msgid="6712143096475264190">"<xliff:g id="LABEL">%1$s</xliff:g> غیرفعال شد"</string> <string name="conference_call" msgid="3751093130790472426">"تماس کنفرانسی"</string> <string name="tooltip_popup_title" msgid="5253721848739260181">"نکتهابزار"</string> diff --git a/core/res/res/values-fi/strings.xml b/core/res/res/values-fi/strings.xml index 7e6b5638fbd6..f5db45f1450d 100644 --- a/core/res/res/values-fi/strings.xml +++ b/core/res/res/values-fi/strings.xml @@ -246,8 +246,8 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"Ääniapuri"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"Lukitse nyt"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <string name="notification_hidden_text" msgid="1135169301897151909">"Sisältö piilotettu"</string> - <string name="notification_hidden_by_policy_text" msgid="9004631276932584600">"Sisältö on piilotettu käytännön perusteella."</string> + <!-- no translation found for notification_hidden_text (6351207030447943784) --> + <skip /> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Virtuaalinen näppäimistö"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"Fyysinen näppäimistö"</string> <string name="notification_channel_security" msgid="7345516133431326347">"Tietosuoja"</string> @@ -1730,14 +1730,8 @@ <string name="unpin_target" msgid="3556545602439143442">"Irrota"</string> <string name="app_info" msgid="6856026610594615344">"Sovelluksen tiedot"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"Palautetaanko laitteen tehdasasetukset?"</string> - <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"Palauta laite napauttamalla"</string> <string name="demo_starting_message" msgid="5268556852031489931">"Aloitetaan esittelyä…"</string> <string name="demo_restarting_message" msgid="952118052531642451">"Palautetaan asetuksia…"</string> - <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"Palautetaanko laitteen tehdasasetukset?"</string> - <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"Muutokset poistetaan ja esittely aloitetaan uudelleen <xliff:g id="TIMEOUT">%1$s</xliff:g> sekunnin kuluttua…"</string> - <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"Peruuta"</string> - <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"Palauta nyt"</string> <string name="suspended_widget_accessibility" msgid="6712143096475264190">"<xliff:g id="LABEL">%1$s</xliff:g> ei ole käytössä."</string> <string name="conference_call" msgid="3751093130790472426">"Puhelinneuvottelu"</string> <string name="tooltip_popup_title" msgid="5253721848739260181">"Työkaluvinkki"</string> diff --git a/core/res/res/values-fr-rCA/strings.xml b/core/res/res/values-fr-rCA/strings.xml index e26ca990ca78..e84d629fb6e4 100644 --- a/core/res/res/values-fr-rCA/strings.xml +++ b/core/res/res/values-fr-rCA/strings.xml @@ -246,8 +246,8 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"Assist. vocale"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"Verrouiller"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">">999"</string> - <string name="notification_hidden_text" msgid="1135169301897151909">"Contenus masqués"</string> - <string name="notification_hidden_by_policy_text" msgid="9004631276932584600">"Contenu masqué conformément aux politiques"</string> + <!-- no translation found for notification_hidden_text (6351207030447943784) --> + <skip /> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Clavier virtuel"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"Clavier physique"</string> <string name="notification_channel_security" msgid="7345516133431326347">"Sécurité"</string> @@ -1730,14 +1730,8 @@ <string name="unpin_target" msgid="3556545602439143442">"Annuler l\'épinglage"</string> <string name="app_info" msgid="6856026610594615344">"Détails de l\'application"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"Réinitialiser l\'appareil?"</string> - <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"Touchez pour réinitialiser l\'appareil"</string> <string name="demo_starting_message" msgid="5268556852031489931">"Démarrage de la démonstration en cours…"</string> <string name="demo_restarting_message" msgid="952118052531642451">"Réinitialisation de l\'appareil en cours…"</string> - <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"Réinitialiser l\'appareil?"</string> - <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"Vous perdrez vos modifications, et la démo recommencera dans <xliff:g id="TIMEOUT">%1$s</xliff:g> secondes…"</string> - <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"Annuler"</string> - <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"Réinitialiser maintenant"</string> <string name="suspended_widget_accessibility" msgid="6712143096475264190">"Désactivé : <xliff:g id="LABEL">%1$s</xliff:g>"</string> <string name="conference_call" msgid="3751093130790472426">"Conférence téléphonique"</string> <string name="tooltip_popup_title" msgid="5253721848739260181">"Infobulle"</string> diff --git a/core/res/res/values-fr/strings.xml b/core/res/res/values-fr/strings.xml index 660eb025431b..a455275fdc31 100644 --- a/core/res/res/values-fr/strings.xml +++ b/core/res/res/values-fr/strings.xml @@ -246,8 +246,8 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"Assistance vocale"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"Verrouiller"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">">999"</string> - <string name="notification_hidden_text" msgid="1135169301897151909">"Contenus masqués"</string> - <string name="notification_hidden_by_policy_text" msgid="9004631276932584600">"Contenu masqué conformément aux règles"</string> + <!-- no translation found for notification_hidden_text (6351207030447943784) --> + <skip /> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Clavier virtuel"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"Clavier physique"</string> <string name="notification_channel_security" msgid="7345516133431326347">"Sécurité"</string> @@ -1730,14 +1730,8 @@ <string name="unpin_target" msgid="3556545602439143442">"Retirer"</string> <string name="app_info" msgid="6856026610594615344">"Infos sur l\'appli"</string> <string name="negative_duration" msgid="5688706061127375131">"− <xliff:g id="TIME">%1$s</xliff:g>"</string> - <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"Réinitialiser l\'appareil ?"</string> - <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"Appuyer pour réinitialiser l\'appareil"</string> <string name="demo_starting_message" msgid="5268556852031489931">"Lancement de la démo…"</string> <string name="demo_restarting_message" msgid="952118052531642451">"Réinitialisation…"</string> - <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"Réinitialiser l\'appareil ?"</string> - <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"Vous perdrez vos modifications, et la démo recommencera dans <xliff:g id="TIMEOUT">%1$s</xliff:g> secondes…"</string> - <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"Annuler"</string> - <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"Réinitialiser maintenant"</string> <string name="suspended_widget_accessibility" msgid="6712143096475264190">"Élément \"<xliff:g id="LABEL">%1$s</xliff:g>\" désactivé"</string> <string name="conference_call" msgid="3751093130790472426">"Conférence téléphonique"</string> <string name="tooltip_popup_title" msgid="5253721848739260181">"Info-bulle"</string> diff --git a/core/res/res/values-gl/strings.xml b/core/res/res/values-gl/strings.xml index fe12e7f8ef49..5839348a5d5b 100644 --- a/core/res/res/values-gl/strings.xml +++ b/core/res/res/values-gl/strings.xml @@ -246,8 +246,8 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"Asistente voz"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"Bloquear agora"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">">999"</string> - <string name="notification_hidden_text" msgid="1135169301897151909">"Contido oculto"</string> - <string name="notification_hidden_by_policy_text" msgid="9004631276932584600">"Ocultouse contido por causa da política"</string> + <!-- no translation found for notification_hidden_text (6351207030447943784) --> + <skip /> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Teclado virtual"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"Teclado físico"</string> <string name="notification_channel_security" msgid="7345516133431326347">"Seguranza"</string> @@ -471,7 +471,7 @@ <string name="permlab_nfc" msgid="4423351274757876953">"controlar Near Field Communication"</string> <string name="permdesc_nfc" msgid="7120611819401789907">"Permite á aplicación comunicarse con etiquetas, tarxetas e lectores Near Field Communication (NFC)."</string> <string name="permlab_disableKeyguard" msgid="3598496301486439258">"desactivar o bloqueo da pantalla"</string> - <string name="permdesc_disableKeyguard" msgid="6034203065077122992">"Permite á aplicación desactivar o bloqueo do teclado e calquera seguridade dos contrasinais asociada. Por exemplo, o teléfono desactiva o bloqueo do teclado ao recibir unha chamada telefónica entrante e, a continuación, volve activar o bloqueo do teclado unha vez finalizada a chamada."</string> + <string name="permdesc_disableKeyguard" msgid="6034203065077122992">"Permite á aplicación desactivar o bloqueo do teclado e calquera seguranza dos contrasinais asociada. Por exemplo, o teléfono desactiva o bloqueo do teclado ao recibir unha chamada telefónica entrante e, a continuación, volve activar o bloqueo do teclado unha vez finalizada a chamada."</string> <string name="permlab_manageFingerprint" msgid="5640858826254575638">"xestionar hardware de impresión dixital"</string> <string name="permdesc_manageFingerprint" msgid="178208705828055464">"Permite que a aplicación invoque métodos para engadir e eliminar modelos de uso de impresión dixital."</string> <string name="permlab_useFingerprint" msgid="3150478619915124905">"usar hardware de impresión dixital"</string> @@ -1731,14 +1731,8 @@ <string name="unpin_target" msgid="3556545602439143442">"Soltar"</string> <string name="app_info" msgid="6856026610594615344">"Información de aplicacións"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"Queres restablecer o dispositivo?"</string> - <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"Toca aquí para restablecer o dispositivo"</string> <string name="demo_starting_message" msgid="5268556852031489931">"Iniciando demostración…"</string> <string name="demo_restarting_message" msgid="952118052531642451">"Restablecendo dispositivo…"</string> - <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"Queres restablecer o dispositivo?"</string> - <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"Perderás os cambios que fixeses e a demostración volverá comezar en <xliff:g id="TIMEOUT">%1$s</xliff:g> segundos…"</string> - <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"Cancelar"</string> - <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"Restablecer agora"</string> <string name="suspended_widget_accessibility" msgid="6712143096475264190">"Desactivouse <xliff:g id="LABEL">%1$s</xliff:g>"</string> <string name="conference_call" msgid="3751093130790472426">"Conferencia telefónica"</string> <string name="tooltip_popup_title" msgid="5253721848739260181">"Cadro de información"</string> diff --git a/core/res/res/values-gu/strings.xml b/core/res/res/values-gu/strings.xml index e9447bc5c499..8ce54f554312 100644 --- a/core/res/res/values-gu/strings.xml +++ b/core/res/res/values-gu/strings.xml @@ -246,8 +246,8 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"વૉઇસ સહાય"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"હવે લૉક કરો"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <string name="notification_hidden_text" msgid="1135169301897151909">"સામગ્રીઓ છુપાવેલ છે"</string> - <string name="notification_hidden_by_policy_text" msgid="9004631276932584600">"નીતિ દ્વારા સામગ્રી છુપાવાઈ"</string> + <!-- no translation found for notification_hidden_text (6351207030447943784) --> + <skip /> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"વર્ચ્યુઅલ કીબોર્ડ"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"ભૌતિક કીબોર્ડ"</string> <string name="notification_channel_security" msgid="7345516133431326347">"સુરક્ષા"</string> @@ -1731,14 +1731,8 @@ <string name="unpin_target" msgid="3556545602439143442">"અનપિન કરો"</string> <string name="app_info" msgid="6856026610594615344">"ઍપ્લિકેશન માહિતી"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"ઉપકરણ ફરીથી સેટ કરીએ?"</string> - <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"ઉપકરણને ફરીથી સેટ કરવા માટે ટૅપ કરો"</string> <string name="demo_starting_message" msgid="5268556852031489931">"ડેમો પ્રારંભ કરી રહ્યાં છે…"</string> <string name="demo_restarting_message" msgid="952118052531642451">"ઉપકરણ ફરીથી સેટ કરી રહ્યાં છે…"</string> - <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"ઉપકરણ ફરીથી સેટ કરીએ?"</string> - <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"તમે કોઈપણ ફેરફારો ગુમાવશો અને ડેમો <xliff:g id="TIMEOUT">%1$s</xliff:g> સેકન્ડમાં ફરી શરૂ થશે…"</string> - <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"રદ કરો"</string> - <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"હમણાં ફરીથી સેટ કરો"</string> <string name="suspended_widget_accessibility" msgid="6712143096475264190">"<xliff:g id="LABEL">%1$s</xliff:g> અક્ષમ કર્યું"</string> <string name="conference_call" msgid="3751093130790472426">"કોન્ફરન્સ કૉલ"</string> <string name="tooltip_popup_title" msgid="5253721848739260181">"ટૂલટિપ"</string> diff --git a/core/res/res/values-hi/strings.xml b/core/res/res/values-hi/strings.xml index a36903a3126f..2b7485293dca 100644 --- a/core/res/res/values-hi/strings.xml +++ b/core/res/res/values-hi/strings.xml @@ -246,8 +246,8 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"वॉइस सहायक"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"अभी लॉक करें"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <string name="notification_hidden_text" msgid="1135169301897151909">"छिपी हुई सामग्री"</string> - <string name="notification_hidden_by_policy_text" msgid="9004631276932584600">"सामग्री पॉलिसी के द्वारा छिपी हुई है"</string> + <!-- no translation found for notification_hidden_text (6351207030447943784) --> + <skip /> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"वर्चुअल कीबोर्ड"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"भौतिक कीबोर्ड"</string> <string name="notification_channel_security" msgid="7345516133431326347">"सुरक्षा"</string> @@ -528,10 +528,10 @@ <string name="permdesc_manageNetworkPolicy" msgid="7537586771559370668">"ऐप्स को नेटवर्क नीतियां प्रबंधित करने और ऐप्स-विशिष्ट नियमों को परिभाषित करने देता है."</string> <string name="permlab_modifyNetworkAccounting" msgid="5088217309088729650">"नेटवर्क उपयोग हिसाब बदलें"</string> <string name="permdesc_modifyNetworkAccounting" msgid="5443412866746198123">"ऐप्स को यह संशोधित करने देता है कि ऐप्स की तुलना में नेटवर्क उपयोग का मूल्यांकन कैसे किया जाता है. सामान्य ऐप्स द्वारा उपयोग करने के लिए नहीं."</string> - <string name="permlab_accessNotifications" msgid="7673416487873432268">"नोटिफिकेशन तक पहुंचें"</string> - <string name="permdesc_accessNotifications" msgid="458457742683431387">"ऐप्स को नोटिफिकेशन को प्राप्त करने, जांच करने, और साफ़ करने देता है, जिनमें अन्य ऐप्स के द्वारा पोस्ट की गई सूचनाएं भी शामिल हैं."</string> - <string name="permlab_bindNotificationListenerService" msgid="7057764742211656654">"नोटिफिकेशन श्रवणकर्ता सेवा से जुड़ें"</string> - <string name="permdesc_bindNotificationListenerService" msgid="985697918576902986">"धारक को नोटिफिकेशन श्रवणकर्ता सेवा के शीर्ष स्तरीय इंटरफ़ेस से जुड़ने देती है. सामान्य ऐप्स के लिए कभी भी आवश्यक नहीं होनी चाहिए."</string> + <string name="permlab_accessNotifications" msgid="7673416487873432268">"नोटिफ़िकेशन तक पहुंचें"</string> + <string name="permdesc_accessNotifications" msgid="458457742683431387">"ऐप्स को नोटिफ़िकेशन को प्राप्त करने, जांच करने, और साफ़ करने देता है, जिनमें अन्य ऐप्स के द्वारा पोस्ट की गई सूचनाएं भी शामिल हैं."</string> + <string name="permlab_bindNotificationListenerService" msgid="7057764742211656654">"नोटिफ़िकेशन श्रवणकर्ता सेवा से जुड़ें"</string> + <string name="permdesc_bindNotificationListenerService" msgid="985697918576902986">"धारक को नोटिफ़िकेशन श्रवणकर्ता सेवा के शीर्ष स्तरीय इंटरफ़ेस से जुड़ने देती है. सामान्य ऐप्स के लिए कभी भी आवश्यक नहीं होनी चाहिए."</string> <string name="permlab_bindConditionProviderService" msgid="1180107672332704641">"किसी स्थिति प्रदाता सेवा से आबद्ध हों"</string> <string name="permdesc_bindConditionProviderService" msgid="1680513931165058425">"धारक को किसी स्थिति प्रदाता सेवा के शीर्ष-स्तर के इंटरफ़ेस से आबद्ध होने देती है. सामान्य ऐप्स के लिए कभी भी आवश्यक नहीं होना चाहिए."</string> <string name="permlab_bindDreamService" msgid="4153646965978563462">"भावी सेवा से आबद्ध करें"</string> @@ -1084,13 +1084,13 @@ <string name="volume_call" msgid="3941680041282788711">"कॉल के दौरान वॉल्यूम"</string> <string name="volume_bluetooth_call" msgid="2002891926351151534">"ब्लूटूथ कॉल के दौरान वॉल्यूम"</string> <string name="volume_alarm" msgid="1985191616042689100">"अलार्म वॉल्यूम"</string> - <string name="volume_notification" msgid="2422265656744276715">"नोटिफिकेशन वॉल्यूम"</string> + <string name="volume_notification" msgid="2422265656744276715">"नोटिफ़िकेशन वॉल्यूम"</string> <string name="volume_unknown" msgid="1400219669770445902">"आवाज़"</string> <string name="volume_icon_description_bluetooth" msgid="6538894177255964340">"ब्लूटूथ वॉल्यूम"</string> <string name="volume_icon_description_ringer" msgid="3326003847006162496">"रिंगटोन वॉल्यूम"</string> <string name="volume_icon_description_incall" msgid="8890073218154543397">"कॉल वॉल्यूम"</string> <string name="volume_icon_description_media" msgid="4217311719665194215">"मीडिया वॉल्यूम"</string> - <string name="volume_icon_description_notification" msgid="7044986546477282274">"नोटिफिकेशन वॉल्यूम"</string> + <string name="volume_icon_description_notification" msgid="7044986546477282274">"नोटिफ़िकेशन वॉल्यूम"</string> <string name="ringtone_default" msgid="3789758980357696936">"डिफ़ॉल्ट रिंगटोन"</string> <string name="ringtone_default_with_actual" msgid="1767304850491060581">"डिफ़ॉल्ट (<xliff:g id="ACTUAL_RINGTONE">%1$s</xliff:g>)"</string> <string name="ringtone_silent" msgid="7937634392408977062">"कोई नहीं"</string> @@ -1289,7 +1289,7 @@ <string name="accessibility_binding_label" msgid="4148120742096474641">"सरल उपयोग"</string> <string name="wallpaper_binding_label" msgid="1240087844304687662">"वॉलपेपर"</string> <string name="chooser_wallpaper" msgid="7873476199295190279">"वॉलपेपर बदलें"</string> - <string name="notification_listener_binding_label" msgid="2014162835481906429">"नोटिफिकेशन श्रवणकर्ता"</string> + <string name="notification_listener_binding_label" msgid="2014162835481906429">"नोटिफ़िकेशन श्रवणकर्ता"</string> <string name="vr_listener_binding_label" msgid="4316591939343607306">"VR श्रोता"</string> <string name="condition_provider_service_binding_label" msgid="1321343352906524564">"स्थिति प्रदाता"</string> <string name="notification_ranker_binding_label" msgid="774540592299064747">"नोटिफ़िकेशन रैंकर सेवा"</string> @@ -1703,7 +1703,7 @@ <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> चयनित</item> </plurals> <string name="default_notification_channel_label" msgid="5929663562028088222">"अवर्गीकृत"</string> - <string name="importance_from_user" msgid="7318955817386549931">"आपने इन नोटिफिकेशन का महत्व सेट किया है."</string> + <string name="importance_from_user" msgid="7318955817386549931">"आपने इन नोटिफ़िकेशन का महत्व सेट किया है."</string> <string name="importance_from_person" msgid="9160133597262938296">"यह मौजूद व्यक्तियों के कारण महत्वपूर्ण है."</string> <string name="user_creation_account_exists" msgid="1942606193570143289">"<xliff:g id="APP">%1$s</xliff:g> को <xliff:g id="ACCOUNT">%2$s</xliff:g> के द्वारा एक नया उपयोगकर्ता बनाने दें?"</string> <string name="user_creation_adding" msgid="4482658054622099197">"<xliff:g id="APP">%1$s</xliff:g> को <xliff:g id="ACCOUNT">%2$s</xliff:g> के द्वारा एक नया उपयोगकर्ता बनाने दें (इस खाते वाला एक उपयोगकर्ता पहले से मौजूद है) ?"</string> @@ -1730,14 +1730,8 @@ <string name="unpin_target" msgid="3556545602439143442">"अनपिन करें"</string> <string name="app_info" msgid="6856026610594615344">"ऐप की जानकारी"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"डिवाइस रीसेट करें?"</string> - <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"डिवाइस को रीसेट करने के लिए टैप करें"</string> <string name="demo_starting_message" msgid="5268556852031489931">"डेमो प्रारंभ हो रहा है…"</string> <string name="demo_restarting_message" msgid="952118052531642451">"डिवाइस पुन: रीसेट कर रहा है…"</string> - <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"डिवाइस रीसेट करें?"</string> - <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"आपके सभी बदलाव खो जाएंगे और डेमो <xliff:g id="TIMEOUT">%1$s</xliff:g> सेकंड में फिर से शुरू हो जाएगा…"</string> - <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"अभी नहीं"</string> - <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"अभी रीसेट करें"</string> <string name="suspended_widget_accessibility" msgid="6712143096475264190">"अक्षम <xliff:g id="LABEL">%1$s</xliff:g>"</string> <string name="conference_call" msgid="3751093130790472426">"कॉन्फ़्रेंस कॉल"</string> <string name="tooltip_popup_title" msgid="5253721848739260181">"टूलटिप"</string> diff --git a/core/res/res/values-hr/strings.xml b/core/res/res/values-hr/strings.xml index a5661be339f1..2605c86b5804 100644 --- a/core/res/res/values-hr/strings.xml +++ b/core/res/res/values-hr/strings.xml @@ -249,8 +249,8 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"Glasovna pomoć"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"Zaključaj sada"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <string name="notification_hidden_text" msgid="1135169301897151909">"Sadržaj je skriven"</string> - <string name="notification_hidden_by_policy_text" msgid="9004631276932584600">"Sadržaj je skriven prema pravilima"</string> + <!-- no translation found for notification_hidden_text (6351207030447943784) --> + <skip /> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Virtualna tipkovnica"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"Fizička tipkovnica"</string> <string name="notification_channel_security" msgid="7345516133431326347">"Sigurnost"</string> @@ -1763,14 +1763,8 @@ <string name="unpin_target" msgid="3556545602439143442">"Otkvači"</string> <string name="app_info" msgid="6856026610594615344">"Informacije o aplikaciji"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"Želite li vratiti uređaj na zadano?"</string> - <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"Dodirnite za vraćanje uređaja na zadano"</string> <string name="demo_starting_message" msgid="5268556852031489931">"Pokretanje demo-načina..."</string> <string name="demo_restarting_message" msgid="952118052531642451">"Vraćanje uređaja na zadano…"</string> - <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"Želite li vratiti uređaj na zadano?"</string> - <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"Sve će se promjene izbrisati, a demonstracija će se ponovo pokrenuti za <xliff:g id="TIMEOUT">%1$s</xliff:g> s…"</string> - <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"Odustani"</string> - <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"Vrati na zadano sada"</string> <string name="suspended_widget_accessibility" msgid="6712143096475264190">"<xliff:g id="LABEL">%1$s</xliff:g> – onemogućeno"</string> <string name="conference_call" msgid="3751093130790472426">"Konferencijski poziv"</string> <string name="tooltip_popup_title" msgid="5253721848739260181">"Opis"</string> diff --git a/core/res/res/values-hu/strings.xml b/core/res/res/values-hu/strings.xml index 3a514bf27703..99ab8b2291fb 100644 --- a/core/res/res/values-hu/strings.xml +++ b/core/res/res/values-hu/strings.xml @@ -246,8 +246,8 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"Hangsegéd"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"Zárolás most"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <string name="notification_hidden_text" msgid="1135169301897151909">"Tartalom elrejtve"</string> - <string name="notification_hidden_by_policy_text" msgid="9004631276932584600">"A tartalom irányelv miatt elrejtve"</string> + <!-- no translation found for notification_hidden_text (6351207030447943784) --> + <skip /> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Virtuális billentyűzet"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"Fizikai billentyűzet"</string> <string name="notification_channel_security" msgid="7345516133431326347">"Biztonság"</string> @@ -1730,14 +1730,8 @@ <string name="unpin_target" msgid="3556545602439143442">"Feloldás"</string> <string name="app_info" msgid="6856026610594615344">"Alkalmazásinformáció"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"Visszaállítja eszközét?"</string> - <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"Koppintson az eszköz visszaállítása érdekében"</string> <string name="demo_starting_message" msgid="5268556852031489931">"Bemutató indítása…"</string> <string name="demo_restarting_message" msgid="952118052531642451">"Eszköz visszaállítása…"</string> - <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"Visszaállítja eszközét?"</string> - <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"A módosítások elvesznek, és a bemutató újra elindul <xliff:g id="TIMEOUT">%1$s</xliff:g> másodperc múlva…"</string> - <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"Mégse"</string> - <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"Visszaállítás most"</string> <string name="suspended_widget_accessibility" msgid="6712143096475264190">"A(z) <xliff:g id="LABEL">%1$s</xliff:g> letiltva"</string> <string name="conference_call" msgid="3751093130790472426">"Konferenciahívás"</string> <string name="tooltip_popup_title" msgid="5253721848739260181">"Elemleírás"</string> diff --git a/core/res/res/values-hy/strings.xml b/core/res/res/values-hy/strings.xml index 7f35c2884a44..b08feef8325a 100644 --- a/core/res/res/values-hy/strings.xml +++ b/core/res/res/values-hy/strings.xml @@ -246,8 +246,8 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"Ձայնային օգնութ"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"Կողպել հիմա"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <string name="notification_hidden_text" msgid="1135169301897151909">"Բովանդակությունը թաքցված է"</string> - <string name="notification_hidden_by_policy_text" msgid="9004631276932584600">"Բովանդակությունը թաքցվել է ըստ քաղաքականության"</string> + <!-- no translation found for notification_hidden_text (6351207030447943784) --> + <skip /> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Վիրտուալ ստեղնաշար"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"Ֆիզիկական ստեղնաշար"</string> <string name="notification_channel_security" msgid="7345516133431326347">"Անվտանգություն"</string> @@ -1730,14 +1730,8 @@ <string name="unpin_target" msgid="3556545602439143442">"Ապամրացնել"</string> <string name="app_info" msgid="6856026610594615344">"Հավելվածի տվյալներ"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"Վերակայե՞լ սարքը:"</string> - <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"Հպեք՝ սարքը վերակայելու համար"</string> <string name="demo_starting_message" msgid="5268556852031489931">"Ցուցադրական օգտատերը գործարկվում է…"</string> <string name="demo_restarting_message" msgid="952118052531642451">"Սարաքը վերակայվում է…"</string> - <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"Վերակայե՞լ սարքը:"</string> - <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"Կատարված փոփոխությունները չեն պահվի, իսկ ցուցադրական նյութը կրկին կգործարկվի <xliff:g id="TIMEOUT">%1$s</xliff:g> վայրկյանից…"</string> - <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"Չեղարկել"</string> - <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"Վերակայել հիմա"</string> <string name="suspended_widget_accessibility" msgid="6712143096475264190">"Անջատած <xliff:g id="LABEL">%1$s</xliff:g>"</string> <string name="conference_call" msgid="3751093130790472426">"Կոնֆերանս զանգ"</string> <string name="tooltip_popup_title" msgid="5253721848739260181">"Հուշակ"</string> diff --git a/core/res/res/values-in/strings.xml b/core/res/res/values-in/strings.xml index 835117958099..c407a074be40 100644 --- a/core/res/res/values-in/strings.xml +++ b/core/res/res/values-in/strings.xml @@ -246,8 +246,8 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"Bantuan Suara"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"Kunci sekarang"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <string name="notification_hidden_text" msgid="1135169301897151909">"Konten tersembunyi"</string> - <string name="notification_hidden_by_policy_text" msgid="9004631276932584600">"Konten disembunyikan menurut kebijakan"</string> + <!-- no translation found for notification_hidden_text (6351207030447943784) --> + <skip /> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Keyboard virtual"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"Keyboard fisik"</string> <string name="notification_channel_security" msgid="7345516133431326347">"Keamanan"</string> @@ -1730,14 +1730,8 @@ <string name="unpin_target" msgid="3556545602439143442">"Lepas pin"</string> <string name="app_info" msgid="6856026610594615344">"Info aplikasi"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"Setel ulang perangkat?"</string> - <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"Ketuk untuk menyetel ulang perangkat"</string> <string name="demo_starting_message" msgid="5268556852031489931">"Memulai demo..."</string> <string name="demo_restarting_message" msgid="952118052531642451">"Menyetel ulang perangkat..."</string> - <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"Setel ulang perangkat?"</string> - <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"Perubahan yang dibuat akan hilang dan demo akan dimulai lagi dalam <xliff:g id="TIMEOUT">%1$s</xliff:g> detik…"</string> - <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"Batal"</string> - <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"Setel ulang sekarang"</string> <string name="suspended_widget_accessibility" msgid="6712143096475264190">"<xliff:g id="LABEL">%1$s</xliff:g> dinonaktifkan"</string> <string name="conference_call" msgid="3751093130790472426">"Konferensi Telepon"</string> <string name="tooltip_popup_title" msgid="5253721848739260181">"Keterangan alat"</string> diff --git a/core/res/res/values-is/strings.xml b/core/res/res/values-is/strings.xml index ed2e27a3aaba..68402a41b15f 100644 --- a/core/res/res/values-is/strings.xml +++ b/core/res/res/values-is/strings.xml @@ -246,8 +246,8 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"Raddaðstoð"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"Læsa núna"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <string name="notification_hidden_text" msgid="1135169301897151909">"Innihald falið"</string> - <string name="notification_hidden_by_policy_text" msgid="9004631276932584600">"Efni falið með reglu"</string> + <!-- no translation found for notification_hidden_text (6351207030447943784) --> + <skip /> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Sýndarlyklaborð"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"Vélbúnaðarlyklaborð"</string> <string name="notification_channel_security" msgid="7345516133431326347">"Öryggi"</string> @@ -1731,14 +1731,8 @@ <string name="unpin_target" msgid="3556545602439143442">"Losa"</string> <string name="app_info" msgid="6856026610594615344">"Forritsupplýsingar"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"Endurstilla tækið?"</string> - <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"Ýttu til að endurstilla tækið"</string> <string name="demo_starting_message" msgid="5268556852031489931">"Byrjar kynningu…"</string> <string name="demo_restarting_message" msgid="952118052531642451">"Endurstillir tækið…"</string> - <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"Endurstilla tækið?"</string> - <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"Þú glatar öllum breytingum og kynningin byrjar aftur eftir <xliff:g id="TIMEOUT">%1$s</xliff:g> sekúndur…"</string> - <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"Hætta við"</string> - <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"Endurstilla núna"</string> <string name="suspended_widget_accessibility" msgid="6712143096475264190">"Slökkt <xliff:g id="LABEL">%1$s</xliff:g>"</string> <string name="conference_call" msgid="3751093130790472426">"Símafundur"</string> <string name="tooltip_popup_title" msgid="5253721848739260181">"Ábending"</string> diff --git a/core/res/res/values-it/strings.xml b/core/res/res/values-it/strings.xml index ba6c8369ca27..363f4c9eae9e 100644 --- a/core/res/res/values-it/strings.xml +++ b/core/res/res/values-it/strings.xml @@ -246,8 +246,8 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"Voice Assist"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"Blocca ora"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <string name="notification_hidden_text" msgid="1135169301897151909">"Contenuti nascosti"</string> - <string name="notification_hidden_by_policy_text" msgid="9004631276932584600">"Contenuti nascosti in base alle norme"</string> + <!-- no translation found for notification_hidden_text (6351207030447943784) --> + <skip /> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Tastiera virtuale"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"Tastiera fisica"</string> <string name="notification_channel_security" msgid="7345516133431326347">"Sicurezza"</string> @@ -1730,14 +1730,8 @@ <string name="unpin_target" msgid="3556545602439143442">"Sblocca"</string> <string name="app_info" msgid="6856026610594615344">"Informazioni app"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"Ripristinare il dispositivo?"</string> - <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"Tocca per ripristinare il dispositivo"</string> <string name="demo_starting_message" msgid="5268556852031489931">"Avvio della demo…"</string> <string name="demo_restarting_message" msgid="952118052531642451">"Ripristino del dispositivo…"</string> - <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"Ripristinare il dispositivo?"</string> - <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"Perderai tutte le modifiche e la demo verrà riavviata tra <xliff:g id="TIMEOUT">%1$s</xliff:g> secondi…"</string> - <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"Annulla"</string> - <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"Ripristina ora"</string> <string name="suspended_widget_accessibility" msgid="6712143096475264190">"Widget <xliff:g id="LABEL">%1$s</xliff:g> disattivato"</string> <string name="conference_call" msgid="3751093130790472426">"Audioconferenza"</string> <string name="tooltip_popup_title" msgid="5253721848739260181">"Descrizione comando"</string> diff --git a/core/res/res/values-iw/strings.xml b/core/res/res/values-iw/strings.xml index 445ff9442cde..9dd60331d2b0 100644 --- a/core/res/res/values-iw/strings.xml +++ b/core/res/res/values-iw/strings.xml @@ -252,8 +252,8 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"Voice Assist"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"נעל עכשיו"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <string name="notification_hidden_text" msgid="1135169301897151909">"התוכן מוסתר"</string> - <string name="notification_hidden_by_policy_text" msgid="9004631276932584600">"התוכן מוסתר על ידי המדיניות"</string> + <!-- no translation found for notification_hidden_text (6351207030447943784) --> + <skip /> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"מקלדת וירטואלית"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"מקלדת פיזית"</string> <string name="notification_channel_security" msgid="7345516133431326347">"אבטחה"</string> @@ -1796,14 +1796,8 @@ <string name="unpin_target" msgid="3556545602439143442">"בטל הצמדה"</string> <string name="app_info" msgid="6856026610594615344">"פרטי אפליקציה"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"האם לאפס את המכשיר?"</string> - <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"הקש כדי לאפס את המכשיר"</string> <string name="demo_starting_message" msgid="5268556852031489931">"מתחיל בהדגמה…"</string> <string name="demo_restarting_message" msgid="952118052531642451">"מאפס את המכשיר…"</string> - <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"האם לאפס את המכשיר?"</string> - <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"תאבד את כל השינויים וההדגמה תתחיל שוב בעוד <xliff:g id="TIMEOUT">%1$s</xliff:g> שניות…"</string> - <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"ביטול"</string> - <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"אפס עכשיו"</string> <string name="suspended_widget_accessibility" msgid="6712143096475264190">"<xliff:g id="LABEL">%1$s</xliff:g> הושבת"</string> <string name="conference_call" msgid="3751093130790472426">"שיחת ועידה"</string> <string name="tooltip_popup_title" msgid="5253721848739260181">"הסבר קצר"</string> diff --git a/core/res/res/values-ja/strings.xml b/core/res/res/values-ja/strings.xml index e9ac51e6cdae..a5ae39f88b91 100644 --- a/core/res/res/values-ja/strings.xml +++ b/core/res/res/values-ja/strings.xml @@ -246,8 +246,8 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"音声アシスト"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"今すぐロック"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <string name="notification_hidden_text" msgid="1135169301897151909">"コンテンツが非表示"</string> - <string name="notification_hidden_by_policy_text" msgid="9004631276932584600">"ポリシーによって非表示になっているコンテンツ"</string> + <!-- no translation found for notification_hidden_text (6351207030447943784) --> + <skip /> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"仮想キーボード"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"物理キーボード"</string> <string name="notification_channel_security" msgid="7345516133431326347">"セキュリティ"</string> @@ -1730,14 +1730,8 @@ <string name="unpin_target" msgid="3556545602439143442">"固定を解除"</string> <string name="app_info" msgid="6856026610594615344">"アプリ情報"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"端末をリセットしますか？"</string> - <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"端末をリセットするにはタップしてください"</string> <string name="demo_starting_message" msgid="5268556852031489931">"デモを開始しています…"</string> <string name="demo_restarting_message" msgid="952118052531642451">"端末をリセットしています…"</string> - <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"端末をリセットしますか？"</string> - <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"変更が失われ、<xliff:g id="TIMEOUT">%1$s</xliff:g> 秒後にデモがもう一度開始されます…"</string> - <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"キャンセル"</string> - <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"今すぐリセット"</string> <string name="suspended_widget_accessibility" msgid="6712143096475264190">"停止済みの「<xliff:g id="LABEL">%1$s</xliff:g>」"</string> <string name="conference_call" msgid="3751093130790472426">"グループ通話"</string> <string name="tooltip_popup_title" msgid="5253721848739260181">"ツールチップ"</string> diff --git a/core/res/res/values-ka/strings.xml b/core/res/res/values-ka/strings.xml index 9c5da6b75a49..ae8825b2a068 100644 --- a/core/res/res/values-ka/strings.xml +++ b/core/res/res/values-ka/strings.xml @@ -246,8 +246,8 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"ხმოვანი ასისტ."</string> <string name="global_action_lockdown" msgid="8751542514724332873">"ახლა ჩაკეტვა"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <string name="notification_hidden_text" msgid="1135169301897151909">"შიგთავსი დამალულია"</string> - <string name="notification_hidden_by_policy_text" msgid="9004631276932584600">"შიგთავსი დამალულია წესების შესაბამისად"</string> + <!-- no translation found for notification_hidden_text (6351207030447943784) --> + <skip /> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"ვირტუალური კლავიატურა"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"ფიზიკური კლავიატურა"</string> <string name="notification_channel_security" msgid="7345516133431326347">"უსაფრთხოება"</string> @@ -1730,14 +1730,8 @@ <string name="unpin_target" msgid="3556545602439143442">"ჩამაგრების მოხსნა"</string> <string name="app_info" msgid="6856026610594615344">"აპის შესახებ"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"გსურთ მოწყობილობის გადაყენება?"</string> - <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"შეეხეთ მოწყობილობის გადასაყენებლად"</string> <string name="demo_starting_message" msgid="5268556852031489931">"მიმდინარეობს დემონსტრაციის დაწყება…"</string> <string name="demo_restarting_message" msgid="952118052531642451">"მიმდინარეობს მოწყობილობის გადაყენება…"</string> - <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"გსურთ მოწყობილობის გადაყენება?"</string> - <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"შეტანილი ცვლილებები დაიკარგება, ხოლო დემონსტრაცია ხელახლა <xliff:g id="TIMEOUT">%1$s</xliff:g> წამში დაიწყება…"</string> - <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"გაუქმება"</string> - <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"ახლავე გადაყენება"</string> <string name="suspended_widget_accessibility" msgid="6712143096475264190">"გათიშული <xliff:g id="LABEL">%1$s</xliff:g>"</string> <string name="conference_call" msgid="3751093130790472426">"საკონფერენციო ზარი"</string> <string name="tooltip_popup_title" msgid="5253721848739260181">"მინიშნება"</string> diff --git a/core/res/res/values-kk/strings.xml b/core/res/res/values-kk/strings.xml index bf26567615a0..d92651179bb1 100644 --- a/core/res/res/values-kk/strings.xml +++ b/core/res/res/values-kk/strings.xml @@ -246,8 +246,8 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"Дауыс көмекшісі"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"Қазір бекіту"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <string name="notification_hidden_text" msgid="1135169301897151909">"Мазмұн жасырылған"</string> - <string name="notification_hidden_by_policy_text" msgid="9004631276932584600">"Мазмұн саясатқа сай жасырылған"</string> + <!-- no translation found for notification_hidden_text (6351207030447943784) --> + <skip /> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Виртуалды пернетақта"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"Қатты пернетақта"</string> <string name="notification_channel_security" msgid="7345516133431326347">"Қауіпсіздік"</string> @@ -1731,14 +1731,8 @@ <string name="unpin_target" msgid="3556545602439143442">"Босату"</string> <string name="app_info" msgid="6856026610594615344">"Қолданба ақпараты"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"Құрылғыны бастапқы күйге қайтару керек пе?"</string> - <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"Құрылғыны бастапқы күйге келтіру үшін түртіңіз"</string> <string name="demo_starting_message" msgid="5268556852031489931">"Демо нұсқасы іске қосылуда..."</string> <string name="demo_restarting_message" msgid="952118052531642451">"Құрылғы бастапқы күйге қайтарылуда..."</string> - <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"Құрылғыны басқапқы күйге қайтару керек пе?"</string> - <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"Барлық өзгеріс жоғалады және демо нұсқасы <xliff:g id="TIMEOUT">%1$s</xliff:g> секундтан кейін қайта қосылады…"</string> - <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"Бас тарту"</string> - <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"Қазір бастапқы күйге қайтару"</string> <string name="suspended_widget_accessibility" msgid="6712143096475264190">"<xliff:g id="LABEL">%1$s</xliff:g> өшірулі"</string> <string name="conference_call" msgid="3751093130790472426">"Конференциялық қоңырау"</string> <string name="tooltip_popup_title" msgid="5253721848739260181">"Қалқыма сөзкөмек"</string> diff --git a/core/res/res/values-km/strings.xml b/core/res/res/values-km/strings.xml index 99823c07265c..6a77d99455f3 100644 --- a/core/res/res/values-km/strings.xml +++ b/core/res/res/values-km/strings.xml @@ -246,8 +246,8 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"ជំនួយសម្លេង"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"ចាក់សោឥឡូវនេះ"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <string name="notification_hidden_text" msgid="1135169301897151909">"បានលាក់មាតិកា"</string> - <string name="notification_hidden_by_policy_text" msgid="9004631276932584600">"មាតិកាត្រូវបានលាក់ដោយផ្អែកលើគោលការណ៍"</string> + <!-- no translation found for notification_hidden_text (6351207030447943784) --> + <skip /> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"ក្ដារចុចនិម្មិត"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"ក្ដារចុចរូបវន្ត"</string> <string name="notification_channel_security" msgid="7345516133431326347">"សុវត្ថិភាព"</string> @@ -1732,14 +1732,8 @@ <string name="unpin_target" msgid="3556545602439143442">"មិនខ្ទាស់"</string> <string name="app_info" msgid="6856026610594615344">"ព័ត៌មានកម្មវិធី"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"កំណត់ឧបករណ៍ឡើងវិញឬ?"</string> - <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"ប៉ះដើម្បីកំណត់ឧបករណ៍ឡើងវិញ"</string> <string name="demo_starting_message" msgid="5268556852031489931">"កំពុងចាប់ផ្តើមការបង្ហាញសាកល្បង…"</string> <string name="demo_restarting_message" msgid="952118052531642451">"កំពុងកំណត់ឧបករណ៍ឡើងវិញ…"</string> - <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"កំណត់ឧបករណ៍ឡើងវិញឬ?"</string> - <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"អ្នកនឹងបាត់បង់ការផ្លាស់ប្តូរណាមួយ ហើយការបង្ហាញសាកល្បងនឹងចាប់ផ្តើមម្តងទៀតក្នុងរយៈពេល <xliff:g id="TIMEOUT">%1$s</xliff:g> វិនាទីទៀត…"</string> - <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"បោះបង់"</string> - <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"កំណត់ឡើងវិញឥឡូវនេះ"</string> <string name="suspended_widget_accessibility" msgid="6712143096475264190">"<xliff:g id="LABEL">%1$s</xliff:g> ដែលបានបិទដំណើរការ"</string> <string name="conference_call" msgid="3751093130790472426">"ការហៅជាក្រុម"</string> <string name="tooltip_popup_title" msgid="5253721848739260181">"ផ្ទាំងលោត"</string> diff --git a/core/res/res/values-kn/strings.xml b/core/res/res/values-kn/strings.xml index 8c8fe6c9bc11..d9be958289d5 100644 --- a/core/res/res/values-kn/strings.xml +++ b/core/res/res/values-kn/strings.xml @@ -246,8 +246,8 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"ಧ್ವನಿ ಸಹಾಯಕ"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"ಈಗ ಲಾಕ್ ಮಾಡಿ"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <string name="notification_hidden_text" msgid="1135169301897151909">"ವಿಷಯಗಳನ್ನು ಮರೆಮಾಡಲಾಗಿದೆ"</string> - <string name="notification_hidden_by_policy_text" msgid="9004631276932584600">"ನೀತಿಯಿಂದ ಮರೆಮಾಡಲಾಗಿರುವ ವಿಷಯಗಳು"</string> + <!-- no translation found for notification_hidden_text (6351207030447943784) --> + <skip /> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"ವರ್ಚುಯಲ್ ಕೀಬೋರ್ಡ್"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"ಭೌತಿಕ ಕೀಬೋರ್ಡ್"</string> <string name="notification_channel_security" msgid="7345516133431326347">"ಭದ್ರತೆ"</string> @@ -1731,14 +1731,8 @@ <string name="unpin_target" msgid="3556545602439143442">"ಅನ್ಪಿನ್"</string> <string name="app_info" msgid="6856026610594615344">"ಅಪ್ಲಿಕೇಶನ್ ಮಾಹಿತಿ"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"ಸಾಧನವನ್ನು ಮರುಹೊಂದಿಸುವುದೇ?"</string> - <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"ಸಾಧನ ಮರುಹೊಂದಿಸಲು ಟ್ಯಾಪ್ ಮಾಡಿ"</string> <string name="demo_starting_message" msgid="5268556852031489931">"ಡೆಮೋ ಪ್ರಾರಂಭಿಸಲಾಗುತ್ತಿದೆ..."</string> <string name="demo_restarting_message" msgid="952118052531642451">"ಸಾಧನ ಮರುಹೊಂದಿಸಲಾಗುತ್ತಿದೆ..."</string> - <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"ಸಾಧನವನ್ನು ಮರುಹೊಂದಿಸುವುದೇ?"</string> - <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"ನೀವು ಯಾವುದೇ ಬದಲಾವಣೆಗಳನ್ನು ಕಳೆದುಕೊಳ್ಳುತ್ತೀರಿ ಮತ್ತು <xliff:g id="TIMEOUT">%1$s</xliff:g> ಸೆಕೆಂಡುಗಳಲ್ಲಿ ಡೆಮೋ ಮತ್ತೆ ಪ್ರಾರಂಭವಾಗುತ್ತದೆ..."</string> - <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"ರದ್ದುಮಾಡಿ"</string> - <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"ಈಗಲೇ ಮರುಹೊಂದಿಸು"</string> <string name="suspended_widget_accessibility" msgid="6712143096475264190">"<xliff:g id="LABEL">%1$s</xliff:g> ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ"</string> <string name="conference_call" msgid="3751093130790472426">"ಕಾನ್ಫರೆನ್ಸ್ ಕರೆ"</string> <string name="tooltip_popup_title" msgid="5253721848739260181">"ಟೂಲ್ಟಿಪ್"</string> diff --git a/core/res/res/values-ko/strings.xml b/core/res/res/values-ko/strings.xml index f082358500b8..902ec1d92ea4 100644 --- a/core/res/res/values-ko/strings.xml +++ b/core/res/res/values-ko/strings.xml @@ -246,8 +246,8 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"음성 지원"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"지금 잠그기"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <string name="notification_hidden_text" msgid="1135169301897151909">"숨겨진 콘텐츠"</string> - <string name="notification_hidden_by_policy_text" msgid="9004631276932584600">"콘텐츠가 정책에 의해 숨겨졌습니다."</string> + <!-- no translation found for notification_hidden_text (6351207030447943784) --> + <skip /> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"가상 키보드"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"물리적 키보드"</string> <string name="notification_channel_security" msgid="7345516133431326347">"보안"</string> @@ -1730,14 +1730,8 @@ <string name="unpin_target" msgid="3556545602439143442">"고정 해제"</string> <string name="app_info" msgid="6856026610594615344">"앱 정보"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"기기를 초기화하시겠습니까?"</string> - <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"기기를 초기화하려면 탭하세요."</string> <string name="demo_starting_message" msgid="5268556852031489931">"데모 시작 중..."</string> <string name="demo_restarting_message" msgid="952118052531642451">"기기 초기화 중..."</string> - <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"기기를 초기화하시겠습니까?"</string> - <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"변경사항이 사라지며 데모가 <xliff:g id="TIMEOUT">%1$s</xliff:g>초 후에 시작됩니다."</string> - <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"취소"</string> - <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"지금 초기화"</string> <string name="suspended_widget_accessibility" msgid="6712143096475264190">"<xliff:g id="LABEL">%1$s</xliff:g> 사용 중지됨"</string> <string name="conference_call" msgid="3751093130790472426">"다자간 통화"</string> <string name="tooltip_popup_title" msgid="5253721848739260181">"도움말"</string> diff --git a/core/res/res/values-ky/strings.xml b/core/res/res/values-ky/strings.xml index 576d8a6800b8..d084443eb483 100644 --- a/core/res/res/values-ky/strings.xml +++ b/core/res/res/values-ky/strings.xml @@ -246,8 +246,8 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"Үн жардамчысы"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"Азыр кулпулоо"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <string name="notification_hidden_text" msgid="1135169301897151909">"Мазмундар жашырылган"</string> - <string name="notification_hidden_by_policy_text" msgid="9004631276932584600">"Тийиштүү саясат боюнча жашырылган мазмундар"</string> + <!-- no translation found for notification_hidden_text (6351207030447943784) --> + <skip /> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Виртуалдык баскычтоп"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"Аппараттык баскычтоп"</string> <string name="notification_channel_security" msgid="7345516133431326347">"Коопсуздук"</string> @@ -1731,14 +1731,8 @@ <string name="unpin_target" msgid="3556545602439143442">"Кадоодон алып коюу"</string> <string name="app_info" msgid="6856026610594615344">"Колдонмо тууралуу"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"Түзмөк баштапкы абалга келтирилсинби?"</string> - <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"Түзмөктү баштапкы абалга келтирүү үчүн таптап коюңуз"</string> <string name="demo_starting_message" msgid="5268556852031489931">"Демо режим башталууда…"</string> <string name="demo_restarting_message" msgid="952118052531642451">"Түзмөк баштапкы абалга келтирилүүдө…"</string> - <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"Түзмөк баштапкы абалга келтирилсинби?"</string> - <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"Бардык өзгөртүүлөр жоголуп, демо режим <xliff:g id="TIMEOUT">%1$s</xliff:g> секунддан кийин кайра башталат…"</string> - <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"Жокко чыгаруу"</string> - <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"Баштапкы абалга келтирүү"</string> <string name="suspended_widget_accessibility" msgid="6712143096475264190">"<xliff:g id="LABEL">%1$s</xliff:g> өчүрүлдү"</string> <string name="conference_call" msgid="3751093130790472426">"Конференц чалуу"</string> <string name="tooltip_popup_title" msgid="5253721848739260181">"Калкып чыгуучу кеңеш"</string> diff --git a/core/res/res/values-lo/strings.xml b/core/res/res/values-lo/strings.xml index 34ca6b166fc2..1653c06604aa 100644 --- a/core/res/res/values-lo/strings.xml +++ b/core/res/res/values-lo/strings.xml @@ -246,8 +246,8 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"ຊ່ວຍເຫຼືອທາງສຽງ"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"ລັອກດຽວນີ້"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <string name="notification_hidden_text" msgid="1135169301897151909">"ເນື້ອຫາຖືກເຊື່ອງໄວ້"</string> - <string name="notification_hidden_by_policy_text" msgid="9004631276932584600">"ເນື້ອຫາຖືກເຊື່ອງຕາມນະໂຍບາຍ"</string> + <!-- no translation found for notification_hidden_text (6351207030447943784) --> + <skip /> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"ແປ້ນພິມສະເໝືອນ"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"ແປ້ນພິມພາຍນອກ"</string> <string name="notification_channel_security" msgid="7345516133431326347">"ຄວາມປອດໄພ"</string> @@ -1730,14 +1730,8 @@ <string name="unpin_target" msgid="3556545602439143442">"ຖອນປັກໝຸດ"</string> <string name="app_info" msgid="6856026610594615344">"ຂໍ້ມູນແອັບ"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"ຣີເຊັດອຸປະກອນບໍ?"</string> - <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"ແຕະເພື່ອຣີເຊັດອຸປະກອນ"</string> <string name="demo_starting_message" msgid="5268556852031489931">"ກຳລັງເລີ່ມເດໂມ…"</string> <string name="demo_restarting_message" msgid="952118052531642451">"ກຳລັງຣີເຊັດອຸປະກອນ…"</string> - <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"ຣີເຊັດອຸປະກອນບໍ?"</string> - <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"ທ່ານຈະສູນເສຍການປ່ຽນແປງ ແລະ ເດໂມຈະເລີ່ມອີກຄັ້ງໃນອີກ <xliff:g id="TIMEOUT">%1$s</xliff:g> ວິນາທີ…"</string> - <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"ຍົກເລີກ"</string> - <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"ຣີເຊັດດຽວນີ້"</string> <string name="suspended_widget_accessibility" msgid="6712143096475264190">"ປິດການນຳໃຊ້ <xliff:g id="LABEL">%1$s</xliff:g> ແລ້ວ"</string> <string name="conference_call" msgid="3751093130790472426">"ການປະຊຸມສາຍ"</string> <string name="tooltip_popup_title" msgid="5253721848739260181">"ຄຳອະທິບາຍເຄື່ອງມື"</string> diff --git a/core/res/res/values-lt/strings.xml b/core/res/res/values-lt/strings.xml index 2209662a682c..47dc7afc1ca1 100644 --- a/core/res/res/values-lt/strings.xml +++ b/core/res/res/values-lt/strings.xml @@ -252,8 +252,8 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"Voice Assist"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"Užrakinti dabar"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <string name="notification_hidden_text" msgid="1135169301897151909">"Turinys paslėptas"</string> - <string name="notification_hidden_by_policy_text" msgid="9004631276932584600">"Turinys paslėptas vadovaujantis politika"</string> + <!-- no translation found for notification_hidden_text (6351207030447943784) --> + <skip /> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Virtualioji klaviatūra"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"Fizinė klaviatūra"</string> <string name="notification_channel_security" msgid="7345516133431326347">"Sauga"</string> @@ -1796,14 +1796,8 @@ <string name="unpin_target" msgid="3556545602439143442">"Atsegti"</string> <string name="app_info" msgid="6856026610594615344">"Programos informacija"</string> <string name="negative_duration" msgid="5688706061127375131">"–<xliff:g id="TIME">%1$s</xliff:g>"</string> - <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"Iš naujo nustatyti įrenginį?"</string> - <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"Palieskite, kad iš naujo nustatytumėte įrenginį"</string> <string name="demo_starting_message" msgid="5268556852031489931">"Paleidžiama demonstracinė versija…"</string> <string name="demo_restarting_message" msgid="952118052531642451">"Įrenginys nustatomas iš naujo…"</string> - <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"Iš naujo nustatyti įrenginį?"</string> - <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"Prarasite visus pakeitimus, o demonstracinė versija bus paleista iš naujo po <xliff:g id="TIMEOUT">%1$s</xliff:g> sek…"</string> - <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"Atšaukti"</string> - <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"Nustatyti iš naujo dabar"</string> <string name="suspended_widget_accessibility" msgid="6712143096475264190">"Išj. valdiklis „<xliff:g id="LABEL">%1$s</xliff:g>“"</string> <string name="conference_call" msgid="3751093130790472426">"Konferencinis skambutis"</string> <string name="tooltip_popup_title" msgid="5253721848739260181">"Patarimas"</string> diff --git a/core/res/res/values-lv/strings.xml b/core/res/res/values-lv/strings.xml index 6988854e17b9..32f2c85dc543 100644 --- a/core/res/res/values-lv/strings.xml +++ b/core/res/res/values-lv/strings.xml @@ -249,8 +249,8 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"Balss palīgs"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"Bloķēt tūlīt"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"Pārsniedz"</string> - <string name="notification_hidden_text" msgid="1135169301897151909">"Saturs paslēpts"</string> - <string name="notification_hidden_by_policy_text" msgid="9004631276932584600">"Saskaņā ar politiku saturs ir paslēpts."</string> + <!-- no translation found for notification_hidden_text (6351207030447943784) --> + <skip /> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Virtuālā tastatūra"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"Fiziskā tastatūra"</string> <string name="notification_channel_security" msgid="7345516133431326347">"Drošība"</string> @@ -1763,14 +1763,8 @@ <string name="unpin_target" msgid="3556545602439143442">"Atspraust"</string> <string name="app_info" msgid="6856026610594615344">"Lietotnes informācija"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"Vai atiestatīt ierīci?"</string> - <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"Pieskarieties, lai atiestatītu ierīci"</string> <string name="demo_starting_message" msgid="5268556852031489931">"Notiek demonstrācijas palaišana..."</string> <string name="demo_restarting_message" msgid="952118052531642451">"Notiek ierīces atiestatīšana..."</string> - <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"Vai atiestatīt ierīci?"</string> - <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"Pēc <xliff:g id="TIMEOUT">%1$s</xliff:g> sekundēm zaudēsiet visas izmaiņas un tiks atkārtoti palaista demonstrācija..."</string> - <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"Atcelt"</string> - <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"Atiestatīt tūlīt"</string> <string name="suspended_widget_accessibility" msgid="6712143096475264190">"<xliff:g id="LABEL">%1$s</xliff:g> atspējots"</string> <string name="conference_call" msgid="3751093130790472426">"Konferences zvans"</string> <string name="tooltip_popup_title" msgid="5253721848739260181">"Rīka padoms"</string> diff --git a/core/res/res/values-mk/strings.xml b/core/res/res/values-mk/strings.xml index 4b0844a34439..db3f88cd0d8b 100644 --- a/core/res/res/values-mk/strings.xml +++ b/core/res/res/values-mk/strings.xml @@ -246,8 +246,8 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"Гласовна помош"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"Заклучи сега"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <string name="notification_hidden_text" msgid="1135169301897151909">"Содржините се скриени"</string> - <string name="notification_hidden_by_policy_text" msgid="9004631276932584600">"Содржините се скриени поради политиката"</string> + <!-- no translation found for notification_hidden_text (6351207030447943784) --> + <skip /> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Виртуелна тастатура"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"Физичка тастатура"</string> <string name="notification_channel_security" msgid="7345516133431326347">"Безбедност"</string> @@ -1733,14 +1733,8 @@ <string name="unpin_target" msgid="3556545602439143442">"Откачете"</string> <string name="app_info" msgid="6856026610594615344">"Информации за апликација"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"Да се ресетира уредот?"</string> - <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"Допрете за да го ресетирате уредот"</string> <string name="demo_starting_message" msgid="5268556852031489931">"Се вклучува демонстрацијата…"</string> <string name="demo_restarting_message" msgid="952118052531642451">"Се ресетира уредот…"</string> - <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"Да се ресетира уредот?"</string> - <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"Ќе ги изгубите измените и демонстрацијата ќе започне повторно по <xliff:g id="TIMEOUT">%1$s</xliff:g> секунди…"</string> - <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"Откажи"</string> - <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"Ресетирај сега"</string> <string name="suspended_widget_accessibility" msgid="6712143096475264190">"Оневозможен <xliff:g id="LABEL">%1$s</xliff:g>"</string> <string name="conference_call" msgid="3751093130790472426">"Конференциски повик"</string> <string name="tooltip_popup_title" msgid="5253721848739260181">"Совет за алатка"</string> diff --git a/core/res/res/values-ml/strings.xml b/core/res/res/values-ml/strings.xml index a0aa2ece2e00..7b5f54dfb4ad 100644 --- a/core/res/res/values-ml/strings.xml +++ b/core/res/res/values-ml/strings.xml @@ -246,8 +246,8 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"വോയ്സ് സഹായം"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"ഇപ്പോൾ ലോക്കുചെയ്യുക"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <string name="notification_hidden_text" msgid="1135169301897151909">"കോൺടാക്റ്റുകൾ മറച്ചു"</string> - <string name="notification_hidden_by_policy_text" msgid="9004631276932584600">"നയം അനുസരിച്ച് ഉള്ളടക്കം മറച്ചിരിക്കുന്നു"</string> + <!-- no translation found for notification_hidden_text (6351207030447943784) --> + <skip /> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"വെർച്വൽ കീബോർഡ്"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"കീബോർഡ്"</string> <string name="notification_channel_security" msgid="7345516133431326347">"സുരക്ഷ"</string> @@ -1731,14 +1731,8 @@ <string name="unpin_target" msgid="3556545602439143442">"അൺപിൻ ചെയ്യുക"</string> <string name="app_info" msgid="6856026610594615344">"ആപ്പ് വിവരം"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"ഉപകരണം പുനക്രമീകരിക്കണോ?"</string> - <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"ഉപകരണം പുനക്രമീകരിക്കാൻ ടാപ്പുചെയ്യുക"</string> <string name="demo_starting_message" msgid="5268556852031489931">"ഡെമോ ആരംഭിക്കുന്നു…"</string> <string name="demo_restarting_message" msgid="952118052531642451">"ഉപകരണം പുനക്രമീകരിക്കുന്നു…"</string> - <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"ഉപകരണം പുനക്രമീകരിക്കണോ?"</string> - <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"മാറ്റങ്ങളെല്ലാം നിങ്ങൾക്ക് നഷ്ടപ്പെടും, <xliff:g id="TIMEOUT">%1$s</xliff:g> സെക്കൻഡിൽ ഡെമോ വീണ്ടും തുടങ്ങും…"</string> - <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"റദ്ദാക്കുക"</string> - <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"ഇപ്പോൾ പുനക്രമീകരിക്കുക"</string> <string name="suspended_widget_accessibility" msgid="6712143096475264190">"<xliff:g id="LABEL">%1$s</xliff:g> പ്രവർത്തനരഹിതമാക്കി"</string> <string name="conference_call" msgid="3751093130790472426">"കോൺഫറൻസ് കോൾ"</string> <string name="tooltip_popup_title" msgid="5253721848739260181">"ടൂൾ ടിപ്പ്"</string> diff --git a/core/res/res/values-mn/strings.xml b/core/res/res/values-mn/strings.xml index 3031c05708a7..61e4039418d0 100644 --- a/core/res/res/values-mn/strings.xml +++ b/core/res/res/values-mn/strings.xml @@ -246,8 +246,8 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"Дуут туслах"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"Одоо түгжих"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <string name="notification_hidden_text" msgid="1135169301897151909">"Контентыг нуусан"</string> - <string name="notification_hidden_by_policy_text" msgid="9004631276932584600">"Удирдамжийн дагуу нуусан агуулга"</string> + <!-- no translation found for notification_hidden_text (6351207030447943784) --> + <skip /> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Виртуал гар"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"Бодит гар"</string> <string name="notification_channel_security" msgid="7345516133431326347">"Аюулгүй байдал"</string> @@ -1728,14 +1728,8 @@ <string name="unpin_target" msgid="3556545602439143442">"Unpin"</string> <string name="app_info" msgid="6856026610594615344">"Апп-н мэдээлэл"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"Төхөөрөмжийг шинэчлэх үү?"</string> - <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"Төхөөрөмжийг шинэчлэхийн тулд товшино уу"</string> <string name="demo_starting_message" msgid="5268556852031489931">"Жишээг эхлүүлж байна…"</string> <string name="demo_restarting_message" msgid="952118052531642451">"Төхөөрөмжийг шинэчилж байна…"</string> - <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"Төхөөрөмжийг шинэчлэх үү?"</string> - <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"Таны хийсэн өөрчлөлтийг хадгалахгүй бөгөөд жишээ <xliff:g id="TIMEOUT">%1$s</xliff:g> секундын дотор дахин эхлэх болно..."</string> - <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"Цуцлах"</string> - <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"Одоо шинэчлэх"</string> <string name="suspended_widget_accessibility" msgid="6712143096475264190">"<xliff:g id="LABEL">%1$s</xliff:g>-г цуцалсан"</string> <string name="conference_call" msgid="3751093130790472426">"Хурлын дуудлага"</string> <string name="tooltip_popup_title" msgid="5253721848739260181">"Зөвлөмж"</string> diff --git a/core/res/res/values-mr/strings.xml b/core/res/res/values-mr/strings.xml index 5f6631e66f84..9bfa6d8e4317 100644 --- a/core/res/res/values-mr/strings.xml +++ b/core/res/res/values-mr/strings.xml @@ -203,7 +203,7 @@ <string name="silent_mode_vibrate" msgid="7072043388581551395">"रिंगर कंपन"</string> <string name="silent_mode_ring" msgid="8592241816194074353">"रिंगर चालू"</string> <string name="reboot_to_update_title" msgid="6212636802536823850">"Android सिस्टीम अद्यतन"</string> - <string name="reboot_to_update_prepare" msgid="6305853831955310890">"अद्यतनित करण्यासाठी तयार करीत आहे…"</string> + <string name="reboot_to_update_prepare" msgid="6305853831955310890">"अपडेट करण्याची तयारी करत आहे…"</string> <string name="reboot_to_update_package" msgid="3871302324500927291">"अद्यतन पॅकेजची प्रक्रिया करीत आहे…"</string> <string name="reboot_to_update_reboot" msgid="6428441000951565185">"रीस्टार्ट करीत आहे..."</string> <string name="reboot_to_reset_title" msgid="4142355915340627490">"फॅक्टरी डेटा रीसेट"</string> @@ -246,8 +246,8 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"व्हॉइस सहाय्य"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"आता लॉक करा"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <string name="notification_hidden_text" msgid="1135169301897151909">"लपविलेली सामग्री"</string> - <string name="notification_hidden_by_policy_text" msgid="9004631276932584600">"धोरणाद्वारे सामग्री लपविली"</string> + <!-- no translation found for notification_hidden_text (6351207030447943784) --> + <skip /> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"व्हर्च्युअल कीबोर्ड"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"वास्तविक कीबोर्ड"</string> <string name="notification_channel_security" msgid="7345516133431326347">"सुरक्षितता"</string> @@ -1731,14 +1731,8 @@ <string name="unpin_target" msgid="3556545602439143442">"अनपिन करा"</string> <string name="app_info" msgid="6856026610594615344">"अॅप माहिती"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"डिव्हाइस रीसेट करायचे?"</string> - <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"डिव्हाइस रीसेट करण्यासाठी टॅप करा"</string> <string name="demo_starting_message" msgid="5268556852031489931">"डेमो प्रारंभ करत आहे..."</string> <string name="demo_restarting_message" msgid="952118052531642451">"डिव्हाइस रीसेट करत आहे..."</string> - <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"डिव्हाइस रीसेट करायचे?"</string> - <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"आपण कोणतेही बदल गमवाल आणि डेमो पुन्हा <xliff:g id="TIMEOUT">%1$s</xliff:g> सेकंदांमध्ये प्रारंभ होईल..."</string> - <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"रद्द करा"</string> - <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"आता रीसेट करा"</string> <string name="suspended_widget_accessibility" msgid="6712143096475264190">"<xliff:g id="LABEL">%1$s</xliff:g> अक्षम केले"</string> <string name="conference_call" msgid="3751093130790472426">"परिषद कॉल"</string> <string name="tooltip_popup_title" msgid="5253721848739260181">"टूलटिप"</string> diff --git a/core/res/res/values-ms/strings.xml b/core/res/res/values-ms/strings.xml index 09fdac2f2e63..6fc478613cd7 100644 --- a/core/res/res/values-ms/strings.xml +++ b/core/res/res/values-ms/strings.xml @@ -246,8 +246,8 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"Bantuan Suara"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"Kunci sekarang"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <string name="notification_hidden_text" msgid="1135169301897151909">"Kandungan tersembunyi"</string> - <string name="notification_hidden_by_policy_text" msgid="9004631276932584600">"Kandungan disembunyikan oleh dasar"</string> + <!-- no translation found for notification_hidden_text (6351207030447943784) --> + <skip /> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Papan kekunci maya"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"Papan kekunci fizikal"</string> <string name="notification_channel_security" msgid="7345516133431326347">"Keselamatan"</string> @@ -1730,14 +1730,8 @@ <string name="unpin_target" msgid="3556545602439143442">"Nyahsemat"</string> <string name="app_info" msgid="6856026610594615344">"Maklumat apl"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"Tetapkan semula peranti?"</string> - <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"Ketik untuk menetapkan semula peranti"</string> <string name="demo_starting_message" msgid="5268556852031489931">"Memulakan tunjuk cara…"</string> <string name="demo_restarting_message" msgid="952118052531642451">"Menetapkan semula peranti…"</string> - <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"Tetapkan semula peranti?"</string> - <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"Anda akan kehilangan sebarang perubahan yang dibuat dan tunjuk cara akan dimulakan sekali lagi dalam masa <xliff:g id="TIMEOUT">%1$s</xliff:g> saat…"</string> - <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"Batal"</string> - <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"Tetapkan semula sekarang"</string> <string name="suspended_widget_accessibility" msgid="6712143096475264190">"<xliff:g id="LABEL">%1$s</xliff:g> dilumpuhkan"</string> <string name="conference_call" msgid="3751093130790472426">"Panggilan Sidang"</string> <string name="tooltip_popup_title" msgid="5253721848739260181">"Keterangan item"</string> diff --git a/core/res/res/values-my/strings.xml b/core/res/res/values-my/strings.xml index 68982ee57261..aa1d6ec4f173 100644 --- a/core/res/res/values-my/strings.xml +++ b/core/res/res/values-my/strings.xml @@ -246,8 +246,8 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"အသံ အကူအညီ"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"ယခု သော့ပိတ်ရန်"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"၉၉၉+"</string> - <string name="notification_hidden_text" msgid="1135169301897151909">"အကြောင်းအရာများ ဝှက်ထား"</string> - <string name="notification_hidden_by_policy_text" msgid="9004631276932584600">"မူဝါဒမှ အကြောင်းအရာများကို ဝှက်ထားသည်"</string> + <!-- no translation found for notification_hidden_text (6351207030447943784) --> + <skip /> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"ပကတိအသွင်ကီးဘုတ်"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"ကီးဘုတ် ခလုတ်ခုံ"</string> <string name="notification_channel_security" msgid="7345516133431326347">"လုံခြုံရေး"</string> @@ -1731,14 +1731,8 @@ <string name="unpin_target" msgid="3556545602439143442">"ဖြုတ်ပါ"</string> <string name="app_info" msgid="6856026610594615344">"အက်ပ်အချက်အလက်"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"စက်ပစ္စည်းကို ပြန်လည်သတ်မှတ်မလား။"</string> - <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"စက်ပစ္စည်းကို ပြန်လည်သတ်မှတ်ရန် တို့ပါ"</string> <string name="demo_starting_message" msgid="5268556852031489931">"သရုပ်ပြချက်ကို စတင်နေသည်…"</string> <string name="demo_restarting_message" msgid="952118052531642451">"စက်ပစ္စည်းကို ပြန်လည်သတ်မှတ်နေသည်…"</string> - <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"စက်ပစ္စည်းကို ပြန်လည်သတ်မှတ်မလား။"</string> - <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"ပြောင်းလဲမှုများကို ဆုံးရှုံးသွားမည်ဖြစ်ပြီး သရုပ်ပြချက်သည် <xliff:g id="TIMEOUT">%1$s</xliff:g> စက္ကန့်အတွင်း ပြန်လည်စတင်ပါမည်…"</string> - <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"မလုပ်တော့"</string> - <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"ယခုပြန်လည်သတ်မှတ်ပါ"</string> <string name="suspended_widget_accessibility" msgid="6712143096475264190">"ပိတ်ထားသည့် <xliff:g id="LABEL">%1$s</xliff:g>"</string> <string name="conference_call" msgid="3751093130790472426">"လူအမြောက်အမြားတပြိုင်နက် ခေါ်ဆိုမှု"</string> <string name="tooltip_popup_title" msgid="5253721848739260181">"အကြံပြုချက်ပြ ပေါ့အပ် ဝင်းဒိုး"</string> diff --git a/core/res/res/values-nb/strings.xml b/core/res/res/values-nb/strings.xml index fc6e2650eca9..b5272b20ca3c 100644 --- a/core/res/res/values-nb/strings.xml +++ b/core/res/res/values-nb/strings.xml @@ -246,8 +246,8 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"Talehjelp"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"Lås nå"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <string name="notification_hidden_text" msgid="1135169301897151909">"Innholdet er skjult"</string> - <string name="notification_hidden_by_policy_text" msgid="9004631276932584600">"Innholdet er skjult i henhold til retningslinjene"</string> + <!-- no translation found for notification_hidden_text (6351207030447943784) --> + <skip /> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Virtuelt tastatur"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"Fysisk tastatur"</string> <string name="notification_channel_security" msgid="7345516133431326347">"Sikkerhet"</string> @@ -1730,14 +1730,8 @@ <string name="unpin_target" msgid="3556545602439143442">"Løsne"</string> <string name="app_info" msgid="6856026610594615344">"Info om appen"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"Tilbakestille enheten?"</string> - <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"Trykk for å tilbakestille enheten"</string> <string name="demo_starting_message" msgid="5268556852031489931">"Starter demo …"</string> <string name="demo_restarting_message" msgid="952118052531642451">"Tilbakestiller enheten …"</string> - <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"Tilbakestille enheten?"</string> - <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"Du mister eventuelle endringer, og demoen starter på nytt om <xliff:g id="TIMEOUT">%1$s</xliff:g> sekunder."</string> - <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"Avbryt"</string> - <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"Tilbakestill nå"</string> <string name="suspended_widget_accessibility" msgid="6712143096475264190">"<xliff:g id="LABEL">%1$s</xliff:g> er slått av"</string> <string name="conference_call" msgid="3751093130790472426">"Konferansesamtale"</string> <string name="tooltip_popup_title" msgid="5253721848739260181">"Verktøytips"</string> diff --git a/core/res/res/values-ne/strings.xml b/core/res/res/values-ne/strings.xml index 820116f58246..cf5cb10bc523 100644 --- a/core/res/res/values-ne/strings.xml +++ b/core/res/res/values-ne/strings.xml @@ -246,8 +246,8 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"आवाज सहायता"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"अब बन्द गर्नुहोस्"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"९९९+"</string> - <string name="notification_hidden_text" msgid="1135169301897151909">"लुकेका सामाग्रीहरू"</string> - <string name="notification_hidden_by_policy_text" msgid="9004631276932584600">"नीतिद्वारा लुकाइएका सामग्री"</string> + <!-- no translation found for notification_hidden_text (6351207030447943784) --> + <skip /> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"भर्चुअल किबोर्ड"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"वास्तविक किबोर्ड"</string> <string name="notification_channel_security" msgid="7345516133431326347">"सुरक्षा"</string> @@ -1736,14 +1736,8 @@ <string name="unpin_target" msgid="3556545602439143442">"अनपिन गर्नुहोस्"</string> <string name="app_info" msgid="6856026610594615344">"अनुप्रयोगका बारे जानकारी"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"यन्त्रलाई रिसेट गर्ने हो?"</string> - <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"यन्त्रलाई रिसेट गर्न ट्याप गर्नुहोस्"</string> <string name="demo_starting_message" msgid="5268556852031489931">"डेमो सुरु गर्दै…"</string> <string name="demo_restarting_message" msgid="952118052531642451">"यन्त्रलाई रिसेट गर्दै…"</string> - <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"यन्त्रलाई रिसेट गर्ने हो?"</string> - <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"तपाईं सबै परिवर्तनहरू गुमाउनु हुनेछ र <xliff:g id="TIMEOUT">%1$s</xliff:g> सेकेन्डमा डेमो फेरि सुरु हुनेछ…"</string> - <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"रद्द गर्नुहोस्"</string> - <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"अहिले रिसेट गर्नुहोस्"</string> <string name="suspended_widget_accessibility" msgid="6712143096475264190">"<xliff:g id="LABEL">%1$s</xliff:g> लाई असक्षम गरियो"</string> <string name="conference_call" msgid="3751093130790472426">"सम्मेलन कल"</string> <string name="tooltip_popup_title" msgid="5253721848739260181">"उपकरणको वर्णन"</string> diff --git a/core/res/res/values-nl/strings.xml b/core/res/res/values-nl/strings.xml index 50dd41dcb9bf..53c3303dac6b 100644 --- a/core/res/res/values-nl/strings.xml +++ b/core/res/res/values-nl/strings.xml @@ -246,8 +246,8 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"Spraakassistent"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"Nu vergrendelen"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999 +"</string> - <string name="notification_hidden_text" msgid="1135169301897151909">"Content verborgen"</string> - <string name="notification_hidden_by_policy_text" msgid="9004631276932584600">"Content verborgen op basis van beleid"</string> + <!-- no translation found for notification_hidden_text (6351207030447943784) --> + <skip /> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Virtueel toetsenbord"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"Fysiek toetsenbord"</string> <string name="notification_channel_security" msgid="7345516133431326347">"Beveiliging"</string> @@ -1730,14 +1730,8 @@ <string name="unpin_target" msgid="3556545602439143442">"Losmaken"</string> <string name="app_info" msgid="6856026610594615344">"App-info"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"Apparaat resetten?"</string> - <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"Tik om apparaat te resetten"</string> <string name="demo_starting_message" msgid="5268556852031489931">"Demo starten…"</string> <string name="demo_restarting_message" msgid="952118052531642451">"Apparaat resetten…"</string> - <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"Apparaat resetten?"</string> - <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"Je wijzigingen gaan verloren. De demo wordt opnieuw gestart over <xliff:g id="TIMEOUT">%1$s</xliff:g> seconden…"</string> - <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"Annuleren"</string> - <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"Nu resetten"</string> <string name="suspended_widget_accessibility" msgid="6712143096475264190">"<xliff:g id="LABEL">%1$s</xliff:g> uitgeschakeld"</string> <string name="conference_call" msgid="3751093130790472426">"Telefonische vergadering"</string> <string name="tooltip_popup_title" msgid="5253721848739260181">"Knopinfo"</string> diff --git a/core/res/res/values-pa/strings.xml b/core/res/res/values-pa/strings.xml index 4b02fa44a10e..403955f83bb2 100644 --- a/core/res/res/values-pa/strings.xml +++ b/core/res/res/values-pa/strings.xml @@ -246,8 +246,8 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"ਵੌਇਸ ਅਸਿਸਟ"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"ਹੁਣ ਲੌਕ ਕਰੋ"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <string name="notification_hidden_text" msgid="1135169301897151909">"ਸਮੱਗਰੀਆਂ ਲੁਕਾਈਆਂ ਗਈਆਂ"</string> - <string name="notification_hidden_by_policy_text" msgid="9004631276932584600">"ਨੀਤੀ ਦੁਆਰਾ ਸਮੱਗਰੀ ਲੁਕਾਈ ਗਈ"</string> + <!-- no translation found for notification_hidden_text (6351207030447943784) --> + <skip /> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"ਆਭਾਸੀ ਕੀ-ਬੋਰਡ"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"ਭੌਤਿਕ ਕੀ-ਬੋਰਡ"</string> <string name="notification_channel_security" msgid="7345516133431326347">"ਸੁਰੱਖਿਆ"</string> @@ -1731,14 +1731,8 @@ <string name="unpin_target" msgid="3556545602439143442">"ਅਨਪਿੰਨ ਕਰੋ"</string> <string name="app_info" msgid="6856026610594615344">"ਐਪ ਜਾਣਕਾਰੀ"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"ਕੀ ਡੀਵਾਈਸ ਮੁੜ-ਸੈੱਟ ਕਰਨੀ ਹੈ?"</string> - <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"ਡੀਵਾਈਸ ਮੁੜ-ਸੈੱਟ ਕਰਨ ਲਈ ਟੈਪ ਕਰੋ"</string> <string name="demo_starting_message" msgid="5268556852031489931">"ਡੈਮੋ ਚਾਲੂ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ…"</string> <string name="demo_restarting_message" msgid="952118052531642451">"ਡੀਵਾਈਸ ਮੁੜ-ਸੈੱਟ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ…"</string> - <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"ਕੀ ਡੀਵਾਈਸ ਮੁੜ-ਸੈੱਟ ਕਰਨੀ ਹੈ?"</string> - <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"ਤੁਸੀਂ ਕਿਸੇ ਵੀ ਤਬਦੀਲੀਆਂ ਨੂੰ ਗੁਆ ਬੈਠੋਂਗੇ ਅਤੇ ਡੈਮੋ <xliff:g id="TIMEOUT">%1$s</xliff:g> ਸਕਿੰਟਾਂ ਵਿੱਚ ਦੁਬਾਰਾ ਚਾਲੂ ਕੀਤਾ ਜਾਵੇਗਾ…"</string> - <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"ਰੱਦ ਕਰੋ"</string> - <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"ਹੁਣੇ ਮੁੜ-ਸੈੱਟ ਕਰੋ"</string> <string name="suspended_widget_accessibility" msgid="6712143096475264190">"ਅਯੋਗ ਬਣਾਇਆ ਗਿਆ <xliff:g id="LABEL">%1$s</xliff:g>"</string> <string name="conference_call" msgid="3751093130790472426">"ਕਾਨਫਰੰਸ ਕਾਲ"</string> <string name="tooltip_popup_title" msgid="5253721848739260181">"ਟੂਲਟਿਪ"</string> diff --git a/core/res/res/values-pl/strings.xml b/core/res/res/values-pl/strings.xml index 450a293fa561..c22f89955566 100644 --- a/core/res/res/values-pl/strings.xml +++ b/core/res/res/values-pl/strings.xml @@ -252,8 +252,8 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"Asystent głosowy"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"Zablokuj teraz"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">">999"</string> - <string name="notification_hidden_text" msgid="1135169301897151909">"Treści ukryte"</string> - <string name="notification_hidden_by_policy_text" msgid="9004631276932584600">"Treść ukryta z powodu zasad"</string> + <!-- no translation found for notification_hidden_text (6351207030447943784) --> + <skip /> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Klawiatura wirtualna"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"Klawiatura fizyczna"</string> <string name="notification_channel_security" msgid="7345516133431326347">"Bezpieczeństwo"</string> @@ -1796,14 +1796,8 @@ <string name="unpin_target" msgid="3556545602439143442">"Odepnij"</string> <string name="app_info" msgid="6856026610594615344">"O aplikacji"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"Zresetować urządzenie?"</string> - <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"Kliknij, by zresetować urządzenie"</string> <string name="demo_starting_message" msgid="5268556852031489931">"Uruchamiam tryb demo…"</string> <string name="demo_restarting_message" msgid="952118052531642451">"Resetuję urządzenie…"</string> - <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"Zresetować urządzenie?"</string> - <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"Stracisz wszystkie wprowadzone zmiany, a tryb demo uruchomi się ponownie za <xliff:g id="TIMEOUT">%1$s</xliff:g> s…"</string> - <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"Anuluj"</string> - <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"Resetuj teraz"</string> <string name="suspended_widget_accessibility" msgid="6712143096475264190">"Wyłączono: <xliff:g id="LABEL">%1$s</xliff:g>"</string> <string name="conference_call" msgid="3751093130790472426">"Połączenie konferencyjne"</string> <string name="tooltip_popup_title" msgid="5253721848739260181">"Etykietka"</string> diff --git a/core/res/res/values-pt-rBR/strings.xml b/core/res/res/values-pt-rBR/strings.xml index 0ff329c91414..2dd62d3945d2 100644 --- a/core/res/res/values-pt-rBR/strings.xml +++ b/core/res/res/values-pt-rBR/strings.xml @@ -246,8 +246,8 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"Ajuda de voz"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"Bloquear agora"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">">999"</string> - <string name="notification_hidden_text" msgid="1135169301897151909">"Conteúdo oculto"</string> - <string name="notification_hidden_by_policy_text" msgid="9004631276932584600">"Conteúdo ocultado pela política"</string> + <!-- no translation found for notification_hidden_text (6351207030447943784) --> + <skip /> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Teclado virtual"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"Teclado físico"</string> <string name="notification_channel_security" msgid="7345516133431326347">"Segurança"</string> @@ -1730,14 +1730,8 @@ <string name="unpin_target" msgid="3556545602439143442">"Liberar guia"</string> <string name="app_info" msgid="6856026610594615344">"Informações do app"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"Redefinir dispositivo?"</string> - <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"Toque para redefinir o dispositivo"</string> <string name="demo_starting_message" msgid="5268556852031489931">"Iniciando demonstração…"</string> <string name="demo_restarting_message" msgid="952118052531642451">"Redefinindo dispositivo…"</string> - <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"Redefinir dispositivo?"</string> - <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"Você perderá todas as alterações. A demonstração será iniciada novamente em <xliff:g id="TIMEOUT">%1$s</xliff:g> segundos…"</string> - <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"Cancelar"</string> - <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"Reiniciar agora"</string> <string name="suspended_widget_accessibility" msgid="6712143096475264190">"Widget <xliff:g id="LABEL">%1$s</xliff:g> desativado"</string> <string name="conference_call" msgid="3751093130790472426">"Teleconferência"</string> <string name="tooltip_popup_title" msgid="5253721848739260181">"Dica"</string> diff --git a/core/res/res/values-pt-rPT/strings.xml b/core/res/res/values-pt-rPT/strings.xml index d8ecd1e5a8b1..706099dad42e 100644 --- a/core/res/res/values-pt-rPT/strings.xml +++ b/core/res/res/values-pt-rPT/strings.xml @@ -63,7 +63,7 @@ <string name="needPuk2" msgid="4526033371987193070">"Introduza o PUK2 para desbloquear o cartão SIM."</string> <string name="enablePin" msgid="209412020907207950">"Ação sem êxito. Ative o bloqueio do SIM/RUIM."</string> <plurals name="pinpuk_attempts" formatted="false" msgid="1251012001539225582"> - <item quantity="one">Tem mais <xliff:g id="NUMBER_1">%d</xliff:g> tentativas antes de o cartão SIM ficar bloqueado.</item> + <item quantity="one">Tem mais <xliff:g id="NUMBER_1">%d</xliff:g> tentativa antes de o cartão SIM ficar bloqueado.</item> <item quantity="other">Tem mais <xliff:g id="NUMBER_1">%d</xliff:g> tentativas antes de o cartão SIM ficar bloqueado.</item> </plurals> <string name="imei" msgid="2625429890869005782">"IMEI"</string> @@ -176,7 +176,7 @@ <string name="low_memory" product="tv" msgid="516619861191025923">"O armazenamento da TV está cheio. Elimine alguns ficheiros para libertar espaço."</string> <string name="low_memory" product="default" msgid="3475999286680000541">"O armazenamento do telemóvel está cheio. Elimine alguns ficheiros para libertar espaço."</string> <plurals name="ssl_ca_cert_warning" formatted="false" msgid="5106721205300213569"> - <item quantity="one">Autoridades de certificação instaladas</item> + <item quantity="one">Autoridade de certificação instalada</item> <item quantity="other">Autoridades de certificação instaladas</item> </plurals> <string name="ssl_ca_cert_noti_by_unknown" msgid="4475437862189850602">"Por um terceiro desconhecido"</string> @@ -232,7 +232,7 @@ <string name="bugreport_option_full_title" msgid="6354382025840076439">"Relatório completo"</string> <string name="bugreport_option_full_summary" msgid="7210859858969115745">"Utilize esta opção para uma interferência mínima do sistema quando o dispositivo não responder ou estiver demasiado lento, ou quando precisar de todas as secções de relatório. Não permite introduzir mais detalhes ou tirar capturas de ecrã adicionais."</string> <plurals name="bugreport_countdown" formatted="false" msgid="6878900193900090368"> - <item quantity="one">A tirar uma captura de ecrã do relatório de erro dentro de <xliff:g id="NUMBER_1">%d</xliff:g> segundos…</item> + <item quantity="one">A tirar uma captura de ecrã do relatório de erro dentro de <xliff:g id="NUMBER_1">%d</xliff:g> segundo…</item> <item quantity="other">A tirar uma captura de ecrã do relatório de erro dentro de <xliff:g id="NUMBER_1">%d</xliff:g> segundos.</item> </plurals> <string name="global_action_toggle_silent_mode" msgid="8219525344246810925">"Modo silencioso"</string> @@ -246,8 +246,8 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"Assist. de voz"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"Bloquear agora"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <string name="notification_hidden_text" msgid="1135169301897151909">"Conteúdo oculto"</string> - <string name="notification_hidden_by_policy_text" msgid="9004631276932584600">"Conteúdo ocultado pela política"</string> + <!-- no translation found for notification_hidden_text (6351207030447943784) --> + <skip /> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Teclado virtual"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"Teclado físico"</string> <string name="notification_channel_security" msgid="7345516133431326347">"Segurança"</string> @@ -868,7 +868,7 @@ <string name="oneMonthDurationPast" msgid="7396384508953779925">"Há 1 mês"</string> <string name="beforeOneMonthDurationPast" msgid="909134546836499826">"Há mais de 1 mês"</string> <plurals name="last_num_days" formatted="false" msgid="5104533550723932025"> - <item quantity="one">Últimos <xliff:g id="COUNT_1">%d</xliff:g> dias</item> + <item quantity="one">Últimos <xliff:g id="COUNT_1">%d</xliff:g> dia</item> <item quantity="other">Últimos <xliff:g id="COUNT_1">%d</xliff:g> dias</item> </plurals> <string name="last_month" msgid="3959346739979055432">"Último mês"</string> @@ -922,35 +922,35 @@ <item quantity="other">dentro de <xliff:g id="COUNT_1">%d</xliff:g> a</item> </plurals> <plurals name="duration_minutes_relative" formatted="false" msgid="3178131706192980192"> - <item quantity="one">há <xliff:g id="COUNT_1">%d</xliff:g> minutos</item> + <item quantity="one">há <xliff:g id="COUNT_1">%d</xliff:g> minuto</item> <item quantity="other">há <xliff:g id="COUNT_1">%d</xliff:g> minutos</item> </plurals> <plurals name="duration_hours_relative" formatted="false" msgid="676894109982008411"> - <item quantity="one">há <xliff:g id="COUNT_1">%d</xliff:g> horas</item> + <item quantity="one">há <xliff:g id="COUNT_1">%d</xliff:g> hora</item> <item quantity="other">há <xliff:g id="COUNT_1">%d</xliff:g> horas</item> </plurals> <plurals name="duration_days_relative" formatted="false" msgid="2203515825765397130"> - <item quantity="one">há <xliff:g id="COUNT_1">%d</xliff:g> dias</item> + <item quantity="one">há <xliff:g id="COUNT_1">%d</xliff:g> dia</item> <item quantity="other">há <xliff:g id="COUNT_1">%d</xliff:g> dias</item> </plurals> <plurals name="duration_years_relative" formatted="false" msgid="4820062134188885734"> - <item quantity="one">há <xliff:g id="COUNT_1">%d</xliff:g> anos</item> + <item quantity="one">há <xliff:g id="COUNT_1">%d</xliff:g> ano</item> <item quantity="other">há <xliff:g id="COUNT_1">%d</xliff:g> anos</item> </plurals> <plurals name="duration_minutes_relative_future" formatted="false" msgid="4655043589817680966"> - <item quantity="one">dentro de <xliff:g id="COUNT_1">%d</xliff:g> minutos</item> + <item quantity="one">dentro de <xliff:g id="COUNT_1">%d</xliff:g> minuto</item> <item quantity="other">dentro de <xliff:g id="COUNT_1">%d</xliff:g> minutos</item> </plurals> <plurals name="duration_hours_relative_future" formatted="false" msgid="8084579714205223891"> - <item quantity="one">dentro de <xliff:g id="COUNT_1">%d</xliff:g> horas</item> + <item quantity="one">dentro de <xliff:g id="COUNT_1">%d</xliff:g> hora</item> <item quantity="other">dentro de <xliff:g id="COUNT_1">%d</xliff:g> horas</item> </plurals> <plurals name="duration_days_relative_future" formatted="false" msgid="333215369363433992"> - <item quantity="one">dentro de <xliff:g id="COUNT_1">%d</xliff:g> dias</item> + <item quantity="one">dentro de <xliff:g id="COUNT_1">%d</xliff:g> dia</item> <item quantity="other">dentro de <xliff:g id="COUNT_1">%d</xliff:g> dias</item> </plurals> <plurals name="duration_years_relative_future" formatted="false" msgid="8644862986413104011"> - <item quantity="one">dentro de <xliff:g id="COUNT_1">%d</xliff:g> anos</item> + <item quantity="one">dentro de <xliff:g id="COUNT_1">%d</xliff:g> ano</item> <item quantity="other">dentro de <xliff:g id="COUNT_1">%d</xliff:g> anos</item> </plurals> <string name="VideoView_error_title" msgid="3534509135438353077">"Problema com o vídeo"</string> @@ -1099,11 +1099,11 @@ <string name="ringtone_picker_title_notification" msgid="4837740874822788802">"Sons de notificação"</string> <string name="ringtone_unknown" msgid="3914515995813061520">"Desconhecido"</string> <plurals name="wifi_available" formatted="false" msgid="7900333017752027322"> - <item quantity="one">Redes Wi-Fi disponíveis</item> + <item quantity="one">Rede Wi-Fi disponível</item> <item quantity="other">Redes Wi-Fi disponíveis</item> </plurals> <plurals name="wifi_available_detailed" formatted="false" msgid="1140699367193975606"> - <item quantity="one">Redes Wi-Fi abertas disponíveis</item> + <item quantity="one">Rede Wi-Fi aberta disponível</item> <item quantity="other">Redes Wi-Fi abertas disponíveis</item> </plurals> <string name="wifi_available_title" msgid="3817100557900599505">"Ligar à rede Wi-Fi aberta"</string> @@ -1602,7 +1602,7 @@ <string name="restr_pin_error_doesnt_match" msgid="2224214190906994548">"Os PINs não correspondem. Tente novamente."</string> <string name="restr_pin_error_too_short" msgid="8173982756265777792">"O PIN é demasiado pequeno. Deve ter, no mínimo, 4 dígitos."</string> <plurals name="restr_pin_countdown" formatted="false" msgid="9061246974881224688"> - <item quantity="one">Tente novamente dentro de <xliff:g id="COUNT">%d</xliff:g> segundos</item> + <item quantity="one">Tente novamente dentro de <xliff:g id="COUNT">%d</xliff:g> segundo</item> <item quantity="other">Tente novamente dentro de <xliff:g id="COUNT">%d</xliff:g> segundos</item> </plurals> <string name="restr_pin_try_later" msgid="973144472490532377">"Tente novamente mais tarde"</string> @@ -1635,7 +1635,7 @@ <string name="data_saver_enable_title" msgid="4674073932722787417">"Ativar a Poupança de dados?"</string> <string name="data_saver_enable_button" msgid="7147735965247211818">"Ativar"</string> <plurals name="zen_mode_duration_minutes_summary" formatted="false" msgid="4367877408072000848"> - <item quantity="one">Durante %1$d minutos (até à(s) <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item> + <item quantity="one">Durante %1$d minuto (até à(s) <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item> <item quantity="other">Durante %1$d minutos (até à(s) <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item> </plurals> <plurals name="zen_mode_duration_minutes_summary_short" formatted="false" msgid="6830154222366042597"> @@ -1643,7 +1643,7 @@ <item quantity="other">Durante %1$d min (até à(s) <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item> </plurals> <plurals name="zen_mode_duration_hours_summary" formatted="false" msgid="8152974162096743862"> - <item quantity="one">Durante %1$d horas (até à(s) <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item> + <item quantity="one">Durante %1$d hora (até à(s) <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item> <item quantity="other">Durante %1$d horas (até à(s) <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item> </plurals> <plurals name="zen_mode_duration_hours_summary_short" formatted="false" msgid="4787552595253082371"> @@ -1651,7 +1651,7 @@ <item quantity="other">Durante %1$d h (até à(s) <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item> </plurals> <plurals name="zen_mode_duration_minutes" formatted="false" msgid="5127407202506485571"> - <item quantity="one">Durante %d minutos</item> + <item quantity="one">Durante %d minuto</item> <item quantity="other">Durante %d minutos</item> </plurals> <plurals name="zen_mode_duration_minutes_short" formatted="false" msgid="2199350154433426128"> @@ -1659,7 +1659,7 @@ <item quantity="other">Durante %d min</item> </plurals> <plurals name="zen_mode_duration_hours" formatted="false" msgid="3938821308277433854"> - <item quantity="one">Durante %d horas</item> + <item quantity="one">Durante %d hora</item> <item quantity="other">Durante %d horas</item> </plurals> <plurals name="zen_mode_duration_hours_short" formatted="false" msgid="6748277774662434217"> @@ -1699,7 +1699,7 @@ <string name="close_button_text" msgid="3937902162644062866">"Fechar"</string> <string name="notification_messaging_title_template" msgid="3452480118762691020">"<xliff:g id="CONVERSATION_TITLE">%1$s</xliff:g>: <xliff:g id="SENDER_NAME">%2$s</xliff:g>"</string> <plurals name="selected_count" formatted="false" msgid="7187339492915744615"> - <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> selecionados</item> + <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> selecionado</item> <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> selecionados</item> </plurals> <string name="default_notification_channel_label" msgid="5929663562028088222">"Sem categoria"</string> @@ -1730,14 +1730,8 @@ <string name="unpin_target" msgid="3556545602439143442">"Soltar"</string> <string name="app_info" msgid="6856026610594615344">"Informações da aplicação"</string> <string name="negative_duration" msgid="5688706061127375131">"-<xliff:g id="TIME">%1$s</xliff:g>"</string> - <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"Pretende repor o dispositivo?"</string> - <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"Toque para repor o dispositivo"</string> <string name="demo_starting_message" msgid="5268556852031489931">"A iniciar a demonstração…"</string> <string name="demo_restarting_message" msgid="952118052531642451">"A repor o dispositivo…"</string> - <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"Pretende repor o dispositivo?"</string> - <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"Perderá todas as alterações e a demonstração começará novamente dentro de <xliff:g id="TIMEOUT">%1$s</xliff:g> segundos…"</string> - <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"Cancelar"</string> - <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"Repor agora"</string> <string name="suspended_widget_accessibility" msgid="6712143096475264190">"<xliff:g id="LABEL">%1$s</xliff:g> desativado"</string> <string name="conference_call" msgid="3751093130790472426">"Conferência"</string> <string name="tooltip_popup_title" msgid="5253721848739260181">"Sugestão"</string> @@ -1763,7 +1757,7 @@ <string name="autofill_error_cannot_autofill" msgid="7402758580060110371">"Não é possível preencher automaticamente o conteúdo"</string> <string name="autofill_picker_no_suggestions" msgid="3908514303773350735">"Sem sugestões do preenchimento automático"</string> <plurals name="autofill_picker_some_suggestions" formatted="false" msgid="5506565809835815274"> - <item quantity="one"><xliff:g id="COUNT">%1$s</xliff:g> sugestões do preenchimento automático</item> + <item quantity="one"><xliff:g id="COUNT">%1$s</xliff:g> sugestão do preenchimento automático</item> <item quantity="other"><xliff:g id="COUNT">%1$s</xliff:g> sugestões do preenchimento automático</item> </plurals> <string name="autofill_save_title" msgid="3345527308992082601">"Pretende guardar no <b><xliff:g id="LABEL">%1$s</xliff:g></b>?"</string> diff --git a/core/res/res/values-pt/strings.xml b/core/res/res/values-pt/strings.xml index 0ff329c91414..2dd62d3945d2 100644 --- a/core/res/res/values-pt/strings.xml +++ b/core/res/res/values-pt/strings.xml @@ -246,8 +246,8 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"Ajuda de voz"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"Bloquear agora"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">">999"</string> - <string name="notification_hidden_text" msgid="1135169301897151909">"Conteúdo oculto"</string> - <string name="notification_hidden_by_policy_text" msgid="9004631276932584600">"Conteúdo ocultado pela política"</string> + <!-- no translation found for notification_hidden_text (6351207030447943784) --> + <skip /> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Teclado virtual"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"Teclado físico"</string> <string name="notification_channel_security" msgid="7345516133431326347">"Segurança"</string> @@ -1730,14 +1730,8 @@ <string name="unpin_target" msgid="3556545602439143442">"Liberar guia"</string> <string name="app_info" msgid="6856026610594615344">"Informações do app"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"Redefinir dispositivo?"</string> - <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"Toque para redefinir o dispositivo"</string> <string name="demo_starting_message" msgid="5268556852031489931">"Iniciando demonstração…"</string> <string name="demo_restarting_message" msgid="952118052531642451">"Redefinindo dispositivo…"</string> - <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"Redefinir dispositivo?"</string> - <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"Você perderá todas as alterações. A demonstração será iniciada novamente em <xliff:g id="TIMEOUT">%1$s</xliff:g> segundos…"</string> - <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"Cancelar"</string> - <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"Reiniciar agora"</string> <string name="suspended_widget_accessibility" msgid="6712143096475264190">"Widget <xliff:g id="LABEL">%1$s</xliff:g> desativado"</string> <string name="conference_call" msgid="3751093130790472426">"Teleconferência"</string> <string name="tooltip_popup_title" msgid="5253721848739260181">"Dica"</string> diff --git a/core/res/res/values-ro/strings.xml b/core/res/res/values-ro/strings.xml index 4603b1975c70..a0c0fe705381 100644 --- a/core/res/res/values-ro/strings.xml +++ b/core/res/res/values-ro/strings.xml @@ -249,8 +249,8 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"Asistent vocal"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"Blocați acum"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"˃999"</string> - <string name="notification_hidden_text" msgid="1135169301897151909">"Conținutul este ascuns"</string> - <string name="notification_hidden_by_policy_text" msgid="9004631276932584600">"Conținutul este ascuns conform politicii"</string> + <!-- no translation found for notification_hidden_text (6351207030447943784) --> + <skip /> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Tastatură virtuală"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"Tastatură fizică"</string> <string name="notification_channel_security" msgid="7345516133431326347">"Securitate"</string> @@ -1763,14 +1763,8 @@ <string name="unpin_target" msgid="3556545602439143442">"Anulați fixarea"</string> <string name="app_info" msgid="6856026610594615344">"Informații despre aplicație"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"Resetați dispozitivul?"</string> - <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"Atingeți pentru a reseta dispozitivul"</string> <string name="demo_starting_message" msgid="5268556852031489931">"Se pornește demonstrația…"</string> <string name="demo_restarting_message" msgid="952118052531642451">"Se resetează dispozitivul…"</string> - <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"Resetați dispozitivul?"</string> - <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"Veți pierde toate modificările, iar demonstrația va începe din nou peste <xliff:g id="TIMEOUT">%1$s</xliff:g> secunde…"</string> - <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"Anulați"</string> - <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"Resetați acum"</string> <string name="suspended_widget_accessibility" msgid="6712143096475264190">"<xliff:g id="LABEL">%1$s</xliff:g> a fost dezactivat"</string> <string name="conference_call" msgid="3751093130790472426">"Conferință telefonică"</string> <string name="tooltip_popup_title" msgid="5253721848739260181">"Balon explicativ"</string> diff --git a/core/res/res/values-ru/strings.xml b/core/res/res/values-ru/strings.xml index 01ce16817d6d..ae7ce069b60f 100644 --- a/core/res/res/values-ru/strings.xml +++ b/core/res/res/values-ru/strings.xml @@ -252,8 +252,8 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"Аудиоподсказки"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"Заблокировать"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">">999"</string> - <string name="notification_hidden_text" msgid="1135169301897151909">"Содержимое скрыто"</string> - <string name="notification_hidden_by_policy_text" msgid="9004631276932584600">"Содержимое скрыто в соответствии с заданными правилами"</string> + <!-- no translation found for notification_hidden_text (6351207030447943784) --> + <skip /> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Виртуальная клавиатура"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"Физическая клавиатура"</string> <string name="notification_channel_security" msgid="7345516133431326347">"Безопасность"</string> @@ -1796,14 +1796,8 @@ <string name="unpin_target" msgid="3556545602439143442">"Открепить"</string> <string name="app_info" msgid="6856026610594615344">"О приложении"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"Сбросить настройки устройства?"</string> - <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"Нажмите здесь, чтобы сбросить настройки"</string> <string name="demo_starting_message" msgid="5268556852031489931">"Запуск деморежима…"</string> <string name="demo_restarting_message" msgid="952118052531642451">"Сброс данных…"</string> - <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"Сбросить настройки устройства?"</string> - <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"Все изменения будут утеряны. Деморежим будет перезапущен через <xliff:g id="TIMEOUT">%1$s</xliff:g> сек."</string> - <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"Отмена"</string> - <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"Сбросить"</string> <string name="suspended_widget_accessibility" msgid="6712143096475264190">"Виджет <xliff:g id="LABEL">%1$s</xliff:g> отключен"</string> <string name="conference_call" msgid="3751093130790472426">"Конференц-связь"</string> <string name="tooltip_popup_title" msgid="5253721848739260181">"Подсказка"</string> diff --git a/core/res/res/values-si/strings.xml b/core/res/res/values-si/strings.xml index cf63a5bc66d8..d519fb629530 100644 --- a/core/res/res/values-si/strings.xml +++ b/core/res/res/values-si/strings.xml @@ -246,8 +246,8 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"හඬ සහායක"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"දැන් අගුළු දමන්න"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <string name="notification_hidden_text" msgid="1135169301897151909">"සැඟවුණු සම්බන්ධතා"</string> - <string name="notification_hidden_by_policy_text" msgid="9004631276932584600">"ප්රතිපත්තිය විසින් අන්තර්ගතය සඟවන ලදී"</string> + <!-- no translation found for notification_hidden_text (6351207030447943784) --> + <skip /> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"අතථ්ය යතුරු පුවරුව"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"භෞතික යතුරු පුවරුව"</string> <string name="notification_channel_security" msgid="7345516133431326347">"ආරක්ෂාව"</string> @@ -1732,14 +1732,8 @@ <string name="unpin_target" msgid="3556545602439143442">"ගලවන්න"</string> <string name="app_info" msgid="6856026610594615344">"යෙදුම් තොරතුරු"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"උපාංගය යළි සකසන්නද?"</string> - <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"උපාංගය යළි සැකසීමට තට්ටු කරන්න"</string> <string name="demo_starting_message" msgid="5268556852031489931">"ආදර්ශනය ආරම්භ කරමින්..."</string> <string name="demo_restarting_message" msgid="952118052531642451">"උපාංගය යළි සකසමින්..."</string> - <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"උපාංගය යළි සකසන්නද?"</string> - <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"ඔබට යම් වෙනස් කිරීම් අහිමි වනු ඇති අතර ආදර්ශනය තත්පර <xliff:g id="TIMEOUT">%1$s</xliff:g>කින් නැවත ආරම්භ වනු ඇත…"</string> - <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"අවලංගු කරන්න"</string> - <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"දැන් යළි සකසන්න"</string> <string name="suspended_widget_accessibility" msgid="6712143096475264190">"අබල කළ <xliff:g id="LABEL">%1$s</xliff:g>"</string> <string name="conference_call" msgid="3751093130790472426">"සම්මන්ත්රණ ඇමතුම"</string> <string name="tooltip_popup_title" msgid="5253721848739260181">"මෙවලම් ඉඟිය"</string> diff --git a/core/res/res/values-sk/strings.xml b/core/res/res/values-sk/strings.xml index b66c1b3429e8..a5849ea864e4 100644 --- a/core/res/res/values-sk/strings.xml +++ b/core/res/res/values-sk/strings.xml @@ -252,8 +252,8 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"Hlasový asistent"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"Uzamknúť"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <string name="notification_hidden_text" msgid="1135169301897151909">"Skrytý obsah"</string> - <string name="notification_hidden_by_policy_text" msgid="9004631276932584600">"Obsah je na základe pravidiel skrytý"</string> + <!-- no translation found for notification_hidden_text (6351207030447943784) --> + <skip /> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Virtuálna klávesnica"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"Fyzická klávesnica"</string> <string name="notification_channel_security" msgid="7345516133431326347">"Zabezpečenie"</string> @@ -1796,14 +1796,8 @@ <string name="unpin_target" msgid="3556545602439143442">"Uvoľniť"</string> <string name="app_info" msgid="6856026610594615344">"Info o aplikácii"</string> <string name="negative_duration" msgid="5688706061127375131">"-<xliff:g id="TIME">%1$s</xliff:g>"</string> - <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"Resetovať zariadenie?"</string> - <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"Klepnutím resetujete zariadenie"</string> <string name="demo_starting_message" msgid="5268556852031489931">"Spúšťa sa ukážka…"</string> <string name="demo_restarting_message" msgid="952118052531642451">"Resetuje sa zariadenie…"</string> - <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"Resetovať zariadenie?"</string> - <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"Prídete o všetky zmeny a ukážka sa znova spustí o <xliff:g id="TIMEOUT">%1$s</xliff:g> s…"</string> - <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"Zrušiť"</string> - <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"Resetovať"</string> <string name="suspended_widget_accessibility" msgid="6712143096475264190">"Deaktivovaná miniaplikácia <xliff:g id="LABEL">%1$s</xliff:g>"</string> <string name="conference_call" msgid="3751093130790472426">"Konferenčný hovor"</string> <string name="tooltip_popup_title" msgid="5253721848739260181">"Popis"</string> diff --git a/core/res/res/values-sl/strings.xml b/core/res/res/values-sl/strings.xml index 45ae315791fe..c5c0df6ba5bd 100644 --- a/core/res/res/values-sl/strings.xml +++ b/core/res/res/values-sl/strings.xml @@ -252,8 +252,8 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"Glas. pomočnik"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"Zakleni zdaj"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999 +"</string> - <string name="notification_hidden_text" msgid="1135169301897151909">"Vsebina je skrita"</string> - <string name="notification_hidden_by_policy_text" msgid="9004631276932584600">"Pravilnik je skril vsebino"</string> + <!-- no translation found for notification_hidden_text (6351207030447943784) --> + <skip /> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Navidezna tipkovnica"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"Fizična tipkovnica"</string> <string name="notification_channel_security" msgid="7345516133431326347">"Varnost"</string> @@ -1796,14 +1796,8 @@ <string name="unpin_target" msgid="3556545602439143442">"Odpenjanje"</string> <string name="app_info" msgid="6856026610594615344">"Podatki o aplikaciji"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"Želite ponastaviti napravo?"</string> - <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"Dotaknite se, če želite ponastaviti napravo"</string> <string name="demo_starting_message" msgid="5268556852031489931">"Začenjanje predstavitve …"</string> <string name="demo_restarting_message" msgid="952118052531642451">"Ponastavljanje naprave …"</string> - <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"Želite ponastaviti napravo?"</string> - <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"Morebitne spremembe bodo izgubljene in predstavitev se bo začela znova čez <xliff:g id="TIMEOUT">%1$s</xliff:g> s …"</string> - <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"Prekliči"</string> - <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"Ponastavi"</string> <string name="suspended_widget_accessibility" msgid="6712143096475264190">"<xliff:g id="LABEL">%1$s</xliff:g> – onemogočeno"</string> <string name="conference_call" msgid="3751093130790472426">"Konferenčni klic"</string> <string name="tooltip_popup_title" msgid="5253721848739260181">"Opis orodja"</string> diff --git a/core/res/res/values-sq/strings.xml b/core/res/res/values-sq/strings.xml index b8a4b2db1212..9fe56c951e7c 100644 --- a/core/res/res/values-sq/strings.xml +++ b/core/res/res/values-sq/strings.xml @@ -246,8 +246,8 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"Ndihma zanore"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"Kyç tani"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <string name="notification_hidden_text" msgid="1135169301897151909">"Përmbajtjet janë të fshehura"</string> - <string name="notification_hidden_by_policy_text" msgid="9004631276932584600">"Përmbajtja është e fshehur për shkak të politikës"</string> + <!-- no translation found for notification_hidden_text (6351207030447943784) --> + <skip /> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Tastiera virtuale"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"Tastiera fizike"</string> <string name="notification_channel_security" msgid="7345516133431326347">"Siguria"</string> @@ -1731,14 +1731,8 @@ <string name="unpin_target" msgid="3556545602439143442">"Zhgozhdo"</string> <string name="app_info" msgid="6856026610594615344">"Informacioni mbi aplikacionin"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"Do ta rivendosësh pajisjen?"</string> - <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"Trokit për ta rivendosur pajisjen"</string> <string name="demo_starting_message" msgid="5268556852031489931">"Po nis demonstrimin..."</string> <string name="demo_restarting_message" msgid="952118052531642451">"Po rivendos pajisjen…"</string> - <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"Do ta rivendosësh pajisjen?"</string> - <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"Do të humbasësh çdo ndryshim dhe demonstrimi do të niset përsëri për <xliff:g id="TIMEOUT">%1$s</xliff:g> sekonda…"</string> - <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"Anulo"</string> - <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"Rivendos tani"</string> <string name="suspended_widget_accessibility" msgid="6712143096475264190">"<xliff:g id="LABEL">%1$s</xliff:g> u çaktivizua"</string> <string name="conference_call" msgid="3751093130790472426">"Telefonatë konferencë"</string> <string name="tooltip_popup_title" msgid="5253721848739260181">"Këshilla për veglën"</string> diff --git a/core/res/res/values-sr/strings.xml b/core/res/res/values-sr/strings.xml index a47515ab859e..a15737c990d4 100644 --- a/core/res/res/values-sr/strings.xml +++ b/core/res/res/values-sr/strings.xml @@ -249,8 +249,8 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"Гласовна помоћ"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"Закључај одмах"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <string name="notification_hidden_text" msgid="1135169301897151909">"Садржај је сакривен"</string> - <string name="notification_hidden_by_policy_text" msgid="9004631276932584600">"Садржај је сакривен смерницама"</string> + <!-- no translation found for notification_hidden_text (6351207030447943784) --> + <skip /> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Виртуелна тастатура"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"Физичка тастатура"</string> <string name="notification_channel_security" msgid="7345516133431326347">"Безбедност"</string> @@ -1763,14 +1763,8 @@ <string name="unpin_target" msgid="3556545602439143442">"Откачи"</string> <string name="app_info" msgid="6856026610594615344">"Информације о апликацији"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"Желите ли да ресетујете уређај?"</string> - <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"Додирните да бисте ресетовали уређај"</string> <string name="demo_starting_message" msgid="5268556852031489931">"Покрећемо демонстрацију..."</string> <string name="demo_restarting_message" msgid="952118052531642451">"Ресетујемо уређај..."</string> - <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"Желите ли да ресетујете уређај?"</string> - <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"Изгубићете све промене и демонстрација ће поново почети за <xliff:g id="TIMEOUT">%1$s</xliff:g> сек…"</string> - <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"Откажи"</string> - <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"Ресетуј"</string> <string name="suspended_widget_accessibility" msgid="6712143096475264190">"Виџет <xliff:g id="LABEL">%1$s</xliff:g> је онемогућен"</string> <string name="conference_call" msgid="3751093130790472426">"Конференцијски позив"</string> <string name="tooltip_popup_title" msgid="5253721848739260181">"Објашњење"</string> diff --git a/core/res/res/values-sv/strings.xml b/core/res/res/values-sv/strings.xml index 6feff4960e9a..980611823bb8 100644 --- a/core/res/res/values-sv/strings.xml +++ b/core/res/res/values-sv/strings.xml @@ -246,8 +246,8 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"Voice Assist"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"Lås nu"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <string name="notification_hidden_text" msgid="1135169301897151909">"Innehåll har dolts"</string> - <string name="notification_hidden_by_policy_text" msgid="9004631276932584600">"Innehåll har dolts p.g.a. en policy"</string> + <!-- no translation found for notification_hidden_text (6351207030447943784) --> + <skip /> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Virtuellt tangentbord"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"Fysiskt tangentbord"</string> <string name="notification_channel_security" msgid="7345516133431326347">"Säkerhet"</string> @@ -1730,14 +1730,8 @@ <string name="unpin_target" msgid="3556545602439143442">"Lossa"</string> <string name="app_info" msgid="6856026610594615344">"Info om appen"</string> <string name="negative_duration" msgid="5688706061127375131">"-<xliff:g id="TIME">%1$s</xliff:g>"</string> - <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"Vill du återställa enheten?"</string> - <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"Tryck om du vill återställa enheten"</string> <string name="demo_starting_message" msgid="5268556852031489931">"Demo startas …"</string> <string name="demo_restarting_message" msgid="952118052531642451">"Enheten återställs …"</string> - <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"Vill du återställa enheten?"</string> - <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"Ändringar som du har gjort sparas inte och demon börjar om om <xliff:g id="TIMEOUT">%1$s</xliff:g> sekunder …"</string> - <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"Avbryt"</string> - <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"Återställ nu"</string> <string name="suspended_widget_accessibility" msgid="6712143096475264190">"<xliff:g id="LABEL">%1$s</xliff:g> har inaktiverats"</string> <string name="conference_call" msgid="3751093130790472426">"Konferenssamtal"</string> <string name="tooltip_popup_title" msgid="5253721848739260181">"Beskrivning"</string> diff --git a/core/res/res/values-sw/strings.xml b/core/res/res/values-sw/strings.xml index 0ef2d1a9daf9..2e0946bb48e2 100644 --- a/core/res/res/values-sw/strings.xml +++ b/core/res/res/values-sw/strings.xml @@ -244,8 +244,8 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"Usaidizi wa Sauti"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"Funga sasa"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <string name="notification_hidden_text" msgid="1135169301897151909">"Maudhui yamefichwa"</string> - <string name="notification_hidden_by_policy_text" msgid="9004631276932584600">"Maudhui yamefichwa kulingana na sera"</string> + <!-- no translation found for notification_hidden_text (6351207030447943784) --> + <skip /> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Kibodi pepe"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"Kibodi halisi"</string> <string name="notification_channel_security" msgid="7345516133431326347">"Usalama"</string> @@ -1390,7 +1390,7 @@ <string name="data_usage_limit_body" msgid="291731708279614081">"Data imesitishwa kwa mzunguko uliosalia"</string> <string name="data_usage_3g_limit_snoozed_title" msgid="7026739121138005231">"Kikomo cha data ya 2G-3G kimezidishwa"</string> <string name="data_usage_4g_limit_snoozed_title" msgid="1106562779311209039">"Kikomo cha data cha 4G kimezidishwa"</string> - <string name="data_usage_mobile_limit_snoozed_title" msgid="279240572165412168">"Kikomo cha data ya ya kifaa cha mkononi kimezidishwa"</string> + <string name="data_usage_mobile_limit_snoozed_title" msgid="279240572165412168">"Umepitisha kiwango cha data ulichoweka"</string> <string name="data_usage_wifi_limit_snoozed_title" msgid="8743856006384825974">"Taarifa za Wi-fi zimevuka kiwanga"</string> <string name="data_usage_limit_snoozed_body" msgid="7035490278298441767">"<xliff:g id="SIZE">%s</xliff:g> juu ya kikomo kilichobainishwa."</string> <string name="data_usage_restricted_title" msgid="5965157361036321914">"Data ya mandhari nyuma imezuiwa"</string> @@ -1728,14 +1728,8 @@ <string name="unpin_target" msgid="3556545602439143442">"Bandua"</string> <string name="app_info" msgid="6856026610594615344">"Maelezo ya programu"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"Ungependa kuweka upya mipangilio ya kifaa?"</string> - <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"Gonga ili uweke upya kifaa"</string> <string name="demo_starting_message" msgid="5268556852031489931">"Inaanzisha onyesho..."</string> <string name="demo_restarting_message" msgid="952118052531642451">"Inaweka upya kifaa..."</string> - <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"Ungependa kuweka upya mipangilio ya kifaa?"</string> - <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"Mabadiliko yoyote hayatahifadhiwa. Onyesho litaanza tena baada ya sekunde <xliff:g id="TIMEOUT">%1$s</xliff:g>..."</string> - <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"Ghairi"</string> - <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"Weka upya sasa"</string> <string name="suspended_widget_accessibility" msgid="6712143096475264190">"<xliff:g id="LABEL">%1$s</xliff:g> imezimwa"</string> <string name="conference_call" msgid="3751093130790472426">"Simu ya Kongamano"</string> <string name="tooltip_popup_title" msgid="5253721848739260181">"Kidirisha cha vidokezo"</string> diff --git a/core/res/res/values-ta/strings.xml b/core/res/res/values-ta/strings.xml index 205ad9d91245..d5cddcbd0eec 100644 --- a/core/res/res/values-ta/strings.xml +++ b/core/res/res/values-ta/strings.xml @@ -246,8 +246,8 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"குரல் உதவி"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"இப்போது பூட்டு"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <string name="notification_hidden_text" msgid="1135169301897151909">"மறைந்துள்ள உள்ளடக்கம்"</string> - <string name="notification_hidden_by_policy_text" msgid="9004631276932584600">"கொள்கையின்படி உள்ளடக்கம் மறைக்கப்பட்டது"</string> + <!-- no translation found for notification_hidden_text (6351207030447943784) --> + <skip /> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"விர்ச்சுவல் விசைப்பலகை"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"கைமுறை விசைப்பலகை"</string> <string name="notification_channel_security" msgid="7345516133431326347">"பாதுகாப்பு"</string> @@ -1731,14 +1731,8 @@ <string name="unpin_target" msgid="3556545602439143442">"பின்னை அகற்று"</string> <string name="app_info" msgid="6856026610594615344">"பயன்பாட்டுத் தகவல்"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"சாதனத்தை மீட்டமைக்கவா?"</string> - <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"சாதனத்தை மீட்டமைக்க, தட்டவும்"</string> <string name="demo_starting_message" msgid="5268556852031489931">"டெமோவைத் தொடங்குகிறது…"</string> <string name="demo_restarting_message" msgid="952118052531642451">"சாதனத்தை மீட்டமைக்கிறது…"</string> - <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"சாதனத்தை மீட்டமைக்கவா?"</string> - <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"மாற்றங்கள் சேமிக்கப்படாது, <xliff:g id="TIMEOUT">%1$s</xliff:g> வினாடிகளில் டெமோ மீண்டும் தொடங்கும்…"</string> - <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"ரத்துசெய்"</string> - <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"இப்போதே மீட்டமை"</string> <string name="suspended_widget_accessibility" msgid="6712143096475264190">"முடக்கப்பட்டது: <xliff:g id="LABEL">%1$s</xliff:g>"</string> <string name="conference_call" msgid="3751093130790472426">"குழு அழைப்பு"</string> <string name="tooltip_popup_title" msgid="5253721848739260181">"உதவிக்குறிப்பு"</string> diff --git a/core/res/res/values-te/strings.xml b/core/res/res/values-te/strings.xml index d80ec9fcb213..a522d6be783b 100644 --- a/core/res/res/values-te/strings.xml +++ b/core/res/res/values-te/strings.xml @@ -246,8 +246,8 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"వాయిస్ సహాయకం"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"ఇప్పుడు లాక్ చేయండి"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <string name="notification_hidden_text" msgid="1135169301897151909">"కంటెంట్లు దాచబడ్డాయి"</string> - <string name="notification_hidden_by_policy_text" msgid="9004631276932584600">"విధానం ద్వారా కంటెంట్లు దాచబడ్డాయి"</string> + <!-- no translation found for notification_hidden_text (6351207030447943784) --> + <skip /> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"వర్చువల్ కీబోర్డ్"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"భౌతిక కీబోర్డ్"</string> <string name="notification_channel_security" msgid="7345516133431326347">"భద్రత"</string> @@ -1731,14 +1731,8 @@ <string name="unpin_target" msgid="3556545602439143442">"అన్పిన్ చేయి"</string> <string name="app_info" msgid="6856026610594615344">"అనువర్తన సమాచారం"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"పరికరాన్ని రీసెట్ చేయాలా?"</string> - <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"పరికరాన్ని రీసెట్ చేయడానికి నొక్కండి"</string> <string name="demo_starting_message" msgid="5268556852031489931">"డెమోను ప్రారంభిస్తోంది..."</string> <string name="demo_restarting_message" msgid="952118052531642451">"పరికరాన్ని రీసెట్ చేస్తోంది..."</string> - <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"పరికరాన్ని రీసెట్ చేయాలా?"</string> - <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"మీరు చేసిన ఏవైనా మార్పులను కోల్పోతారు మరియు డెమో <xliff:g id="TIMEOUT">%1$s</xliff:g> సెకన్లలో మళ్లీ ప్రారంభమవుతుంది…"</string> - <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"రద్దు చేయి"</string> - <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"ఇప్పుడే రీసెట్ చేయి"</string> <string name="suspended_widget_accessibility" msgid="6712143096475264190">"<xliff:g id="LABEL">%1$s</xliff:g> నిలిపివేయబడింది"</string> <string name="conference_call" msgid="3751093130790472426">"కాన్ఫరెన్స్ కాల్"</string> <string name="tooltip_popup_title" msgid="5253721848739260181">"సాధనం చిట్కా"</string> diff --git a/core/res/res/values-th/strings.xml b/core/res/res/values-th/strings.xml index 2c293ed789d6..9bb55a4df15f 100644 --- a/core/res/res/values-th/strings.xml +++ b/core/res/res/values-th/strings.xml @@ -246,8 +246,8 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"ตัวช่วยเสียง"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"ล็อกเลย"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <string name="notification_hidden_text" msgid="1135169301897151909">"เนื้อหาถูกซ่อนไว้"</string> - <string name="notification_hidden_by_policy_text" msgid="9004631276932584600">"มีการซ่อนเนื้อหาโดยนโยบาย"</string> + <!-- no translation found for notification_hidden_text (6351207030447943784) --> + <skip /> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"แป้นพิมพ์เสมือน"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"แป้นพิมพ์บนเครื่อง"</string> <string name="notification_channel_security" msgid="7345516133431326347">"ความปลอดภัย"</string> @@ -1730,14 +1730,8 @@ <string name="unpin_target" msgid="3556545602439143442">"เลิกปักหมุด"</string> <string name="app_info" msgid="6856026610594615344">"ข้อมูลแอป"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"รีเซ็ตอุปกรณ์ไหม"</string> - <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"แตะเพื่อรีเซ็ตอุปกรณ์"</string> <string name="demo_starting_message" msgid="5268556852031489931">"กำลังเริ่มการสาธิต…"</string> <string name="demo_restarting_message" msgid="952118052531642451">"กำลังรีเซ็ตอุปกรณ์…"</string> - <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"รีเซ็ตอุปกรณ์ไหม"</string> - <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"การเปลี่ยนแปลงของคุณจะหายไปและการสาธิตจะเริ่มต้นอีกครั้งใน <xliff:g id="TIMEOUT">%1$s</xliff:g> วินาที…"</string> - <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"ยกเลิก"</string> - <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"รีเซ็ตทันที"</string> <string name="suspended_widget_accessibility" msgid="6712143096475264190">"ปิดใช้ <xliff:g id="LABEL">%1$s</xliff:g>"</string> <string name="conference_call" msgid="3751093130790472426">"การประชุมสาย"</string> <string name="tooltip_popup_title" msgid="5253721848739260181">"เคล็ดลับเครื่องมือ"</string> diff --git a/core/res/res/values-tl/strings.xml b/core/res/res/values-tl/strings.xml index a619687a1714..bd3c53a1bf0d 100644 --- a/core/res/res/values-tl/strings.xml +++ b/core/res/res/values-tl/strings.xml @@ -246,8 +246,8 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"Voice Assist"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"I-lock ngayon"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <string name="notification_hidden_text" msgid="1135169301897151909">"Nakatago ang mga content"</string> - <string name="notification_hidden_by_policy_text" msgid="9004631276932584600">"Itinago ang mga content alinsunod sa patakaran"</string> + <!-- no translation found for notification_hidden_text (6351207030447943784) --> + <skip /> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Virtual na keyboard"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"Pisikal na keyboard"</string> <string name="notification_channel_security" msgid="7345516133431326347">"Seguridad"</string> @@ -1730,14 +1730,8 @@ <string name="unpin_target" msgid="3556545602439143442">"I-unpin"</string> <string name="app_info" msgid="6856026610594615344">"Impormasyon ng app"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"Gusto mo bang i-reset ang device?"</string> - <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"Mag-tap upang i-reset ang device"</string> <string name="demo_starting_message" msgid="5268556852031489931">"Sinisimulan ang demo…"</string> <string name="demo_restarting_message" msgid="952118052531642451">"Nire-reset ang device…"</string> - <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"Gusto mo bang i-reset ang device?"</string> - <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"Mawawala mo ang anumang mga pagbabago at magsisimulang muli ang demo pagkalipas ng <xliff:g id="TIMEOUT">%1$s</xliff:g> (na) segundo…"</string> - <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"Kanselahin"</string> - <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"I-reset ngayon"</string> <string name="suspended_widget_accessibility" msgid="6712143096475264190">"Na-disable ang <xliff:g id="LABEL">%1$s</xliff:g>"</string> <string name="conference_call" msgid="3751093130790472426">"Conference Call"</string> <string name="tooltip_popup_title" msgid="5253721848739260181">"Tooltip"</string> diff --git a/core/res/res/values-tr/strings.xml b/core/res/res/values-tr/strings.xml index 9ef46a7bdefa..877fa1d13c7e 100644 --- a/core/res/res/values-tr/strings.xml +++ b/core/res/res/values-tr/strings.xml @@ -246,8 +246,8 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"Sesli Yardım"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"Şimdi kilitle"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <string name="notification_hidden_text" msgid="1135169301897151909">"İçerik gizlendi"</string> - <string name="notification_hidden_by_policy_text" msgid="9004631276932584600">"İçerikler politika nedeniyle gizlendi"</string> + <!-- no translation found for notification_hidden_text (6351207030447943784) --> + <skip /> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Sanal klavye"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"Fiziksel klavye"</string> <string name="notification_channel_security" msgid="7345516133431326347">"Güvenlik"</string> @@ -1730,14 +1730,8 @@ <string name="unpin_target" msgid="3556545602439143442">"Sabitlemeyi kaldır"</string> <string name="app_info" msgid="6856026610594615344">"Uygulama bilgileri"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"Cihaz sıfırlansın mı?"</string> - <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"Cihazı sıfırlamak için dokunun"</string> <string name="demo_starting_message" msgid="5268556852031489931">"Demo başlatılıyor…"</string> <string name="demo_restarting_message" msgid="952118052531642451">"Cihaz sıfırlanıyor…"</string> - <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"Cihaz sıfırlansın mı?"</string> - <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"Değişiklikleri kaybedeceksiniz ve demo <xliff:g id="TIMEOUT">%1$s</xliff:g> saniye içinde tekrar başlayacak…"</string> - <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"İptal"</string> - <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"Şimdi sıfırla"</string> <string name="suspended_widget_accessibility" msgid="6712143096475264190">"<xliff:g id="LABEL">%1$s</xliff:g> devre dışı"</string> <string name="conference_call" msgid="3751093130790472426">"Konferans Çağrısı"</string> <string name="tooltip_popup_title" msgid="5253721848739260181">"İpucu"</string> diff --git a/core/res/res/values-uk/strings.xml b/core/res/res/values-uk/strings.xml index 7d1871f4f9c5..75c984861007 100644 --- a/core/res/res/values-uk/strings.xml +++ b/core/res/res/values-uk/strings.xml @@ -21,10 +21,10 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="byteShort" msgid="8340973892742019101">"б"</string> - <string name="kilobyteShort" msgid="7542884022844556968">"Кб"</string> - <string name="megabyteShort" msgid="6355851576770428922">"Мб"</string> - <string name="gigabyteShort" msgid="3259882455212193214">"Гб"</string> - <string name="terabyteShort" msgid="231613018159186962">"Тб"</string> + <string name="kilobyteShort" msgid="7542884022844556968">"КБ"</string> + <string name="megabyteShort" msgid="6355851576770428922">"МБ"</string> + <string name="gigabyteShort" msgid="3259882455212193214">"ГБ"</string> + <string name="terabyteShort" msgid="231613018159186962">"ТБ"</string> <string name="petabyteShort" msgid="5637816680144990219">"Пб"</string> <string name="fileSizeSuffix" msgid="8897567456150907538">"<xliff:g id="NUMBER">%1$s</xliff:g> <xliff:g id="UNIT">%2$s</xliff:g>"</string> <string name="durationDays" msgid="6652371460511178259">"<xliff:g id="DAYS">%1$d</xliff:g> дн."</string> @@ -252,8 +252,8 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"Голос. підказки"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"Блокувати зараз"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <string name="notification_hidden_text" msgid="1135169301897151909">"Вміст сховано"</string> - <string name="notification_hidden_by_policy_text" msgid="9004631276932584600">"Вміст сховано згідно з правилом"</string> + <!-- no translation found for notification_hidden_text (6351207030447943784) --> + <skip /> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Віртуальна клавіатура"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"Фізична клавіатура"</string> <string name="notification_channel_security" msgid="7345516133431326347">"Безпека"</string> @@ -1027,7 +1027,7 @@ <string name="browse" msgid="6993590095938149861">"Веб-переглядач"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Закінчується пам’ять"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Деякі системні функції можуть не працювати"</string> - <string name="low_internal_storage_view_text_no_boot" msgid="6935190099204693424">"Недостатньо місця для системи. Переконайтесь, що на пристрої є 250 Мб вільного місця, і повторіть спробу."</string> + <string name="low_internal_storage_view_text_no_boot" msgid="6935190099204693424">"Недостатньо місця для системи. Переконайтесь, що на пристрої є 250 МБ вільного місця, і повторіть спробу."</string> <string name="app_running_notification_title" msgid="8718335121060787914">"<xliff:g id="APP_NAME">%1$s</xliff:g> працює"</string> <string name="app_running_notification_text" msgid="1197581823314971177">"Торкніться, щоб дізнатися більше або зупинити додаток."</string> <string name="ok" msgid="5970060430562524910">"OK"</string> @@ -1796,14 +1796,8 @@ <string name="unpin_target" msgid="3556545602439143442">"Відкріпити"</string> <string name="app_info" msgid="6856026610594615344">"Про додаток"</string> <string name="negative_duration" msgid="5688706061127375131">"-<xliff:g id="TIME">%1$s</xliff:g>"</string> - <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"Скинути налаштування пристрою?"</string> - <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"Торкніться, щоб скинути налаштування пристрою"</string> <string name="demo_starting_message" msgid="5268556852031489931">"Запуск демонстрації…"</string> <string name="demo_restarting_message" msgid="952118052531642451">"Скидання налаштувань пристрою…"</string> - <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"Скинути налаштування пристрою?"</string> - <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"Ви втратите всі зміни, а демонстрація знову почнеться через <xliff:g id="TIMEOUT">%1$s</xliff:g> с…"</string> - <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"Скасувати"</string> - <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"Скинути"</string> <string name="suspended_widget_accessibility" msgid="6712143096475264190">"<xliff:g id="LABEL">%1$s</xliff:g> вимкнено"</string> <string name="conference_call" msgid="3751093130790472426">"Конференц-виклик"</string> <string name="tooltip_popup_title" msgid="5253721848739260181">"Спливаюча підказка"</string> diff --git a/core/res/res/values-ur/strings.xml b/core/res/res/values-ur/strings.xml index 9c96d36d8c5e..b754a5380ff9 100644 --- a/core/res/res/values-ur/strings.xml +++ b/core/res/res/values-ur/strings.xml @@ -246,8 +246,8 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"Voice Assist"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"ابھی مقفل کریں"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <string name="notification_hidden_text" msgid="1135169301897151909">"مواد مخفی ہیں"</string> - <string name="notification_hidden_by_policy_text" msgid="9004631276932584600">"مواد پالیسی کے تحت مخفی ہے"</string> + <!-- no translation found for notification_hidden_text (6351207030447943784) --> + <skip /> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"ورچوئل کی بورڈ"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"فزیکل کی بورڈ"</string> <string name="notification_channel_security" msgid="7345516133431326347">"سیکیورٹی"</string> @@ -1731,14 +1731,8 @@ <string name="unpin_target" msgid="3556545602439143442">"پن ہٹائیں"</string> <string name="app_info" msgid="6856026610594615344">"ایپ کی معلومات"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"آلہ ری سیٹ کریں؟"</string> - <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"آلہ ری سیٹ کرنے کیلئے تھپتھپائیں"</string> <string name="demo_starting_message" msgid="5268556852031489931">"ڈیمو شروع ہو رہا ہے…"</string> <string name="demo_restarting_message" msgid="952118052531642451">"آلہ ری سیٹ ہو رہا ہے…"</string> - <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"آلہ ری سیٹ کریں؟"</string> - <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"آپ کی تمام تبدیلیاں ضائع ہو جائیں گی اور ڈیمو <xliff:g id="TIMEOUT">%1$s</xliff:g> سیکنڈز میں دوبارہ شروع ہوگا…"</string> - <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"منسوخ کریں"</string> - <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"ابھی ری سیٹ کریں"</string> <string name="suspended_widget_accessibility" msgid="6712143096475264190">"غیر فعال کردہ <xliff:g id="LABEL">%1$s</xliff:g>"</string> <string name="conference_call" msgid="3751093130790472426">"کانفرنس کال"</string> <string name="tooltip_popup_title" msgid="5253721848739260181">"ٹول ٹپ"</string> diff --git a/core/res/res/values-uz/strings.xml b/core/res/res/values-uz/strings.xml index c5b6d53e588d..24a8a9b589c7 100644 --- a/core/res/res/values-uz/strings.xml +++ b/core/res/res/values-uz/strings.xml @@ -246,8 +246,8 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"Ovozli yordam"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"Qulflash"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <string name="notification_hidden_text" msgid="1135169301897151909">"Kontent yashirildi"</string> - <string name="notification_hidden_by_policy_text" msgid="9004631276932584600">"Qoidaga muvofiq kontent yashirilgan"</string> + <!-- no translation found for notification_hidden_text (6351207030447943784) --> + <skip /> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Virtual klaviatura"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"Tashqi klaviatura"</string> <string name="notification_channel_security" msgid="7345516133431326347">"Xavfsizlik"</string> @@ -1731,14 +1731,8 @@ <string name="unpin_target" msgid="3556545602439143442">"Olib tashlash"</string> <string name="app_info" msgid="6856026610594615344">"Ilova haqida"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"Qurilma asl holatga qaytarilsinmi?"</string> - <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"Qurilmani asl holatga qaytarish uchun bosing"</string> <string name="demo_starting_message" msgid="5268556852031489931">"Demo boshlanmoqda…"</string> <string name="demo_restarting_message" msgid="952118052531642451">"Qurilma asl holatga qaytarilmoqda…"</string> - <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"Qurilma asl holatga qaytarilsinmi?"</string> - <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"Har qanday o‘zgarishlar o‘chib ketadi va demo <xliff:g id="TIMEOUT">%1$s</xliff:g> soniyadan so‘ng yana qayta ishga tushadi…"</string> - <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"Bekor qilish"</string> - <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"Asl holatga qaytarish"</string> <string name="suspended_widget_accessibility" msgid="6712143096475264190">"<xliff:g id="LABEL">%1$s</xliff:g> vidjeti o‘chirilgan"</string> <string name="conference_call" msgid="3751093130790472426">"Konferens-aloqa"</string> <string name="tooltip_popup_title" msgid="5253721848739260181">"Maslahat oynasi"</string> diff --git a/core/res/res/values-vi/strings.xml b/core/res/res/values-vi/strings.xml index 291fdd01391c..0c081fa55fda 100644 --- a/core/res/res/values-vi/strings.xml +++ b/core/res/res/values-vi/strings.xml @@ -246,8 +246,8 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"Trợ lý thoại"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"Khóa ngay"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <string name="notification_hidden_text" msgid="1135169301897151909">"Nội dung bị ẩn"</string> - <string name="notification_hidden_by_policy_text" msgid="9004631276932584600">"Nội dung bị ẩn theo chính sách"</string> + <!-- no translation found for notification_hidden_text (6351207030447943784) --> + <skip /> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Bàn phím ảo"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"Bàn phím thực"</string> <string name="notification_channel_security" msgid="7345516133431326347">"Bảo mật"</string> @@ -1730,14 +1730,8 @@ <string name="unpin_target" msgid="3556545602439143442">"Bỏ ghim"</string> <string name="app_info" msgid="6856026610594615344">"Thông tin ứng dụng"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"Đặt lại thiết bị?"</string> - <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"Nhấn để đặt lại thiết bị"</string> <string name="demo_starting_message" msgid="5268556852031489931">"Đang bắt đầu bản trình diễn..."</string> <string name="demo_restarting_message" msgid="952118052531642451">"Đang đặt lại thiết bị..."</string> - <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"Đặt lại thiết bị?"</string> - <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"Bạn sẽ bị mất mọi thay đổi và bản trình diễn sẽ bắt đầu lại sau <xliff:g id="TIMEOUT">%1$s</xliff:g> giây…"</string> - <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"Hủy"</string> - <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"Đặt lại ngay bây giờ"</string> <string name="suspended_widget_accessibility" msgid="6712143096475264190">"Đã tắt <xliff:g id="LABEL">%1$s</xliff:g>"</string> <string name="conference_call" msgid="3751093130790472426">"Cuộc gọi nhiều bên"</string> <string name="tooltip_popup_title" msgid="5253721848739260181">"Chú giải công cụ"</string> diff --git a/core/res/res/values-zh-rCN/strings.xml b/core/res/res/values-zh-rCN/strings.xml index c2ee71f2720a..fec4827eea67 100644 --- a/core/res/res/values-zh-rCN/strings.xml +++ b/core/res/res/values-zh-rCN/strings.xml @@ -246,8 +246,8 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"语音助理"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"立即锁定"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <string name="notification_hidden_text" msgid="1135169301897151909">"内容已隐藏"</string> - <string name="notification_hidden_by_policy_text" msgid="9004631276932584600">"内容已隐藏（根据政策规定）"</string> + <!-- no translation found for notification_hidden_text (6351207030447943784) --> + <skip /> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"虚拟键盘"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"实体键盘"</string> <string name="notification_channel_security" msgid="7345516133431326347">"安全性"</string> @@ -1730,14 +1730,8 @@ <string name="unpin_target" msgid="3556545602439143442">"取消固定"</string> <string name="app_info" msgid="6856026610594615344">"应用信息"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"要重置设备吗？"</string> - <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"点按即可重置设备"</string> <string name="demo_starting_message" msgid="5268556852031489931">"正在启动演示模式…"</string> <string name="demo_restarting_message" msgid="952118052531642451">"正在重置设备…"</string> - <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"要重置设备吗？"</string> - <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"您将丢失所有更改，而且演示模式将在 <xliff:g id="TIMEOUT">%1$s</xliff:g> 秒后重新启动…"</string> - <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"取消"</string> - <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"立即重置"</string> <string name="suspended_widget_accessibility" msgid="6712143096475264190">"已停用的<xliff:g id="LABEL">%1$s</xliff:g>"</string> <string name="conference_call" msgid="3751093130790472426">"电话会议"</string> <string name="tooltip_popup_title" msgid="5253721848739260181">"提示"</string> diff --git a/core/res/res/values-zh-rHK/strings.xml b/core/res/res/values-zh-rHK/strings.xml index 6ca5fa5594d2..2517f688998c 100644 --- a/core/res/res/values-zh-rHK/strings.xml +++ b/core/res/res/values-zh-rHK/strings.xml @@ -246,8 +246,8 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"語音助手"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"立即鎖定"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <string name="notification_hidden_text" msgid="1135169301897151909">"內容已隱藏"</string> - <string name="notification_hidden_by_policy_text" msgid="9004631276932584600">"已根據政策隱藏內容"</string> + <!-- no translation found for notification_hidden_text (6351207030447943784) --> + <skip /> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"虛擬鍵盤"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"實體鍵盤"</string> <string name="notification_channel_security" msgid="7345516133431326347">"安全性"</string> @@ -1730,14 +1730,8 @@ <string name="unpin_target" msgid="3556545602439143442">"取消固定"</string> <string name="app_info" msgid="6856026610594615344">"應用程式資料"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"要重設裝置嗎？"</string> - <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"輕按即可重設裝置"</string> <string name="demo_starting_message" msgid="5268556852031489931">"正在開始示範…"</string> <string name="demo_restarting_message" msgid="952118052531642451">"正在重設裝置…"</string> - <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"要重設裝置嗎？"</string> - <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"系統將不會儲存變更，示範將於 <xliff:g id="TIMEOUT">%1$s</xliff:g> 秒後重新開始…"</string> - <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"取消"</string> - <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"立即重設"</string> <string name="suspended_widget_accessibility" msgid="6712143096475264190">"「<xliff:g id="LABEL">%1$s</xliff:g>」已停用"</string> <string name="conference_call" msgid="3751093130790472426">"會議通話"</string> <string name="tooltip_popup_title" msgid="5253721848739260181">"提示"</string> diff --git a/core/res/res/values-zh-rTW/strings.xml b/core/res/res/values-zh-rTW/strings.xml index 5dea9d948dbc..da7d7112e122 100644 --- a/core/res/res/values-zh-rTW/strings.xml +++ b/core/res/res/values-zh-rTW/strings.xml @@ -246,8 +246,8 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"語音小幫手"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"立即鎖定"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"超過 999"</string> - <string name="notification_hidden_text" msgid="1135169301897151909">"內容已隱藏"</string> - <string name="notification_hidden_by_policy_text" msgid="9004631276932584600">"內容已依據政策隱藏"</string> + <!-- no translation found for notification_hidden_text (6351207030447943784) --> + <skip /> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"虛擬鍵盤"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"實體鍵盤"</string> <string name="notification_channel_security" msgid="7345516133431326347">"安全性"</string> @@ -1730,14 +1730,8 @@ <string name="unpin_target" msgid="3556545602439143442">"取消固定"</string> <string name="app_info" msgid="6856026610594615344">"應用程式資訊"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"要重設裝置嗎？"</string> - <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"輕觸即可重設裝置"</string> <string name="demo_starting_message" msgid="5268556852031489931">"正在啟動示範模式..."</string> <string name="demo_restarting_message" msgid="952118052531642451">"正在重設裝置..."</string> - <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"要重設裝置嗎？"</string> - <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"系統不會儲存你所做的變更，示範模式將於 <xliff:g id="TIMEOUT">%1$s</xliff:g> 秒後重新開始…"</string> - <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"取消"</string> - <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"立即重設"</string> <string name="suspended_widget_accessibility" msgid="6712143096475264190">"已停用的<xliff:g id="LABEL">%1$s</xliff:g>"</string> <string name="conference_call" msgid="3751093130790472426">"電話會議"</string> <string name="tooltip_popup_title" msgid="5253721848739260181">"工具提示"</string> diff --git a/core/res/res/values-zu/strings.xml b/core/res/res/values-zu/strings.xml index 0b4c25875309..b99689b2cd79 100644 --- a/core/res/res/values-zu/strings.xml +++ b/core/res/res/values-zu/strings.xml @@ -246,8 +246,8 @@ <string name="global_action_voice_assist" msgid="7751191495200504480">"Isisekeli sezwi"</string> <string name="global_action_lockdown" msgid="8751542514724332873">"Khiya manje"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> - <string name="notification_hidden_text" msgid="1135169301897151909">"Okuqukethwe kufihliwe"</string> - <string name="notification_hidden_by_policy_text" msgid="9004631276932584600">"Okuqukethwe kufihlwe inqubomgomo"</string> + <!-- no translation found for notification_hidden_text (6351207030447943784) --> + <skip /> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Ikhibhodi ebonakalayo"</string> <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"Ikhibhodi ephathekayo"</string> <string name="notification_channel_security" msgid="7345516133431326347">"Ukuphepha"</string> @@ -1730,14 +1730,8 @@ <string name="unpin_target" msgid="3556545602439143442">"Susa ukuphina"</string> <string name="app_info" msgid="6856026610594615344">"Ulwazi lohlelo lokusebenza"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <string name="reset_retail_demo_mode_title" msgid="2370249087943803584">"Setha kabusha idivayisi?"</string> - <string name="reset_retail_demo_mode_text" msgid="5481925817590883246">"Thepha ukuze usethe kabusha idivayisi"</string> <string name="demo_starting_message" msgid="5268556852031489931">"Iqalisa i-demo..."</string> <string name="demo_restarting_message" msgid="952118052531642451">"Isetha kabusha idivayisi..."</string> - <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"Setha kabusha idivayisi?"</string> - <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"Uzolahlekelwa inoma iluphi ushintsho futhi idemo izoqala futhi kumasekhondi angu-<xliff:g id="TIMEOUT">%1$s</xliff:g>..."</string> - <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"Khansela"</string> - <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"Setha kabusha manje"</string> <string name="suspended_widget_accessibility" msgid="6712143096475264190">"I-<xliff:g id="LABEL">%1$s</xliff:g> ekhutshaziwe"</string> <string name="conference_call" msgid="3751093130790472426">"Ikholi yengqungquthela"</string> <string name="tooltip_popup_title" msgid="5253721848739260181">"Ithulithiphu"</string> diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index f817ab39bf6c..7819f3032cb3 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -959,15 +959,7 @@ <item>30</item> </integer-array> - <!-- Vibrator pattern for feedback about booting with safe mode disabled --> - <integer-array name="config_safeModeDisabledVibePattern"> - <item>0</item> - <item>1</item> - <item>20</item> - <item>21</item> - </integer-array> - - <!-- Vibrator pattern for feedback about booting with safe mode disabled --> + <!-- Vibrator pattern for feedback about booting with safe mode enabled --> <integer-array name="config_safeModeEnabledVibePattern"> <item>0</item> <item>1</item> @@ -2788,18 +2780,6 @@ <!-- Component that runs demo mode when it is enabled. --> <string name="config_demoModePackage" translatable="false"></string> - <!-- Component that is the default launcher when demo mode is enabled. --> - <string name="config_demoModeLauncherComponent">com.android.retaildemo/.DemoPlayer</string> - - <!-- Hashed password (SHA-256) used to restrict carrier demo mode operation. --> - <string name="config_carrierDemoModePassword" translatable="false"></string> - - <!-- Secure setting used to activate carrier demo mode. --> - <string name="config_carrierDemoModeSetting" translatable="false"></string> - - <!-- List of packages to enable in carrier demo mode (comma separated). --> - <string name="config_carrierDemoModePackages" translatable="false"></string> - <!-- Number of days preloaded file cache should be preserved on a device before it can be deleted --> <integer name="config_keepPreloadsMinDays">7</integer> @@ -3001,6 +2981,8 @@ <string name="config_headlineFontFamily" translatable="false"></string> <!-- Name of a font family to use for headlines. Defaults to sans-serif-light --> <string name="config_headlineFontFamilyLight" translatable="false">sans-serif-light</string> + <!-- Allows setting custom fontFeatureSettings on specific text. --> + <string name="config_headlineFontFeatureSettings" translatable="false"></string> <!-- An array of packages that need to be treated as type system in battery settings --> <string-array translatable="false" name="config_batteryPackageTypeSystem"> diff --git a/core/res/res/values/dimens.xml b/core/res/res/values/dimens.xml index 743f4ad9efeb..b4636a69709c 100644 --- a/core/res/res/values/dimens.xml +++ b/core/res/res/values/dimens.xml @@ -30,7 +30,7 @@ will be displayed in the app launcher and elsewhere. --> <dimen name="app_icon_size">48dip</dimen> - <dimen name="toast_y_offset">64dip</dimen> + <dimen name="toast_y_offset">24dp</dimen> <!-- Height of the status bar --> <dimen name="status_bar_height">24dp</dimen> <!-- Height of the bottom navigation / system bar. --> @@ -237,9 +237,6 @@ <!-- The minimum height of the content if there are at least two lines or a picture--> <dimen name="notification_min_content_height">41dp</dimen> - <!-- The small size of the image if the height drawing doesn't work anymore --> - <dimen name="media_notification_expanded_image_small_size">72dp</dimen> - <!-- The size of the media actions in the media notification. --> <dimen name="media_notification_action_button_size">48dp</dimen> diff --git a/core/res/res/values/locale_config.xml b/core/res/res/values/locale_config.xml index 0ba8b578a1c1..04ea0771f8e9 100644 --- a/core/res/res/values/locale_config.xml +++ b/core/res/res/values/locale_config.xml @@ -380,7 +380,6 @@ <item>nl-NL</item> <!-- Dutch (Netherlands) --> <item>nl-SR</item> <!-- Dutch (Suriname) --> <item>nl-SX</item> <!-- Dutch (Sint Maarten) --> - <item>nmg-CM</item> <!-- Kwasio (Cameroon) --> <item>nn-NO</item> <!-- Norwegian Nynorsk (Norway) --> <item>nnh-CM</item> <!-- Ngiemboon (Cameroon) --> <item>nus-SS</item> <!-- Nuer (South Sudan) --> diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index 34710fc41181..ab26ae18ba99 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -591,10 +591,7 @@ <string name="notification_header_divider_symbol_with_spaces" translatable="false">" • "</string> <!-- Text shown in place of notification contents when the notification is hidden on a secure lockscreen --> - <string name="notification_hidden_text">Contents hidden</string> - - <!-- Text shown in place of notification contents when the notification is hidden by policy on a secure lockscreen --> - <string name="notification_hidden_by_policy_text">Contents hidden by policy</string> + <string name="notification_hidden_text">New notification</string> <!-- Text shown when viewing channel settings for notifications related to the virtual keyboard --> <string name="notification_channel_virtual_keyboard">Virtual keyboard</string> diff --git a/core/res/res/values/styles.xml b/core/res/res/values/styles.xml index 5c6e3df3ac33..4b0fe3f3a04c 100644 --- a/core/res/res/values/styles.xml +++ b/core/res/res/values/styles.xml @@ -956,7 +956,8 @@ please see styles_device_defaults.xml. </style> <style name="TextAppearance.Toast"> - <item name="fontFamily">sans-serif-condensed</item> + <item name="fontFamily">sans-serif</item> + <item name="textSize">14sp</item> </style> <style name="TextAppearance.Tooltip"> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 7670c7ba4086..decf42d6d699 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -1167,10 +1167,6 @@ <java-symbol type="string" name="config_ethernet_tcp_buffers" /> <java-symbol type="string" name="config_wifi_tcp_buffers" /> <java-symbol type="string" name="config_demoModePackage" /> - <java-symbol type="string" name="config_demoModeLauncherComponent" /> - <java-symbol type="string" name="config_carrierDemoModePassword" /> - <java-symbol type="string" name="config_carrierDemoModeSetting" /> - <java-symbol type="string" name="config_carrierDemoModePackages" /> <java-symbol type="string" name="demo_starting_message" /> <java-symbol type="string" name="demo_restarting_message" /> <java-symbol type="string" name="conference_call" /> @@ -1557,7 +1553,6 @@ <java-symbol type="array" name="config_autoRotationTiltTolerance" /> <java-symbol type="array" name="config_keyboardTapVibePattern" /> <java-symbol type="array" name="config_longPressVibePattern" /> - <java-symbol type="array" name="config_safeModeDisabledVibePattern" /> <java-symbol type="array" name="config_safeModeEnabledVibePattern" /> <java-symbol type="array" name="config_virtualKeyVibePattern" /> <java-symbol type="attr" name="actionModePopupWindowStyle" /> @@ -2019,12 +2014,6 @@ <java-symbol type="string" name="config_customVpnConfirmDialogComponent" /> <java-symbol type="string" name="config_defaultNetworkScorerPackageName" /> <java-symbol type="string" name="config_persistentDataPackageName" /> - <java-symbol type="string" name="reset_retail_demo_mode_title" /> - <java-symbol type="string" name="reset_retail_demo_mode_text" /> - <java-symbol type="string" name="demo_user_inactivity_timeout_title" /> - <java-symbol type="string" name="demo_user_inactivity_timeout_countdown" /> - <java-symbol type="string" name="demo_user_inactivity_timeout_left_button" /> - <java-symbol type="string" name="demo_user_inactivity_timeout_right_button" /> <java-symbol type="layout" name="resolver_list" /> <java-symbol type="id" name="resolver_list" /> @@ -2561,7 +2550,6 @@ <java-symbol type="id" name="notification_material_reply_text_3" /> <java-symbol type="string" name="notification_hidden_text" /> - <java-symbol type="string" name="notification_hidden_by_policy_text" /> <java-symbol type="id" name="app_name_text" /> <java-symbol type="id" name="header_text" /> <java-symbol type="id" name="expand_button" /> @@ -2652,7 +2640,6 @@ <java-symbol type="string" name="new_sms_notification_title" /> <java-symbol type="string" name="new_sms_notification_content" /> - <java-symbol type="dimen" name="media_notification_expanded_image_small_size" /> <java-symbol type="dimen" name="media_notification_expanded_image_margin_bottom" /> <java-symbol type="dimen" name="notification_content_image_margin_end" /> diff --git a/core/tests/coretests/src/com/android/internal/os/BatteryStatsBackgroundStatsTest.java b/core/tests/coretests/src/com/android/internal/os/BatteryStatsBackgroundStatsTest.java index c539f789ff60..c21c3be2bcbe 100644 --- a/core/tests/coretests/src/com/android/internal/os/BatteryStatsBackgroundStatsTest.java +++ b/core/tests/coretests/src/com/android/internal/os/BatteryStatsBackgroundStatsTest.java @@ -217,10 +217,6 @@ public class BatteryStatsBackgroundStatsTest extends TestCase { curr = 1000 * (clocks.realtime = clocks.uptime = 305); bi.updateTimeBasesLocked(false, false, curr, curr); // off battery - // Stop timer - curr = 1000 * (clocks.realtime = clocks.uptime = 409); - bi.noteBluetoothScanStoppedFromSourceLocked(ws); - // Start timer (unoptimized) curr = 1000 * (clocks.realtime = clocks.uptime = 1000); bi.noteBluetoothScanStartedFromSourceLocked(ws, true); @@ -233,9 +229,13 @@ public class BatteryStatsBackgroundStatsTest extends TestCase { curr = 1000 * (clocks.realtime = clocks.uptime = 3004); bi.noteUidProcessStateLocked(UID, ActivityManager.PROCESS_STATE_TOP); - // Stop timer + // Stop timer (optimized) + curr = 1000 * (clocks.realtime = clocks.uptime = 3409); + bi.noteBluetoothScanStoppedFromSourceLocked(ws, false); + + // Stop timer (unoptimized) curr = 1000 * (clocks.realtime = clocks.uptime = 4008); - bi.noteBluetoothScanStoppedFromSourceLocked(ws); + bi.noteBluetoothScanStoppedFromSourceLocked(ws, true); // Test curr = 1000 * (clocks.realtime = clocks.uptime = 5000); diff --git a/core/tests/coretests/src/com/android/internal/os/BatteryStatsNoteTest.java b/core/tests/coretests/src/com/android/internal/os/BatteryStatsNoteTest.java index 4e8ab316e1c9..ed54f5303750 100644 --- a/core/tests/coretests/src/com/android/internal/os/BatteryStatsNoteTest.java +++ b/core/tests/coretests/src/com/android/internal/os/BatteryStatsNoteTest.java @@ -44,8 +44,6 @@ public class BatteryStatsNoteTest extends TestCase{ assertEquals(101, bi.getUidStats().get(UID).getBluetoothScanResultCounter() .getCountLocked(STATS_SINCE_CHARGED)); - // TODO: remove next line when Counter misreporting values when plugged-in bug is fixed. - bi.noteUidProcessStateLocked(UID, ActivityManager.PROCESS_STATE_IMPORTANT_BACKGROUND); BatteryStats.Counter bgCntr = bi.getUidStats().get(UID).getBluetoothScanResultBgCounter(); if (bgCntr != null) { assertEquals(0, bgCntr.getCountLocked(STATS_SINCE_CHARGED)); diff --git a/core/tests/coretests/src/com/android/internal/os/BatteryStatsSensorTest.java b/core/tests/coretests/src/com/android/internal/os/BatteryStatsSensorTest.java index af4a6d92cea6..8fd4e3110569 100644 --- a/core/tests/coretests/src/com/android/internal/os/BatteryStatsSensorTest.java +++ b/core/tests/coretests/src/com/android/internal/os/BatteryStatsSensorTest.java @@ -400,7 +400,7 @@ public class BatteryStatsSensorTest extends TestCase { assertNotNull(sensor.getSensorBackgroundTime()); // Reset the stats. Since the sensor is still running, we should still see the timer - bi.getUidStatsLocked(UID).reset(); + bi.getUidStatsLocked(UID).reset(clocks.uptime * 1000, clocks.realtime * 1000); sensor = uid.getSensorStats().get(SENSOR_ID); assertNotNull(sensor); @@ -410,9 +410,111 @@ public class BatteryStatsSensorTest extends TestCase { bi.noteStopSensorLocked(UID, SENSOR_ID); // Now the sensor timer has stopped so this reset should also take out the sensor. - bi.getUidStatsLocked(UID).reset(); + bi.getUidStatsLocked(UID).reset(clocks.uptime * 1000, clocks.realtime * 1000); sensor = uid.getSensorStats().get(SENSOR_ID); assertNull(sensor); } + + @SmallTest + public void testSensorResetTimes() throws Exception { + final MockClocks clocks = new MockClocks(); + MockBatteryStatsImpl bi = new MockBatteryStatsImpl(clocks); + final int which = BatteryStats.STATS_SINCE_CHARGED; + bi.mForceOnBattery = true; + clocks.realtime = 100; // in ms + clocks.uptime = 100; // in ms + + // TimeBases are on for some time. + BatteryStatsImpl.TimeBase timeBase = bi.getOnBatteryTimeBase(); + BatteryStatsImpl.TimeBase bgTimeBase = bi.getOnBatteryBackgroundTimeBase(UID); + timeBase.setRunning(true, clocks.uptime * 1000, clocks.realtime * 1000); + bgTimeBase.setRunning(true, clocks.uptime * 1000, clocks.realtime * 1000); + bi.noteUidProcessStateLocked(UID, ActivityManager.PROCESS_STATE_IMPORTANT_BACKGROUND); + + clocks.realtime += 100; + clocks.uptime += 100; + + // TimeBases are turned off + timeBase.setRunning(false, clocks.uptime * 1000, clocks.realtime * 1000); + bgTimeBase.setRunning(false, clocks.uptime * 1000, clocks.realtime * 1000); + + clocks.realtime += 100; + clocks.uptime += 100; + + // Timer is turned on + bi.noteStartSensorLocked(UID, SENSOR_ID); + + clocks.realtime += 100; + clocks.uptime += 100; + + // Timebase was off so times are all 0. + BatteryStats.Uid.Sensor sensor = bi.getUidStats().get(UID).getSensorStats().get(SENSOR_ID); + BatteryStats.Timer timer = sensor.getSensorTime(); + BatteryStats.Timer bgTimer = sensor.getSensorBackgroundTime(); + assertEquals(0, timer.getTotalTimeLocked(1000*clocks.realtime, which)); + assertEquals(0, timer.getTotalDurationMsLocked(clocks.realtime)); + assertEquals(0, bgTimer.getTotalTimeLocked(1000*clocks.realtime, which)); + assertEquals(0, bgTimer.getTotalDurationMsLocked(clocks.realtime)); + + clocks.realtime += 100; + clocks.uptime += 100; + + // Reset the stats. Since the sensor is still running, we should still see the timer + // but still with 0 times. + bi.getUidStatsLocked(UID).reset(clocks.uptime * 1000, clocks.realtime * 1000); + assertEquals(0, timer.getTotalTimeLocked(1000*clocks.realtime, which)); + assertEquals(0, timer.getTotalDurationMsLocked(clocks.realtime)); + assertEquals(0, bgTimer.getTotalTimeLocked(1000*clocks.realtime, which)); + assertEquals(0, bgTimer.getTotalDurationMsLocked(clocks.realtime)); + + clocks.realtime += 100; + clocks.uptime += 100; + + // Now stop the timer. The times should still be 0. + bi.noteStopSensorLocked(UID, SENSOR_ID); + assertEquals(0, timer.getTotalTimeLocked(1000*clocks.realtime, which)); + assertEquals(0, timer.getTotalDurationMsLocked(clocks.realtime)); + assertEquals(0, bgTimer.getTotalTimeLocked(1000*clocks.realtime, which)); + assertEquals(0, bgTimer.getTotalDurationMsLocked(clocks.realtime)); + + // Now repeat with the TimeBases turned on the entire time. + timeBase.setRunning(true, clocks.uptime * 1000, clocks.realtime * 1000); + bgTimeBase.setRunning(true, clocks.uptime * 1000, clocks.realtime * 1000); + clocks.realtime += 100; + clocks.uptime += 100; + + // Timer is turned on + bi.noteStartSensorLocked(UID, SENSOR_ID); + + clocks.realtime += 111; + clocks.uptime += 1111; + + // Timebase and timer was on so times have increased. + assertEquals(111_000, timer.getTotalTimeLocked(1000*clocks.realtime, which)); + assertEquals(111, timer.getTotalDurationMsLocked(clocks.realtime)); + assertEquals(111_000, bgTimer.getTotalTimeLocked(1000*clocks.realtime, which)); + assertEquals(111, bgTimer.getTotalDurationMsLocked(clocks.realtime)); + + clocks.realtime += 100; + clocks.uptime += 100; + + // Reset the stats. Since the sensor is still running, we should still see the timer + // but with 0 times. + bi.getUidStatsLocked(UID).reset(clocks.uptime * 1000, clocks.realtime * 1000); + assertEquals(0, timer.getTotalTimeLocked(1000*clocks.realtime, which)); + assertEquals(0, timer.getTotalDurationMsLocked(clocks.realtime)); + assertEquals(0, bgTimer.getTotalTimeLocked(1000*clocks.realtime, which)); + assertEquals(0, bgTimer.getTotalDurationMsLocked(clocks.realtime)); + + clocks.realtime += 112; + clocks.uptime += 112; + + // Now stop the timer. The times should have increased since the timebase was on. + bi.noteStopSensorLocked(UID, SENSOR_ID); + assertEquals(112_000, timer.getTotalTimeLocked(1000*clocks.realtime, which)); + assertEquals(112, timer.getTotalDurationMsLocked(clocks.realtime)); + assertEquals(112_000, bgTimer.getTotalTimeLocked(1000*clocks.realtime, which)); + assertEquals(112, bgTimer.getTotalDurationMsLocked(clocks.realtime)); + } } diff --git a/keystore/java/android/security/KeyStore.java b/keystore/java/android/security/KeyStore.java index bfd1422ddca4..ccf9de0abdb4 100644 --- a/keystore/java/android/security/KeyStore.java +++ b/keystore/java/android/security/KeyStore.java @@ -341,12 +341,14 @@ public class KeyStore { } } - public boolean grant(String key, int uid) { + public String grant(String key, int uid) { try { - return mBinder.grant(key, uid) == NO_ERROR; + String grantAlias = mBinder.grant(key, uid); + if (grantAlias == "") return null; + return grantAlias; } catch (RemoteException e) { Log.w(TAG, "Cannot connect to keystore", e); - return false; + return null; } } diff --git a/keystore/tests/src/android/security/KeyStoreTest.java b/keystore/tests/src/android/security/KeyStoreTest.java index 319cf32397a1..1d5bf1205bf9 100644 --- a/keystore/tests/src/android/security/KeyStoreTest.java +++ b/keystore/tests/src/android/security/KeyStoreTest.java @@ -483,7 +483,7 @@ public class KeyStoreTest extends ActivityUnitTestCase<Activity> { mKeyStore.generate(TEST_KEYNAME, KeyStore.UID_SELF, NativeConstants.EVP_PKEY_RSA, RSA_KEY_SIZE, KeyStore.FLAG_ENCRYPTED, null)); - assertTrue("Should be able to grant key to other user", + assertNotNull("Should be able to grant key to other user", mKeyStore.grant(TEST_KEYNAME, 0)); } @@ -493,19 +493,19 @@ public class KeyStoreTest extends ActivityUnitTestCase<Activity> { assertTrue("Should be able to import key for testcase", mKeyStore.importKey(TEST_KEYNAME, PRIVKEY_BYTES, KeyStore.UID_SELF, KeyStore.FLAG_ENCRYPTED)); - assertTrue("Should be able to grant key to other user", mKeyStore.grant(TEST_KEYNAME, 0)); + assertNotNull("Should be able to grant key to other user", mKeyStore.grant(TEST_KEYNAME, 0)); } public void testGrant_NoKey_Failure() throws Exception { assertTrue("Should be able to unlock keystore for test", mKeyStore.onUserPasswordChanged(TEST_PASSWD)); - assertFalse("Should not be able to grant without first initializing the keystore", + assertNull("Should not be able to grant without first initializing the keystore", mKeyStore.grant(TEST_KEYNAME, 0)); } public void testGrant_NotInitialized_Failure() throws Exception { - assertFalse("Should not be able to grant without first initializing the keystore", + assertNull("Should not be able to grant without first initializing the keystore", mKeyStore.grant(TEST_KEYNAME, 0)); } @@ -517,7 +517,7 @@ public class KeyStoreTest extends ActivityUnitTestCase<Activity> { mKeyStore.generate(TEST_KEYNAME, KeyStore.UID_SELF, NativeConstants.EVP_PKEY_RSA, RSA_KEY_SIZE, KeyStore.FLAG_ENCRYPTED, null)); - assertTrue("Should be able to grant key to other user", + assertNotNull("Should be able to grant key to other user", mKeyStore.grant(TEST_KEYNAME, 0)); assertTrue("Should be able to ungrant key to other user", @@ -531,7 +531,7 @@ public class KeyStoreTest extends ActivityUnitTestCase<Activity> { assertTrue("Should be able to import key for testcase", mKeyStore.importKey(TEST_KEYNAME, PRIVKEY_BYTES, KeyStore.UID_SELF, KeyStore.FLAG_ENCRYPTED)); - assertTrue("Should be able to grant key to other user", + assertNotNull("Should be able to grant key to other user", mKeyStore.grant(TEST_KEYNAME, 0)); assertTrue("Should be able to ungrant key to other user", @@ -563,7 +563,7 @@ public class KeyStoreTest extends ActivityUnitTestCase<Activity> { mKeyStore.generate(TEST_KEYNAME, KeyStore.UID_SELF, NativeConstants.EVP_PKEY_RSA, RSA_KEY_SIZE, KeyStore.FLAG_ENCRYPTED, null)); - assertTrue("Should be able to grant key to other user", + assertNotNull("Should be able to grant key to other user", mKeyStore.grant(TEST_KEYNAME, 0)); assertTrue("Should be able to ungrant key to other user", @@ -581,10 +581,10 @@ public class KeyStoreTest extends ActivityUnitTestCase<Activity> { mKeyStore.generate(TEST_KEYNAME, KeyStore.UID_SELF, NativeConstants.EVP_PKEY_RSA, RSA_KEY_SIZE, KeyStore.FLAG_ENCRYPTED, null)); - assertTrue("Should be able to grant key to other user", + assertNotNull("Should be able to grant key to other user", mKeyStore.grant(TEST_KEYNAME, 0)); - assertTrue("Should be able to grant key to other user a second time", + assertNotNull("Should be able to grant key to other user a second time", mKeyStore.grant(TEST_KEYNAME, 0)); assertTrue("Should be able to ungrant key to other user", diff --git a/packages/CarrierDefaultApp/src/com/android/carrierdefaultapp/CaptivePortalLoginActivity.java b/packages/CarrierDefaultApp/src/com/android/carrierdefaultapp/CaptivePortalLoginActivity.java index ae8fc80f03c7..6194b87dd76f 100644 --- a/packages/CarrierDefaultApp/src/com/android/carrierdefaultapp/CaptivePortalLoginActivity.java +++ b/packages/CarrierDefaultApp/src/com/android/carrierdefaultapp/CaptivePortalLoginActivity.java @@ -77,6 +77,7 @@ public class CaptivePortalLoginActivity extends Activity { private WebView mWebView; private MyWebViewClient mWebViewClient; private boolean mLaunchBrowser = false; + private Thread mTestingThread = null; @Override protected void onCreate(Bundle savedInstanceState) { @@ -127,8 +128,6 @@ public class CaptivePortalLoginActivity extends Activity { @Override public void onDestroy() { - super.onDestroy(); - releaseNetworkRequest(); if (mLaunchBrowser) { // Give time for this network to become default. After 500ms just proceed. for (int i = 0; i < 5; i++) { @@ -143,6 +142,13 @@ public class CaptivePortalLoginActivity extends Activity { if (DBG) logd("starting activity with intent ACTION_VIEW for " + url); startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(url))); } + + if (mTestingThread != null) { + mTestingThread.interrupt(); + } + mWebView.destroy(); + releaseNetworkRequest(); + super.onDestroy(); } // Find WebView's proxy BroadcastReceiver and prompt it to read proxy system properties. @@ -215,13 +221,14 @@ public class CaptivePortalLoginActivity extends Activity { } private void testForCaptivePortal() { - new Thread(new Runnable() { + mTestingThread = new Thread(new Runnable() { public void run() { // Give time for captive portal to open. try { Thread.sleep(1000); } catch (InterruptedException e) { } + if (isFinishing() || isDestroyed()) return; HttpURLConnection urlConnection = null; int httpResponseCode = 500; int oldTag = TrafficStats.getAndSetThreadStatsTag(TrafficStats.TAG_SYSTEM_PROBE); @@ -244,7 +251,8 @@ public class CaptivePortalLoginActivity extends Activity { done(true); } } - }).start(); + }); + mTestingThread.start(); } private Network getNetworkForCaptivePortal() { diff --git a/packages/SystemUI/res/drawable/ic_landscape_from_auto_rotate.xml b/packages/SettingsLib/res/drawable/ic_landscape_from_auto_rotate.xml index 061f9fe81a75..061f9fe81a75 100644 --- a/packages/SystemUI/res/drawable/ic_landscape_from_auto_rotate.xml +++ b/packages/SettingsLib/res/drawable/ic_landscape_from_auto_rotate.xml diff --git a/packages/SystemUI/res/drawable/ic_qs_night_display_on.xml b/packages/SettingsLib/res/drawable/ic_qs_night_display_on.xml index 8801f5d09801..8801f5d09801 100644 --- a/packages/SystemUI/res/drawable/ic_qs_night_display_on.xml +++ b/packages/SettingsLib/res/drawable/ic_qs_night_display_on.xml diff --git a/packages/SystemUI/res/drawable/ic_signal_location.xml b/packages/SettingsLib/res/drawable/ic_signal_location.xml index 2f605805eba2..2f605805eba2 100644 --- a/packages/SystemUI/res/drawable/ic_signal_location.xml +++ b/packages/SettingsLib/res/drawable/ic_signal_location.xml diff --git a/packages/SettingsLib/res/values-gl/strings.xml b/packages/SettingsLib/res/values-gl/strings.xml index 1a6fd39d22fc..fe91f4036c88 100644 --- a/packages/SettingsLib/res/values-gl/strings.xml +++ b/packages/SettingsLib/res/values-gl/strings.xml @@ -296,7 +296,7 @@ <string name="enable_freeform_support" msgid="1461893351278940416">"Activar ventás de forma libre"</string> <string name="enable_freeform_support_summary" msgid="8247310463288834487">"Activa a compatibilidade con ventás de forma libre experimentais."</string> <string name="local_backup_password_title" msgid="3860471654439418822">"Contrasinal para copias"</string> - <string name="local_backup_password_summary_none" msgid="6951095485537767956">"As copias de seguridade de ordenador completas non están protexidas"</string> + <string name="local_backup_password_summary_none" msgid="6951095485537767956">"As copias de seguranza de ordenador completas non están protexidas"</string> <string name="local_backup_password_summary_change" msgid="5376206246809190364">"Toca para cambiar ou eliminar o contrasinal para as copias de seguranza completas do escritorio"</string> <string name="local_backup_password_toast_success" msgid="582016086228434290">"Novo contrasinal da copia de seguranza definido"</string> <string name="local_backup_password_toast_confirmation_mismatch" msgid="7805892532752708288">"O contrasinal novo e a confirmación non coinciden"</string> diff --git a/packages/SettingsLib/res/values-hi/strings.xml b/packages/SettingsLib/res/values-hi/strings.xml index f0da2f7c4387..12564b531ee9 100644 --- a/packages/SettingsLib/res/values-hi/strings.xml +++ b/packages/SettingsLib/res/values-hi/strings.xml @@ -220,7 +220,7 @@ <string name="mobile_data_always_on_summary" msgid="8149773901431697910">"वाई-फ़ाई के सक्रिय रहने पर भी, हमेशा मोबाइल डेटा सक्रिय रखें (तेज़ी से नेटवर्क स्विच करने के लिए)."</string> <string name="tethering_hardware_offload_summary" msgid="7726082075333346982">"हार्डवेयर त्वरण को टेदर करना उपलब्ध होने पर उसका उपयोग करें"</string> <string name="adb_warning_title" msgid="6234463310896563253">"USB डीबग करने की अनुमति दें?"</string> - <string name="adb_warning_message" msgid="7316799925425402244">"USB डीबग करने का उद्देश्य केवल विकास है. इसका इस्तेमाल आपके कंप्यूटर और आपके डिवाइस के बीच डेटा को कॉपी करने, बिना नोटिफिकेशन के आपके डिवाइस पर ऐप इंस्टॉल करने और लॉग डेटा पढ़ने के लिए करें."</string> + <string name="adb_warning_message" msgid="7316799925425402244">"USB डीबग करने का उद्देश्य केवल विकास है. इसका इस्तेमाल आपके कंप्यूटर और आपके डिवाइस के बीच डेटा को कॉपी करने, बिना नोटिफ़िकेशन के आपके डिवाइस पर ऐप इंस्टॉल करने और लॉग डेटा पढ़ने के लिए करें."</string> <string name="adb_keys_warning_message" msgid="5659849457135841625">"आपके द्वारा पूर्व में प्राधिकृत सभी कंप्यूटर से USB डीबगिंग की पहुंच निरस्त करें?"</string> <string name="dev_settings_warning_title" msgid="7244607768088540165">"विकास सेटिंग की अनुमति दें?"</string> <string name="dev_settings_warning_message" msgid="2298337781139097964">"ये सेटिंग केवल विकास संबंधी उपयोग के प्रयोजन से हैं. वे आपके डिवाइस और उस पर स्थित ऐप्स को खराब कर सकती हैं या उनके दुर्व्यवहार का कारण हो सकती हैं."</string> diff --git a/packages/SettingsLib/src/com/android/settingslib/suggestions/SuggestionParser.java b/packages/SettingsLib/src/com/android/settingslib/suggestions/SuggestionParser.java index 167ffe61e42b..7f82a1ca17fa 100644 --- a/packages/SettingsLib/src/com/android/settingslib/suggestions/SuggestionParser.java +++ b/packages/SettingsLib/src/com/android/settingslib/suggestions/SuggestionParser.java @@ -91,7 +91,8 @@ public class SuggestionParser { // Shared prefs keys for storing dismissed state. // Index into current dismissed state. - private static final String DISMISS_INDEX = "_dismiss_index"; + @VisibleForTesting + static final String DISMISS_INDEX = "_dismiss_index"; private static final String SETUP_TIME = "_setup_time"; private static final String IS_DISMISSED = "_is_dismissed"; @@ -355,7 +356,8 @@ public class SuggestionParser { return elapsedTime > category.exclusiveExpireDaysInMillis; } - private boolean isDismissed(Tile suggestion, boolean isSmartSuggestionEnabled) { + @VisibleForTesting + boolean isDismissed(Tile suggestion, boolean isSmartSuggestionEnabled) { String dismissControl = getDismissControl(suggestion, isSmartSuggestionEnabled); if (dismissControl == null) { return false; @@ -372,7 +374,11 @@ public class SuggestionParser { return false; } int index = mSharedPrefs.getInt(keyBase + DISMISS_INDEX, 0); - int currentDismiss = parseDismissString(dismissControl)[index]; + int[] dismissRules = parseDismissString(dismissControl); + if (dismissRules.length <= index) { + return true; + } + int currentDismiss = dismissRules[index]; long time = getEndTime(mSharedPrefs.getLong(keyBase + SETUP_TIME, 0), currentDismiss); if (System.currentTimeMillis() >= time) { // Dismiss timeout has passed, undismiss it. diff --git a/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java b/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java index 0400e243eda6..8f6210042fe8 100644 --- a/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java +++ b/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java @@ -118,6 +118,7 @@ public class AccessPoint implements Comparable<AccessPoint> { */ private final ConcurrentHashMap<String, ScanResult> mScanResultCache = new ConcurrentHashMap<String, ScanResult>(32); + /** Maximum age of scan results to hold onto while actively scanning. **/ private static final long MAX_SCAN_RESULT_AGE_MS = 15000; static final String KEY_NETWORKINFO = "key_networkinfo"; @@ -441,6 +442,10 @@ public class AccessPoint implements Comparable<AccessPoint> { } private void evictOldScanResults() { + if (WifiTracker.sStaleScanResults) { + // Do not evict old scan results unless we are scanning and have fresh results. + return; + } long nowMs = SystemClock.elapsedRealtime(); for (Iterator<ScanResult> iter = mScanResultCache.values().iterator(); iter.hasNext(); ) { ScanResult result = iter.next(); diff --git a/packages/SettingsLib/src/com/android/settingslib/wifi/TestAccessPointBuilder.java b/packages/SettingsLib/src/com/android/settingslib/wifi/TestAccessPointBuilder.java index 4307cb0f1b7b..3413f249cf0c 100644 --- a/packages/SettingsLib/src/com/android/settingslib/wifi/TestAccessPointBuilder.java +++ b/packages/SettingsLib/src/com/android/settingslib/wifi/TestAccessPointBuilder.java @@ -22,6 +22,7 @@ import android.net.NetworkInfo; import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiInfo; import android.os.Bundle; +import android.support.annotation.Keep; /** * Build and return a valid AccessPoint. @@ -30,6 +31,7 @@ import android.os.Bundle; * applications. AccessPoints were designed to only be populated by the mechanisms of scan results * and wifi configurations. */ +@Keep public class TestAccessPointBuilder { // match the private values in WifiManager private static final int MIN_RSSI = -100; @@ -49,10 +51,12 @@ public class TestAccessPointBuilder { Context mContext; + @Keep public TestAccessPointBuilder(Context context) { mContext = context; } + @Keep public AccessPoint build() { Bundle bundle = new Bundle(); @@ -77,6 +81,7 @@ public class TestAccessPointBuilder { return ap; } + @Keep public TestAccessPointBuilder setActive(boolean active) { if (active) { mNetworkInfo = new NetworkInfo( @@ -96,6 +101,7 @@ public class TestAccessPointBuilder { * <p>Side effect: if this AccessPoint was previously unreachable, * setting the level will also make it reachable. */ + @Keep public TestAccessPointBuilder setLevel(int level) { // Reversal of WifiManager.calculateSignalLevels if (level == 0) { @@ -110,11 +116,13 @@ public class TestAccessPointBuilder { return this; } + @Keep public TestAccessPointBuilder setNetworkInfo(NetworkInfo info) { mNetworkInfo = info; return this; } + @Keep public TestAccessPointBuilder setRssi(int rssi) { mRssi = rssi; return this; @@ -125,6 +133,7 @@ public class TestAccessPointBuilder { * Side effect: if the signal level was not previously set, * making an AccessPoint reachable will set the signal to the minimum level. */ + @Keep public TestAccessPointBuilder setReachable(boolean reachable) { if (reachable) { // only override the mRssi if it hasn't been set yet @@ -137,6 +146,7 @@ public class TestAccessPointBuilder { return this; } + @Keep public TestAccessPointBuilder setSaved(boolean saved){ if (saved) { mNetworkId = 1; @@ -146,26 +156,31 @@ public class TestAccessPointBuilder { return this; } + @Keep public TestAccessPointBuilder setSecurity(int security) { mSecurity = security; return this; } + @Keep public TestAccessPointBuilder setSsid(String newSsid) { ssid = newSsid; return this; } + @Keep public TestAccessPointBuilder setFqdn(String fqdn) { mFqdn = fqdn; return this; } + @Keep public TestAccessPointBuilder setProviderFriendlyName(String friendlyName) { mProviderFriendlyName = friendlyName; return this; } + @Keep public TestAccessPointBuilder setWifiInfo(WifiInfo info) { mWifiInfo = info; return this; @@ -177,6 +192,7 @@ public class TestAccessPointBuilder { * <p>Setting this to a value other than {@link WifiConfiguration#INVALID_NETWORK_ID} makes this * AccessPoint a saved network. */ + @Keep public TestAccessPointBuilder setNetworkId(int networkId) { mNetworkId = networkId; return this; diff --git a/packages/SettingsLib/src/com/android/settingslib/wifi/WifiTracker.java b/packages/SettingsLib/src/com/android/settingslib/wifi/WifiTracker.java index 5a35da96375a..b299961ffac2 100644 --- a/packages/SettingsLib/src/com/android/settingslib/wifi/WifiTracker.java +++ b/packages/SettingsLib/src/com/android/settingslib/wifi/WifiTracker.java @@ -143,7 +143,9 @@ public class WifiTracker { @VisibleForTesting Scanner mScanner; - private boolean mStaleScanResults = true; + + @GuardedBy("mLock") + static boolean sStaleScanResults = true; public WifiTracker(Context context, WifiListener wifiListener, boolean includeSaved, boolean includeScans) { @@ -237,9 +239,7 @@ public class WifiTracker { }; } - /** - * Synchronously update the list of access points with the latest information. - */ + /** Synchronously update the list of access points with the latest information. */ @MainThread public void forceUpdate() { synchronized (mLock) { @@ -249,6 +249,7 @@ public class WifiTracker { final List<ScanResult> newScanResults = mWifiManager.getScanResults(); List<WifiConfiguration> configs = mWifiManager.getConfiguredNetworks(); + mInternalAccessPoints.clear(); updateAccessPointsLocked(newScanResults, configs); if (DBG) { @@ -353,7 +354,7 @@ public class WifiTracker { * <p>This should always be called when done with a WifiTracker (if startTracking was called) to * ensure proper cleanup and prevent any further callbacks from occurring. * - * <p>Calling this method will set the {@link #mStaleScanResults} bit, which prevents + * <p>Calling this method will set the {@link #sStaleScanResults} bit, which prevents * {@link WifiListener#onAccessPointsChanged()} callbacks from being invoked (until the bit * is unset on the next SCAN_RESULTS_AVAILABLE_ACTION). */ @@ -371,8 +372,8 @@ public class WifiTracker { mWorkHandler.removePendingMessages(); mMainHandler.removePendingMessages(); + sStaleScanResults = true; } - mStaleScanResults = true; } private void unregisterScoreCache() { @@ -477,14 +478,14 @@ public class WifiTracker { /** * Safely modify {@link #mInternalAccessPoints} by acquiring {@link #mLock} first. * - * <p>Will not perform the update if {@link #mStaleScanResults} is true + * <p>Will not perform the update if {@link #sStaleScanResults} is true */ private void updateAccessPoints() { List<WifiConfiguration> configs = mWifiManager.getConfiguredNetworks(); final List<ScanResult> newScanResults = mWifiManager.getScanResults(); synchronized (mLock) { - if(!mStaleScanResults) { + if(!sStaleScanResults) { updateAccessPointsLocked(newScanResults, configs); } } @@ -494,7 +495,7 @@ public class WifiTracker { * Update the internal list of access points. * * <p>Do not called directly (except for forceUpdate), use {@link #updateAccessPoints()} which - * respects {@link #mStaleScanResults}. + * respects {@link #sStaleScanResults}. */ @GuardedBy("mLock") private void updateAccessPointsLocked(final List<ScanResult> newScanResults, @@ -784,9 +785,11 @@ public class WifiTracker { mWorkHandler.sendEmptyMessage(WorkHandler.MSG_UPDATE_ACCESS_POINTS); } else if (WifiManager.NETWORK_STATE_CHANGED_ACTION.equals(action)) { NetworkInfo info = intent.getParcelableExtra(WifiManager.EXTRA_NETWORK_INFO); - mConnected.set(info.isConnected()); - mMainHandler.sendEmptyMessage(MainHandler.MSG_CONNECTED_CHANGED); + if(mConnected.get() != info.isConnected()) { + mConnected.set(info.isConnected()); + mMainHandler.sendEmptyMessage(MainHandler.MSG_CONNECTED_CHANGED); + } mWorkHandler.obtainMessage(WorkHandler.MSG_UPDATE_NETWORK_INFO, info) .sendToTarget(); @@ -839,7 +842,7 @@ public class WifiTracker { // Only notify listeners of changes if we have fresh scan results, otherwise the // UI will be updated with stale results. We want to copy the APs regardless, // for instances where forceUpdate was invoked by the caller. - if (mStaleScanResults) { + if (sStaleScanResults) { copyAndNotifyListeners(false /*notifyListeners*/); } else { copyAndNotifyListeners(true /*notifyListeners*/); @@ -894,7 +897,7 @@ public class WifiTracker { switch (msg.what) { case MSG_UPDATE_ACCESS_POINTS: if (msg.arg1 == CLEAR_STALE_SCAN_RESULTS) { - mStaleScanResults = false; + sStaleScanResults = false; } updateAccessPoints(); break; diff --git a/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/WifiTrackerTest.java b/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/WifiTrackerTest.java index c87d01a7da8e..6ede55d2941e 100644 --- a/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/WifiTrackerTest.java +++ b/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/WifiTrackerTest.java @@ -135,7 +135,9 @@ public class WifiTrackerTest { private HandlerThread mWorkerThread; private Looper mWorkerLooper; private Looper mMainLooper; + private int mOriginalScoringUiSettingValue; + private boolean mOriginalStaleScanResultsValue; @Before public void setUp() { @@ -210,6 +212,8 @@ public class WifiTrackerTest { InstrumentationRegistry.getTargetContext().getContentResolver(), Settings.Global.NETWORK_SCORING_UI_ENABLED, 1 /* enabled */); + + mOriginalStaleScanResultsValue = WifiTracker.sStaleScanResults; } @After @@ -218,6 +222,8 @@ public class WifiTrackerTest { InstrumentationRegistry.getTargetContext().getContentResolver(), Settings.Global.NETWORK_SCORING_UI_ENABLED, mOriginalScoringUiSettingValue); + + WifiTracker.sStaleScanResults = mOriginalStaleScanResultsValue; } private static ScanResult buildScanResult1() { @@ -840,4 +846,37 @@ public class WifiTrackerTest { assertThat(tracker.getAccessPoints()).isEmpty(); } + + @Test + public void onConnectedChangedCallback_shouldNotBeInvokedWhenNoStateChange() throws Exception { + WifiTracker tracker = createTrackerWithScanResultsAndAccessPoint1Connected(); + verify(mockWifiListener, times(1)).onConnectedChanged(); + + NetworkInfo networkInfo = new NetworkInfo( + ConnectivityManager.TYPE_WIFI, 0, "Type Wifi", "subtype"); + networkInfo.setDetailedState(NetworkInfo.DetailedState.CONNECTED, "connected", "test"); + + Intent intent = new Intent(WifiManager.NETWORK_STATE_CHANGED_ACTION); + intent.putExtra(WifiManager.EXTRA_NETWORK_INFO, networkInfo); + tracker.mReceiver.onReceive(mContext, intent); + + verify(mockWifiListener, times(1)).onConnectedChanged(); + } + + @Test + public void onConnectedChangedCallback_shouldNBeInvokedWhenStateChanges() throws Exception { + WifiTracker tracker = createTrackerWithScanResultsAndAccessPoint1Connected(); + verify(mockWifiListener, times(1)).onConnectedChanged(); + + NetworkInfo networkInfo = new NetworkInfo( + ConnectivityManager.TYPE_WIFI, 0, "Type Wifi", "subtype"); + networkInfo.setDetailedState( + NetworkInfo.DetailedState.DISCONNECTED, "dicconnected", "test"); + + Intent intent = new Intent(WifiManager.NETWORK_STATE_CHANGED_ACTION); + intent.putExtra(WifiManager.EXTRA_NETWORK_INFO, networkInfo); + tracker.mReceiver.onReceive(mContext, intent); + + verify(mockWifiListener, times(2)).onConnectedChanged(); + } } diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/suggestions/SuggestionParserTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/suggestions/SuggestionParserTest.java index 60933cfbbbda..83911360bdfe 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/suggestions/SuggestionParserTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/suggestions/SuggestionParserTest.java @@ -16,6 +16,8 @@ package com.android.settingslib.suggestions; +import static com.google.common.truth.Truth.assertThat; + import android.content.ComponentName; import android.content.Context; import android.content.Intent; @@ -42,8 +44,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import static com.google.common.truth.Truth.assertThat; - @RunWith(SettingLibRobolectricTestRunner.class) @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) public class SuggestionParserTest { @@ -190,6 +190,24 @@ public class SuggestionParserTest { assertThat(sl.getSuggestionForCategory("category2")).hasSize(1); } + @Test + public void isSuggestionDismissed_mismatchRule_shouldDismiss() { + final Tile suggestion = new Tile(); + suggestion.metaData = new Bundle(); + suggestion.metaData.putString(SuggestionParser.META_DATA_DISMISS_CONTROL, "1,2,3"); + suggestion.intent = new Intent().setComponent(new ComponentName("pkg", "cls")); + + // Dismiss suggestion when smart suggestion is not enabled. + mSuggestionParser.dismissSuggestion(suggestion, false /* isSmartSuggestionEnabled */); + final String suggestionKey = suggestion.intent.getComponent().flattenToShortString(); + // And point to last rule in dismiss control + mPrefs.edit().putInt(suggestionKey + SuggestionParser.DISMISS_INDEX, 2).apply(); + + // Turn on smart suggestion, and check if suggestion is enabled. + assertThat(mSuggestionParser.isDismissed(suggestion, true /* isSmartSuggestionEnabled */)) + .isTrue(); + } + private void readAndDismissSuggestion(boolean isSmartSuggestionEnabled) { mSuggestionsBeforeDismiss = new ArrayList<>(); mSuggestionsAfterDismiss = new ArrayList<>(); diff --git a/packages/SystemUI/AndroidManifest.xml b/packages/SystemUI/AndroidManifest.xml index e322acc5d731..47ffa5c5ff82 100644 --- a/packages/SystemUI/AndroidManifest.xml +++ b/packages/SystemUI/AndroidManifest.xml @@ -208,7 +208,7 @@ android:icon="@drawable/icon" android:process="com.android.systemui" android:supportsRtl="true" - android:theme="@style/systemui_theme" + android:theme="@style/Theme.SystemUI" android:defaultToDeviceProtectedStorage="true" android:directBootAware="true"> <!-- Keep theme in sync with SystemUIApplication.onCreate(). diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_password_view.xml b/packages/SystemUI/res-keyguard/layout/keyguard_password_view.xml index b821e7e76c60..9fdb00eebe10 100644 --- a/packages/SystemUI/res-keyguard/layout/keyguard_password_view.xml +++ b/packages/SystemUI/res-keyguard/layout/keyguard_password_view.xml @@ -43,7 +43,7 @@ android:layout_height="wrap_content" android:layout_width="280dp" android:layout_gravity="center_horizontal" - android:theme="@style/PasswordTheme" + android:theme="?attr/passwordStyle" > <EditText android:id="@+id/passwordEntry" diff --git a/packages/SystemUI/res-keyguard/values/attrs.xml b/packages/SystemUI/res-keyguard/values/attrs.xml index 802bd308d407..e2ce210efdcb 100644 --- a/packages/SystemUI/res-keyguard/values/attrs.xml +++ b/packages/SystemUI/res-keyguard/values/attrs.xml @@ -41,4 +41,6 @@ <declare-styleable name="CarrierText"> <attr name="allCaps" format="boolean" /> </declare-styleable> + + <attr name="passwordStyle" format="reference" /> </resources> diff --git a/packages/SystemUI/res-keyguard/values/strings.xml b/packages/SystemUI/res-keyguard/values/strings.xml index b951c4c591f7..589f1c16935b 100644 --- a/packages/SystemUI/res-keyguard/values/strings.xml +++ b/packages/SystemUI/res-keyguard/values/strings.xml @@ -99,12 +99,12 @@ <string name="keyguard_sim_unlock_progress_dialog_message">Unlocking SIM card\u2026</string> <!-- Time format strings for fall-back clock widget --> - <string name="keyguard_widget_12_hours_format" translatable="false">h\uee01mm</string> + <string name="keyguard_widget_12_hours_format" translatable="false">h:mm</string> <!-- Time format strings for fall-back clock widget --> - <string name="keyguard_widget_24_hours_format" translatable="false">kk\uee01mm</string> + <string name="keyguard_widget_24_hours_format" translatable="false">kk:mm</string> <!-- The character used in keyguard_widget_12_hours_format and keyguard_widget_24_hours_format to represent a ":". --> - <string name="keyguard_fancy_colon" translatable="false">\uee01</string> + <string name="keyguard_fancy_colon" translatable="false"></string> <!-- Accessibility description of the PIN password view. [CHAR_LIMIT=none] --> <string name="keyguard_accessibility_pin_area">PIN area</string> diff --git a/packages/SystemUI/res-keyguard/values/styles.xml b/packages/SystemUI/res-keyguard/values/styles.xml index ea867eed08b4..4f8214769445 100644 --- a/packages/SystemUI/res-keyguard/values/styles.xml +++ b/packages/SystemUI/res-keyguard/values/styles.xml @@ -54,13 +54,20 @@ <style name="widget_big_thin"> <item name="android:textSize">@dimen/widget_big_font_size</item> <item name="android:fontFamily">@*android:string/config_headlineFontFamilyLight</item> + <item name="android:fontFeatureSettings">@*android:string/config_headlineFontFeatureSettings</item> </style> <style name="BouncerSecurityContainer"> <item name="android:layout_gravity">center_horizontal|bottom</item> </style> - <style name="PasswordTheme" parent="systemui_theme"> + <style name="PasswordTheme" parent="Theme.SystemUI"> + <item name="android:textColor">?attr/wallpaperTextColor</item> + <item name="android:colorControlNormal">?attr/wallpaperTextColor</item> + <item name="android:colorControlActivated">?attr/wallpaperTextColor</item> + </style> + + <style name="PasswordTheme.Light" parent="Theme.SystemUI.Light"> <item name="android:textColor">?attr/wallpaperTextColor</item> <item name="android:colorControlNormal">?attr/wallpaperTextColor</item> <item name="android:colorControlActivated">?attr/wallpaperTextColor</item> diff --git a/packages/SystemUI/res/drawable/ic_dnd.xml b/packages/SystemUI/res/drawable/ic_dnd.xml index e658e687821b..9a1d502e21e5 100644 --- a/packages/SystemUI/res/drawable/ic_dnd.xml +++ b/packages/SystemUI/res/drawable/ic_dnd.xml @@ -1,5 +1,5 @@ <!-- - Copyright (C) 2015 The Android Open Source Project + Copyright (C) 2017 The Android Open Source Project Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -15,13 +15,13 @@ --> <vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" - android:viewportHeight="48.0" - android:viewportWidth="48.0" + android:viewportHeight="24.0" + android:viewportWidth="24.0" android:width="24dp" android:tint="?android:attr/colorControlNormal"> <path android:fillColor="#FFFFFFFF" - android:pathData="M24.0,4.0C12.95,4.0 4.0,12.95 4.0,24.0s8.95,20.0 20.0,20.0 20.0,-8.95 20.0,-20.0S35.05,4.0 24.0,4.0zm10.0,22.0L14.0,26.0l0.0,-4.0l20.0,0.0l0.0,4.0z" /> + android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM16,13L8,13c-0.55,0 -1,-0.45 -1,-1s0.45,-1 1,-1h8c0.55,0 1,0.45 1,1s-0.45,1 -1,1z"/> </vector> diff --git a/packages/SystemUI/res/drawable/ic_dnd_total_silence.xml b/packages/SystemUI/res/drawable/ic_dnd_total_silence.xml index 0515b35fb875..e7b9fa7e6988 100644 --- a/packages/SystemUI/res/drawable/ic_dnd_total_silence.xml +++ b/packages/SystemUI/res/drawable/ic_dnd_total_silence.xml @@ -1,5 +1,5 @@ <!-- - Copyright (C) 2015 The Android Open Source Project + Copyright (C) 2017 The Android Open Source Project Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -22,9 +22,6 @@ <path android:fillColor="#FFFFFFFF" - android:pathData="M12.0,2.0C6.5,2.0 2.0,6.5 2.0,12.0s4.5,10.0 10.0,10.0s10.0,-4.5 10.0,-10.0S17.5,2.0 12.0,2.0zM12.0,20.5c-4.7,0.0 -8.5,-3.8 -8.5,-8.5S7.3,3.5 12.0,3.5s8.5,3.8 8.5,8.5S16.7,20.5 12.0,20.5z"/> - <path - android:fillColor="#FFFFFFFF" - android:pathData="M12.0,6.0c-3.3,0.0 -6.0,2.7 -6.0,6.0c0.0,3.3 2.7,6.0 6.0,6.0s6.0,-2.7 6.0,-6.0C18.0,8.7 15.4,6.0 12.0,6.0zM15.0,13.0L9.0,13.0l0.0,-2.0l6.0,0.0L15.0,13.0z"/> + android:pathData="M12,2C6.5,2 2,6.5 2,12s4.5,10 10,10 10,-4.5 10,-10S17.5,2 12,2zM12,20.5c-4.7,0 -8.5,-3.8 -8.5,-8.5S7.3,3.5 12,3.5s8.5,3.8 8.5,8.5 -3.8,8.5 -8.5,8.5zM12,6c-3.3,0 -6,2.7 -6,6s2.7,6 6,6 6,-2.7 6,-6 -2.6,-6 -6,-6zM14,13h-4c-0.55,0 -1,-0.45 -1,-1s0.45,-1 1,-1h4c0.55,0 1,0.45 1,1s-0.45,1 -1,1z"/> </vector> diff --git a/packages/SystemUI/res/drawable/ic_volume_alarm.xml b/packages/SystemUI/res/drawable/ic_volume_alarm.xml index e64f445bef27..996e488e8c81 100644 --- a/packages/SystemUI/res/drawable/ic_volume_alarm.xml +++ b/packages/SystemUI/res/drawable/ic_volume_alarm.xml @@ -1,5 +1,5 @@ <!-- - Copyright (C) 2015 The Android Open Source Project + Copyright (C) 2017 The Android Open Source Project Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -15,13 +15,13 @@ --> <vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24.0dp" - android:viewportHeight="48.0" - android:viewportWidth="48.0" + android:viewportHeight="24.0" + android:viewportWidth="24.0" android:width="24.0dp" android:tint="?android:attr/colorControlNormal"> <path android:fillColor="#FFFFFF" - android:pathData="M44.0,11.44l-9.19,-7.71 -2.57,3.06 9.19,7.71 2.57,-3.06zm-28.24,-4.66l-2.57,-3.06 -9.19,7.71 2.57,3.06 9.19,-7.71zm9.24,9.22l-3.0,0.0l0.0,12.0l9.49,5.71 1.51,-2.47 -8.0,-4.74l0.0,-10.5zm-1.01,-8.0c-9.95,0.0 -17.99,8.06 -17.99,18.0s8.04,18.0 17.99,18.0 18.01,-8.06 18.01,-18.0 -8.06,-18.0 -18.01,-18.0zm0.01,32.0c-7.73,0.0 -14.0,-6.27 -14.0,-14.0s6.27,-14.0 14.0,-14.0 14.0,6.27 14.0,14.0 -6.26,14.0 -14.0,14.0z" /> + android:pathData="M2.7,6.5c-0.4,-0.4 -0.3,-1 0.1,-1.4l3,-2.6c0.4,-0.4 1,-0.3 1.4,0.1C7.6,3 7.5,3.7 7.1,4l-3,2.6C3.6,7 3,6.9 2.7,6.5zM21.3,5.1l-3.1,-2.6c-0.4,-0.4 -0.99,-0.31 -1.4,0.1c-0.4,0.4 -0.3,1 0.1,1.4L20,6.6c0.41,0.37 1,0.3 1.4,-0.1C21.73,6.12 21.7,5.4 21.3,5.1zM21,13c0,5 -4,9 -9,9s-9,-4 -9,-9s4,-9 9,-9S21,8 21,13zM19.1,13c0,-3.9 -3.2,-7.1 -7.1,-7.1S4.9,9.1 4.9,13s3.2,7.1 7.1,7.1S19.1,16.9 19.1,13zM11.75,8C11.34,8 11,8.34 11,8.75V14l4.14,2.48c0.34,0.21 0.77,0.1 0.98,-0.24s0.09,-0.79 -0.25,-0.99l-3.37,-2v-4.5C12.5,8.34 12.16,8 11.75,8z"/> -</vector>
\ No newline at end of file +</vector> diff --git a/packages/SystemUI/res/drawable/ic_volume_alarm_mute.xml b/packages/SystemUI/res/drawable/ic_volume_alarm_mute.xml index 37d769084b6d..02fb1e702438 100644 --- a/packages/SystemUI/res/drawable/ic_volume_alarm_mute.xml +++ b/packages/SystemUI/res/drawable/ic_volume_alarm_mute.xml @@ -1,5 +1,5 @@ <!-- - Copyright (C) 2015 The Android Open Source Project + Copyright (C) 2017 The Android Open Source Project Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -15,13 +15,13 @@ --> <vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24.0dp" - android:viewportHeight="48.0" - android:viewportWidth="48.0" + android:viewportHeight="24.0" + android:viewportWidth="24.0" android:width="24.0dp" android:tint="?android:attr/colorControlNormal" > <path android:fillColor="#FFFFFF" - android:pathData="M24.0,12.0c7.73,0.0 14.0,6.27 14.0,14.0 0.0,1.69 -0.31,3.3 -0.86,4.8l3.04,3.04c1.16,-2.37 1.82,-5.03 1.82,-7.84 0.0,-9.94 -8.06,-18.0 -18.01,-18.0 -2.81,0.0 -5.46,0.66 -7.84,1.81l3.05,3.05c1.5,-0.55 3.11,-0.86 4.8,-0.86zm20.0,-0.56l-9.19,-7.71 -2.57,3.06 9.19,7.71 2.57,-3.06zm-38.16,-6.85l-2.55,2.54 2.66,2.66 -2.22,1.86 2.84,2.84 2.22,-1.86 1.6,1.6c-2.73,3.16 -4.39,7.27 -4.39,11.77 0.0,9.94 8.04,18.0 17.99,18.0 4.51,0.0 8.62,-1.67 11.77,-4.4l4.4,4.4 2.54,-2.55 -34.91,-34.91 -1.95,-1.95zm27.1,32.19c-2.43,2.01 -5.54,3.22 -8.94,3.22 -7.73,0.0 -14.0,-6.27 -14.0,-14.0 0.0,-3.4 1.21,-6.51 3.22,-8.94l19.72,19.72zm-16.91,-30.23l-2.84,-2.84 -1.7,1.43 2.84,2.84 1.7,-1.43z" /> + android:pathData="M21.35,6.49c-0.35,0.42 -0.98,0.47 -1.4,0.12l-3.07,-2.57a1,1 0,1 1,1.29 -1.53l3.07,2.57c0.42,0.35 0.47,0.98 0.11,1.41zM20.72,20.09a0.9,0.9 0,0 1,0 1.27,0.9 0.9,0 0,1 -1.27,0l-1.57,-1.57A8.875,8.875 0,0 1,12 22c-4.98,0 -9,-4.03 -9,-9 0,-2.25 0.83,-4.31 2.2,-5.89l-0.8,-0.8 -0.41,0.35a1,1 0,0 1,-1.35 -0.06,1 1,0 0,1 0.07,-1.47l0.27,-0.23 -0.7,-0.7a0.9,0.9 0,0 1,0 -1.27c0.35,-0.35 0.93,-0.35 1.28,0l17.16,17.16zM16.54,18.45L6.55,8.46A7.041,7.041 0,0 0,4.9 13c0,3.91 3.19,7.1 7.1,7.1 1.73,0 3.31,-0.62 4.54,-1.65zM7.17,3.98A0.997,0.997 0,1 0,5.9 2.44l-0.16,0.13 1.42,1.42 0.01,-0.01zM12,4c-1.41,0 -2.73,0.33 -3.92,0.91l1.45,1.45c0.77,-0.29 1.6,-0.46 2.47,-0.46 3.91,0 7.1,3.18 7.1,7.1 0,0.87 -0.17,1.7 -0.45,2.47l1.44,1.44c0.58,-1.18 0.91,-2.5 0.91,-3.91a9,9 0,0 0,-9 -9z"/> -</vector>
\ No newline at end of file +</vector> diff --git a/packages/SystemUI/res/drawable/ic_volume_bt_sco.xml b/packages/SystemUI/res/drawable/ic_volume_bt_sco.xml index 5c3c6503d7c6..b0b9404cef46 100644 --- a/packages/SystemUI/res/drawable/ic_volume_bt_sco.xml +++ b/packages/SystemUI/res/drawable/ic_volume_bt_sco.xml @@ -1,5 +1,5 @@ <!-- - Copyright (C) 2015 The Android Open Source Project + Copyright (C) 2017 The Android Open Source Project Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -15,13 +15,16 @@ --> <vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24.0dp" - android:viewportHeight="48.0" - android:viewportWidth="48.0" + android:viewportHeight="24.0" + android:viewportWidth="24.0" android:width="24.0dp" android:tint="?android:attr/colorControlNormal" > <path android:fillColor="#FFFFFF" - android:pathData="M29.41,19.0L34.0,14.41L34.0,22.0l1.0,0.0l5.71,-5.71 -4.3,-4.29 4.29,-4.29L35.0,2.0l-1.0,0.0l0.0,7.59L29.41,5.0 28.0,6.41 33.59,12.0 28.0,17.59 29.41,19.0zM36.0,5.83l1.88,1.88L36.0,9.59L36.0,5.83zm0.0,8.58l1.88,1.88L36.0,18.17l0.0,-3.76zM40.0,31.0c-2.49,0.0 -4.89,-0.4 -7.14,-1.14 -0.69,-0.22 -1.48,-0.06 -2.0,0.49l-4.4,4.41c-5.67,-2.88 -10.29,-7.51 -13.18,-13.17l4.4,-4.41c0.55,-0.5 0.71,-1.3 0.49,-2.03C17.4,12.9 17.0,10.49 17.0,8.0c0.0,-1.11 -0.89,-2.0 -2.0,-2.0L8.0,6.0c-1.11,0.0 -2.0,0.89 -2.0,2.0 0.0,18.78 15.22,34.0 34.0,34.0 1.11,0.0 2.0,-0.89 2.0,-2.0l0.0,-7.0c0.0,-1.11 -0.89,-2.0 -2.0,-2.0z" /> + android:pathData="M20,15.5c-1.25,0 -2.45,-0.2 -3.57,-0.57c-0.35,-0.11 -0.74,-0.03 -1.02,0.24l-2.2,2.2c-2.83,-1.44 -5.15,-3.75 -6.59,-6.59l2.2,-2.21c0.28,-0.26 0.36,-0.65 0.25,-1C8.7,6.45 8.5,5.25 8.5,4c0,-0.55 -0.45,-1 -1,-1H4C3.45,3 3,3.45 3,4c0,9.39 7.61,17 17,17c0.55,0 1,-0.45 1,-1v-3.5C21,15.95 20.55,15.5 20,15.5z"/> + <path + android:fillColor="#FFFFFF" + android:pathData="M17.97,6l1.88,-1.87c0.21,-0.21 0.21,-0.54 0,-0.74L17.6,1.16l-0.01,-0.01c-0.21,-0.2 -0.53,-0.2 -0.73,0.01c-0.09,0.1 -0.15,0.23 -0.15,0.36v3.23l-2.03,-2.03c-0.21,-0.21 -0.53,-0.21 -0.74,0c-0.21,0.21 -0.21,0.53 0,0.74L16.49,6l-2.55,2.55c-0.21,0.21 -0.21,0.53 0,0.74c0.21,0.21 0.53,0.21 0.74,0l2.03,-2.03v3.23c0,0.29 0.24,0.52 0.52,0.52c0.13,0 0.26,-0.05 0.35,-0.15l2.25,-2.25c0.21,-0.21 0.21,-0.54 0,-0.74L17.97,6zM17.75,2.78l0.99,0.99l-0.99,0.99V2.78zM17.75,9.23V7.27l0.99,0.99L17.75,9.23z"/> -</vector>
\ No newline at end of file +</vector> diff --git a/packages/SystemUI/res/drawable/ic_volume_media.xml b/packages/SystemUI/res/drawable/ic_volume_media.xml index d6892077fa58..53c0740d88ea 100644 --- a/packages/SystemUI/res/drawable/ic_volume_media.xml +++ b/packages/SystemUI/res/drawable/ic_volume_media.xml @@ -1,5 +1,5 @@ <!-- - Copyright (C) 2015 The Android Open Source Project + Copyright (C) 2017 The Android Open Source Project Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -22,6 +22,6 @@ <path android:fillColor="#FFFFFF" - android:pathData="M12.0,3.0l0.0,9.28c-0.47,-0.17 -0.97,-0.28 -1.5,-0.28C8.01,12.0 6.0,14.01 6.0,16.5S8.01,21.0 10.5,21.0c2.31,0.0 4.2,-1.75 4.45,-4.0L15.0,17.0L15.0,6.0l4.0,0.0L19.0,3.0l-7.0,0.0z" /> + android:pathData="M18,3h-5c-0.55,0 -1,0.45 -1,1v8.3a3.88,3.88 0,0 0,-2.9 -0.04c-1.79,0.67 -3.11,2.35 -3.1,4.26A4.483,4.483 0,0 0,10.5 21c2.5,0 4.5,-2.3 4.5,-4.5V6h3c0.55,0 1,-0.45 1,-1V4c0,-0.55 -0.45,-1 -1,-1z"/> -</vector>
\ No newline at end of file +</vector> diff --git a/packages/SystemUI/res/drawable/ic_volume_media_bt.xml b/packages/SystemUI/res/drawable/ic_volume_media_bt.xml index 9b7b2da72b9c..60d0184c0ba2 100644 --- a/packages/SystemUI/res/drawable/ic_volume_media_bt.xml +++ b/packages/SystemUI/res/drawable/ic_volume_media_bt.xml @@ -1,5 +1,5 @@ <!-- - Copyright (C) 2015 The Android Open Source Project + Copyright (C) 2017 The Android Open Source Project Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -22,9 +22,6 @@ <path android:fillColor="#FFFFFF" - android:pathData="M17.0,3.0l-7.0,0.0l0.0,9.3C9.5,12.1 9.0,12.0 8.5,12.0C6.0,12.0 4.0,14.0 4.0,16.5S6.0,21.0 8.5,21.0s4.5,-2.3 4.5,-4.5C13.0,14.7 13.0,6.0 13.0,6.0l4.0,0.0L17.0,3.0z"/> - <path - android:fillColor="#FFFFFF" - android:pathData="M23.4,9.9L20.5,7.0L20.0,7.0l0.0,3.8l-2.3,-2.3L17.0,9.2l2.8,2.8L17.0,14.8l0.7,0.7l2.3,-2.3L20.0,17.0l0.5,0.0l2.8,-2.8L21.2,12.0L23.4,9.9zM21.0,8.9l0.9,0.9l-0.9,1.0L21.0,8.9zM21.9,14.2L21.0,15.1l0.0,-1.9L21.9,14.2z"/> + android:pathData="M16,3h-5c-0.55,0 -1,0.45 -1,1v8.3c-0.93,-0.39 -1.96,-0.4 -2.9,-0.04c-1.79,0.67 -3.11,2.35 -3.1,4.26C4,19 6.01,21 8.49,21c0,0 0.01,0 0.01,0c2.5,0 4.5,-2.3 4.5,-4.5V6h3c0.55,0 1,-0.45 1,-1V4C17,3.45 16.55,3 16,3zM20.97,12l1.88,-1.87c0.21,-0.21 0.21,-0.54 0,-0.74L20.6,7.16l-0.01,-0.01c-0.21,-0.2 -0.53,-0.2 -0.73,0.01c-0.09,0.1 -0.15,0.23 -0.15,0.36v3.23l-2.03,-2.03c-0.21,-0.21 -0.53,-0.21 -0.74,0c-0.21,0.21 -0.21,0.53 0,0.74L19.49,12l-2.55,2.55c-0.21,0.21 -0.21,0.53 0,0.74c0.21,0.21 0.53,0.21 0.74,0l2.03,-2.03v3.23c0,0.29 0.24,0.52 0.52,0.52c0.13,0 0.26,-0.05 0.35,-0.15l0.02,-0.02l2.23,-2.23c0.21,-0.21 0.21,-0.54 0,-0.74L20.97,12zM20.75,10.75V8.78l0.99,0.99L20.75,10.75zM20.75,15.23v-1.96l0.99,0.99C21.73,14.25 20.75,15.23 20.75,15.23z"/> </vector> diff --git a/packages/SystemUI/res/drawable/ic_volume_media_bt_mute.xml b/packages/SystemUI/res/drawable/ic_volume_media_bt_mute.xml index 17ac01d078dd..49fcfc4d4919 100644 --- a/packages/SystemUI/res/drawable/ic_volume_media_bt_mute.xml +++ b/packages/SystemUI/res/drawable/ic_volume_media_bt_mute.xml @@ -1,5 +1,5 @@ <!-- - Copyright (C) 2015 The Android Open Source Project + Copyright (C) 2017 The Android Open Source Project Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -22,12 +22,12 @@ <path android:fillColor="#FFFFFF" - android:pathData="M13.0,6.0l4.0,0.0L17.0,3.0l-7.0,0.0l0.0,5.6l3.0,3.0C13.0,8.8 13.0,6.0 13.0,6.0z"/> + android:pathData="M13,6h3c0.55,0 1,-0.45 1,-1V4c0,-0.55 -0.45,-1 -1,-1h-5c-0.55,0 -1,0.45 -1,1v4.6l3,3V6z"/> <path android:fillColor="#FFFFFF" - android:pathData="M2.1,5.7L8.4,12.0C6.0,12.1 4.0,14.0 4.0,16.5S6.0,21.0 8.5,21.0c2.7,0.0 4.5,-2.3 4.5,-4.3l0.0,-0.1l3.9,3.9l1.3,-1.3L3.4,4.5L2.1,5.7z"/> + android:pathData="M4,5.1C3.67,4.76 3.12,4.75 2.78,5.08C2.41,5.42 2.4,6 2.75,6.35L8.4,12C6,12.1 4,14 4,16.5c0,2.51 2.33,4.67 4.84,4.48C11.35,20.81 13,18.62 13,16.7v-0.1l3.27,3.27c0.35,0.35 0.91,0.35 1.25,0l0.05,-0.05c0.35,-0.35 0.35,-0.91 0,-1.25L4,5.1z"/> <path android:fillColor="#FFFFFF" - android:pathData="M23.4,9.9L20.5,7.0L20.0,7.0l0.0,3.8l-2.3,-2.3L17.0,9.2l2.8,2.8L17.0,14.8l0.7,0.7l2.3,-2.3L20.0,17.0l0.5,0.0l2.8,-2.8L21.2,12.0L23.4,9.9zM21.0,8.9l0.9,0.9l-0.9,1.0L21.0,8.9zM21.9,14.2L21.0,15.1l0.0,-1.9L21.9,14.2z"/> + android:pathData="M20.97,12l1.88,-1.87c0.21,-0.21 0.21,-0.54 0,-0.74L20.6,7.16l-0.01,-0.01c-0.21,-0.2 -0.53,-0.2 -0.73,0.01c-0.09,0.1 -0.15,0.23 -0.15,0.36v3.23l-2.03,-2.03c-0.21,-0.21 -0.53,-0.21 -0.74,0c-0.21,0.21 -0.21,0.53 0,0.74L19.49,12l-2.55,2.55c-0.21,0.21 -0.21,0.53 0,0.74c0.21,0.21 0.53,0.21 0.74,0l2.03,-2.03v3.23c0,0.29 0.24,0.52 0.52,0.52c0.13,0 0.26,-0.05 0.35,-0.15l2.25,-2.25c0.21,-0.21 0.21,-0.54 0,-0.74L20.97,12zM20.75,8.78l0.99,0.99l-0.99,0.98V8.78zM20.75,15.23v-1.96l0.99,0.99C21.73,14.25 20.75,15.23 20.75,15.23z"/> -</vector>
\ No newline at end of file +</vector> diff --git a/packages/SystemUI/res/drawable/ic_volume_media_mute.xml b/packages/SystemUI/res/drawable/ic_volume_media_mute.xml index 267d09d7b84e..ebb86e896d21 100644 --- a/packages/SystemUI/res/drawable/ic_volume_media_mute.xml +++ b/packages/SystemUI/res/drawable/ic_volume_media_mute.xml @@ -1,5 +1,5 @@ <!-- - Copyright (C) 2015 The Android Open Source Project + Copyright (C) 2017 The Android Open Source Project Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -22,9 +22,6 @@ <path android:fillColor="#FFFFFF" - android:pathData="M15.0,6.0l4.0,0.0L19.0,3.0l-7.0,0.0l0.0,5.6l3.0,3.0C15.0,8.8 15.0,6.0 15.0,6.0z" /> - <path - android:fillColor="#FFFFFF" - android:pathData="M4.8,3.9L3.5,5.1l6.9,6.9C8.0,12.1 6.0,14.0 6.0,16.5C6.0,19.0 8.0,21.0 10.5,21.0c2.7,0.0 4.5,-2.3 4.5,-4.3c0.0,0.0 0.0,-0.1 0.0,-0.1l4.0,4.0l1.3,-1.3L4.8,3.9z" /> + android:pathData="M15,6h3c0.55,0 1,-0.45 1,-1V4c0,-0.55 -0.45,-1 -1,-1h-5c-0.55,0 -1,0.45 -1,1v4.6l3,3V6zM4.18,4.48c-0.37,0.34 -0.38,0.92 -0.03,1.27L10.4,12C8,12.1 6,14 6,16.5c0,2.51 2.33,4.67 4.84,4.48 2.51,-0.17 4.16,-2.36 4.16,-4.28v-0.1l3.37,3.37c0.35,0.35 0.91,0.35 1.25,0l0.05,-0.05c0.35,-0.35 0.35,-0.91 0,-1.25L5.4,4.5a0.866,0.866 0,0 0,-1.22 -0.02z"/> -</vector>
\ No newline at end of file +</vector> diff --git a/packages/SystemUI/res/drawable/ic_volume_ringer.xml b/packages/SystemUI/res/drawable/ic_volume_ringer.xml index 18af711a493f..f258856696bb 100644 --- a/packages/SystemUI/res/drawable/ic_volume_ringer.xml +++ b/packages/SystemUI/res/drawable/ic_volume_ringer.xml @@ -1,5 +1,5 @@ <!-- - Copyright (C) 2015 The Android Open Source Project + Copyright (C) 2017 The Android Open Source Project Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -15,13 +15,17 @@ --> <vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" - android:viewportHeight="24.0" - android:viewportWidth="24.0" + android:viewportHeight="23.4" + android:viewportWidth="23.4" android:width="24dp" android:tint="?android:attr/colorControlNormal" > - <path - android:fillColor="#FFFFFF" - android:pathData="M11.5,22.0c1.1,0.0 2.0,-0.9 2.0,-2.0l-4.0,0.0C9.5,21.1 10.4,22.0 11.5,22.0zM18.0,16.0l0.0,-5.5c0.0,-3.1 -2.1,-5.6 -5.0,-6.3L13.0,3.5C13.0,2.7 12.3,2.0 11.5,2.0C10.7,2.0 10.0,2.7 10.0,3.5l0.0,0.7c-2.9,0.7 -5.0,3.2 -5.0,6.3L5.0,16.0l-2.0,2.0l0.0,1.0l17.0,0.0l0.0,-1.0L18.0,16.0z" /> + <group + android:translateX="-0.78" + android:translateY="-0.5" > + <path + android:fillColor="#FFFFFF" + android:pathData="M12,22c1.1,0 2,-0.9 2,-2h-4C10,21.1 10.9,22 12,22zM18,16v-5c0,-3.07 -1.64,-5.64 -4.5,-6.32V4c0,-0.83 -0.67,-1.5 -1.5,-1.5S10.5,3.17 10.5,4v0.68C7.63,5.36 6,7.92 6,11v5l-2.15,2.15c-0.19,0.2 -0.19,0.51 0.01,0.71C3.95,18.95 4.07,19 4.2,19h15.6c0.45,0 0.67,-0.54 0.35,-0.85L18,16z"/> + </group> -</vector>
\ No newline at end of file +</vector> diff --git a/packages/SystemUI/res/drawable/ic_volume_ringer_mute.xml b/packages/SystemUI/res/drawable/ic_volume_ringer_mute.xml index bc926c3340a3..106d899f1b64 100644 --- a/packages/SystemUI/res/drawable/ic_volume_ringer_mute.xml +++ b/packages/SystemUI/res/drawable/ic_volume_ringer_mute.xml @@ -1,5 +1,5 @@ <!-- - Copyright (C) 2015 The Android Open Source Project + Copyright (C) 2017 The Android Open Source Project Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -15,13 +15,23 @@ --> <vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" - android:viewportHeight="48.0" - android:viewportWidth="48.0" + android:viewportHeight="23.4" + android:viewportWidth="23.3" android:width="24dp" android:tint="?android:attr/colorControlNormal" > - <path - android:fillColor="#FFFFFF" - android:pathData="M23.000000,44.000000c2.200000,0.000000 4.000000,-1.800000 4.000000,-4.000000l-8.000000,0.000000C19.000000,42.200001 20.799999,44.000000 23.000000,44.000000zM36.000000,21.000000c0.000000,-6.100000 -4.300000,-11.300000 -10.000000,-12.600000L26.000000,7.000000c0.000000,-1.700000 -1.300000,-3.000000 -3.000000,-3.000000c-1.700000,0.000000 -3.000000,1.300000 -3.000000,3.000000l0.000000,1.400000c-1.000000,0.200000 -2.000000,0.600000 -2.900000,1.100000L36.000000,28.400000L36.000000,21.000000zM35.500000,38.000000l4.000000,4.000000l2.500000,-2.500000L8.500000,6.000000L6.000000,8.500000l5.800000,5.800000C10.700000,16.299999 10.000000,18.600000 10.000000,21.000000l0.000000,11.000000l-4.000000,4.000000l0.000000,2.000000L35.500000,38.000000z" /> + <group + android:translateX="-0.85" + android:translateY="-0.5" > + <path + android:fillColor="#FF0" + android:pathData="M20.73,19.46l-0.6,-0.6c0,0 0,0 0,0L5.54,4.26c-0.35,-0.35 -0.92,-0.35 -1.27,0c-0.35,0.35 -0.35,0.92 0,1.27l2.4,2.4C6.25,8.85 6,9.88 6,11v5l-2.15,2.15c-0.19,0.2 -0.19,0.51 0.01,0.71C3.95,18.95 4.07,19 4.2,19h13.53l1.73,1.73c0.35,0.35 0.92,0.35 1.27,0C21.09,20.38 21.09,19.81 20.73,19.46z"/> + <path + android:fillColor="#FF0" + android:pathData="M18,11c0,-3.07 -1.64,-5.64 -4.5,-6.32V4c0,-0.83 -0.67,-1.5 -1.5,-1.5S10.5,3.17 10.5,4v0.68C9.87,4.83 9.31,5.08 8.8,5.4l9.2,9.2V11z"/> + <path + android:fillColor="#FF0" + android:pathData="M12,22c1.1,0 2,-0.9 2,-2h-4C10,21.1 10.9,22 12,22z"/> + </group> -</vector>
\ No newline at end of file +</vector> diff --git a/packages/SystemUI/res/drawable/ic_volume_ringer_vibrate.xml b/packages/SystemUI/res/drawable/ic_volume_ringer_vibrate.xml index ffbffad690ec..9db8511c3623 100644 --- a/packages/SystemUI/res/drawable/ic_volume_ringer_vibrate.xml +++ b/packages/SystemUI/res/drawable/ic_volume_ringer_vibrate.xml @@ -1,5 +1,5 @@ <!-- - Copyright (C) 2015 The Android Open Source Project + Copyright (C) 2017 The Android Open Source Project Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -22,6 +22,6 @@ <path android:fillColor="#FFFFFF" - android:pathData="M0.0,15.0l2.0,0.0L2.0,9.0L0.0,9.0L0.0,15.0zM3.0,17.0l2.0,0.0L5.0,7.0L3.0,7.0L3.0,17.0zM22.0,9.0l0.0,6.0l2.0,0.0L24.0,9.0L22.0,9.0zM19.0,17.0l2.0,0.0L21.0,7.0l-2.0,0.0L19.0,17.0zM16.5,3.0l-9.0,0.0C6.7,3.0 6.0,3.7 6.0,4.5l0.0,15.0C6.0,20.3 6.7,21.0 7.5,21.0l9.0,0.0c0.8,0.0 1.5,-0.7 1.5,-1.5l0.0,-15.0C18.0,3.7 17.3,3.0 16.5,3.0zM16.0,19.0L8.0,19.0L8.0,5.0l8.0,0.0L16.0,19.0z" /> + android:pathData="M1,15c0.55,0 1,-0.45 1,-1v-4c0,-0.55 -0.45,-1 -1,-1s-1,0.45 -1,1v4c0,0.55 0.45,1 1,1zM4,17c0.55,0 1,-0.45 1,-1L5,8c0,-0.55 -0.45,-1 -1,-1s-1,0.45 -1,1v8c0,0.55 0.45,1 1,1zM22,10v4c0,0.55 0.45,1 1,1s1,-0.45 1,-1v-4c0,-0.55 -0.45,-1 -1,-1s-1,0.45 -1,1zM20,17c0.55,0 1,-0.45 1,-1L21,8c0,-0.55 -0.45,-1 -1,-1s-1,0.45 -1,1v8c0,0.55 0.45,1 1,1zM16.5,3h-9C6.67,3 6,3.67 6,4.5v15c0,0.83 0.67,1.5 1.5,1.5h9c0.83,0 1.5,-0.67 1.5,-1.5v-15c0,-0.83 -0.67,-1.5 -1.5,-1.5zM16,19L8,19L8,5h8v14z"/> -</vector>
\ No newline at end of file +</vector> diff --git a/packages/SystemUI/res/drawable/rounded_bg.xml b/packages/SystemUI/res/drawable/rounded_bg.xml index 56aa9fe800d9..c23a87fbfb79 100644 --- a/packages/SystemUI/res/drawable/rounded_bg.xml +++ b/packages/SystemUI/res/drawable/rounded_bg.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle"> - <solid android:color="#ffffffff" /> + <solid android:color="?android:attr/colorPrimary" /> <corners android:bottomLeftRadius="@dimen/corner_size" android:topLeftRadius="@dimen/corner_size" diff --git a/packages/SystemUI/res/drawable/rounded_bg_bottom.xml b/packages/SystemUI/res/drawable/rounded_bg_bottom.xml index 0201f2835452..b3bea635f953 100644 --- a/packages/SystemUI/res/drawable/rounded_bg_bottom.xml +++ b/packages/SystemUI/res/drawable/rounded_bg_bottom.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle"> - <solid android:color="#ffeeeeee" /> + <solid android:color="?android:attr/colorPrimaryDark" /> <corners android:bottomLeftRadius="@dimen/corner_size" android:topLeftRadius="0dp" diff --git a/packages/SystemUI/res/drawable/rounded_bg_full.xml b/packages/SystemUI/res/drawable/rounded_bg_full.xml index 65d00dea7357..a6f40fad7e48 100644 --- a/packages/SystemUI/res/drawable/rounded_bg_full.xml +++ b/packages/SystemUI/res/drawable/rounded_bg_full.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle"> - <solid android:color="#ffffffff" /> + <solid android:color="?android:attr/colorPrimary" /> <corners android:bottomLeftRadius="@dimen/corner_size" android:topLeftRadius="@dimen/corner_size" diff --git a/packages/SystemUI/res/drawable/rounded_full_bg_bottom.xml b/packages/SystemUI/res/drawable/rounded_full_bg_bottom.xml index f6ee558b5064..c3e36f211845 100644 --- a/packages/SystemUI/res/drawable/rounded_full_bg_bottom.xml +++ b/packages/SystemUI/res/drawable/rounded_full_bg_bottom.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle"> - <solid android:color="#ffeeeeee" /> + <solid android:color="?android:attr/colorPrimaryDark" /> <corners android:bottomLeftRadius="@dimen/corner_size" android:topLeftRadius="0dp" diff --git a/packages/SystemUI/res/drawable/volume_dialog_background.xml b/packages/SystemUI/res/drawable/volume_dialog_background.xml index d6adea992456..996ac5e030da 100644 --- a/packages/SystemUI/res/drawable/volume_dialog_background.xml +++ b/packages/SystemUI/res/drawable/volume_dialog_background.xml @@ -14,5 +14,5 @@ limitations under the License. --> <shape xmlns:android="http://schemas.android.com/apk/res/android" > - <solid android:color="?android:attr/colorPrimary" /> + <solid android:color="?android:attr/colorBackgroundFloating" /> </shape>
\ No newline at end of file diff --git a/packages/SystemUI/res/layout/global_actions_wrapped.xml b/packages/SystemUI/res/layout/global_actions_wrapped.xml index 528a53475661..ec357d252a5c 100644 --- a/packages/SystemUI/res/layout/global_actions_wrapped.xml +++ b/packages/SystemUI/res/layout/global_actions_wrapped.xml @@ -6,6 +6,7 @@ android:layout_marginBottom="0dp" android:paddingTop="@dimen/global_actions_top_padding" android:clipToPadding="false" + android:theme="@style/qs_theme" android:clipChildren="false"> <LinearLayout diff --git a/packages/SystemUI/res/layout/volume_dialog.xml b/packages/SystemUI/res/layout/volume_dialog.xml index 18ffd0fac417..4487abc318dc 100644 --- a/packages/SystemUI/res/layout/volume_dialog.xml +++ b/packages/SystemUI/res/layout/volume_dialog.xml @@ -21,6 +21,7 @@ android:layout_marginBottom="@dimen/volume_dialog_margin_bottom" android:background="@drawable/volume_dialog_background" android:paddingTop="@dimen/volume_dialog_padding_top" + android:theme="@style/qs_theme" android:translationZ="4dp" > <LinearLayout diff --git a/packages/SystemUI/res/layout/volume_zen_footer.xml b/packages/SystemUI/res/layout/volume_zen_footer.xml index 91dc6178cd86..38627b6546cb 100644 --- a/packages/SystemUI/res/layout/volume_zen_footer.xml +++ b/packages/SystemUI/res/layout/volume_zen_footer.xml @@ -51,8 +51,7 @@ android:clickable="true" android:contentDescription="@string/accessibility_desc_close" android:scaleType="center" - android:src="@drawable/ic_close" - android:tint="@android:color/white" /> + android:src="@drawable/ic_close_white" /> <TextView android:id="@+id/zen_introduction_message" @@ -128,4 +127,4 @@ android:textColor="?android:attr/colorAccent" android:textAppearance="@style/TextAppearance.QS.DetailButton" /> -</com.android.systemui.volume.ZenFooter>
\ No newline at end of file +</com.android.systemui.volume.ZenFooter> diff --git a/packages/SystemUI/res/layout/zen_mode_panel.xml b/packages/SystemUI/res/layout/zen_mode_panel.xml index 200eabf80e4e..426164186aba 100644 --- a/packages/SystemUI/res/layout/zen_mode_panel.xml +++ b/packages/SystemUI/res/layout/zen_mode_panel.xml @@ -59,8 +59,7 @@ android:clickable="true" android:contentDescription="@string/accessibility_desc_close" android:scaleType="center" - android:src="@drawable/ic_close" - android:tint="@android:color/white" /> + android:src="@drawable/ic_close_white" /> <TextView android:id="@+id/zen_introduction_message" diff --git a/packages/SystemUI/res/values-hi/strings.xml b/packages/SystemUI/res/values-hi/strings.xml index 75ed110f716c..4668b802979e 100644 --- a/packages/SystemUI/res/values-hi/strings.xml +++ b/packages/SystemUI/res/values-hi/strings.xml @@ -29,7 +29,7 @@ <item quantity="one">अवलोकन में %d स्क्रीन</item> <item quantity="other">अवलोकन में %d स्क्रीन</item> </plurals> - <string name="status_bar_no_notifications_title" msgid="4755261167193833213">"कोई नोटिफिकेशन नहीं"</string> + <string name="status_bar_no_notifications_title" msgid="4755261167193833213">"कोई नोटिफ़िकेशन नहीं"</string> <string name="status_bar_ongoing_events_title" msgid="1682504513316879202">"ऑनगोइंग"</string> <string name="status_bar_latest_events_title" msgid="6594767438577593172">"सूचनाएं"</string> <string name="battery_low_title" msgid="6456385927409742437">"बैटरी कम है"</string> @@ -166,7 +166,7 @@ <string name="accessibility_settings_button" msgid="799583911231893380">"सिस्टम सेटिंग."</string> <string name="accessibility_notifications_button" msgid="4498000369779421892">"सूचनाएं."</string> <string name="accessibility_overflow_action" msgid="5681882033274783311">"सभी नोटिफ़िकेशन देखें"</string> - <string name="accessibility_remove_notification" msgid="3603099514902182350">"नोटिफिकेशन साफ़ करें"</string> + <string name="accessibility_remove_notification" msgid="3603099514902182350">"नोटिफ़िकेशन साफ़ करें"</string> <string name="accessibility_gps_enabled" msgid="3511469499240123019">"GPS सक्षम."</string> <string name="accessibility_gps_acquiring" msgid="8959333351058967158">"GPS प्राप्त करना."</string> <string name="accessibility_tty_enabled" msgid="4613200365379426561">"टेलीटाइपराइटर सक्षम."</string> @@ -181,8 +181,8 @@ <string name="accessibility_recents_item_open_app_info" msgid="5107479759905883540">"<xliff:g id="APP">%s</xliff:g> ऐप्लिकेशन जानकारी खोलें."</string> <string name="accessibility_recents_item_launched" msgid="7616039892382525203">"<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">"नोटिफिकेशन खारिज की गई."</string> - <string name="accessibility_desc_notification_shade" msgid="4690274844447504208">"नोटिफिकेशन शेड."</string> + <string name="accessibility_notification_dismissed" msgid="854211387186306927">"नोटिफ़िकेशन खारिज की गई."</string> + <string name="accessibility_desc_notification_shade" msgid="4690274844447504208">"नोटिफ़िकेशन शेड."</string> <string name="accessibility_desc_quick_settings" msgid="6186378411582437046">"त्वरित सेटिंग."</string> <string name="accessibility_desc_lock_screen" msgid="5625143713611759164">"लॉक स्क्रीन."</string> <string name="accessibility_desc_settings" msgid="3417884241751434521">"सेटिंग"</string> @@ -255,7 +255,7 @@ <item quantity="one">इसमें <xliff:g id="NUMBER_1">%s</xliff:g> और नोटिफ़िकेशन हैं.</item> <item quantity="other">इसमें <xliff:g id="NUMBER_1">%s</xliff:g> और नोटिफ़िकेशन हैं.</item> </plurals> - <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"नोटिफिकेशन सेटिंग"</string> + <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"नोटिफ़िकेशन सेटिंग"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"<xliff:g id="APP_NAME">%s</xliff:g> सेटिंग"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"स्क्रीन स्वचालित रूप से घूमेगी."</string> <string name="accessibility_rotation_lock_on_landscape" msgid="6731197337665366273">"स्क्रीन लैंडस्केप अभिविन्यास में लॉक है."</string> @@ -411,7 +411,7 @@ <string name="media_projection_remember_text" msgid="3103510882172746752">"फिर से न दिखाएं"</string> <string name="clear_all_notifications_text" msgid="814192889771462828">"सभी साफ करें"</string> <string name="media_projection_action_text" msgid="8470872969457985954">"अब प्रारंभ करें"</string> - <string name="empty_shade_text" msgid="708135716272867002">"कोई नोटिफिकेशन नहीं"</string> + <string name="empty_shade_text" msgid="708135716272867002">"कोई नोटिफ़िकेशन नहीं"</string> <string name="profile_owned_footer" msgid="8021888108553696069">"प्रोफ़ाइल को मॉनीटर किया जा सकता है"</string> <string name="vpn_footer" msgid="2388611096129106812">"नेटवर्क को मॉनीटर किया जा सकता है"</string> <string name="branded_vpn_footer" msgid="2168111859226496230">"नेटवर्क को मॉनिटर किया जा सकता है"</string> @@ -542,8 +542,8 @@ <string name="enable_bluetooth_title" msgid="5027037706500635269">"ब्लूटूथ चालू करें?"</string> <string name="enable_bluetooth_message" msgid="9106595990708985385">"अपने कीबोर्ड को अपने टैबलेट से कनेक्ट करने के लिए, आपको पहले ब्लूटूथ चालू करना होगा."</string> <string name="enable_bluetooth_confirmation_ok" msgid="6258074250948309715">"चालू करें"</string> - <string name="show_silently" msgid="6841966539811264192">"नोटिफिकेशन मौन रूप से दिखाएं"</string> - <string name="block" msgid="2734508760962682611">"सभी नोटिफिकेशन अवरुद्ध करें"</string> + <string name="show_silently" msgid="6841966539811264192">"नोटिफ़िकेशन मौन रूप से दिखाएं"</string> + <string name="block" msgid="2734508760962682611">"सभी नोटिफ़िकेशन अवरुद्ध करें"</string> <string name="do_not_silence" msgid="6878060322594892441">"मौन ना करें"</string> <string name="do_not_silence_block" msgid="4070647971382232311">"मौन या अवरुद्ध ना करें"</string> <string name="tuner_full_importance_settings" msgid="3207312268609236827">"पावर नोटिफ़िकेशन नियंत्रण"</string> diff --git a/packages/SystemUI/res/values-ko/strings.xml b/packages/SystemUI/res/values-ko/strings.xml index c35c30c4869c..7667c5e3bc99 100644 --- a/packages/SystemUI/res/values-ko/strings.xml +++ b/packages/SystemUI/res/values-ko/strings.xml @@ -758,7 +758,7 @@ <string name="notification_channel_alerts" msgid="4496839309318519037">"알림"</string> <string name="notification_channel_screenshot" msgid="6314080179230000938">"스크린샷"</string> <string name="notification_channel_general" msgid="4525309436693914482">"일반 메시지"</string> - <string name="notification_channel_storage" msgid="3077205683020695313">"저장소"</string> + <string name="notification_channel_storage" msgid="3077205683020695313">"저장공간"</string> <string name="instant_apps" msgid="6647570248119804907">"인스턴트 앱"</string> <string name="instant_apps_message" msgid="8116608994995104836">"인스턴트 앱은 설치가 필요하지 않습니다."</string> <string name="app_info" msgid="6856026610594615344">"앱 정보"</string> diff --git a/packages/SystemUI/res/values-pt-rPT/strings.xml b/packages/SystemUI/res/values-pt-rPT/strings.xml index 9f03e505fc5c..b40b6d45dac2 100644 --- a/packages/SystemUI/res/values-pt-rPT/strings.xml +++ b/packages/SystemUI/res/values-pt-rPT/strings.xml @@ -26,7 +26,7 @@ <string name="status_bar_no_recent_apps" msgid="7374907845131203189">"Os ecrãs recentes aparecem aqui"</string> <string name="status_bar_accessibility_dismiss_recents" msgid="4576076075226540105">"Ignorar aplicações recentes"</string> <plurals name="status_bar_accessibility_recent_apps" formatted="false" msgid="9138535907802238759"> - <item quantity="one">%d ecrãs na Vista geral</item> + <item quantity="one">%d ecrã na Vista geral</item> <item quantity="other">%d ecrãs na Vista geral</item> </plurals> <string name="status_bar_no_notifications_title" msgid="4755261167193833213">"Sem notificações"</string> @@ -252,7 +252,7 @@ <string name="accessibility_clear_all" msgid="5235938559247164925">"Limpar todas as notificações."</string> <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string> <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404"> - <item quantity="one">Mais <xliff:g id="NUMBER_1">%s</xliff:g> notificações no grupo.</item> + <item quantity="one">Mais <xliff:g id="NUMBER_1">%s</xliff:g> notificação no grupo.</item> <item quantity="other">Mais <xliff:g id="NUMBER_1">%s</xliff:g> notificações no grupo.</item> </plurals> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"Definições de notificação"</string> @@ -556,7 +556,7 @@ <string name="notification_default_channel_desc" msgid="2506053815870808359">"Esta aplicação não tem categorias de notificação"</string> <string name="notification_unblockable_desc" msgid="3561016061737896906">"Não é possível desativar as notificações desta aplicação"</string> <plurals name="notification_num_channels_desc" formatted="false" msgid="5492793452274077663"> - <item quantity="one">1 de <xliff:g id="NUMBER_1">%d</xliff:g> categorias de notificação desta aplicação</item> + <item quantity="one">1 de <xliff:g id="NUMBER_1">%d</xliff:g> categoria de notificação desta aplicação</item> <item quantity="other">1 de <xliff:g id="NUMBER_1">%d</xliff:g> categorias de notificação desta aplicação</item> </plurals> <string name="notification_channels_list_desc_2" msgid="6214732715833946441">"<xliff:g id="CHANNEL_NAME_1">%1$s</xliff:g>, <xliff:g id="CHANNEL_NAME_2">%2$s</xliff:g>"</string> diff --git a/packages/SystemUI/res/values-sw/strings.xml b/packages/SystemUI/res/values-sw/strings.xml index 2d485e78cf60..b3fd5e31864f 100644 --- a/packages/SystemUI/res/values-sw/strings.xml +++ b/packages/SystemUI/res/values-sw/strings.xml @@ -240,7 +240,7 @@ <string name="accessibility_ambient_display_charging" msgid="9084521679384069087">"Inachaji"</string> <string name="data_usage_disabled_dialog_3g_title" msgid="5281770593459841889">"Data ya 2G-3G imesitishwa"</string> <string name="data_usage_disabled_dialog_4g_title" msgid="1601769736881078016">"Data ya 4G imesitishwa"</string> - <string name="data_usage_disabled_dialog_mobile_title" msgid="6801382439018099779">"Data ya simu imesitishwa"</string> + <string name="data_usage_disabled_dialog_mobile_title" msgid="6801382439018099779">"Data ya mtandao wa simu imesitishwa"</string> <string name="data_usage_disabled_dialog_title" msgid="3932437232199671967">"Data imesitishwa"</string> <string name="data_usage_disabled_dialog" msgid="4919541636934603816">"Umefikia kikomo cha data ulichoweka. Hutumii tena data ya simu.\n\nUkiendelea, huenda ukatozwa ada ya matumizi ya data."</string> <string name="data_usage_disabled_dialog_enable" msgid="1412395410306390593">"Endelea"</string> @@ -316,7 +316,7 @@ <string name="quick_settings_hotspot_label" msgid="6046917934974004879">"Mtandao-hewa"</string> <string name="quick_settings_notifications_label" msgid="4818156442169154523">"Arifa"</string> <string name="quick_settings_flashlight_label" msgid="2133093497691661546">"Tochi"</string> - <string name="quick_settings_cellular_detail_title" msgid="3661194685666477347">"Data ya simu"</string> + <string name="quick_settings_cellular_detail_title" msgid="3661194685666477347">"Data ya mtandao wa simu"</string> <string name="quick_settings_cellular_detail_data_usage" msgid="1964260360259312002">"Matumizi ya data"</string> <string name="quick_settings_cellular_detail_remaining_data" msgid="722715415543541249">"Data iliyosalia"</string> <string name="quick_settings_cellular_detail_over_limit" msgid="967669665390990427">"Imezidi kikomo"</string> @@ -761,7 +761,7 @@ <string name="instant_apps_message" msgid="8116608994995104836">"Huhitaji kusakinisha programu zinazofunguka papo hapo."</string> <string name="app_info" msgid="6856026610594615344">"Maelezo ya programu"</string> <string name="go_to_web" msgid="1106022723459948514">"Nenda kwenye wavuti"</string> - <string name="mobile_data" msgid="7094582042819250762">"Data ya simu"</string> + <string name="mobile_data" msgid="7094582042819250762">"Data ya mtandao wa simu"</string> <string name="wifi_is_off" msgid="1838559392210456893">"Wi-Fi imezimwa"</string> <string name="bt_is_off" msgid="2640685272289706392">"Bluetooth imezimwa"</string> <string name="dnd_is_off" msgid="6167780215212497572">"Kipengele cha Usinisumbue kimezimwa"</string> diff --git a/packages/SystemUI/res/values-uk/strings.xml b/packages/SystemUI/res/values-uk/strings.xml index a0d5a65e82f3..cc523313f53f 100644 --- a/packages/SystemUI/res/values-uk/strings.xml +++ b/packages/SystemUI/res/values-uk/strings.xml @@ -157,7 +157,7 @@ <string name="accessibility_cell_data" msgid="5326139158682385073">"Мобільне передавання даних"</string> <string name="accessibility_cell_data_on" msgid="5927098403452994422">"Мобільне передавання даних увімкнено"</string> <string name="accessibility_cell_data_off" msgid="443267573897409704">"Мобільне передавання даних вимкнено"</string> - <string name="accessibility_bluetooth_tether" msgid="4102784498140271969">"Прив’язка Bluetooth."</string> + <string name="accessibility_bluetooth_tether" msgid="4102784498140271969">"Bluetooth-модем"</string> <string name="accessibility_airplane_mode" msgid="834748999790763092">"Режим польоту."</string> <string name="accessibility_vpn_on" msgid="5993385083262856059">"Мережу VPN увімкнено."</string> <string name="accessibility_no_sims" msgid="3957997018324995781">"Немає SIM-карти."</string> diff --git a/packages/SystemUI/res/values/attrs.xml b/packages/SystemUI/res/values/attrs.xml index 056008245563..745d6015d0ff 100644 --- a/packages/SystemUI/res/values/attrs.xml +++ b/packages/SystemUI/res/values/attrs.xml @@ -127,7 +127,7 @@ <attr name="lightIconTheme" format="reference" /> <attr name="darkIconTheme" format="reference" /> - <attr name="wallpaperTextColor" format="color" /> - <attr name="wallpaperTextColorSecondary" format="color" /> + <attr name="wallpaperTextColor" format="reference|color" /> + <attr name="wallpaperTextColorSecondary" format="reference|color" /> </resources> diff --git a/packages/SystemUI/res/values/colors.xml b/packages/SystemUI/res/values/colors.xml index 0ab44ed85ec8..054d520c13e3 100644 --- a/packages/SystemUI/res/values/colors.xml +++ b/packages/SystemUI/res/values/colors.xml @@ -146,4 +146,6 @@ <color name="instant_apps_color">#ff4d5a64</color> + <color name="zen_introduction">#ffffffff</color> + </resources> diff --git a/packages/SystemUI/res/values/config.xml b/packages/SystemUI/res/values/config.xml index 58117bd73883..34aa6d039850 100644 --- a/packages/SystemUI/res/values/config.xml +++ b/packages/SystemUI/res/values/config.xml @@ -268,7 +268,7 @@ <integer name="doze_small_icon_alpha">222</integer><!-- 87% of 0xff --> <!-- Doze: the brightness value to use for the lower brightness AOD mode --> - <integer name="config_doze_aod_brightness_low">6</integer> + <integer name="config_doze_aod_brightness_low">5</integer> <!-- Doze: the brightness value to use for the higher brightness AOD mode --> <integer name="config_doze_aod_brightness_high">27</integer> diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml index 7eabf3995042..6202d130df7d 100644 --- a/packages/SystemUI/res/values/strings.xml +++ b/packages/SystemUI/res/values/strings.xml @@ -2046,4 +2046,7 @@ been identified for them as running). [CHAR LIMIT=NONE] --> <string name="running_foreground_services_msg">Tap for details on battery and data usage</string> + <!-- Prompt to turn off data usage [CHAR LIMIT=NONE] --> + <string name="data_usage_disable_mobile" msgid="8656552431969276305">Turn off mobile data?</string> + </resources> diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml index daed847c2ac3..99111f88d4af 100644 --- a/packages/SystemUI/res/values/styles.xml +++ b/packages/SystemUI/res/values/styles.xml @@ -16,7 +16,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android"> - <style name="RecentsTheme" parent="RecentsBase"> + <style name="RecentsTheme" parent="@android:style/Theme.Material"> <!-- NoTitle --> <item name="android:windowNoTitle">true</item> <!-- Misc --> @@ -27,13 +27,6 @@ <item name="android:ambientShadowAlpha">0.35</item> </style> - <!-- OverlayManager might replace this style entirely, use RecentsTheme to set a property - that should exist in both light and dark versions of Recents --> - <style name="RecentsBase" parent="@android:style/Theme.Material"> - <item name="android:textColorPrimaryInverse">@*android:color/primary_text_material_dark</item> - <item name="android:textColorSecondaryInverse">@*android:color/secondary_text_material_dark</item> - </style> - <!-- Recents theme --> <style name="RecentsTheme.Wallpaper"> <item name="android:windowBackground">@*android:color/transparent</item> @@ -41,8 +34,13 @@ <item name="android:windowShowWallpaper">true</item> <item name="android:windowDisablePreview">true</item> <item name="clearAllStyle">@style/ClearAllButtonDefaultMargins</item> - <item name="wallpaperTextColor">?android:attr/textColorPrimaryInverse</item> - <item name="wallpaperTextColorSecondary">?android:attr/textColorSecondaryInverse</item> + <item name="wallpaperTextColor">@*android:color/primary_text_material_dark</item> + <item name="wallpaperTextColorSecondary">@*android:color/secondary_text_material_dark</item> + </style> + + <style name="RecentsTheme.Wallpaper.Light"> + <item name="wallpaperTextColor">@*android:color/primary_text_material_light</item> + <item name="wallpaperTextColorSecondary">@*android:color/secondary_text_material_light</item> </style> <style name="ClearAllButtonDefaultMargins"> @@ -220,6 +218,7 @@ <style name="TextAppearance.QS.Introduction"> <item name="android:textSize">14sp</item> + <item name="android:textColor">@color/zen_introduction</item> </style> <style name="TextAppearance.QS.Warning"> @@ -236,7 +235,7 @@ </style> <style name="TextAppearance.QS.DetailButton.White"> - <item name="android:textColor">@color/qs_detail_button_white</item> + <item name="android:textColor">@color/zen_introduction</item> </style> <style name="TextAppearance.QS.DetailEmpty"> @@ -300,21 +299,26 @@ <style name="Animation.StatusBar"> </style> - <!-- Overlay manager may replace this theme --> - <style name="systemui_base" parent="@*android:style/Theme.DeviceDefault.QuickSettings" /> - - <style name="systemui_theme" parent="systemui_base"> + <style name="Theme.SystemUI" parent="@*android:style/Theme.DeviceDefault.QuickSettings"> <item name="lightIconTheme">@style/DualToneLightTheme</item> <item name="darkIconTheme">@style/DualToneDarkTheme</item> - <item name="wallpaperTextColor">?android:attr/textColorPrimaryInverse</item> - <item name="wallpaperTextColorSecondary">?android:attr/textColorSecondaryInverse</item> - <item name="android:colorControlHighlight">?android:attr/textColorSecondaryInverse</item> + <item name="wallpaperTextColor">@*android:color/primary_text_material_dark</item> + <item name="wallpaperTextColorSecondary">@*android:color/secondary_text_material_dark</item> + <item name="android:colorControlHighlight">@*android:color/primary_text_material_dark</item> <item name="*android:lockPatternStyle">@style/LockPatternStyle</item> + <item name="passwordStyle">@style/PasswordTheme</item> + </style> + + <style name="Theme.SystemUI.Light" parent="@*android:style/Theme.DeviceDefault.QuickSettings"> + <item name="wallpaperTextColor">@*android:color/primary_text_material_light</item> + <item name="wallpaperTextColorSecondary">@*android:color/secondary_text_material_light</item> + <item name="android:colorControlHighlight">@*android:color/primary_text_material_light</item> + <item name="passwordStyle">@style/PasswordTheme.Light</item> </style> <style name="LockPatternStyle"> - <item name="*android:regularColor">?android:attr/textColorPrimaryInverse</item> - <item name="*android:successColor">?android:attr/textColorPrimaryInverse</item> + <item name="*android:regularColor">?attr/wallpaperTextColor</item> + <item name="*android:successColor">?attr/wallpaperTextColor</item> <item name="*android:errorColor">?android:attr/colorError</item> </style> diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardClockAccessibilityDelegate.java b/packages/SystemUI/src/com/android/keyguard/KeyguardClockAccessibilityDelegate.java index 80509a689a64..6a83c719b38f 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardClockAccessibilityDelegate.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardClockAccessibilityDelegate.java @@ -36,6 +36,9 @@ class KeyguardClockAccessibilityDelegate extends View.AccessibilityDelegate { @Override public void onInitializeAccessibilityEvent(View host, AccessibilityEvent event) { super.onInitializeAccessibilityEvent(host, event); + if (TextUtils.isEmpty(mFancyColon)) { + return; + } CharSequence text = event.getContentDescription(); if (!TextUtils.isEmpty(text)) { event.setContentDescription(replaceFancyColon(text)); @@ -44,15 +47,22 @@ class KeyguardClockAccessibilityDelegate extends View.AccessibilityDelegate { @Override public void onPopulateAccessibilityEvent(View host, AccessibilityEvent event) { - CharSequence text = ((TextView) host).getText(); - if (!TextUtils.isEmpty(text)) { - event.getText().add(replaceFancyColon(text)); + if (TextUtils.isEmpty(mFancyColon)) { + super.onPopulateAccessibilityEvent(host, event); + } else { + CharSequence text = ((TextView) host).getText(); + if (!TextUtils.isEmpty(text)) { + event.getText().add(replaceFancyColon(text)); + } } } @Override public void onInitializeAccessibilityNodeInfo(View host, AccessibilityNodeInfo info) { super.onInitializeAccessibilityNodeInfo(host, info); + if (TextUtils.isEmpty(mFancyColon)) { + return; + } if (!TextUtils.isEmpty(info.getText())) { info.setText(replaceFancyColon(info.getText())); } @@ -62,6 +72,13 @@ class KeyguardClockAccessibilityDelegate extends View.AccessibilityDelegate { } private CharSequence replaceFancyColon(CharSequence text) { + if (TextUtils.isEmpty(mFancyColon)) { + return text; + } return text.toString().replace(mFancyColon, ":"); } + + public static boolean isNeeded(Context context) { + return !TextUtils.isEmpty(context.getString(R.string.keyguard_fancy_colon)); + } } diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java b/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java index 165ca2a2d3be..27bc599f7f52 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java @@ -21,6 +21,7 @@ import android.app.AlertDialog; import android.app.admin.DevicePolicyManager; import android.content.Context; import android.os.UserHandle; +import android.support.annotation.VisibleForTesting; import android.util.AttributeSet; import android.util.Log; import android.util.Slog; @@ -470,7 +471,8 @@ public class KeyguardSecurityContainer extends FrameLayout implements KeyguardSe return 0; } - protected int getLayoutIdFor(SecurityMode securityMode) { + @VisibleForTesting + public int getLayoutIdFor(SecurityMode securityMode) { switch (securityMode) { case Pattern: return R.layout.keyguard_pattern_view; case PIN: return R.layout.keyguard_pin_view; diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardStatusView.java b/packages/SystemUI/src/com/android/keyguard/KeyguardStatusView.java index a9d583f4f701..bc2a59df42a6 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardStatusView.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardStatusView.java @@ -153,7 +153,9 @@ public class KeyguardStatusView extends GridLayout { mDateView = findViewById(R.id.date_view); mClockView = findViewById(R.id.clock_view); mClockView.setShowCurrentUserTime(true); - mClockView.setAccessibilityDelegate(new KeyguardClockAccessibilityDelegate(mContext)); + if (KeyguardClockAccessibilityDelegate.isNeeded(mContext)) { + mClockView.setAccessibilityDelegate(new KeyguardClockAccessibilityDelegate(mContext)); + } mOwnerInfo = findViewById(R.id.owner_info); mBatteryDoze = findViewById(R.id.battery_doze); mKeyguardStatusArea = findViewById(R.id.keyguard_status_area); diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java b/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java index 7c0aa0700d9c..32775fe9d5c1 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java @@ -132,6 +132,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener { private static final int MSG_DREAMING_STATE_CHANGED = 333; private static final int MSG_USER_UNLOCKED = 334; private static final int MSG_ASSISTANT_STACK_CHANGED = 335; + private static final int MSG_FINGERPRINT_AUTHENTICATION_CONTINUE = 336; /** Fingerprint state: Not listening to fingerprint. */ private static final int FINGERPRINT_STATE_STOPPED = 0; @@ -200,6 +201,13 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener { private int mFingerprintRunningState = FINGERPRINT_STATE_STOPPED; private LockPatternUtils mLockPatternUtils; + /** + * Short delay before restarting fingerprint authentication after a successful try + * This should be slightly longer than the time between onFingerprintAuthenticated and + * setKeyguardGoingAway(true). + */ + private static final int FINGERPRINT_CONTINUE_DELAY_MS = 500; + // If FP daemon dies, keyguard should retry after a short delay private int mHardwareUnavailableRetryCount = 0; private static final int HW_UNAVAILABLE_TIMEOUT = 3000; // ms @@ -294,6 +302,9 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener { mAssistantVisible = (boolean)msg.obj; updateFingerprintListeningState(); break; + case MSG_FINGERPRINT_AUTHENTICATION_CONTINUE: + updateFingerprintListeningState(); + break; } } }; @@ -446,9 +457,11 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener { } } + mHandler.sendMessageDelayed(mHandler.obtainMessage(MSG_FINGERPRINT_AUTHENTICATION_CONTINUE), + FINGERPRINT_CONTINUE_DELAY_MS); + // Only authenticate fingerprint once when assistant is visible mAssistantVisible = false; - updateFingerprintListeningState(); Trace.endSection(); } @@ -1136,6 +1149,11 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener { } private void updateFingerprintListeningState() { + // If this message exists, we should not authenticate again until this message is + // consumed by the handler + if (mHandler.hasMessages(MSG_FINGERPRINT_AUTHENTICATION_CONTINUE)) { + return; + } mHandler.removeCallbacks(mRetryFingerprintAuthentication); boolean shouldListenForFingerprint = shouldListenForFingerprint(); if (mFingerprintRunningState == FINGERPRINT_STATE_RUNNING && !shouldListenForFingerprint) { @@ -1148,9 +1166,10 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener { private boolean shouldListenForFingerprint() { return (mKeyguardIsVisible || !mDeviceInteractive || - (mBouncer && !mKeyguardGoingAway) || mGoingToSleep || - (mAssistantVisible && mKeyguardOccluded)) - && !mSwitchingUser && !isFingerprintDisabled(getCurrentUser()); + (mBouncer && !mKeyguardGoingAway) || mGoingToSleep || + (mAssistantVisible && mKeyguardOccluded)) + && !mSwitchingUser && !isFingerprintDisabled(getCurrentUser()) + && !mKeyguardGoingAway; } private void startListeningForFingerprint() { diff --git a/packages/SystemUI/src/com/android/systemui/AutoReinflateContainer.java b/packages/SystemUI/src/com/android/systemui/AutoReinflateContainer.java index 810dd8c403a7..01b42545a8cf 100644 --- a/packages/SystemUI/src/com/android/systemui/AutoReinflateContainer.java +++ b/packages/SystemUI/src/com/android/systemui/AutoReinflateContainer.java @@ -24,59 +24,50 @@ import android.view.LayoutInflater; import android.view.View; import android.widget.FrameLayout; +import com.android.systemui.statusbar.policy.ConfigurationController; + import java.util.ArrayList; import java.util.List; /** * Custom {@link FrameLayout} that re-inflates when changes to {@link Configuration} happen. - * Currently supports changes to density and locale. + * Currently supports changes to density, asset path, and locale. */ -public class AutoReinflateContainer extends FrameLayout { +public class AutoReinflateContainer extends FrameLayout implements + ConfigurationController.ConfigurationListener { private final List<InflateListener> mInflateListeners = new ArrayList<>(); private final int mLayout; - private int mDensity; - private LocaleList mLocaleList; public AutoReinflateContainer(Context context, @Nullable AttributeSet attrs) { super(context, attrs); - mDensity = context.getResources().getConfiguration().densityDpi; - mLocaleList = context.getResources().getConfiguration().getLocales(); - TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.AutoReinflateContainer); if (!a.hasValue(R.styleable.AutoReinflateContainer_android_layout)) { throw new IllegalArgumentException("AutoReinflateContainer must contain a layout"); } mLayout = a.getResourceId(R.styleable.AutoReinflateContainer_android_layout, 0); + a.recycle(); inflateLayout(); } @Override - protected void onConfigurationChanged(Configuration newConfig) { - super.onConfigurationChanged(newConfig); - boolean shouldInflateLayout = false; - final int density = newConfig.densityDpi; - if (density != mDensity) { - mDensity = density; - shouldInflateLayout = true; - } - final LocaleList localeList = newConfig.getLocales(); - if (localeList != mLocaleList) { - mLocaleList = localeList; - shouldInflateLayout = true; - } + protected void onAttachedToWindow() { + super.onAttachedToWindow(); + Dependency.get(ConfigurationController.class).addCallback(this); + } - if (shouldInflateLayout) { - inflateLayout(); - } + @Override + protected void onDetachedFromWindow() { + super.onDetachedFromWindow(); + Dependency.get(ConfigurationController.class).removeCallback(this); } protected void inflateLayoutImpl() { LayoutInflater.from(getContext()).inflate(mLayout, this); } - protected void inflateLayout() { + public void inflateLayout() { removeAllViews(); inflateLayoutImpl(); final int N = mInflateListeners.size(); @@ -90,6 +81,21 @@ public class AutoReinflateContainer extends FrameLayout { listener.onInflated(getChildAt(0)); } + @Override + public void onDensityOrFontScaleChanged() { + inflateLayout(); + } + + @Override + public void onOverlayChanged() { + inflateLayout(); + } + + @Override + public void onLocaleListChanged() { + inflateLayout(); + } + public interface InflateListener { /** * Called whenever a new view is inflated. diff --git a/packages/SystemUI/src/com/android/systemui/HardwareBgDrawable.java b/packages/SystemUI/src/com/android/systemui/HardwareBgDrawable.java index 6417e292158a..467ec2e50b48 100644 --- a/packages/SystemUI/src/com/android/systemui/HardwareBgDrawable.java +++ b/packages/SystemUI/src/com/android/systemui/HardwareBgDrawable.java @@ -22,7 +22,8 @@ import android.graphics.PixelFormat; import android.graphics.Rect; import android.graphics.drawable.Drawable; import android.graphics.drawable.LayerDrawable; -import android.util.Log; + +import com.android.settingslib.Utils; public class HardwareBgDrawable extends LayerDrawable { @@ -43,22 +44,25 @@ public class HardwareBgDrawable extends LayerDrawable { } mRoundTop = roundTop; mLayers = layers; - mLayers[1].setTint(0xffeeeeee); } private static Drawable[] getLayers(Context context, boolean roundTop, boolean roundEnd) { int drawable = roundEnd ? R.drawable.rounded_bg_full : R.drawable.rounded_bg; + final Drawable[] layers; if (roundTop) { - return new Drawable[]{ + layers = new Drawable[]{ + context.getDrawable(drawable).mutate(), context.getDrawable(drawable).mutate(), + }; + } else { + layers = new Drawable[]{ context.getDrawable(drawable).mutate(), + context.getDrawable(roundEnd ? R.drawable.rounded_full_bg_bottom + : R.drawable.rounded_bg_bottom).mutate(), }; } - return new Drawable[]{ - context.getDrawable(drawable).mutate(), - context.getDrawable(roundEnd ? R.drawable.rounded_full_bg_bottom - : R.drawable.rounded_bg_bottom).mutate(), - }; + layers[1].setTint(Utils.getColorAttr(context, android.R.attr.colorPrimaryDark)); + return layers; } public void setCutPoint(int point) { diff --git a/packages/SystemUI/src/com/android/systemui/SystemUIApplication.java b/packages/SystemUI/src/com/android/systemui/SystemUIApplication.java index fe6eb4b5acfe..9f2dcd958211 100644 --- a/packages/SystemUI/src/com/android/systemui/SystemUIApplication.java +++ b/packages/SystemUI/src/com/android/systemui/SystemUIApplication.java @@ -116,7 +116,7 @@ public class SystemUIApplication extends Application implements SysUiServiceProv // Set the application theme that is inherited by all services. Note that setting the // application theme in the manifest does only work for activities. Keep this in sync with // the theme set there. - setTheme(R.style.systemui_theme); + setTheme(R.style.Theme_SystemUI); SystemUIFactory.createFromConfig(this); diff --git a/core/java/android/app/RetailDemoModeServiceInternal.java b/packages/SystemUI/src/com/android/systemui/doze/DozeReceiver.java index 7ca214aae602..dcb3882be85e 100644 --- a/core/java/android/app/RetailDemoModeServiceInternal.java +++ b/packages/SystemUI/src/com/android/systemui/doze/DozeReceiver.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016 The Android Open Source Project + * Copyright (C) 2017 The Android Open Source Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,16 +14,11 @@ * limitations under the License */ -package android.app; +package com.android.systemui.doze; /** - * Retail Demo Mode Service interface to be used locally inside system server - * - * @hide Only for use inside system server + * Interface for class that cares about doze states. */ -public interface RetailDemoModeServiceInternal { - /** - * Used to notify RetailDemoModeService of any user activity. - */ - public void onUserActivity(); -}
\ No newline at end of file +public interface DozeReceiver { + void setDozing(boolean dozing); +} diff --git a/packages/SystemUI/src/com/android/systemui/doze/DozeSensors.java b/packages/SystemUI/src/com/android/systemui/doze/DozeSensors.java index 0d5527cf6cd9..bf1c06035ec2 100644 --- a/packages/SystemUI/src/com/android/systemui/doze/DozeSensors.java +++ b/packages/SystemUI/src/com/android/systemui/doze/DozeSensors.java @@ -184,6 +184,13 @@ public class DozeSensors { pw.print("ProxSensor: "); pw.println(mProxSensor.toString()); } + /** + * @return true if prox is currently far, false if near or null if unknown. + */ + public Boolean isProximityCurrentlyFar() { + return mProxSensor.mCurrentlyFar; + } + private class ProxSensor implements SensorEventListener { static final long COOLDOWN_TRIGGER = 2 * 1000; diff --git a/packages/SystemUI/src/com/android/systemui/doze/DozeTriggers.java b/packages/SystemUI/src/com/android/systemui/doze/DozeTriggers.java index d1f5337b80b0..ea064797f8f5 100644 --- a/packages/SystemUI/src/com/android/systemui/doze/DozeTriggers.java +++ b/packages/SystemUI/src/com/android/systemui/doze/DozeTriggers.java @@ -103,8 +103,11 @@ public class DozeTriggers implements DozeMachine.Part { private void proximityCheckThenCall(IntConsumer callback, boolean alreadyPerformedProxCheck, int pulseReason) { + Boolean cachedProxFar = mDozeSensors.isProximityCurrentlyFar(); if (alreadyPerformedProxCheck) { callback.accept(ProximityCheck.RESULT_NOT_CHECKED); + } else if (cachedProxFar != null) { + callback.accept(cachedProxFar ? ProximityCheck.RESULT_FAR : ProximityCheck.RESULT_NEAR); } else { final long start = SystemClock.uptimeMillis(); new ProximityCheck() { diff --git a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java index ad177a7e849f..7799c0190f54 100644 --- a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java +++ b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java @@ -68,6 +68,7 @@ import android.text.TextUtils; import android.util.ArraySet; import android.util.Log; import android.util.MathUtils; +import android.view.ContextThemeWrapper; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -143,7 +144,7 @@ class GlobalActionsDialog implements DialogInterface.OnDismissListener, DialogIn * @param context everything needs a context :( */ public GlobalActionsDialog(Context context, GlobalActionsManager windowManagerFuncs) { - mContext = context; + mContext = new ContextThemeWrapper(context, com.android.systemui.R.style.qs_theme); mWindowManagerFuncs = windowManagerFuncs; mAudioManager = (AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE); mDreamManager = IDreamManager.Stub.asInterface( @@ -1226,7 +1227,7 @@ class GlobalActionsDialog implements DialogInterface.OnDismissListener, DialogIn public ActionsDialog(Context context, OnClickListener clickListener, MyAdapter adapter, OnItemLongClickListener longClickListener) { super(context, com.android.systemui.R.style.Theme_SystemUI_Dialog_GlobalActions); - mContext = getContext(); + mContext = context; mAdapter = adapter; mClickListener = clickListener; mLongClickListener = longClickListener; @@ -1238,8 +1239,8 @@ class GlobalActionsDialog implements DialogInterface.OnDismissListener, DialogIn window.requestFeature(Window.FEATURE_NO_TITLE); window.clearFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND | WindowManager.LayoutParams.FLAG_LAYOUT_INSET_DECOR); - window.addFlags(WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE - | WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN + window.addFlags( + WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN | WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL | WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED | WindowManager.LayoutParams.FLAG_WATCH_OUTSIDE_TOUCH diff --git a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsImpl.java b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsImpl.java index c1e51b9c0bbb..08b7b71a47d8 100644 --- a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsImpl.java +++ b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsImpl.java @@ -15,6 +15,7 @@ package com.android.systemui.globalactions; import com.android.systemui.Dependency; +import com.android.systemui.R; import com.android.systemui.plugins.GlobalActions; import com.android.systemui.statusbar.policy.DeviceProvisionedController; import com.android.systemui.statusbar.policy.KeyguardMonitor; @@ -38,9 +39,7 @@ public class GlobalActionsImpl implements GlobalActions { @Override public void showGlobalActions(GlobalActionsManager manager) { if (mGlobalActions == null) { - final ContextThemeWrapper context = new ContextThemeWrapper(mContext, - android.R.style.Theme_Material_Light); - mGlobalActions = new GlobalActionsDialog(context, manager); + mGlobalActions = new GlobalActionsDialog(mContext, manager); } mGlobalActions.showDialog(mKeyguardMonitor.isShowing(), mDeviceProvisionedController.isDeviceProvisioned()); diff --git a/packages/SystemUI/src/com/android/systemui/pip/phone/PipManager.java b/packages/SystemUI/src/com/android/systemui/pip/phone/PipManager.java index ebf4b5d83029..6c6054cb6d12 100644 --- a/packages/SystemUI/src/com/android/systemui/pip/phone/PipManager.java +++ b/packages/SystemUI/src/com/android/systemui/pip/phone/PipManager.java @@ -92,7 +92,7 @@ public class PipManager implements BasePipManager { ComponentName topPipActivity = PipUtils.getTopPinnedActivity(mContext, mActivityManager); - mMenuController.hideMenu(); + mMenuController.onActivityUnpinned(topPipActivity); mTouchHandler.onActivityUnpinned(topPipActivity); mNotificationController.onActivityUnpinned(topPipActivity); diff --git a/packages/SystemUI/src/com/android/systemui/pip/phone/PipMenuActivityController.java b/packages/SystemUI/src/com/android/systemui/pip/phone/PipMenuActivityController.java index e310847943c5..c558056530b6 100644 --- a/packages/SystemUI/src/com/android/systemui/pip/phone/PipMenuActivityController.java +++ b/packages/SystemUI/src/com/android/systemui/pip/phone/PipMenuActivityController.java @@ -22,6 +22,7 @@ import android.app.ActivityManager.StackInfo; import android.app.ActivityOptions; import android.app.IActivityManager; import android.app.RemoteAction; +import android.content.ComponentName; import android.content.Context; import android.content.Intent; import android.content.pm.ParceledListSlice; @@ -32,6 +33,7 @@ import android.os.Handler; import android.os.Message; import android.os.Messenger; import android.os.RemoteException; +import android.os.SystemClock; import android.os.UserHandle; import android.util.Log; import android.view.IWindowManager; @@ -77,6 +79,9 @@ public class PipMenuActivityController { public static final int MENU_STATE_CLOSE = 1; public static final int MENU_STATE_FULL = 2; + // The duration to wait before we consider the start activity as having timed out + private static final long START_ACTIVITY_REQUEST_TIMEOUT_MS = 300; + /** * A listener interface to receive notification on changes in PIP. */ @@ -125,8 +130,9 @@ public class PipMenuActivityController { private ReferenceCountedTrigger mOnAttachDecrementTrigger; private boolean mStartActivityRequested; + private long mStartActivityRequestedTime; private Messenger mToActivityMessenger; - private Messenger mMessenger = new Messenger(new Handler() { + private Handler mHandler = new Handler() { @Override public void handleMessage(Message msg) { switch (msg.what) { @@ -161,7 +167,7 @@ public class PipMenuActivityController { } case MESSAGE_UPDATE_ACTIVITY_CALLBACK: { mToActivityMessenger = msg.replyTo; - mStartActivityRequested = false; + setStartActivityRequested(false); if (mOnAttachDecrementTrigger != null) { mOnAttachDecrementTrigger.decrement(); mOnAttachDecrementTrigger = null; @@ -174,7 +180,17 @@ public class PipMenuActivityController { } } } - }); + }; + private Messenger mMessenger = new Messenger(mHandler); + + private Runnable mStartActivityRequestedTimeoutRunnable = () -> { + setStartActivityRequested(false); + if (mOnAttachDecrementTrigger != null) { + mOnAttachDecrementTrigger.decrement(); + mOnAttachDecrementTrigger = null; + } + Log.e(TAG, "Expected start menu activity request timed out"); + }; private ActionListener mMediaActionListener = new ActionListener() { @Override @@ -202,6 +218,11 @@ public class PipMenuActivityController { } } + public void onActivityUnpinned(ComponentName topPipActivity) { + hideMenu(); + setStartActivityRequested(false); + } + public void onPinnedStackAnimationEnded() { // Note: Only active menu activities care about this event if (mToActivityMessenger != null) { @@ -243,7 +264,9 @@ public class PipMenuActivityController { } catch (RemoteException e) { Log.e(TAG, "Could not notify menu to update dismiss fraction", e); } - } else if (!mStartActivityRequested) { + } else if (!mStartActivityRequested || isStartActivityRequestedElapsed()) { + // If we haven't requested the start activity, or if it previously took too long to + // start, then start it startMenuActivity(MENU_STATE_NONE, null /* stackBounds */, null /* movementBounds */, false /* allowMenuTimeout */); } @@ -273,7 +296,9 @@ public class PipMenuActivityController { } catch (RemoteException e) { Log.e(TAG, "Could not notify menu to show", e); } - } else if (!mStartActivityRequested) { + } else if (!mStartActivityRequested || isStartActivityRequestedElapsed()) { + // If we haven't requested the start activity, or if it previously took too long to + // start, then start it startMenuActivity(menuState, stackBounds, movementBounds, allowMenuTimeout); } } @@ -368,12 +393,12 @@ public class PipMenuActivityController { pinnedStackInfo.taskIds[pinnedStackInfo.taskIds.length - 1]); options.setTaskOverlay(true, true /* canResume */); mContext.startActivityAsUser(intent, options.toBundle(), UserHandle.CURRENT); - mStartActivityRequested = true; + setStartActivityRequested(true); } else { Log.e(TAG, "No PIP tasks found"); } } catch (RemoteException e) { - mStartActivityRequested = false; + setStartActivityRequested(false); Log.e(TAG, "Error showing PIP menu activity", e); } } @@ -416,6 +441,14 @@ public class PipMenuActivityController { } /** + * @return whether the time of the activity request has exceeded the timeout. + */ + private boolean isStartActivityRequestedElapsed() { + return (SystemClock.uptimeMillis() - mStartActivityRequestedTime) + >= START_ACTIVITY_REQUEST_TIMEOUT_MS; + } + + /** * Handles changes in menu visibility. */ private void onMenuStateChanged(int menuState, boolean resize) { @@ -443,12 +476,24 @@ public class PipMenuActivityController { mMenuState = menuState; } + private void setStartActivityRequested(boolean requested) { + mHandler.removeCallbacks(mStartActivityRequestedTimeoutRunnable); + mStartActivityRequested = requested; + mStartActivityRequestedTime = requested ? SystemClock.uptimeMillis() : 0; + } + public final void onBusEvent(HidePipMenuEvent event) { if (mStartActivityRequested) { // If the menu has been start-requested, but not actually started, then we defer the - // trigger callback until the menu has started and called back to the controller + // trigger callback until the menu has started and called back to the controller. mOnAttachDecrementTrigger = event.getAnimationTrigger(); mOnAttachDecrementTrigger.increment(); + + // Fallback for b/63752800, we have started the PipMenuActivity but it has not made any + // callbacks. Don't continue to wait for the menu to show past some timeout. + mHandler.removeCallbacks(mStartActivityRequestedTimeoutRunnable); + mHandler.postDelayed(mStartActivityRequestedTimeoutRunnable, + START_ACTIVITY_REQUEST_TIMEOUT_MS); } } @@ -458,5 +503,7 @@ public class PipMenuActivityController { pw.println(innerPrefix + "mMenuState=" + mMenuState); pw.println(innerPrefix + "mToActivityMessenger=" + mToActivityMessenger); pw.println(innerPrefix + "mListeners=" + mListeners.size()); + pw.println(innerPrefix + "mStartActivityRequested=" + mStartActivityRequested); + pw.println(innerPrefix + "mStartActivityRequestedTime=" + mStartActivityRequestedTime); } } diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSSecurityFooter.java b/packages/SystemUI/src/com/android/systemui/qs/QSSecurityFooter.java index 56fca1f14fba..3ce1465cfd8a 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSSecurityFooter.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSSecurityFooter.java @@ -15,13 +15,16 @@ */ package com.android.systemui.qs; +import android.app.ActivityManager; import android.app.AlertDialog; import android.content.Context; import android.content.DialogInterface; import android.content.Intent; +import android.content.pm.UserInfo; import android.os.Handler; import android.os.Looper; import android.os.Message; +import android.os.UserManager; import android.provider.Settings; import android.text.SpannableStringBuilder; import android.text.method.LinkMovementMethod; @@ -59,6 +62,8 @@ public class QSSecurityFooter implements OnClickListener, DialogInterface.OnClic private final Handler mMainHandler; private final View mDivider; + private final UserManager mUm; + private AlertDialog mDialog; private QSTileHost mHost; protected H mHandler; @@ -81,6 +86,7 @@ public class QSSecurityFooter implements OnClickListener, DialogInterface.OnClic mSecurityController = Dependency.get(SecurityController.class); mHandler = new H(Dependency.get(Dependency.BG_LOOPER)); mDivider = qsPanel == null ? null : qsPanel.getDivider(); + mUm = (UserManager) mContext.getSystemService(Context.USER_SERVICE); } public void setHostEnvironment(QSTileHost host) { @@ -128,6 +134,9 @@ public class QSSecurityFooter implements OnClickListener, DialogInterface.OnClic private void handleRefreshState() { final boolean isDeviceManaged = mSecurityController.isDeviceManaged(); + final UserInfo currentUser = mUm.getUserInfo(ActivityManager.getCurrentUser()); + final boolean isDemoDevice = UserManager.isDeviceInDemoMode(mContext) && currentUser != null + && currentUser.isDemo(); final boolean hasWorkProfile = mSecurityController.hasWorkProfile(); final boolean hasCACerts = mSecurityController.hasCACertInCurrentUser(); final boolean hasCACertsInWorkProfile = mSecurityController.hasCACertInWorkProfile(); @@ -137,7 +146,7 @@ public class QSSecurityFooter implements OnClickListener, DialogInterface.OnClic final CharSequence organizationName = mSecurityController.getDeviceOwnerOrganizationName(); final CharSequence workProfileName = mSecurityController.getWorkProfileOrganizationName(); // Update visibility of footer - mIsVisible = isDeviceManaged || hasCACerts || hasCACertsInWorkProfile || + mIsVisible = (isDeviceManaged && !isDemoDevice) || hasCACerts || hasCACertsInWorkProfile || vpnName != null || vpnNameWorkProfile != null; // Update the string mFooterTextContent = getFooterText(isDeviceManaged, hasWorkProfile, diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/CellularTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/CellularTile.java index 81ec6a7c72a9..272380ba6c3a 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/CellularTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/CellularTile.java @@ -16,6 +16,7 @@ package com.android.systemui.qs.tiles; +import android.app.AlertDialog; import android.content.ComponentName; import android.content.Context; import android.content.Intent; @@ -38,8 +39,9 @@ import com.android.systemui.plugins.qs.QSTile.SignalState; import com.android.systemui.qs.CellTileView; import com.android.systemui.qs.CellTileView.SignalIcon; import com.android.systemui.qs.QSHost; -import com.android.systemui.qs.SignalTileView; import com.android.systemui.qs.tileimpl.QSTileImpl; +import com.android.systemui.statusbar.phone.SystemUIDialog; +import com.android.systemui.statusbar.policy.KeyguardMonitor; import com.android.systemui.statusbar.policy.NetworkController; import com.android.systemui.statusbar.policy.NetworkController.IconState; import com.android.systemui.statusbar.policy.NetworkController.SignalCallback; @@ -55,11 +57,13 @@ public class CellularTile extends QSTileImpl<SignalState> { private final CellSignalCallback mSignalCallback = new CellSignalCallback(); private final ActivityStarter mActivityStarter; + private final KeyguardMonitor mKeyguardMonitor; public CellularTile(QSHost host) { super(host); mController = Dependency.get(NetworkController.class); mActivityStarter = Dependency.get(ActivityStarter.class); + mKeyguardMonitor = Dependency.get(KeyguardMonitor.class); mDataController = mController.getMobileDataController(); mDetailAdapter = new CellularDetailAdapter(); } @@ -95,7 +99,28 @@ public class CellularTile extends QSTileImpl<SignalState> { @Override protected void handleClick() { - mDataController.setMobileDataEnabled(!mDataController.isMobileDataEnabled()); + if (mDataController.isMobileDataEnabled()) { + if (mKeyguardMonitor.isSecure() && !mKeyguardMonitor.canSkipBouncer()) { + mActivityStarter.postQSRunnableDismissingKeyguard(() -> { + showDisableDialog(); + }); + } else { + showDisableDialog(); + } + } else { + mDataController.setMobileDataEnabled(true); + } + } + + private void showDisableDialog() { + mHost.collapsePanels(); + SystemUIDialog.applyFlags(new AlertDialog.Builder(mContext) + .setMessage(R.string.data_usage_disable_mobile) + .setNegativeButton(android.R.string.cancel, null) + .setPositiveButton( + com.android.internal.R.string.alert_windows_notification_turn_off_action, + (d, w) -> mDataController.setMobileDataEnabled(false)) + .create()).show(); } @Override diff --git a/packages/SystemUI/src/com/android/systemui/recents/IRecentsSystemUserCallbacks.aidl b/packages/SystemUI/src/com/android/systemui/recents/IRecentsSystemUserCallbacks.aidl index 1240e055d25a..cc7798e8721b 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/IRecentsSystemUserCallbacks.aidl +++ b/packages/SystemUI/src/com/android/systemui/recents/IRecentsSystemUserCallbacks.aidl @@ -31,4 +31,5 @@ oneway interface IRecentsSystemUserCallbacks { void sendRecentsDrawnEvent(); void sendDockingTopTaskEvent(int dragMode, in Rect initialRect); void sendLaunchRecentsEvent(); + void setWaitingForTransitionStartEvent(boolean waitingForTransitionStart); } diff --git a/packages/SystemUI/src/com/android/systemui/recents/Recents.java b/packages/SystemUI/src/com/android/systemui/recents/Recents.java index de2ace4c30d1..3800c8db7de7 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/Recents.java +++ b/packages/SystemUI/src/com/android/systemui/recents/Recents.java @@ -57,6 +57,7 @@ import com.android.systemui.recents.events.activity.DockedTopTaskEvent; import com.android.systemui.recents.events.activity.RecentsActivityStartingEvent; import com.android.systemui.recents.events.component.RecentsVisibilityChangedEvent; import com.android.systemui.recents.events.component.ScreenPinningRequestEvent; +import com.android.systemui.recents.events.component.SetWaitingForTransitionStartEvent; import com.android.systemui.recents.events.component.ShowUserToastEvent; import com.android.systemui.recents.events.ui.RecentsDrawnEvent; import com.android.systemui.recents.misc.SystemServicesProxy; @@ -711,6 +712,25 @@ public class Recents extends SystemUI } } + public final void onBusEvent(SetWaitingForTransitionStartEvent event) { + int processUser = sSystemServicesProxy.getProcessUser(); + if (sSystemServicesProxy.isSystemUser(processUser)) { + mImpl.setWaitingForTransitionStart(event.waitingForTransitionStart); + } else { + postToSystemUser(new Runnable() { + @Override + public void run() { + try { + mUserToSystemCallbacks.setWaitingForTransitionStartEvent( + event.waitingForTransitionStart); + } catch (RemoteException e) { + Log.e(TAG, "Callback failed", e); + } + } + }); + } + } + /** * Attempts to register with the system user. */ diff --git a/packages/SystemUI/src/com/android/systemui/recents/RecentsActivity.java b/packages/SystemUI/src/com/android/systemui/recents/RecentsActivity.java index f2ea6a683e95..c0550b5c52e6 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/RecentsActivity.java +++ b/packages/SystemUI/src/com/android/systemui/recents/RecentsActivity.java @@ -20,11 +20,11 @@ import android.app.Activity; import android.app.ActivityManager; import android.app.ActivityOptions; import android.app.TaskStackBuilder; +import android.app.WallpaperManager; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.content.IntentFilter; -import android.content.pm.ActivityInfo; import android.content.res.Configuration; import android.net.Uri; import android.os.Bundle; @@ -41,12 +41,15 @@ import android.view.ViewTreeObserver.OnPreDrawListener; import android.view.WindowManager; import android.view.WindowManager.LayoutParams; +import com.android.internal.colorextraction.ColorExtractor; import com.android.internal.logging.MetricsLogger; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.keyguard.LatencyTracker; import com.android.systemui.DejankUtils; +import com.android.systemui.Dependency; import com.android.systemui.Interpolators; import com.android.systemui.R; +import com.android.systemui.colorextraction.SysuiColorExtractor; import com.android.systemui.recents.events.EventBus; import com.android.systemui.recents.events.activity.CancelEnterRecentsWindowAnimationEvent; import com.android.systemui.recents.events.activity.ConfigurationChangedEvent; @@ -100,7 +103,8 @@ import java.util.List; /** * The main Recents activity that is started from RecentsComponent. */ -public class RecentsActivity extends Activity implements ViewTreeObserver.OnPreDrawListener { +public class RecentsActivity extends Activity implements ViewTreeObserver.OnPreDrawListener, + ColorExtractor.OnColorsChangedListener { private final static String TAG = "RecentsActivity"; private final static boolean DEBUG = false; @@ -129,6 +133,10 @@ public class RecentsActivity extends Activity implements ViewTreeObserver.OnPreD private DozeTrigger mIterateTrigger; private final UserInteractionEvent mUserInteractionEvent = new UserInteractionEvent(); + // Theme and colors + private SysuiColorExtractor mColorExtractor; + private boolean mUsingDarkText; + /** * A common Runnable to finish Recents by launching Home with an animation depending on the * last activity launch state. Generally we always launch home when we exit Recents rather than @@ -329,6 +337,14 @@ public class RecentsActivity extends Activity implements ViewTreeObserver.OnPreD mPackageMonitor = new RecentsPackageMonitor(); mPackageMonitor.register(this); + // Select theme based on wallpaper colors + mColorExtractor = Dependency.get(SysuiColorExtractor.class); + mColorExtractor.addOnColorsChangedListener(this); + mUsingDarkText = mColorExtractor.getColors(ColorExtractor.TYPE_DARK, + WallpaperManager.FLAG_SYSTEM, true).supportsDarkText(); + setTheme(mUsingDarkText ? R.style.RecentsTheme_Wallpaper_Light + : R.style.RecentsTheme_Wallpaper); + // Set the Recents layout setContentView(R.layout.recents); takeKeyEvents(true); @@ -375,13 +391,37 @@ public class RecentsActivity extends Activity implements ViewTreeObserver.OnPreD EventBus.getDefault().send(new RecentsVisibilityChangedEvent(this, true)); MetricsLogger.visible(this, MetricsEvent.OVERVIEW_ACTIVITY); - // Make sure we have the right gradient and we're listening for update events - mRecentsView.onStart(); + // Getting system scrim colors ignoring wallpaper visibility since it should never be grey. + ColorExtractor.GradientColors systemColors = mColorExtractor.getColors( + ColorExtractor.TYPE_DARK, WallpaperManager.FLAG_SYSTEM, true); + // We don't want to interpolate colors because we're defining the initial state. + // Gradient should be set/ready when you open "Recents". + mRecentsView.setScrimColors(systemColors, false); + // Notify of the next draw mRecentsView.getViewTreeObserver().addOnPreDrawListener(mRecentsDrawnEventListener); } @Override + public void onColorsChanged(ColorExtractor colorExtractor, int which) { + if ((which & WallpaperManager.FLAG_SYSTEM) != 0) { + // Recents doesn't care about the wallpaper being visible or not, it always + // wants to scrim with wallpaper colors + ColorExtractor.GradientColors colors = mColorExtractor.getColors( + WallpaperManager.FLAG_SYSTEM, + ColorExtractor.TYPE_DARK, true /* ignoreVis */); + boolean darkText = colors.supportsDarkText(); + if (darkText != mUsingDarkText) { + mUsingDarkText = darkText; + setTheme(mUsingDarkText ? R.style.RecentsTheme_Wallpaper_Light + : R.style.RecentsTheme_Wallpaper); + mRecentsView.reevaluateStyles(); + } + mRecentsView.setScrimColors(colors, true /* animated */); + } + } + + @Override protected void onNewIntent(Intent intent) { super.onNewIntent(intent); @@ -483,12 +523,7 @@ public class RecentsActivity extends Activity implements ViewTreeObserver.OnPreD mLastConfig.orientation != newDeviceConfiguration.orientation, mLastConfig.densityDpi != newDeviceConfiguration.densityDpi, numStackTasks > 0)); - int configDiff = mLastConfig.updateFrom(newDeviceConfiguration); - - // Recreate activity if an overlay was enabled/disabled - if ((configDiff & ActivityInfo.CONFIG_ASSETS_PATHS) != 0) { - recreate(); - } + mLastConfig.updateFrom(newDeviceConfiguration); } @Override @@ -508,9 +543,6 @@ public class RecentsActivity extends Activity implements ViewTreeObserver.OnPreD MetricsLogger.hidden(this, MetricsEvent.OVERVIEW_ACTIVITY); Recents.getTaskLoader().getHighResThumbnailLoader().setVisible(false); - // We don't need to update the gradient when we're not visible - mRecentsView.onStop(); - if (!isChangingConfigurations()) { // Workaround for b/22542869, if the RecentsActivity is started again, but without going // through SystemUI, we need to reset the config launch flags to ensure that we do not diff --git a/packages/SystemUI/src/com/android/systemui/recents/RecentsImpl.java b/packages/SystemUI/src/com/android/systemui/recents/RecentsImpl.java index 42e892136954..86e93fdd63ad 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/RecentsImpl.java +++ b/packages/SystemUI/src/com/android/systemui/recents/RecentsImpl.java @@ -24,12 +24,11 @@ import static android.view.View.MeasureSpec; import android.app.ActivityManager; import android.app.ActivityManager.TaskSnapshot; import android.app.ActivityOptions; +import android.app.ActivityOptions.OnAnimationStartedListener; import android.content.ActivityNotFoundException; import android.content.Context; import android.content.Intent; import android.content.res.Resources; -import android.graphics.Bitmap; -import android.graphics.Canvas; import android.graphics.GraphicBuffer; import android.graphics.Rect; import android.graphics.RectF; @@ -208,6 +207,20 @@ public class RecentsImpl implements ActivityOptions.OnAnimationFinishedListener protected static RecentsTaskLoadPlan sInstanceLoadPlan; // Stores the last pinned task time protected static long sLastPipTime = -1; + // Stores whether we are waiting for a transition to/from recents to start. During this time, + // we disallow the user from manually toggling recents until the transition has started. + private static boolean mWaitingForTransitionStart = false; + // Stores whether or not the user toggled while we were waiting for a transition to/from + // recents. In this case, we defer the toggle state until then and apply it immediately after. + private static boolean mToggleFollowingTransitionStart = true; + + private ActivityOptions.OnAnimationStartedListener mResetToggleFlagListener = + new OnAnimationStartedListener() { + @Override + public void onAnimationStarted() { + setWaitingForTransitionStart(false); + } + }; protected Context mContext; protected Handler mHandler; @@ -365,6 +378,11 @@ public class RecentsImpl implements ActivityOptions.OnAnimationFinishedListener return; } + if (mWaitingForTransitionStart) { + mToggleFollowingTransitionStart = true; + return; + } + mDraggingInRecents = false; mLaunchedWhileDocking = false; mTriggeredFromAltTab = false; @@ -638,6 +656,18 @@ public class RecentsImpl implements ActivityOptions.OnAnimationFinishedListener } } + public void setWaitingForTransitionStart(boolean waitingForTransitionStart) { + if (mWaitingForTransitionStart == waitingForTransitionStart) { + return; + } + + mWaitingForTransitionStart = waitingForTransitionStart; + if (!waitingForTransitionStart && mToggleFollowingTransitionStart) { + toggleRecents(DividerView.INVALID_RECENTS_GROW_TARGET); + } + mToggleFollowingTransitionStart = false; + } + /** * Returns the preloaded load plan and invalidates it. */ @@ -865,8 +895,9 @@ public class RecentsImpl implements ActivityOptions.OnAnimationFinishedListener } AppTransitionAnimationSpec[] specsArray = new AppTransitionAnimationSpec[specs.size()]; specs.toArray(specsArray); + return new Pair<>(ActivityOptions.makeThumbnailAspectScaleDownAnimation(mDummyStackView, - specsArray, mHandler, null, this), null); + specsArray, mHandler, mResetToggleFlagListener, this), null); } else { // Update the destination rect Task toTask = new Task(); @@ -884,8 +915,10 @@ public class RecentsImpl implements ActivityOptions.OnAnimationFinishedListener return Lists.newArrayList(new AppTransitionAnimationSpec( toTask.key.id, thumbnail, rect)); }); + return new Pair<>(ActivityOptions.makeMultiThumbFutureAspectScaleAnimation(mContext, - mHandler, future.getFuture(), null, false /* scaleUp */), future); + mHandler, future.getFuture(), mResetToggleFlagListener, false /* scaleUp */), + future); } } @@ -919,11 +952,11 @@ public class RecentsImpl implements ActivityOptions.OnAnimationFinishedListener private GraphicBuffer drawThumbnailTransitionBitmap(Task toTask, TaskViewTransform toTransform) { SystemServicesProxy ssp = Recents.getSystemServices(); - if (toTransform != null && toTask.key != null) { + int width = (int) toTransform.rect.width(); + int height = (int) toTransform.rect.height(); + if (toTransform != null && toTask.key != null && width > 0 && height > 0) { synchronized (mHeaderBarLock) { boolean disabledInSafeMode = !toTask.isSystemApp && ssp.isInSafeMode(); - int width = (int) toTransform.rect.width(); - int height = (int) toTransform.rect.height(); mHeaderBar.onTaskViewSizeChanged(width, height); if (RecentsDebugFlags.Static.EnableTransitionThumbnailDebugMode) { return RecentsTransitionHelper.drawViewIntoGraphicBuffer(width, mTaskBarHeight, @@ -991,6 +1024,10 @@ public class RecentsImpl implements ActivityOptions.OnAnimationFinishedListener launchState.launchedToTaskId = runningTaskId; launchState.launchedWithAltTab = mTriggeredFromAltTab; + // Disable toggling of recents between starting the activity and it is visible and the app + // has started its transition into recents. + setWaitingForTransitionStart(useThumbnailTransition); + // Preload the icon (this will be a null-op if we have preloaded the icon already in // preloadRecents()) preloadIcon(runningTaskId); diff --git a/packages/SystemUI/src/com/android/systemui/recents/RecentsSystemUser.java b/packages/SystemUI/src/com/android/systemui/recents/RecentsSystemUser.java index 3921a20cffd1..1285626015d2 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/RecentsSystemUser.java +++ b/packages/SystemUI/src/com/android/systemui/recents/RecentsSystemUser.java @@ -29,6 +29,7 @@ import com.android.systemui.EventLogTags; import com.android.systemui.recents.events.EventBus; import com.android.systemui.recents.events.activity.DockedTopTaskEvent; import com.android.systemui.recents.events.activity.RecentsActivityStartingEvent; +import com.android.systemui.recents.events.component.SetWaitingForTransitionStartEvent; import com.android.systemui.recents.events.ui.RecentsDrawnEvent; import com.android.systemui.recents.misc.ForegroundThread; @@ -105,4 +106,10 @@ public class RecentsSystemUser extends IRecentsSystemUserCallbacks.Stub { public void sendLaunchRecentsEvent() throws RemoteException { EventBus.getDefault().post(new RecentsActivityStartingEvent()); } + + @Override + public void setWaitingForTransitionStartEvent(boolean waitingForTransitionStart) { + EventBus.getDefault().post(new SetWaitingForTransitionStartEvent( + waitingForTransitionStart)); + } } diff --git a/packages/SystemUI/src/com/android/systemui/recents/events/component/SetWaitingForTransitionStartEvent.java b/packages/SystemUI/src/com/android/systemui/recents/events/component/SetWaitingForTransitionStartEvent.java new file mode 100644 index 000000000000..d9cf5fbf645d --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/recents/events/component/SetWaitingForTransitionStartEvent.java @@ -0,0 +1,31 @@ +/* + * Copyright (C) 2017 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.recents.events.component; + +import com.android.systemui.recents.events.EventBus; + +/** + * This is sent when we are setting/resetting the flag to wait for the transition to start. + */ +public class SetWaitingForTransitionStartEvent extends EventBus.Event { + + public final boolean waitingForTransitionStart; + + public SetWaitingForTransitionStartEvent(boolean waitingForTransitionStart) { + this.waitingForTransitionStart = waitingForTransitionStart; + } +} diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/RecentsTransitionHelper.java b/packages/SystemUI/src/com/android/systemui/recents/views/RecentsTransitionHelper.java index 968b77f17e62..67685b8737ce 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/views/RecentsTransitionHelper.java +++ b/packages/SystemUI/src/com/android/systemui/recents/views/RecentsTransitionHelper.java @@ -54,6 +54,7 @@ import com.android.systemui.recents.events.activity.LaunchTaskFailedEvent; import com.android.systemui.recents.events.activity.LaunchTaskStartedEvent; import com.android.systemui.recents.events.activity.LaunchTaskSucceededEvent; import com.android.systemui.recents.events.component.ScreenPinningRequestEvent; +import com.android.systemui.recents.events.component.SetWaitingForTransitionStartEvent; import com.android.systemui.recents.misc.SystemServicesProxy; import com.android.systemui.recents.model.Task; import com.android.systemui.recents.model.TaskStack; @@ -117,31 +118,58 @@ public class RecentsTransitionHelper { final Rect windowRect = Recents.getSystemServices().getWindowRect(); transitionFuture = getAppTransitionFuture( () -> composeAnimationSpecs(task, stackView, destinationStack, windowRect)); - animStartedListener = () -> { - // If we are launching into another task, cancel the previous task's - // window transition - EventBus.getDefault().send(new CancelEnterRecentsWindowAnimationEvent(task)); - EventBus.getDefault().send(new ExitRecentsWindowFirstAnimationFrameEvent()); - stackView.cancelAllTaskViewAnimations(); - - if (screenPinningRequested) { - // Request screen pinning after the animation runs - mStartScreenPinningRunnable.taskId = task.key.id; - mHandler.postDelayed(mStartScreenPinningRunnable, 350); + animStartedListener = new OnAnimationStartedListener() { + private boolean mHandled; + + @Override + public void onAnimationStarted() { + if (mHandled) { + return; + } + mHandled = true; + + // If we are launching into another task, cancel the previous task's + // window transition + EventBus.getDefault().send(new CancelEnterRecentsWindowAnimationEvent(task)); + EventBus.getDefault().send(new ExitRecentsWindowFirstAnimationFrameEvent()); + stackView.cancelAllTaskViewAnimations(); + + if (screenPinningRequested) { + // Request screen pinning after the animation runs + mStartScreenPinningRunnable.taskId = task.key.id; + mHandler.postDelayed(mStartScreenPinningRunnable, 350); + } + + // Reset the state where we are waiting for the transition to start + EventBus.getDefault().send(new SetWaitingForTransitionStartEvent(false)); } }; } else { // This is only the case if the task is not on screen (scrolled offscreen for example) transitionFuture = null; - animStartedListener = () -> { - // If we are launching into another task, cancel the previous task's - // window transition - EventBus.getDefault().send(new CancelEnterRecentsWindowAnimationEvent(task)); - EventBus.getDefault().send(new ExitRecentsWindowFirstAnimationFrameEvent()); - stackView.cancelAllTaskViewAnimations(); + animStartedListener = new OnAnimationStartedListener() { + private boolean mHandled; + + @Override + public void onAnimationStarted() { + if (mHandled) { + return; + } + mHandled = true; + + // If we are launching into another task, cancel the previous task's + // window transition + EventBus.getDefault().send(new CancelEnterRecentsWindowAnimationEvent(task)); + EventBus.getDefault().send(new ExitRecentsWindowFirstAnimationFrameEvent()); + stackView.cancelAllTaskViewAnimations(); + + // Reset the state where we are waiting for the transition to start + EventBus.getDefault().send(new SetWaitingForTransitionStartEvent(false)); + } }; } + EventBus.getDefault().send(new SetWaitingForTransitionStartEvent(true)); final ActivityOptions opts = ActivityOptions.makeMultiThumbFutureAspectScaleAnimation(mContext, mHandler, transitionFuture != null ? transitionFuture.future : null, animStartedListener, true /* scaleUp */); 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 fd37b17f3cd0..8e094813257c 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/views/RecentsView.java +++ b/packages/SystemUI/src/com/android/systemui/recents/views/RecentsView.java @@ -21,13 +21,12 @@ import static android.app.ActivityManager.StackId.INVALID_STACK_ID; import android.animation.Animator; import android.animation.ObjectAnimator; import android.app.ActivityOptions.OnAnimationStartedListener; -import android.app.WallpaperColors; -import android.app.WallpaperManager; import android.content.Context; +import android.content.res.ColorStateList; import android.graphics.Canvas; import android.graphics.Color; +import android.graphics.PointF; import android.graphics.Rect; -import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.Drawable; import android.util.ArraySet; import android.util.AttributeSet; @@ -43,12 +42,12 @@ import android.widget.FrameLayout; import android.widget.TextView; import com.android.internal.colorextraction.ColorExtractor; +import com.android.internal.colorextraction.drawable.GradientDrawable; import com.android.internal.logging.MetricsLogger; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; -import com.android.systemui.Dependency; +import com.android.settingslib.Utils; import com.android.systemui.Interpolators; import com.android.systemui.R; -import com.android.systemui.colorextraction.SysuiColorExtractor; import com.android.systemui.recents.Recents; import com.android.systemui.recents.RecentsActivity; import com.android.systemui.recents.RecentsActivityLaunchState; @@ -83,8 +82,6 @@ import com.android.systemui.stackdivider.WindowManagerProxy; import com.android.systemui.statusbar.FlingAnimationUtils; import com.android.systemui.statusbar.phone.ScrimController; -import com.android.internal.colorextraction.drawable.GradientDrawable; - import java.io.PrintWriter; import java.util.ArrayList; import java.util.List; @@ -93,7 +90,7 @@ import java.util.List; * This view is the the top level layout that contains TaskStacks (which are laid out according * to their SpaceNode bounds. */ -public class RecentsView extends FrameLayout implements ColorExtractor.OnColorsChangedListener { +public class RecentsView extends FrameLayout { private static final String TAG = "RecentsView"; @@ -107,6 +104,9 @@ public class RecentsView extends FrameLayout implements ColorExtractor.OnColorsC private TaskStackView mTaskStackView; private TextView mStackActionButton; private TextView mEmptyView; + private final float mStackButtonShadowRadius; + private final PointF mStackButtonShadowDistance; + private final int mStackButtonShadowColor; private boolean mAwaitingFirstLayout = true; private boolean mLastTaskLaunchedWasFreeform; @@ -117,7 +117,6 @@ public class RecentsView extends FrameLayout implements ColorExtractor.OnColorsC private float mBusynessFactor; private GradientDrawable mBackgroundScrim; - private final SysuiColorExtractor mColorExtractor; private Animator mBackgroundScrimAnimator; private RecentsTransitionHelper mTransitionHelper; @@ -148,29 +147,51 @@ public class RecentsView extends FrameLayout implements ColorExtractor.OnColorsC mFlingAnimationUtils = new FlingAnimationUtils(context, 0.3f); mBackgroundScrim = new GradientDrawable(context); mBackgroundScrim.setCallback(this); - mColorExtractor = Dependency.get(SysuiColorExtractor.class); - LayoutInflater inflater = LayoutInflater.from(context); + boolean usingDarkText = Color.luminance( + Utils.getColorAttr(mContext, R.attr.wallpaperTextColor)) < 0.5f; + LayoutInflater inflater = LayoutInflater.from(context); mEmptyView = (TextView) inflater.inflate(R.layout.recents_empty, this, false); addView(mEmptyView); - boolean usingDarkText = - Color.luminance(mEmptyView.getTextColors().getDefaultColor()) < 0.5f; if (RecentsDebugFlags.Static.EnableStackActionButton) { + if (mStackActionButton != null) { + removeView(mStackActionButton); + } mStackActionButton = (TextView) inflater.inflate(R.layout.recents_stack_action_button, this, false); - mStackActionButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - EventBus.getDefault().send(new DismissAllTaskViewsEvent()); - } - }); - // Disable black shadow if text color is already dark. + mStackActionButton.setOnClickListener( + v -> EventBus.getDefault().send(new DismissAllTaskViewsEvent())); + + mStackButtonShadowRadius = mStackActionButton.getShadowRadius(); + mStackButtonShadowDistance = new PointF(mStackActionButton.getShadowDx(), + mStackActionButton.getShadowDy()); + mStackButtonShadowColor = mStackActionButton.getShadowColor(); + addView(mStackActionButton); + } + + reevaluateStyles(); + } + + public void reevaluateStyles() { + int textColor = Utils.getColorAttr(mContext, R.attr.wallpaperTextColor); + boolean usingDarkText = Color.luminance(textColor) < 0.5f; + + mEmptyView.setTextColor(textColor); + mEmptyView.setCompoundDrawableTintList(new ColorStateList(new int[][]{ + {android.R.attr.state_enabled}}, new int[]{textColor})); + + if (mStackActionButton != null) { + mStackActionButton.setTextColor(textColor); + // Enable/disable shadow if text color is already dark. if (usingDarkText) { mStackActionButton.setShadowLayer(0, 0, 0, 0); + } else { + mStackActionButton.setShadowLayer(mStackButtonShadowRadius, + mStackButtonShadowDistance.x, mStackButtonShadowDistance.y, + mStackButtonShadowColor); } - addView(mStackActionButton); } // Let's also require dark status and nav bars if the text is dark @@ -369,6 +390,16 @@ public class RecentsView extends FrameLayout implements ColorExtractor.OnColorsC } } + /** + * Set the color of the scrim. + * + * @param scrimColors Colors to use. + * @param animated Interpolate colors if true. + */ + public void setScrimColors(ColorExtractor.GradientColors scrimColors, boolean animated) { + mBackgroundScrim.setColors(scrimColors, animated); + } + @Override protected void onAttachedToWindow() { EventBus.getDefault().register(this, RecentsActivity.EVENT_BUS_PRIORITY + 1); @@ -888,29 +919,4 @@ public class RecentsView extends FrameLayout implements ColorExtractor.OnColorsC mTaskStackView.dump(innerPrefix, writer); } } - - @Override - public void onColorsChanged(ColorExtractor colorExtractor, int which) { - if ((which & WallpaperManager.FLAG_SYSTEM) != 0) { - // Recents doesn't care about the wallpaper being visible or not, it always - // wants to scrim with wallpaper colors - mBackgroundScrim.setColors( - mColorExtractor.getColors(WallpaperManager.FLAG_SYSTEM, - ColorExtractor.TYPE_DARK, true)); - } - } - - public void onStart() { - mColorExtractor.addOnColorsChangedListener(this); - // Getting system scrim colors ignoring wallpaper visibility since it should never be grey. - ColorExtractor.GradientColors systemColors = mColorExtractor.getColors( - ColorExtractor.TYPE_DARK, WallpaperManager.FLAG_SYSTEM, true); - // We don't want to interpolate colors because we're defining the initial state. - // Gradient should be set/ready when you open "Recents". - mBackgroundScrim.setColors(systemColors, false); - } - - public void onStop() { - mColorExtractor.removeOnColorsChangedListener(this); - } } diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackLayoutAlgorithm.java b/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackLayoutAlgorithm.java index 813503431962..9c14d481b8be 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackLayoutAlgorithm.java +++ b/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackLayoutAlgorithm.java @@ -23,6 +23,7 @@ import android.content.res.Resources; import android.graphics.Path; import android.graphics.Rect; import android.util.ArraySet; +import android.util.Log; import android.util.MutableFloat; import android.util.SparseArray; import android.util.SparseIntArray; @@ -481,6 +482,13 @@ public class TaskStackLayoutAlgorithm { int height = mStackRect.height() - mInitialTopOffset - mStackBottomOffset; mTaskRect.set(mStackRect.left, mStackRect.top, mStackRect.right, mStackRect.top + height); + if (mTaskRect.width() <= 0 || mTaskRect.height() <= 0) { + // Logging for b/36654830 + Log.e(TAG, "Invalid task rect: taskRect=" + mTaskRect + " stackRect=" + mStackRect + + " displayRect=" + displayRect + " windowRect=" + windowRect + + " taskStackBounds=" + taskStackBounds); + } + // Short circuit here if the stack rects haven't changed so we don't do all the work below if (!lastStackRect.equals(mStackRect)) { // Reinitialize the focused and unfocused curves diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/DismissView.java b/packages/SystemUI/src/com/android/systemui/statusbar/DismissView.java index 543666407fb9..d7c6443a6c3b 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/DismissView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/DismissView.java @@ -16,6 +16,7 @@ package com.android.systemui.statusbar; +import android.annotation.ColorInt; import android.content.Context; import android.content.res.Configuration; import android.util.AttributeSet; @@ -46,6 +47,10 @@ public class DismissView extends StackScrollerDecorView { mDismissButton = (DismissViewButton) findContentView(); } + public void setTextColor(@ColorInt int color) { + mDismissButton.setTextColor(color); + } + public void setOnButtonClickListener(OnClickListener listener) { mContent.setOnClickListener(listener); } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/EmptyShadeView.java b/packages/SystemUI/src/com/android/systemui/statusbar/EmptyShadeView.java index 92b0890a5d2b..58adde269758 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/EmptyShadeView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/EmptyShadeView.java @@ -16,6 +16,7 @@ package com.android.systemui.statusbar; +import android.annotation.ColorInt; import android.content.Context; import android.content.res.Configuration; import android.util.AttributeSet; @@ -45,6 +46,10 @@ public class EmptyShadeView extends StackScrollerDecorView { return findViewById(R.id.no_notifications); } + public void setTextColor(@ColorInt int color) { + mEmptyText.setTextColor(color); + } + @Override protected void onFinishInflate() { super.onFinishInflate(); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java b/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java index 25ef478fc630..74737c4c2948 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java @@ -280,13 +280,10 @@ public class KeyguardIndicationController { if (mDozing) { // If we're dozing, never show a persistent indication. if (!TextUtils.isEmpty(mTransientIndication)) { - // When dozing we ignore the initial text color and use white instead. - // We don't wait to draw black text on a black background. - int color = mTransientTextColor == mInitialTextColor ? - Color.WHITE : mTransientTextColor; + // When dozing we ignore any text color and use white instead, because + // colors can be hard to read in low brightness. + mTextView.setTextColor(Color.WHITE); mTextView.switchIndication(mTransientIndication); - mTextView.setTextColor(color); - } else { mTextView.switchIndication(null); } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ConfigurationControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ConfigurationControllerImpl.java index 85d2d73d7c28..37554c457065 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ConfigurationControllerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ConfigurationControllerImpl.java @@ -18,6 +18,7 @@ import android.content.Context; import android.content.om.IOverlayManager; import android.content.pm.ActivityInfo; import android.content.res.Configuration; +import android.os.LocaleList; import android.os.RemoteException; import android.os.ServiceManager; import android.os.UserHandle; @@ -36,11 +37,13 @@ public class ConfigurationControllerImpl implements ConfigurationController, private final Configuration mLastConfig = new Configuration(); private int mDensity; private float mFontScale; + private LocaleList mLocaleList; public ConfigurationControllerImpl(Context context) { Configuration currentConfig = context.getResources().getConfiguration(); mFontScale = currentConfig.fontScale; mDensity = currentConfig.densityDpi; + mLocaleList = currentConfig.getLocales(); } @Override @@ -65,6 +68,16 @@ public class ConfigurationControllerImpl implements ConfigurationController, mFontScale = fontScale; } + final LocaleList localeList = newConfig.getLocales(); + if (!localeList.equals(mLocaleList)) { + mLocaleList = localeList; + listeners.forEach(l -> { + if (mListeners.contains(l)) { + l.onLocaleListChanged(); + } + }); + } + if ((mLastConfig.updateFrom(newConfig) & ActivityInfo.CONFIG_ASSETS_PATHS) != 0) { listeners.forEach(l -> { if (mListeners.contains(l)) { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/FingerprintUnlockController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/FingerprintUnlockController.java index df059e3686ba..b4fe900e5320 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/FingerprintUnlockController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/FingerprintUnlockController.java @@ -29,6 +29,7 @@ import com.android.keyguard.KeyguardUpdateMonitorCallback; import com.android.keyguard.LatencyTracker; import com.android.systemui.Dependency; import com.android.systemui.keyguard.KeyguardViewMediator; +import com.android.systemui.keyguard.WakefulnessLifecycle; /** * Controller which coordinates all the fingerprint unlocking actions with the UI. @@ -99,6 +100,7 @@ public class FingerprintUnlockController extends KeyguardUpdateMonitorCallback { private final UnlockMethodCache mUnlockMethodCache; private final Context mContext; private int mPendingAuthenticatedUserId = -1; + private boolean mPendingShowBouncer; public FingerprintUnlockController(Context context, DozeScrimController dozeScrimController, @@ -110,6 +112,7 @@ public class FingerprintUnlockController extends KeyguardUpdateMonitorCallback { mPowerManager = context.getSystemService(PowerManager.class); mUpdateMonitor = KeyguardUpdateMonitor.getInstance(context); mUpdateMonitor.registerCallback(this); + Dependency.get(WakefulnessLifecycle.class).addObserver(mWakefulnessObserver); mStatusBarWindowManager = Dependency.get(StatusBarWindowManager.class); mDozeScrimController = dozeScrimController; mKeyguardViewMediator = keyguardViewMediator; @@ -212,9 +215,10 @@ public class FingerprintUnlockController extends KeyguardUpdateMonitorCallback { Trace.beginSection("MODE_UNLOCK or MODE_SHOW_BOUNCER"); if (!wasDeviceInteractive) { mStatusBarKeyguardViewManager.notifyDeviceWakeUpRequested(); + mPendingShowBouncer = true; + } else { + showBouncer(); } - mStatusBarKeyguardViewManager.animateCollapsePanels( - FINGERPRINT_COLLAPSE_SPEEDUP_FACTOR); Trace.endSection(); break; case MODE_WAKE_AND_UNLOCK_PULSING: @@ -247,6 +251,12 @@ public class FingerprintUnlockController extends KeyguardUpdateMonitorCallback { Trace.endSection(); } + private void showBouncer() { + mStatusBarKeyguardViewManager.animateCollapsePanels( + FINGERPRINT_COLLAPSE_SPEEDUP_FACTOR); + mPendingShowBouncer = false; + } + @Override public void onStartedGoingToSleep(int why) { mPendingAuthenticatedUserId = -1; @@ -338,4 +348,14 @@ public class FingerprintUnlockController extends KeyguardUpdateMonitorCallback { } mStatusBar.notifyFpAuthModeChanged(); } + + private final WakefulnessLifecycle.Observer mWakefulnessObserver = + new WakefulnessLifecycle.Observer() { + @Override + public void onFinishedWakingUp() { + if (mPendingShowBouncer) { + FingerprintUnlockController.this.showBouncer(); + } + } + }; } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java index 3e183b657501..cdba24ca205c 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java @@ -238,10 +238,12 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL mEnterpriseDisclosure = findViewById( R.id.keyguard_indication_enterprise_disclosure); mIndicationText = findViewById(R.id.keyguard_indication_text); - watchForCameraPolicyChanges(); updateCameraVisibility(); mUnlockMethodCache = UnlockMethodCache.getInstance(getContext()); mUnlockMethodCache.addListener(this); + KeyguardUpdateMonitor updateMonitor = KeyguardUpdateMonitor.getInstance(mContext); + mLockIcon.setScreenOn(updateMonitor.isScreenOn()); + mLockIcon.setDeviceInteractive(updateMonitor.isDeviceInteractive()); mLockIcon.update(); setClipChildren(false); setClipToPadding(false); @@ -278,6 +280,11 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL .withDefault(() -> new DefaultLeftButton()) .withCallback(button -> setLeftButton(button)) .build(); + final IntentFilter filter = new IntentFilter(); + filter.addAction(DevicePolicyManager.ACTION_DEVICE_POLICY_MANAGER_STATE_CHANGED); + getContext().registerReceiverAsUser(mDevicePolicyReceiver, + UserHandle.ALL, filter, null, null); + KeyguardUpdateMonitor.getInstance(mContext).registerCallback(mUpdateMonitorCallback); } @Override @@ -286,6 +293,8 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL mAccessibilityController.removeStateChangedCallback(this); mRightExtension.destroy(); mLeftExtension.destroy(); + getContext().unregisterReceiver(mDevicePolicyReceiver); + KeyguardUpdateMonitor.getInstance(mContext).removeCallback(mUpdateMonitorCallback); } private void initAccessibility() { @@ -401,14 +410,6 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL && pm.resolveActivity(PHONE_INTENT, 0) != null; } - private void watchForCameraPolicyChanges() { - final IntentFilter filter = new IntentFilter(); - filter.addAction(DevicePolicyManager.ACTION_DEVICE_POLICY_MANAGER_STATE_CHANGED); - getContext().registerReceiverAsUser(mDevicePolicyReceiver, - UserHandle.ALL, filter, null, null); - KeyguardUpdateMonitor.getInstance(mContext).registerCallback(mUpdateMonitorCallback); - } - @Override public void onStateChanged(boolean accessibilityEnabled, boolean touchExplorationEnabled) { mRightAffordanceView.setClickable(touchExplorationEnabled); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java index 426444158b11..12fa946fad90 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java @@ -316,7 +316,8 @@ public class NavigationBarView extends FrameLayout implements PluginListener<Nav mDockedIcon = getDrawable(ctx, R.drawable.ic_sysbar_docked, R.drawable.ic_sysbar_docked_dark); } - if (oldConfig.densityDpi != newConfig.densityDpi) { + if (oldConfig.densityDpi != newConfig.densityDpi + || oldConfig.getLayoutDirection() != newConfig.getLayoutDirection()) { mBackIcon = getDrawable(ctx, R.drawable.ic_sysbar_back, R.drawable.ic_sysbar_back_dark); mBackLandIcon = mBackIcon; mBackAltIcon = getDrawable(ctx, @@ -672,7 +673,8 @@ public class NavigationBarView extends FrameLayout implements PluginListener<Nav updateTaskSwitchHelper(); updateIcons(getContext(), mConfiguration, newConfig); updateRecentsIcon(); - if (uiCarModeChanged || mConfiguration.densityDpi != newConfig.densityDpi) { + if (uiCarModeChanged || mConfiguration.densityDpi != newConfig.densityDpi + || mConfiguration.getLayoutDirection() != newConfig.getLayoutDirection()) { // If car mode or density changes, we need to reset the icons. setNavigationIconHints(mNavigationIconHints, true); } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java index 1f03ceaeddda..384d95ce0858 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java @@ -156,6 +156,7 @@ import com.android.keyguard.KeyguardUpdateMonitor; import com.android.keyguard.KeyguardUpdateMonitorCallback; import com.android.keyguard.ViewMediatorCallback; import com.android.systemui.ActivityStarterDelegate; +import com.android.systemui.AutoReinflateContainer; import com.android.systemui.DejankUtils; import com.android.systemui.DemoMode; import com.android.systemui.Dependency; @@ -175,6 +176,7 @@ import com.android.systemui.classifier.FalsingManager; import com.android.systemui.colorextraction.SysuiColorExtractor; import com.android.systemui.doze.DozeHost; import com.android.systemui.doze.DozeLog; +import com.android.systemui.doze.DozeReceiver; import com.android.systemui.fragments.ExtensionFragmentListener; import com.android.systemui.fragments.FragmentHostManager; import com.android.systemui.keyguard.KeyguardViewMediator; @@ -987,9 +989,6 @@ public class StatusBar extends SystemUI implements DemoMode, Dependency.get(ActivityStarterDelegate.class).setActivityStarterImpl(this); Dependency.get(ConfigurationController.class).addCallback(this); - - // Make sure that we're using the correct theme - onOverlayChanged(); } protected void createIconController() { @@ -1002,6 +1001,7 @@ public class StatusBar extends SystemUI implements DemoMode, final Context context = mContext; updateDisplaySize(); // populates mDisplayMetrics updateResources(); + updateTheme(); inflateStatusBarWindow(context); mStatusBarWindow.setService(this); @@ -1209,7 +1209,6 @@ public class StatusBar extends SystemUI implements DemoMode, }); } - PowerManager pm = (PowerManager) mContext.getSystemService(Context.POWER_SERVICE); if (!pm.isScreenOn()) { mBroadcastReceiver.onReceive(mContext, new Intent(Intent.ACTION_SCREEN_OFF)); @@ -1314,14 +1313,14 @@ public class StatusBar extends SystemUI implements DemoMode, reevaluateStyles(); } - public void onOverlayChanged() { + private void reinflateViews() { reevaluateStyles(); // Clock and bottom icons mNotificationPanel.onOverlayChanged(); - + // The status bar on the keyguard is a special layout. + mKeyguardStatusBar.onOverlayChanged(); // Recreate Indication controller because internal references changed - // TODO: unregister callbacks before recreating mKeyguardIndicationController = SystemUIFactory.getInstance().createKeyguardIndicationController(mContext, mStatusBarWindow.findViewById(R.id.keyguard_indication_area), @@ -1337,6 +1336,9 @@ public class StatusBar extends SystemUI implements DemoMode, if (mStatusBarKeyguardViewManager != null) { mStatusBarKeyguardViewManager.onOverlayChanged(); } + if (mAmbientIndicationContainer instanceof AutoReinflateContainer) { + ((AutoReinflateContainer) mAmbientIndicationContainer).inflateLayout(); + } } protected void reevaluateStyles() { @@ -1939,9 +1941,6 @@ public class StatusBar extends SystemUI implements DemoMode, boolean sensitive = userPublic && needsRedaction; boolean deviceSensitive = devicePublic && !userAllowsPrivateNotificationsInPublic(mCurrentUserId); - if (sensitive) { - updatePublicContentView(ent, ent.notification); - } ent.row.setSensitive(sensitive, deviceSensitive); ent.row.setNeedsRedaction(needsRedaction); if (mGroupManager.isChildInGroupWithSummary(ent.row.getStatusBarNotification())) { @@ -2869,17 +2868,6 @@ public class StatusBar extends SystemUI implements DemoMode, updateTheme(); } - public boolean isUsingDarkText() { - OverlayInfo themeInfo = null; - try { - themeInfo = mOverlayManager.getOverlayInfo("com.android.systemui.theme.lightwallpaper", - mCurrentUserId); - } catch (RemoteException e) { - e.printStackTrace(); - } - return themeInfo != null && themeInfo.isEnabled(); - } - public boolean isUsingDarkTheme() { OverlayInfo themeInfo = null; try { @@ -4578,24 +4566,13 @@ public class StatusBar extends SystemUI implements DemoMode, * Switches theme from light to dark and vice-versa. */ private void updateTheme() { + final boolean inflated = mStackScroller != null; - int which; - if (mState == StatusBarState.KEYGUARD || mState == StatusBarState.SHADE_LOCKED) { - which = WallpaperManager.FLAG_LOCK; - } else { - which = WallpaperManager.FLAG_SYSTEM; - } - - // Gradient defines if text color should be light or dark. - final boolean useDarkText = mColorExtractor.getColors(which, true /* ignoreVisibility */) - .supportsDarkText(); - // And wallpaper defines if QS should be light or dark. + // The system wallpaper defines if QS should be light or dark. WallpaperColors systemColors = mColorExtractor .getWallpaperColors(WallpaperManager.FLAG_SYSTEM); final boolean useDarkTheme = systemColors != null && (systemColors.getColorHints() & WallpaperColors.HINT_SUPPORTS_DARK_THEME) != 0; - - // Enable/disable dark UI. if (isUsingDarkTheme() != useDarkTheme) { try { mOverlayManager.setEnabled("com.android.systemui.theme.dark", @@ -4604,18 +4581,33 @@ public class StatusBar extends SystemUI implements DemoMode, Log.w(TAG, "Can't change theme", e); } } - // Enable/disable dark text overlay. - if (isUsingDarkText() != useDarkText) { - try { - mOverlayManager.setEnabled("com.android.systemui.theme.lightwallpaper", - useDarkText, mCurrentUserId); - } catch (RemoteException e) { - Log.w(TAG, "Can't change theme", e); + + // Lock wallpaper defines the color of the majority of the views, hence we'll use it + // to set our default theme. + final boolean lockDarkText = mColorExtractor.getColors(WallpaperManager.FLAG_LOCK, true + /* ignoreVisibility */).supportsDarkText(); + final int themeResId = lockDarkText ? R.style.Theme_SystemUI_Light : R.style.Theme_SystemUI; + if (mContext.getThemeResId() != themeResId) { + mContext.setTheme(themeResId); + if (inflated) { + reinflateViews(); } } - // Make sure we have the correct navbar/statusbar colors. - mStatusBarWindowManager.setKeyguardDark(useDarkText); + if (inflated) { + int which; + if (mState == StatusBarState.KEYGUARD || mState == StatusBarState.SHADE_LOCKED) { + which = WallpaperManager.FLAG_LOCK; + } else { + which = WallpaperManager.FLAG_SYSTEM; + } + final boolean useDarkText = mColorExtractor.getColors(which, + true /* ignoreVisibility */).supportsDarkText(); + mStackScroller.updateDecorViews(useDarkText); + + // Make sure we have the correct navbar/statusbar colors. + mStatusBarWindowManager.setKeyguardDark(useDarkText); + } } private void updateDozingState() { @@ -5168,6 +5160,7 @@ public class StatusBar extends SystemUI implements DemoMode, mStackScroller.setAnimationsEnabled(true); mVisualStabilityManager.setScreenOn(true); mNotificationPanel.setTouchDisabled(false); + mDozeServiceHost.stopDozing(); updateVisibleToUser(); updateIsKeyguard(); } @@ -5350,6 +5343,9 @@ public class StatusBar extends SystemUI implements DemoMode, } mStatusBarWindowManager.setDozing(mDozing); mStatusBarKeyguardViewManager.setDozing(mDozing); + if (mAmbientIndicationContainer instanceof DozeReceiver) { + ((DozeReceiver) mAmbientIndicationContainer).setDozing(mDozing); + } updateDozingState(); Trace.endSection(); } @@ -6833,7 +6829,6 @@ public class StatusBar extends SystemUI implements DemoMode, } }); - final boolean keyguardShowing = mStatusBarKeyguardViewManager.isShowing(); final boolean afterKeyguardGone = intent.isActivity() && PreviewInflater.wouldLaunchResolverActivity(mContext, intent.getIntent(), mCurrentUserId); @@ -6860,7 +6855,7 @@ public class StatusBar extends SystemUI implements DemoMode, } } final StatusBarNotification parentToCancelFinal = parentToCancel; - new Thread() { + final Runnable runnable = new Runnable() { @Override public void run() { try { @@ -6932,7 +6927,14 @@ public class StatusBar extends SystemUI implements DemoMode, }); } } - }.start(); + }; + + if (mStatusBarKeyguardViewManager.isShowing() + && mStatusBarKeyguardViewManager.isOccluded()) { + mStatusBarKeyguardViewManager.addAfterKeyguardGoneRunnable(runnable); + } else { + new Thread(runnable).start(); + } // close the shade if it was open animateCollapsePanels(CommandQueue.FLAG_EXCLUDE_RECENTS_PANEL, @@ -7235,24 +7237,6 @@ public class StatusBar extends SystemUI implements DemoMode, setAreThereNotifications(); } - protected void updatePublicContentView(Entry entry, - StatusBarNotification sbn) { - final RemoteViews publicContentView = entry.cachedPublicContentView; - View inflatedView = entry.getPublicContentView(); - if (entry.autoRedacted && publicContentView != null && inflatedView != null) { - final boolean disabledByPolicy = - !adminAllowsUnredactedNotifications(entry.notification.getUserId()); - String notificationHiddenText = mContext.getString(disabledByPolicy - ? com.android.internal.R.string.notification_hidden_by_policy_text - : com.android.internal.R.string.notification_hidden_text); - TextView titleView = (TextView) inflatedView.findViewById(android.R.id.title); - if (titleView != null - && !titleView.getText().toString().equals(notificationHiddenText)) { - titleView.setText(notificationHiddenText); - } - } - } - protected void notifyHeadsUpScreenOff() { maybeEscalateHeadsUp(); } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/SystemUIDialog.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/SystemUIDialog.java index 2783ec5d0492..7b6725bfa392 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/SystemUIDialog.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/SystemUIDialog.java @@ -69,9 +69,10 @@ public class SystemUIDialog extends AlertDialog { } } - public static void applyFlags(AlertDialog dialog) { + public static AlertDialog applyFlags(AlertDialog dialog) { dialog.getWindow().setType(WindowManager.LayoutParams.TYPE_STATUS_BAR_PANEL); dialog.getWindow().addFlags(WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM | WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED); + return dialog; } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/ConfigurationController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/ConfigurationController.java index 418c48ec36f2..3dca371541ef 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/ConfigurationController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/ConfigurationController.java @@ -28,5 +28,6 @@ public interface ConfigurationController extends CallbackController<Configuratio default void onConfigChanged(Configuration newConfig) {} default void onDensityOrFontScaleChanged() {} default void onOverlayChanged() {} + default void onLocaleListChanged() {} } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java b/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java index 42cebe2632bb..4bbe895da7ca 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java @@ -23,6 +23,7 @@ import android.animation.PropertyValuesHolder; import android.animation.TimeAnimator; import android.animation.ValueAnimator; import android.animation.ValueAnimator.AnimatorUpdateListener; +import android.annotation.ColorInt; import android.annotation.FloatRange; import android.annotation.Nullable; import android.content.Context; @@ -44,6 +45,7 @@ import android.util.FloatProperty; import android.util.Log; import android.util.Pair; import android.util.Property; +import android.view.ContextThemeWrapper; import android.view.InputDevice; import android.view.MotionEvent; import android.view.VelocityTracker; @@ -61,6 +63,7 @@ import android.widget.ScrollView; import com.android.internal.logging.MetricsLogger; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; +import com.android.settingslib.Utils; import com.android.systemui.ExpandHelper; import com.android.systemui.Interpolators; import com.android.systemui.R; @@ -363,6 +366,7 @@ public class NotificationStackScrollLayout extends ViewGroup return object.getBackgroundFadeAmount(); } }; + private boolean mUsingLightTheme; private boolean mQsExpanded; private boolean mForwardScrollable; private boolean mBackwardScrollable; @@ -3653,6 +3657,23 @@ public class NotificationStackScrollLayout extends ViewGroup mTmpSortedChildren.clear(); } + /** + * Update colors of "dismiss" and "empty shade" views. + * + * @param lightTheme True if light theme should be used. + */ + public void updateDecorViews(boolean lightTheme) { + if (lightTheme == mUsingLightTheme) { + return; + } + mUsingLightTheme = lightTheme; + Context context = new ContextThemeWrapper(mContext, + lightTheme ? R.style.Theme_SystemUI_Light : R.style.Theme_SystemUI); + final int textColor = Utils.getColorAttr(context, R.attr.wallpaperTextColor); + mDismissView.setTextColor(textColor); + mEmptyShadeView.setTextColor(textColor); + } + public void goToFullShade(long delay) { if (mDismissView != null) { mDismissView.setInvisible(); diff --git a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java index 7e9c8656c04b..9e50e81033e0 100644 --- a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java +++ b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java @@ -53,6 +53,7 @@ import android.util.DisplayMetrics; import android.util.Log; import android.util.Slog; import android.util.SparseBooleanArray; +import android.view.ContextThemeWrapper; import android.view.Gravity; import android.view.MotionEvent; import android.view.View; @@ -151,7 +152,7 @@ public class VolumeDialogImpl implements VolumeDialog, TunerService.Tunable { private TunerZenModePanel mZenPanel; public VolumeDialogImpl(Context context) { - mContext = context; + mContext = new ContextThemeWrapper(context, com.android.systemui.R.style.qs_theme); mZenModeController = Dependency.get(ZenModeController.class); mController = Dependency.get(VolumeDialogController.class); mKeyguard = (KeyguardManager) mContext.getSystemService(Context.KEYGUARD_SERVICE); diff --git a/packages/SystemUI/src/com/android/systemui/volume/ZenFooter.java b/packages/SystemUI/src/com/android/systemui/volume/ZenFooter.java index 17d98b19277e..74642129b197 100644 --- a/packages/SystemUI/src/com/android/systemui/volume/ZenFooter.java +++ b/packages/SystemUI/src/com/android/systemui/volume/ZenFooter.java @@ -111,7 +111,9 @@ public class ZenFooter extends LinearLayout { if (mZen == zen) return; mZen = zen; update(); - updateIntroduction(); + post(() -> { + updateIntroduction(); + }); } private void setConfig(ZenModeConfig config) { diff --git a/packages/SystemUI/tests/AndroidManifest.xml b/packages/SystemUI/tests/AndroidManifest.xml index f24e7b56bfc4..03f3c56aab73 100644 --- a/packages/SystemUI/tests/AndroidManifest.xml +++ b/packages/SystemUI/tests/AndroidManifest.xml @@ -39,6 +39,8 @@ <uses-permission android:name="android.permission.WAKE_LOCK" /> <uses-permission android:name="android.permission.GET_APP_OPS_STATS" /> <uses-permission android:name="android.permission.BLUETOOTH" /> + <uses-permission android:name="android.permission.TRUST_LISTENER" /> + <uses-permission android:name="android.permission.USE_FINGERPRINT" /> <application> <uses-library android:name="android.test.runner" /> diff --git a/packages/SystemUI/tests/src/com/android/keyguard/KeyguardClockAccessibilityDelegateTest.java b/packages/SystemUI/tests/src/com/android/keyguard/KeyguardClockAccessibilityDelegateTest.java index 855adb451020..e37ea95515d0 100644 --- a/packages/SystemUI/tests/src/com/android/keyguard/KeyguardClockAccessibilityDelegateTest.java +++ b/packages/SystemUI/tests/src/com/android/keyguard/KeyguardClockAccessibilityDelegateTest.java @@ -16,6 +16,7 @@ package com.android.keyguard; +import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -36,12 +37,17 @@ import java.util.List; public class KeyguardClockAccessibilityDelegateTest extends SysuiTestCase { private TextView mView; + private String m12HoursFormat; + private String m24HoursFormat; @Before public void setUp() throws Exception { + m12HoursFormat = mContext.getString(R.string.keyguard_widget_12_hours_format); + m24HoursFormat = mContext.getString(R.string.keyguard_widget_24_hours_format); + mView = new TextView(mContext); - mView.setText(R.string.keyguard_widget_12_hours_format); - mView.setContentDescription(mContext.getString(R.string.keyguard_widget_12_hours_format)); + mView.setText(m12HoursFormat); + mView.setContentDescription(m12HoursFormat); mView.setAccessibilityDelegate(new KeyguardClockAccessibilityDelegate(mContext)); } @@ -77,6 +83,21 @@ public class KeyguardClockAccessibilityDelegateTest extends SysuiTestCase { assertTrue(isAscii(info.getContentDescription())); } + @Test + public void isNeeded_returnsTrueIfDateFormatsContainNonAscii() { + if (!isAscii(m12HoursFormat) || !isAscii(m24HoursFormat)) { + assertTrue(KeyguardClockAccessibilityDelegate.isNeeded(mContext)); + } + } + + @Test + public void isNeeded_returnsWhetherFancyColonExists() { + boolean hasFancyColon = !TextUtils.isEmpty(mContext.getString( + R.string.keyguard_fancy_colon)); + + assertEquals(hasFancyColon, KeyguardClockAccessibilityDelegate.isNeeded(mContext)); + } + private boolean isAscii(CharSequence text) { return text.chars().allMatch((i) -> i < 128); } diff --git a/packages/SystemUI/tests/src/com/android/keyguard/KeyguardSecurityContainerTest.java b/packages/SystemUI/tests/src/com/android/keyguard/KeyguardSecurityContainerTest.java new file mode 100644 index 000000000000..fcf327b5d1fa --- /dev/null +++ b/packages/SystemUI/tests/src/com/android/keyguard/KeyguardSecurityContainerTest.java @@ -0,0 +1,58 @@ +/* + * Copyright (C) 2017 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License + */ + +package com.android.keyguard; + +import org.junit.Test; +import org.junit.runner.RunWith; + +import android.content.Context; +import android.support.test.filters.SmallTest; +import android.support.test.runner.AndroidJUnit4; +import android.test.UiThreadTest; +import android.util.Log; +import android.view.LayoutInflater; +import android.view.View; + +import com.android.systemui.SysuiTestCase; + +@SmallTest +@RunWith(AndroidJUnit4.class) +public class KeyguardSecurityContainerTest extends SysuiTestCase { + + @UiThreadTest + @Test + public void showSecurityScreen_canInflateAllModes() { + KeyguardSecurityContainer keyguardSecurityContainer = + new KeyguardSecurityContainer(getContext()); + + Context context = getContext(); + + for (int theme : new int[] {R.style.Theme_SystemUI, R.style.Theme_SystemUI_Light}) { + context.setTheme(theme); + final LayoutInflater inflater = LayoutInflater.from(context); + KeyguardSecurityModel.SecurityMode[] modes = + KeyguardSecurityModel.SecurityMode.values(); + for (KeyguardSecurityModel.SecurityMode mode : modes) { + final int resId = keyguardSecurityContainer.getLayoutIdFor(mode); + if (resId == 0) { + continue; + } + inflater.inflate(resId, null /* root */, false /* attach */); + } + } + } +}
\ No newline at end of file diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/QSSecurityFooterTest.java b/packages/SystemUI/tests/src/com/android/systemui/qs/QSSecurityFooterTest.java index ebd266b87d6c..a8487b3eff4e 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/qs/QSSecurityFooterTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/qs/QSSecurityFooterTest.java @@ -16,12 +16,16 @@ package com.android.systemui.qs; import static junit.framework.Assert.assertEquals; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import android.content.Context; +import android.content.pm.UserInfo; import android.os.Handler; import android.os.Looper; +import android.os.UserManager; +import android.provider.Settings; import android.support.test.runner.AndroidJUnit4; import android.test.suitebuilder.annotation.SmallTest; import android.text.SpannableStringBuilder; @@ -39,6 +43,7 @@ import android.testing.TestableImageView; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.mockito.Mockito; /* * Compile and run the whole SystemUI test suite: @@ -63,6 +68,7 @@ public class QSSecurityFooterTest extends SysuiTestCase { private TestableImageView mFooterIcon; private QSSecurityFooter mFooter; private SecurityController mSecurityController = mock(SecurityController.class); + private UserManager mUserManager; @Before public void setUp() { @@ -72,6 +78,8 @@ public class QSSecurityFooterTest extends SysuiTestCase { new LayoutInflaterBuilder(mContext) .replace("ImageView", TestableImageView.class) .build()); + mUserManager = Mockito.mock(UserManager.class); + mContext.addMockSystemService(Context.USER_SERVICE, mUserManager); Handler h = new Handler(Looper.getMainLooper()); h.post(() -> mFooter = new QSSecurityFooter(null, mContext)); waitForIdleSync(h); @@ -123,6 +131,21 @@ public class QSSecurityFooterTest extends SysuiTestCase { } @Test + public void testManagedDemoMode() { + when(mSecurityController.isDeviceManaged()).thenReturn(true); + when(mSecurityController.getDeviceOwnerOrganizationName()).thenReturn(null); + final UserInfo mockUserInfo = Mockito.mock(UserInfo.class); + when(mockUserInfo.isDemo()).thenReturn(true); + when(mUserManager.getUserInfo(anyInt())).thenReturn(mockUserInfo); + Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.DEVICE_DEMO_MODE, 1); + + mFooter.refreshState(); + + waitForIdleSync(mFooter.mHandler); + assertEquals(View.GONE, mRootView.getVisibility()); + } + + @Test public void testNetworkLoggingEnabled() { when(mSecurityController.isDeviceManaged()).thenReturn(true); when(mSecurityController.isNetworkLoggingEnabled()).thenReturn(true); diff --git a/packages/overlays/SysuiLightWallpaperThemeOverlay/Android.mk b/packages/overlays/SysuiLightWallpaperThemeOverlay/Android.mk deleted file mode 100644 index 4782a166146b..000000000000 --- a/packages/overlays/SysuiLightWallpaperThemeOverlay/Android.mk +++ /dev/null @@ -1,13 +0,0 @@ -LOCAL_PATH:= $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_RRO_THEME := SysuiLightWallpaperTheme -LOCAL_CERTIFICATE := platform - -LOCAL_SRC_FILES := $(call all-subdir-java-files) - -LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res - -LOCAL_PACKAGE_NAME := SysuiLightWallpaperThemeOverlay - -include $(BUILD_RRO_PACKAGE) diff --git a/packages/overlays/SysuiLightWallpaperThemeOverlay/AndroidManifest.xml b/packages/overlays/SysuiLightWallpaperThemeOverlay/AndroidManifest.xml deleted file mode 100644 index 0a8749c64ea2..000000000000 --- a/packages/overlays/SysuiLightWallpaperThemeOverlay/AndroidManifest.xml +++ /dev/null @@ -1,8 +0,0 @@ -<manifest xmlns:android="http://schemas.android.com/apk/res/android" - package="com.android.systemui.theme.lightwallpaper" - android:versionCode="1" - android:versionName="1.0"> - <overlay android:targetPackage="com.android.systemui" android:priority="2"/> - - <application android:label="@string/sysui_overlay_light" android:hasCode="false"/> -</manifest> diff --git a/packages/overlays/SysuiLightWallpaperThemeOverlay/res/values/strings.xml b/packages/overlays/SysuiLightWallpaperThemeOverlay/res/values/strings.xml deleted file mode 100644 index acc3d16610ec..000000000000 --- a/packages/overlays/SysuiLightWallpaperThemeOverlay/res/values/strings.xml +++ /dev/null @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/** - * Copyright (c) 2017, The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ ---> -<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - - <string name="sysui_overlay_light">Light</string> - -</resources> - diff --git a/packages/overlays/SysuiLightWallpaperThemeOverlay/res/values/styles.xml b/packages/overlays/SysuiLightWallpaperThemeOverlay/res/values/styles.xml deleted file mode 100644 index 53912b50df00..000000000000 --- a/packages/overlays/SysuiLightWallpaperThemeOverlay/res/values/styles.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<resources> - <style name="systemui_base" parent="@*android:style/Theme.DeviceDefault.QuickSettings"> - <item name="android:textColorPrimaryInverse">@*android:color/primary_text_material_light</item> - <item name="android:textColorSecondaryInverse">@*android:color/secondary_text_material_light</item> - </style> - - <style name="RecentsBase" parent="@android:style/Theme.Material"> - <item name="android:textColorPrimaryInverse">@*android:color/primary_text_material_light</item> - <item name="android:textColorSecondaryInverse">@*android:color/secondary_text_material_light</item> - </style> -</resources>
\ No newline at end of file diff --git a/services/core/java/com/android/server/LocationManagerService.java b/services/core/java/com/android/server/LocationManagerService.java index 72754616133a..a4e673d975e4 100644 --- a/services/core/java/com/android/server/LocationManagerService.java +++ b/services/core/java/com/android/server/LocationManagerService.java @@ -243,8 +243,9 @@ public class LocationManagerService extends ILocationManager.Stub { private GnssLocationProvider.GnssSystemInfoProvider mGnssSystemInfoProvider; - private GnssLocationProvider.GnssBatchingProvider mGnssBatchingProvider; private GnssLocationProvider.GnssMetricsProvider mGnssMetricsProvider; + + private GnssLocationProvider.GnssBatchingProvider mGnssBatchingProvider; private IBatchedLocationCallback mGnssBatchingCallback; private LinkedCallback mGnssBatchingDeathCallback; private boolean mGnssBatchingInProgress = false; diff --git a/services/core/java/com/android/server/VibratorService.java b/services/core/java/com/android/server/VibratorService.java index c68e5d6a36c5..473384081656 100644 --- a/services/core/java/com/android/server/VibratorService.java +++ b/services/core/java/com/android/server/VibratorService.java @@ -48,6 +48,7 @@ import android.os.VibrationEffect; import android.os.WorkSource; import android.provider.Settings; import android.provider.Settings.SettingNotFoundException; +import android.util.DebugUtils; import android.util.Slog; import android.view.InputDevice; import android.media.AudioAttributes; @@ -60,10 +61,7 @@ import com.android.server.power.BatterySaverPolicy.ServiceType; import java.io.FileDescriptor; import java.io.PrintWriter; import java.util.ArrayList; -import java.util.Arrays; -import java.util.Iterator; import java.util.LinkedList; -import java.util.ListIterator; public class VibratorService extends IVibratorService.Stub implements InputManager.InputDeviceListener { @@ -948,6 +946,21 @@ public class VibratorService extends IVibratorService.Stub } private int runVibrate() { + try { + final int zenMode = Settings.Global.getInt(mContext.getContentResolver(), + Settings.Global.ZEN_MODE); + if (zenMode != Settings.Global.ZEN_MODE_OFF) { + try (PrintWriter pw = getOutPrintWriter();) { + pw.print("Ignoring because device is on DND mode "); + pw.println(DebugUtils.flagsToString(Settings.Global.class, "ZEN_MODE_", + zenMode)); + return 0; + } + } + } catch (SettingNotFoundException e) { + // ignore + } + final long duration = Long.parseLong(getNextArgRequired()); if (duration > MAX_VIBRATION_MS) { throw new IllegalArgumentException("maximum duration is " + MAX_VIBRATION_MS); @@ -972,7 +985,8 @@ public class VibratorService extends IVibratorService.Stub pw.println(" Prints this help text."); pw.println(""); pw.println(" vibrate duration [description]"); - pw.println(" Vibrates for duration milliseconds."); + pw.println(" Vibrates for duration milliseconds; ignored when device is on DND "); + pw.println(" (Do Not Disturb) mode."); pw.println(""); } } diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index 75467f514540..803d8f0944c2 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -13365,7 +13365,6 @@ public class ActivityManagerService extends IActivityManager.Stub final ActivityRecord r = ActivityRecord.isInStackLocked(token); if (r != null) { final ActivityOptions activityOptions = r.pendingOptions; - r.pendingOptions = null; return activityOptions == null ? null : activityOptions.toBundle(); } return null; @@ -23982,9 +23981,19 @@ public class ActivityManagerService extends IActivityManager.Stub // We might change the visibilities here, so prepare an empty app transition which // might be overridden later if we actually change visibilities. - mWindowManager.prepareAppTransition(TRANSIT_NONE, false /* alwaysKeepCurrent */); + final boolean wasTransitionSet = + mWindowManager.getPendingAppTransition() != TRANSIT_NONE; + if (!wasTransitionSet) { + mWindowManager.prepareAppTransition(TRANSIT_NONE, + false /* alwaysKeepCurrent */); + } mStackSupervisor.ensureActivitiesVisibleLocked(null, 0, !PRESERVE_WINDOWS); - mWindowManager.executeAppTransition(); + + // If there was a transition set already we don't want to interfere with it as we + // might be starting it too early. + if (!wasTransitionSet) { + mWindowManager.executeAppTransition(); + } } if (callback != null) { callback.run(); diff --git a/services/core/java/com/android/server/am/ActivityRecord.java b/services/core/java/com/android/server/am/ActivityRecord.java index 7a00a549a293..c09947c402fb 100644 --- a/services/core/java/com/android/server/am/ActivityRecord.java +++ b/services/core/java/com/android/server/am/ActivityRecord.java @@ -41,6 +41,7 @@ import static android.content.Intent.CATEGORY_HOME; import static android.content.Intent.CATEGORY_LAUNCHER; import static android.content.Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS; import static android.content.Intent.FLAG_ACTIVITY_NO_HISTORY; +import static android.content.pm.ActivityInfo.CONFIG_APP_BOUNDS; import static android.content.pm.ActivityInfo.CONFIG_ORIENTATION; import static android.content.pm.ActivityInfo.CONFIG_ROTATION; import static android.content.pm.ActivityInfo.CONFIG_SCREEN_LAYOUT; @@ -2601,6 +2602,12 @@ final class ActivityRecord extends ConfigurationContainer implements AppWindowCo if ((changes & CONFIG_ROTATION) != 0) { changes &= ~CONFIG_ROTATION; } + + // We don't want app bound changes to cause relaunches. + if ((changes & CONFIG_APP_BOUNDS) != 0) { + changes &= ~CONFIG_APP_BOUNDS; + } + return changes; } diff --git a/services/core/java/com/android/server/am/ActivityStack.java b/services/core/java/com/android/server/am/ActivityStack.java index 777a36887440..51e0e3bfd022 100644 --- a/services/core/java/com/android/server/am/ActivityStack.java +++ b/services/core/java/com/android/server/am/ActivityStack.java @@ -1912,9 +1912,11 @@ class ActivityStack<T extends StackWindowController> extends ConfigurationContai } else if (mStackId == FULLSCREEN_WORKSPACE_STACK_ID) { if (DEBUG_VISIBILITY) Slog.v(TAG_VISIBILITY, "Skipping after task=" + task + " returning to non-application type=" + task.getTaskToReturnTo()); - // Once we reach a fullscreen task that should return to another task, then no - // other activities behind that one should be visible. - if (task.getTaskToReturnTo() != APPLICATION_ACTIVITY_TYPE) { + // Once we reach a fullscreen stack task that has a running activity and should + // return to another stack task, then no other activities behind that one should + // be visible. + if (task.topRunningActivityLocked() != null && + task.getTaskToReturnTo() != APPLICATION_ACTIVITY_TYPE) { behindFullscreenActivity = true; } } diff --git a/services/core/java/com/android/server/am/ActivityStackSupervisor.java b/services/core/java/com/android/server/am/ActivityStackSupervisor.java index e0f2a751604a..f3963ed4b215 100644 --- a/services/core/java/com/android/server/am/ActivityStackSupervisor.java +++ b/services/core/java/com/android/server/am/ActivityStackSupervisor.java @@ -5170,11 +5170,14 @@ public class ActivityStackSupervisor extends ConfigurationContainer implements D // Work Challenge is present) let startActivityInPackage handle the intercepting. if (!mService.mUserController.shouldConfirmCredentials(task.userId) && task.getRootActivity() != null) { - mService.mActivityStarter.sendPowerHintForLaunchStartIfNeeded(true /* forceSend */); + final ActivityRecord targetActivity = task.getTopActivity(); + + mService.mActivityStarter.sendPowerHintForLaunchStartIfNeeded(true /* forceSend */, + targetActivity); mActivityMetricsLogger.notifyActivityLaunching(); mService.moveTaskToFrontLocked(task.taskId, 0, bOptions, true /* fromRecents */); mActivityMetricsLogger.notifyActivityLaunched(ActivityManager.START_TASK_TO_FRONT, - task.getTopActivity()); + targetActivity); // If we are launching the task in the docked stack, put it into resizing mode so // the window renders full-screen with the background filling the void. Also only diff --git a/services/core/java/com/android/server/am/ActivityStarter.java b/services/core/java/com/android/server/am/ActivityStarter.java index 4f04066c6076..76f65e28c2d1 100644 --- a/services/core/java/com/android/server/am/ActivityStarter.java +++ b/services/core/java/com/android/server/am/ActivityStarter.java @@ -969,7 +969,7 @@ class ActivityStarter { return START_SUCCESS; } - void sendPowerHintForLaunchStartIfNeeded(boolean forceSend) { + void sendPowerHintForLaunchStartIfNeeded(boolean forceSend, ActivityRecord targetActivity) { boolean sendHint = forceSend; if (!sendHint) { @@ -978,7 +978,7 @@ class ActivityStarter { final ActivityRecord resumedActivity = mSupervisor.getResumedActivityLocked(); sendHint = resumedActivity == null || resumedActivity.app == null - || !resumedActivity.app.equals(mStartActivity.app); + || !resumedActivity.app.equals(targetActivity.app); } if (sendHint && mService.mLocalPowerManager != null) { @@ -1098,7 +1098,7 @@ class ActivityStarter { } } - sendPowerHintForLaunchStartIfNeeded(false /* forceSend */); + sendPowerHintForLaunchStartIfNeeded(false /* forceSend */, reusedActivity); reusedActivity = setTargetStackAndMoveToFrontIfNeeded(reusedActivity); @@ -1127,6 +1127,7 @@ class ActivityStarter { if (outActivity != null && outActivity.length > 0) { outActivity[0] = reusedActivity; } + return START_TASK_TO_FRONT; } } @@ -1218,7 +1219,7 @@ class ActivityStarter { EventLogTags.AM_CREATE_ACTIVITY, mStartActivity, mStartActivity.getTask()); mTargetStack.mLastPausedActivity = null; - sendPowerHintForLaunchStartIfNeeded(false /* forceSend */); + sendPowerHintForLaunchStartIfNeeded(false /* forceSend */, mStartActivity); mTargetStack.startActivityLocked(mStartActivity, topFocused, newTask, mKeepCurTransition, mOptions); @@ -1520,7 +1521,8 @@ class ActivityStarter { if (mLaunchSingleInstance) { // There can be one and only one instance of single instance activity in the // history, and it is always in its own unique task, so we do a special search. - intentActivity = mSupervisor.findActivityLocked(mIntent, mStartActivity.info, false); + intentActivity = mSupervisor.findActivityLocked(mIntent, mStartActivity.info, + mStartActivity.isHomeActivity()); } else if ((mLaunchFlags & FLAG_ACTIVITY_LAUNCH_ADJACENT) != 0) { // For the launch adjacent case we only want to put the activity in an existing // task if the activity already exists in the history. diff --git a/services/core/java/com/android/server/am/BatteryStatsService.java b/services/core/java/com/android/server/am/BatteryStatsService.java index 06ab75a8fb40..65697e9d7143 100644 --- a/services/core/java/com/android/server/am/BatteryStatsService.java +++ b/services/core/java/com/android/server/am/BatteryStatsService.java @@ -985,10 +985,10 @@ public final class BatteryStatsService extends IBatteryStats.Stub } @Override - public void noteBleScanStopped(WorkSource ws) { + public void noteBleScanStopped(WorkSource ws, boolean isUnoptimized) { enforceCallingPermission(); synchronized (mStats) { - mStats.noteBluetoothScanStoppedFromSourceLocked(ws); + mStats.noteBluetoothScanStoppedFromSourceLocked(ws, isUnoptimized); } } diff --git a/services/core/java/com/android/server/connectivity/tethering/OffloadHardwareInterface.java b/services/core/java/com/android/server/connectivity/tethering/OffloadHardwareInterface.java index 4df566f03d6d..25fab9e403a1 100644 --- a/services/core/java/com/android/server/connectivity/tethering/OffloadHardwareInterface.java +++ b/services/core/java/com/android/server/connectivity/tethering/OffloadHardwareInterface.java @@ -40,7 +40,7 @@ public class OffloadHardwareInterface { // Change this value to control whether tether offload is enabled or // disabled by default in the absence of an explicit Settings value. // See accompanying unittest to distinguish 0 from non-0 values. - private static final int DEFAULT_TETHER_OFFLOAD_DISABLED = 0; + private static final int DEFAULT_TETHER_OFFLOAD_DISABLED = 1; private static final String NO_INTERFACE_NAME = ""; private static final String NO_IPV4_ADDRESS = ""; private static final String NO_IPV4_GATEWAY = ""; diff --git a/services/core/java/com/android/server/content/SyncLogger.java b/services/core/java/com/android/server/content/SyncLogger.java index db794643b4df..d93bdc9efabf 100644 --- a/services/core/java/com/android/server/content/SyncLogger.java +++ b/services/core/java/com/android/server/content/SyncLogger.java @@ -22,6 +22,7 @@ import android.os.Environment; import android.os.FileUtils; import android.os.SystemProperties; import android.text.format.DateUtils; +import android.util.Log; import android.util.Slog; import com.android.internal.annotations.GuardedBy; @@ -127,6 +128,8 @@ public class SyncLogger { @GuardedBy("mLock") private boolean mErrorShown; + private static final boolean DO_LOGCAT = Log.isLoggable(TAG, Log.DEBUG); + RotatingFileLogger() { mLogPath = new File(Environment.getDataSystemDirectory(), "syncmanager-log"); } @@ -158,6 +161,8 @@ public class SyncLogger { mStringBuilder.append(android.os.Process.myTid()); mStringBuilder.append(' '); + final int messageStart = mStringBuilder.length(); + for (Object o : message) { mStringBuilder.append(o); } @@ -166,6 +171,11 @@ public class SyncLogger { try { mLogWriter.append(mStringBuilder); mLogWriter.flush(); + + // Also write on logcat. + if (DO_LOGCAT) { + Log.d(TAG, mStringBuilder.substring(messageStart)); + } } catch (IOException e) { handleException("Failed to write log", e); } diff --git a/services/core/java/com/android/server/content/SyncManager.java b/services/core/java/com/android/server/content/SyncManager.java index c250005204ba..3e05d50b0355 100644 --- a/services/core/java/com/android/server/content/SyncManager.java +++ b/services/core/java/com/android/server/content/SyncManager.java @@ -1704,6 +1704,8 @@ public class SyncManager { // Include "this" in the message so that the handler can ignore it if this // ActiveSyncContext is no longer the mActiveSyncContext at message handling // time. + mLogger.log("onFinished result=", result, " endpoint=", + (mSyncOperation == null ? "null" : mSyncOperation.target)); sendSyncFinishedOrCanceledMessage(this, result); } @@ -1745,6 +1747,7 @@ public class SyncManager { Context.BIND_AUTO_CREATE | Context.BIND_NOT_FOREGROUND | Context.BIND_ALLOW_OOM_MANAGEMENT, new UserHandle(mSyncOperation.target.userId)); + mLogger.log("bindService() returned=", mBound, " for ", this); if (!bindResult) { mBound = false; } else { @@ -1767,6 +1770,7 @@ public class SyncManager { } if (mBound) { mBound = false; + mLogger.log("unbindService for ", this); mContext.unbindService(this); try { mBatteryStats.noteSyncFinish(mEventName, mSyncAdapterUid); @@ -2729,9 +2733,14 @@ public class SyncManager { // outstanding try { if (currentSyncContext.mSyncAdapter != null) { + mLogger.log("Calling cancelSync for SERVICE_DISCONNECTED ", + currentSyncContext, + " adapter=", currentSyncContext.mSyncAdapter); currentSyncContext.mSyncAdapter.cancelSync(currentSyncContext); + mLogger.log("Canceled"); } } catch (RemoteException e) { + mLogger.log("RemoteException ", Log.getStackTraceString(e)); // We don't need to retry this in this case. } @@ -3217,14 +3226,15 @@ public class SyncManager { mLogger.log("Sync start: account=" + syncOperation.target.account, " authority=", syncOperation.target.provider, " reason=", SyncOperation.reasonToString(null, syncOperation.reason), - " extras=", SyncOperation.extrasToString(syncOperation.extras)); + " extras=", SyncOperation.extrasToString(syncOperation.extras), + " adapter=", activeSyncContext.mSyncAdapter); activeSyncContext.mSyncAdapter = ISyncAdapter.Stub.asInterface(syncAdapter); activeSyncContext.mSyncAdapter .startSync(activeSyncContext, syncOperation.target.provider, syncOperation.target.account, syncOperation.extras); - mLogger.log("Sync finish"); + mLogger.log("Sync is running now..."); } catch (RemoteException remoteExc) { mLogger.log("Sync failed with RemoteException: ", remoteExc.toString()); Log.d(TAG, "maybeStartNextSync: caught a RemoteException, rescheduling", remoteExc); @@ -3297,7 +3307,6 @@ public class SyncManager { activeSyncContext.mSyncAdapter.asBinder().unlinkToDeath(activeSyncContext, 0); activeSyncContext.mIsLinkedToDeath = false; } - closeActiveSyncContext(activeSyncContext); final long elapsedTime = SystemClock.elapsedRealtime() - activeSyncContext.mStartTime; String historyMessage; int downstreamActivity; @@ -3355,8 +3364,12 @@ public class SyncManager { } if (activeSyncContext.mSyncAdapter != null) { try { + mLogger.log("Calling cancelSync for runSyncFinishedOrCanceled ", + activeSyncContext, " adapter=", activeSyncContext.mSyncAdapter); activeSyncContext.mSyncAdapter.cancelSync(activeSyncContext); + mLogger.log("Canceled"); } catch (RemoteException e) { + mLogger.log("RemoteException ", Log.getStackTraceString(e)); // we don't need to retry this in this case } } @@ -3365,6 +3378,9 @@ public class SyncManager { upstreamActivity = 0; } + // Close and unbind the service. Don't use activeSyncContext.mSyncAdapter after this. + closeActiveSyncContext(activeSyncContext); + stopSyncEvent(activeSyncContext.mHistoryRowId, syncOperation, historyMessage, upstreamActivity, downstreamActivity, elapsedTime); // Check for full-resync and schedule it after closing off the last sync. diff --git a/services/core/java/com/android/server/display/NightDisplayService.java b/services/core/java/com/android/server/display/NightDisplayService.java index b3cf57b3564a..b124a392f21c 100644 --- a/services/core/java/com/android/server/display/NightDisplayService.java +++ b/services/core/java/com/android/server/display/NightDisplayService.java @@ -111,11 +111,7 @@ public final class NightDisplayService extends SystemService private float[] mMatrixNight = new float[16]; /** - * These coefficients were generated by an LLS quadratic regression fitted to the - * overdetermined system based on experimental readings (and subsequent conversion from xy - * chromaticity coordinates to gamma-corrected RGB values): { (temperature, R, G, B) } -> - * { (7304, 1.0, 1.0, 1.0), (4082, 1.0, 0.857, 0.719), (2850, 1.0, .754, .516), - * (2596, 1.0, 0.722, 0.454) }. The 3x3 matrix is formatted like so: + * The 3x3 color transformation matrix is formatted like so: * <table> * <tr><td>R: a coefficient</td><td>G: a coefficient</td><td>B: a coefficient</td></tr> * <tr><td>R: b coefficient</td><td>G: b coefficient</td><td>B: b coefficient</td></tr> @@ -123,9 +119,9 @@ public final class NightDisplayService extends SystemService * </table> */ private static final float[] mColorTempCoefficients = new float[] { - 0.0f, -0.00000000962353339f, -0.0000000189359041f, - 0.0f, 0.000153045476f, 0.000302412211f, - 1.0f, 0.390782778f, -0.198650895f + 0.0f, -0.0000000871377221f, -0.0000000753960646f, + 0.0f, 0.000750142586f, .000725567598f, + 1.0f, -.830130222f, -1.15546312f }; private int mCurrentUser = UserHandle.USER_NULL; @@ -410,7 +406,7 @@ public final class NightDisplayService extends SystemService return; } - Matrix.setIdentityM(mMatrixNight, 0); + Matrix.setIdentityM(outTemp, 0); final float squareTemperature = colorTemperature * colorTemperature; final float red = squareTemperature * mColorTempCoefficients[0] diff --git a/services/core/java/com/android/server/location/GnssLocationProvider.java b/services/core/java/com/android/server/location/GnssLocationProvider.java index 83bb17eeaf3c..cdf25cfe65f6 100644 --- a/services/core/java/com/android/server/location/GnssLocationProvider.java +++ b/services/core/java/com/android/server/location/GnssLocationProvider.java @@ -1754,20 +1754,32 @@ public class GnssLocationProvider implements LocationProviderInterface { } /** - * called from native code - Gps measurements callback + * called from native code - GNSS measurements callback */ private void reportMeasurementData(GnssMeasurementsEvent event) { if (!mItarSpeedLimitExceeded) { - mGnssMeasurementsProvider.onMeasurementsAvailable(event); + // send to handler to allow native to return quickly + mHandler.post(new Runnable() { + @Override + public void run() { + mGnssMeasurementsProvider.onMeasurementsAvailable(event); + } + }); } } /** - * called from native code - GPS navigation message callback + * called from native code - GNSS navigation message callback */ private void reportNavigationMessage(GnssNavigationMessage event) { if (!mItarSpeedLimitExceeded) { - mGnssNavigationMessageProvider.onNavigationMessageAvailable(event); + // send to handler to allow native to return quickly + mHandler.post(new Runnable() { + @Override + public void run() { + mGnssNavigationMessageProvider.onNavigationMessageAvailable(event); + } + }); } } diff --git a/services/core/java/com/android/server/location/GnssMeasurementsProvider.java b/services/core/java/com/android/server/location/GnssMeasurementsProvider.java index caf1d6ca5e35..924520b5a0f1 100644 --- a/services/core/java/com/android/server/location/GnssMeasurementsProvider.java +++ b/services/core/java/com/android/server/location/GnssMeasurementsProvider.java @@ -54,9 +54,8 @@ public abstract class GnssMeasurementsProvider } public void onGpsEnabledChanged() { - if (tryUpdateRegistrationWithService()) { - updateResult(); - } + tryUpdateRegistrationWithService(); + updateResult(); } @Override diff --git a/services/core/java/com/android/server/location/GnssNavigationMessageProvider.java b/services/core/java/com/android/server/location/GnssNavigationMessageProvider.java index 8d2192892f74..df3c49bd2ed5 100644 --- a/services/core/java/com/android/server/location/GnssNavigationMessageProvider.java +++ b/services/core/java/com/android/server/location/GnssNavigationMessageProvider.java @@ -55,9 +55,8 @@ public abstract class GnssNavigationMessageProvider } public void onGpsEnabledChanged() { - if (tryUpdateRegistrationWithService()) { - updateResult(); - } + tryUpdateRegistrationWithService(); + updateResult(); } @Override diff --git a/services/core/java/com/android/server/location/RemoteListenerHelper.java b/services/core/java/com/android/server/location/RemoteListenerHelper.java index ec2828b1a59f..f51bc871c04f 100644 --- a/services/core/java/com/android/server/location/RemoteListenerHelper.java +++ b/services/core/java/com/android/server/location/RemoteListenerHelper.java @@ -25,6 +25,7 @@ import android.os.IInterface; import android.os.RemoteException; import android.util.Log; +import java.lang.Runnable; import java.util.HashMap; import java.util.Map; @@ -45,7 +46,7 @@ abstract class RemoteListenerHelper<TListener extends IInterface> { private final Map<IBinder, LinkedListener> mListenerMap = new HashMap<>(); - private boolean mIsRegistered; + private boolean mIsRegistered; // must access only on handler thread private boolean mHasIsSupported; private boolean mIsSupported; @@ -83,12 +84,12 @@ abstract class RemoteListenerHelper<TListener extends IInterface> { } else if (mHasIsSupported && !mIsSupported) { result = RESULT_NOT_SUPPORTED; } else if (!isGpsEnabled()) { - result = RESULT_GPS_LOCATION_DISABLED; - } else if (!tryRegister()) { // only attempt to register if GPS is enabled, otherwise we will register once GPS // becomes available - result = RESULT_INTERNAL_ERROR; + result = RESULT_GPS_LOCATION_DISABLED; } else if (mHasIsSupported && mIsSupported) { + tryRegister(); + // initially presume success, possible internal error could follow asynchornously result = RESULT_SUCCESS; } else { // at this point if the supported flag is not set, the notification will be sent @@ -117,8 +118,8 @@ abstract class RemoteListenerHelper<TListener extends IInterface> { protected abstract boolean isAvailableInPlatform(); protected abstract boolean isGpsEnabled(); - protected abstract boolean registerWithService(); - protected abstract void unregisterFromService(); + protected abstract boolean registerWithService(); // must access only on handler thread + protected abstract void unregisterFromService(); // must access only on handler thread protected abstract ListenerOperation<TListener> getHandlerOperation(int result); protected interface ListenerOperation<TListener extends IInterface> { @@ -138,22 +139,16 @@ abstract class RemoteListenerHelper<TListener extends IInterface> { } } - protected boolean tryUpdateRegistrationWithService() { + protected void tryUpdateRegistrationWithService() { synchronized (mListenerMap) { if (!isGpsEnabled()) { tryUnregister(); - return true; + return; } if (mListenerMap.isEmpty()) { - return true; - } - if (tryRegister()) { - // registration was successful, there is no need to update the state - return true; + return; } - ListenerOperation<TListener> operation = getHandlerOperation(RESULT_INTERNAL_ERROR); - foreachUnsafe(operation); - return false; + tryRegister(); } } @@ -180,19 +175,40 @@ abstract class RemoteListenerHelper<TListener extends IInterface> { } } - private boolean tryRegister() { - if (!mIsRegistered) { - mIsRegistered = registerWithService(); - } - return mIsRegistered; + private void tryRegister() { + mHandler.post(new Runnable() { + @Override + public void run() { + if (!mIsRegistered) { + mIsRegistered = registerWithService(); + } + if (!mIsRegistered) { + // post back a failure + mHandler.post(new Runnable() { + @Override + public void run() { + synchronized (mListenerMap) { + ListenerOperation<TListener> operation = getHandlerOperation(RESULT_INTERNAL_ERROR); + foreachUnsafe(operation); + } + } + }); + } + } + }); } private void tryUnregister() { - if (!mIsRegistered) { - return; - } - unregisterFromService(); - mIsRegistered = false; + mHandler.post(new Runnable() { + @Override + public void run() { + if (!mIsRegistered) { + return; + } + unregisterFromService(); + mIsRegistered = false; + } + }); } private int calculateCurrentResultUnsafe() { diff --git a/services/core/java/com/android/server/notification/RankingHelper.java b/services/core/java/com/android/server/notification/RankingHelper.java index 8420c90ed76f..d7b36aaa8008 100644 --- a/services/core/java/com/android/server/notification/RankingHelper.java +++ b/services/core/java/com/android/server/notification/RankingHelper.java @@ -567,13 +567,6 @@ public class RankingHelper implements RankingConfig { existing.setDescription(channel.getDescription()); existing.setBlockableSystem(channel.isBlockableSystem()); - // Apps are allowed to downgrade channel importance if the user has not changed any - // fields on this channel yet. - if (existing.getUserLockedFields() == 0 && - channel.getImportance() < existing.getImportance()) { - existing.setImportance(channel.getImportance()); - } - updateConfig(); return; } diff --git a/services/core/java/com/android/server/policy/AccessibilityShortcutController.java b/services/core/java/com/android/server/policy/AccessibilityShortcutController.java index 50900834b16a..0b54e5e53822 100644 --- a/services/core/java/com/android/server/policy/AccessibilityShortcutController.java +++ b/services/core/java/com/android/server/policy/AccessibilityShortcutController.java @@ -154,7 +154,7 @@ public class AccessibilityShortcutController { // Don't check if haptics are disabled, as we need to alert the user that their // way of interacting with the phone may change if they activate the shortcut long[] vibePattern = PhoneWindowManager.getLongIntArray(mContext.getResources(), - R.array.config_safeModeDisabledVibePattern); + R.array.config_longPressVibePattern); vibrator.vibrate(vibePattern, -1, VIBRATION_ATTRIBUTES); } diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java index d36d2f187e53..e3cf459774e9 100644 --- a/services/core/java/com/android/server/policy/PhoneWindowManager.java +++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java @@ -431,9 +431,6 @@ public class PhoneWindowManager implements WindowManagerPolicy { // Vibrator pattern for a short vibration when tapping on a day/month/year date of a Calendar. long[] mCalendarDateVibePattern; - // Vibrator pattern for haptic feedback during boot when safe mode is disabled. - long[] mSafeModeDisabledVibePattern; - // Vibrator pattern for haptic feedback during boot when safe mode is enabled. long[] mSafeModeEnabledVibePattern; @@ -819,6 +816,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { private static final int MSG_BUGREPORT_TV = 22; private static final int MSG_ACCESSIBILITY_TV = 23; private static final int MSG_DISPATCH_BACK_KEY_TO_AUTOFILL = 24; + private static final int MSG_SYSTEM_KEY_PRESS = 25; private static final int MSG_REQUEST_TRANSIENT_BARS_ARG_STATUS = 0; private static final int MSG_REQUEST_TRANSIENT_BARS_ARG_NAVIGATION = 1; @@ -908,6 +906,9 @@ public class PhoneWindowManager implements WindowManagerPolicy { case MSG_DISPATCH_BACK_KEY_TO_AUTOFILL: mAutofillManagerInternal.onBackKeyPressed(); break; + case MSG_SYSTEM_KEY_PRESS: + sendSystemKeyToStatusBar(msg.arg1); + break; } } } @@ -1279,14 +1280,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { } // Inform the StatusBar; but do not allow it to consume the event. - IStatusBarService statusBar = getStatusBarService(); - if (statusBar != null) { - try { - statusBar.handleSystemKey(event.getKeyCode()); - } catch (RemoteException e) { - // Oh well. - } - } + sendSystemKeyToStatusBarAsync(event.getKeyCode()); // If the power key has still not yet been handled, then detect short // press, long press, or multi press and decide what to do. @@ -2076,8 +2070,6 @@ public class PhoneWindowManager implements WindowManagerPolicy { com.android.internal.R.array.config_longPressVibePattern); mCalendarDateVibePattern = getLongIntArray(mContext.getResources(), com.android.internal.R.array.config_calendarDateVibePattern); - mSafeModeDisabledVibePattern = getLongIntArray(mContext.getResources(), - com.android.internal.R.array.config_safeModeDisabledVibePattern); mSafeModeEnabledVibePattern = getLongIntArray(mContext.getResources(), com.android.internal.R.array.config_safeModeEnabledVibePattern); @@ -3169,7 +3161,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { @Override public void selectRotationAnimationLw(int anim[]) { // If the screen is off or non-interactive, force a jumpcut. - final boolean forceJumpcut = !mScreenOnFully || !mAwake; + final boolean forceJumpcut = !mScreenOnFully || !okToAnimate(); if (PRINT_ANIM) Slog.i(TAG, "selectRotationAnimation mTopFullscreen=" + mTopFullscreenOpaqueWindowState + " rotationAnimation=" + (mTopFullscreenOpaqueWindowState == null ? @@ -5987,6 +5979,8 @@ public class PhoneWindowManager implements WindowManagerPolicy { } } if (down) { + sendSystemKeyToStatusBarAsync(event.getKeyCode()); + TelecomManager telecomManager = getTelecommService(); if (telecomManager != null) { if (telecomManager.isRinging()) { @@ -6024,7 +6018,6 @@ public class PhoneWindowManager implements WindowManagerPolicy { event, AudioManager.USE_DEFAULT_STREAM_TYPE, false); break; } - } if (mUseTvRouting || mHandleVolumeKeysInWM) { // Defer special key handlings to @@ -6230,20 +6223,36 @@ public class PhoneWindowManager implements WindowManagerPolicy { if (!mAccessibilityManager.isEnabled() || !mAccessibilityManager.sendFingerprintGesture(event.getKeyCode())) { if (areSystemNavigationKeysEnabled()) { - IStatusBarService sbar = getStatusBarService(); - if (sbar != null) { - try { - sbar.handleSystemKey(event.getKeyCode()); - } catch (RemoteException e1) { - // oops, no statusbar. Ignore event. - } - } + sendSystemKeyToStatusBarAsync(event.getKeyCode()); } } } } /** + * Notify the StatusBar that a system key was pressed. + */ + private void sendSystemKeyToStatusBar(int keyCode) { + IStatusBarService statusBar = getStatusBarService(); + if (statusBar != null) { + try { + statusBar.handleSystemKey(keyCode); + } catch (RemoteException e) { + // Oh well. + } + } + } + + /** + * Notify the StatusBar that a system key was pressed without blocking the current thread. + */ + private void sendSystemKeyToStatusBarAsync(int keyCode) { + Message message = mHandler.obtainMessage(MSG_SYSTEM_KEY_PRESS, keyCode, 0); + message.setAsynchronous(true); + mHandler.sendMessage(message); + } + + /** * Returns true if the key can have global actions attached to it. * We reserve all power management keys for the system since they require * very careful handling. @@ -7220,9 +7229,9 @@ public class PhoneWindowManager implements WindowManagerPolicy { @Override public void setSafeMode(boolean safeMode) { mSafeMode = safeMode; - performHapticFeedbackLw(null, safeMode - ? HapticFeedbackConstants.SAFE_MODE_ENABLED - : HapticFeedbackConstants.SAFE_MODE_DISABLED, true); + if (safeMode) { + performHapticFeedbackLw(null, HapticFeedbackConstants.SAFE_MODE_ENABLED, true); + } } static long[] getLongIntArray(Resources r, int resid) { @@ -7694,7 +7703,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { private boolean areSystemNavigationKeysEnabled() { return Settings.Secure.getIntForUser(mContext.getContentResolver(), - Settings.Secure.SYSTEM_NAVIGATION_KEYS_ENABLED, 1, UserHandle.USER_CURRENT) == 1; + Settings.Secure.SYSTEM_NAVIGATION_KEYS_ENABLED, 0, UserHandle.USER_CURRENT) == 1; } @Override @@ -7741,9 +7750,6 @@ public class PhoneWindowManager implements WindowManagerPolicy { case HapticFeedbackConstants.CALENDAR_DATE: pattern = mCalendarDateVibePattern; break; - case HapticFeedbackConstants.SAFE_MODE_DISABLED: - pattern = mSafeModeDisabledVibePattern; - break; case HapticFeedbackConstants.SAFE_MODE_ENABLED: pattern = mSafeModeEnabledVibePattern; break; diff --git a/services/core/java/com/android/server/power/Notifier.java b/services/core/java/com/android/server/power/Notifier.java index f5bb082fac6d..0ecf0e1ea7a7 100644 --- a/services/core/java/com/android/server/power/Notifier.java +++ b/services/core/java/com/android/server/power/Notifier.java @@ -18,7 +18,6 @@ package com.android.server.power; import android.app.ActivityManagerInternal; import android.app.AppOpsManager; -import android.app.RetailDemoModeServiceInternal; import com.android.internal.app.IAppOpsService; import com.android.internal.app.IBatteryStats; @@ -94,7 +93,6 @@ final class Notifier { private final ActivityManagerInternal mActivityManagerInternal; private final InputManagerInternal mInputManagerInternal; private final InputMethodManagerInternal mInputMethodManagerInternal; - private final RetailDemoModeServiceInternal mRetailDemoModeServiceInternal; private final NotifierHandler mHandler; private final Intent mScreenOnIntent; @@ -140,7 +138,6 @@ final class Notifier { mActivityManagerInternal = LocalServices.getService(ActivityManagerInternal.class); mInputManagerInternal = LocalServices.getService(InputManagerInternal.class); mInputMethodManagerInternal = LocalServices.getService(InputMethodManagerInternal.class); - mRetailDemoModeServiceInternal = LocalServices.getService(RetailDemoModeServiceInternal.class); mHandler = new NotifierHandler(looper); mScreenOnIntent = new Intent(Intent.ACTION_SCREEN_ON); @@ -587,9 +584,6 @@ final class Notifier { } mUserActivityPending = false; } - if (mRetailDemoModeServiceInternal != null) { - mRetailDemoModeServiceInternal.onUserActivity(); - } mPolicy.userActivity(); } diff --git a/services/core/java/com/android/server/vr/VrManagerService.java b/services/core/java/com/android/server/vr/VrManagerService.java index e73732872cd2..447d639f31b3 100644 --- a/services/core/java/com/android/server/vr/VrManagerService.java +++ b/services/core/java/com/android/server/vr/VrManagerService.java @@ -779,7 +779,8 @@ public class VrManagerService extends SystemService implements EnabledComponentC } if ((calling != null || mPersistentVrModeEnabled) - && !Objects.equals(calling, mCurrentVrModeComponent)) { + && !Objects.equals(calling, mCurrentVrModeComponent) + || mRunning2dInVr != running2dInVr) { sendUpdatedCaller = true; } mCurrentVrModeComponent = calling; diff --git a/services/core/java/com/android/server/wm/WindowStateAnimator.java b/services/core/java/com/android/server/wm/WindowStateAnimator.java index 8f1065f75642..23b515e3c5c9 100644 --- a/services/core/java/com/android/server/wm/WindowStateAnimator.java +++ b/services/core/java/com/android/server/wm/WindowStateAnimator.java @@ -1604,21 +1604,33 @@ class WindowStateAnimator { recoveringMemory); mSurfaceController.setLayer(mAnimLayer); - if (prepared && mLastHidden && mDrawState == HAS_DRAWN) { - if (showSurfaceRobustlyLocked()) { - markPreservedSurfaceForDestroy(); - mAnimator.requestRemovalOfReplacedWindows(w); - mLastHidden = false; - if (mIsWallpaper) { - w.dispatchWallpaperVisibility(true); + if (prepared && mDrawState == HAS_DRAWN) { + if (mLastHidden) { + if (showSurfaceRobustlyLocked()) { + markPreservedSurfaceForDestroy(); + mAnimator.requestRemovalOfReplacedWindows(w); + mLastHidden = false; + if (mIsWallpaper) { + w.dispatchWallpaperVisibility(true); + } + // This draw means the difference between unique content and mirroring. + // Run another pass through performLayout to set mHasContent in the + // LogicalDisplay. + mAnimator.setPendingLayoutChanges(w.getDisplayId(), + WindowManagerPolicy.FINISH_LAYOUT_REDO_ANIM); + } else { + w.setOrientationChanging(false); } - // This draw means the difference between unique content and mirroring. - // Run another pass through performLayout to set mHasContent in the - // LogicalDisplay. - mAnimator.setPendingLayoutChanges(w.getDisplayId(), - WindowManagerPolicy.FINISH_LAYOUT_REDO_ANIM); - } else { - w.setOrientationChanging(false); + } + // We process mTurnOnScreen even for windows which have already + // been shown, to handle cases where windows are not necessarily + // hidden while the screen is turning off. + // TODO(b/63773439): These cases should be eliminated, though we probably still + // want to process mTurnOnScreen in this way for clarity. + if (mWin.mTurnOnScreen) { + if (DEBUG_VISIBILITY) Slog.v(TAG, "Show surface turning screen on: " + mWin); + mWin.mTurnOnScreen = false; + mAnimator.mBulkUpdateParams |= SET_TURN_ON_SCREEN; } } if (hasSurface()) { @@ -1730,11 +1742,6 @@ class WindowStateAnimator { if (!shown) return false; - if (mWin.mTurnOnScreen) { - if (DEBUG_VISIBILITY) Slog.v(TAG, "Show surface turning screen on: " + mWin); - mWin.mTurnOnScreen = false; - mAnimator.mBulkUpdateParams |= SET_TURN_ON_SCREEN; - } return true; } diff --git a/services/profile-classes b/services/profile-classes index 289b113b49b6..a2189bc1e709 100644 --- a/services/profile-classes +++ b/services/profile-classes @@ -277,7 +277,6 @@ Landroid/app/ResourcesManager; Landroid/app/ResourcesManager$1; Landroid/app/ResultInfo; Landroid/app/ResultInfo$1; -Landroid/app/RetailDemoModeServiceInternal; Landroid/app/SearchableInfo; Landroid/app/SearchableInfo$1; Landroid/app/SearchManager; diff --git a/services/tests/notification/src/com/android/server/notification/NotificationManagerServiceTest.java b/services/tests/notification/src/com/android/server/notification/NotificationManagerServiceTest.java index bbec98ce583d..38016971af34 100644 --- a/services/tests/notification/src/com/android/server/notification/NotificationManagerServiceTest.java +++ b/services/tests/notification/src/com/android/server/notification/NotificationManagerServiceTest.java @@ -242,42 +242,6 @@ public class NotificationManagerServiceTest extends NotificationTestCase { } @Test - public void testCreateNotificationChannels_SecondCreateDoesNotChangeImportance() - throws Exception { - final NotificationChannel channel = - new NotificationChannel("id", "name", NotificationManager.IMPORTANCE_DEFAULT); - mBinderService.createNotificationChannels(PKG, - new ParceledListSlice(Arrays.asList(channel))); - - // Recreating the channel doesn't throw, but ignores importance. - final NotificationChannel dupeChannel = - new NotificationChannel("id", "name", NotificationManager.IMPORTANCE_HIGH); - mBinderService.createNotificationChannels(PKG, - new ParceledListSlice(Arrays.asList(dupeChannel))); - final NotificationChannel createdChannel = - mBinderService.getNotificationChannel(PKG, "id"); - assertEquals(NotificationManager.IMPORTANCE_DEFAULT, createdChannel.getImportance()); - } - - @Test - public void testCreateNotificationChannels_SecondCreateAllowedToDowngradeImportance() - throws Exception { - final NotificationChannel channel = - new NotificationChannel("id", "name", NotificationManager.IMPORTANCE_DEFAULT); - mBinderService.createNotificationChannels(PKG, - new ParceledListSlice(Arrays.asList(channel))); - - // Recreating with a lower importance is allowed to modify the channel. - final NotificationChannel dupeChannel = - new NotificationChannel("id", "name", NotificationManager.IMPORTANCE_LOW); - mBinderService.createNotificationChannels(PKG, - new ParceledListSlice(Arrays.asList(dupeChannel))); - final NotificationChannel createdChannel = - mBinderService.getNotificationChannel(PKG, "id"); - assertEquals(NotificationManager.IMPORTANCE_LOW, createdChannel.getImportance()); - } - - @Test public void testCreateNotificationChannels_CannotDowngradeImportanceIfAlreadyUpdated() throws Exception { final NotificationChannel channel = diff --git a/services/tests/servicestests/src/com/android/server/pm/UserManagerTest.java b/services/tests/servicestests/src/com/android/server/pm/UserManagerTest.java index 1964cad1aefc..b656d5e9a343 100644 --- a/services/tests/servicestests/src/com/android/server/pm/UserManagerTest.java +++ b/services/tests/servicestests/src/com/android/server/pm/UserManagerTest.java @@ -53,8 +53,7 @@ public class UserManagerTest extends AndroidTestCase { // Packages which are used during tests. private static final String[] PACKAGES = new String[] { - "com.android.egg", - "com.android.retaildemo" + "com.android.egg" }; private final Object mUserRemoveLock = new Object(); diff --git a/services/tests/servicestests/src/com/android/server/wm/AppBoundsTests.java b/services/tests/servicestests/src/com/android/server/wm/AppBoundsTests.java index 520666b6ab8d..f7ea0c47b874 100644 --- a/services/tests/servicestests/src/com/android/server/wm/AppBoundsTests.java +++ b/services/tests/servicestests/src/com/android/server/wm/AppBoundsTests.java @@ -17,6 +17,7 @@ package com.android.server.wm; import android.app.ActivityManager; +import android.content.pm.ActivityInfo; import android.content.res.Configuration; import android.graphics.Rect; import android.view.DisplayInfo; @@ -49,6 +50,19 @@ public class AppBoundsTests extends WindowTestsBase { } /** + * Ensures that appBounds causes {@link android.content.pm.ActivityInfo.CONFIG_APP_BOUNDS} diff. + */ + @Test + public void testAppBoundsConfigurationDiff() { + final Configuration config = new Configuration(); + final Configuration config2 = new Configuration(); + config.appBounds = new Rect(0, 1, 1, 0); + config2.appBounds = new Rect(0, 2, 2, 0); + + assertEquals(ActivityInfo.CONFIG_APP_BOUNDS, config.diff(config2)); + } + + /** * Ensures the configuration app bounds at the root level match the app dimensions. */ @Test diff --git a/tests/Internal/src/com/android/internal/colorextraction/ColorExtractorTest.java b/tests/Internal/src/com/android/internal/colorextraction/ColorExtractorTest.java index 0060901578cd..cb6a83d2644b 100644 --- a/tests/Internal/src/com/android/internal/colorextraction/ColorExtractorTest.java +++ b/tests/Internal/src/com/android/internal/colorextraction/ColorExtractorTest.java @@ -16,12 +16,14 @@ package com.android.internal.colorextraction; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.mockito.Mockito.any; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.verifyNoMoreInteractions; +import android.app.WallpaperColors; import android.app.WallpaperManager; import android.content.Context; import android.graphics.Color; @@ -29,7 +31,6 @@ import android.support.test.InstrumentationRegistry; import android.support.test.filters.SmallTest; import android.support.test.runner.AndroidJUnit4; -import com.android.internal.colorextraction.ColorExtractor; import com.android.internal.colorextraction.ColorExtractor.GradientColors; import com.android.internal.colorextraction.types.ExtractionType; import com.android.internal.colorextraction.types.Tonal; @@ -78,10 +79,10 @@ public class ColorExtractorTest { ExtractionType type = (inWallpaperColors, outGradientColorsNormal, outGradientColorsDark, outGradientColorsExtraDark) -> { - outGradientColorsNormal.set(colorsExpectedNormal); - outGradientColorsDark.set(colorsExpectedDark); - outGradientColorsExtraDark.set(colorsExpectedExtraDark); - }; + outGradientColorsNormal.set(colorsExpectedNormal); + outGradientColorsDark.set(colorsExpectedDark); + outGradientColorsExtraDark.set(colorsExpectedExtraDark); + }; ColorExtractor extractor = new ColorExtractor(mContext, type); GradientColors colors = extractor.getColors(WallpaperManager.FLAG_SYSTEM, @@ -92,4 +93,22 @@ public class ColorExtractorTest { colors = extractor.getColors(WallpaperManager.FLAG_SYSTEM, ColorExtractor.TYPE_EXTRA_DARK); assertEquals("Extracted colors not being used!", colors, colorsExpectedExtraDark); } + + @Test + public void addOnColorsChangedListener_invokesListener() { + ColorExtractor.OnColorsChangedListener mockedListeners = + mock(ColorExtractor.OnColorsChangedListener.class); + ColorExtractor extractor = new ColorExtractor(mContext, new Tonal(mContext)); + extractor.addOnColorsChangedListener(mockedListeners); + + extractor.onColorsChanged(new WallpaperColors(Color.valueOf(Color.RED), null, null), + WallpaperManager.FLAG_LOCK); + verify(mockedListeners, times(1)).onColorsChanged(any(), + eq(WallpaperManager.FLAG_LOCK)); + + extractor.removeOnColorsChangedListener(mockedListeners); + extractor.onColorsChanged(new WallpaperColors(Color.valueOf(Color.RED), null, null), + WallpaperManager.FLAG_LOCK); + verifyNoMoreInteractions(mockedListeners); + } } |
