diff options
385 files changed, 4605 insertions, 1349 deletions
diff --git a/Android.mk b/Android.mk index fb08395dce6c..61df64e3892b 100644 --- a/Android.mk +++ b/Android.mk @@ -75,6 +75,7 @@ LOCAL_SRC_FILES += \ core/java/android/app/IAppTask.aidl \ core/java/android/app/ITaskStackListener.aidl \ core/java/android/app/IBackupAgent.aidl \ + core/java/android/app/IEphemeralResolver.aidl \ core/java/android/app/IInstrumentationWatcher.aidl \ core/java/android/app/INotificationManager.aidl \ core/java/android/app/IProcessObserver.aidl \ @@ -305,7 +306,6 @@ LOCAL_SRC_FILES += \ core/java/com/android/internal/app/IAppOpsService.aidl \ core/java/com/android/internal/app/IAssistScreenshotReceiver.aidl \ core/java/com/android/internal/app/IBatteryStats.aidl \ - core/java/com/android/internal/app/IEphemeralResolver.aidl \ core/java/com/android/internal/app/ISoundTriggerService.aidl \ core/java/com/android/internal/app/IVoiceInteractionManagerService.aidl \ core/java/com/android/internal/app/IVoiceInteractionSessionListener.aidl \ diff --git a/api/system-current.txt b/api/system-current.txt index 6cd602057e3e..4f512a08816d 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -4525,6 +4525,15 @@ package android.app { field public static final int VISIBILITY_VISIBLE_NOTIFY_ONLY_COMPLETION = 3; // 0x3 } + public abstract class EphemeralResolverService extends android.app.Service { + ctor public EphemeralResolverService(); + method public final void attachBaseContext(android.content.Context); + method public final android.os.IBinder onBind(android.content.Intent); + method public abstract java.util.List<android.content.pm.EphemeralResolveInfo> onEphemeralResolveInfoList(int[], int); + field public static final java.lang.String EXTRA_RESOLVE_INFO = "android.app.extra.RESOLVE_INFO"; + field public static final java.lang.String EXTRA_SEQUENCE = "android.app.extra.SEQUENCE"; + } + public class ExpandableListActivity extends android.app.Activity implements android.widget.ExpandableListView.OnChildClickListener android.widget.ExpandableListView.OnGroupCollapseListener android.widget.ExpandableListView.OnGroupExpandListener android.view.View.OnCreateContextMenuListener { ctor public ExpandableListActivity(); method public android.widget.ExpandableListAdapter getExpandableListAdapter(); diff --git a/core/java/android/app/ActivityManagerInternal.java b/core/java/android/app/ActivityManagerInternal.java index 83e2678c37c2..0ba937a3f16b 100644 --- a/core/java/android/app/ActivityManagerInternal.java +++ b/core/java/android/app/ActivityManagerInternal.java @@ -171,4 +171,12 @@ public abstract class ActivityManagerInternal { */ public abstract int startActivitiesAsPackage(String packageName, int userId, Intent[] intents, Bundle bOptions); + + /** + * Get the procstate for the UID. The return value will be between + * {@link ActivityManager#MIN_PROCESS_STATE} and {@link ActivityManager#MAX_PROCESS_STATE}. + * Note if the UID doesn't exist, it'll return {@link ActivityManager#PROCESS_STATE_NONEXISTENT} + * (-1). + */ + public abstract int getUidProcessState(int uid); } diff --git a/core/java/android/app/ApplicationPackageManager.java b/core/java/android/app/ApplicationPackageManager.java index 8cc1bc49f219..37faa2e23dbf 100644 --- a/core/java/android/app/ApplicationPackageManager.java +++ b/core/java/android/app/ApplicationPackageManager.java @@ -1245,18 +1245,16 @@ public class ApplicationPackageManager extends PackageManager { return mContext.mMainThread.getSystemContext().getResources(); } final boolean sameUid = (app.uid == Process.myUid()); - try { - return mContext.mMainThread.getTopLevelResources( + final Resources r = mContext.mMainThread.getTopLevelResources( sameUid ? app.sourceDir : app.publicSourceDir, sameUid ? app.splitSourceDirs : app.splitPublicSourceDirs, app.resourceDirs, app.sharedLibraryFiles, Display.DEFAULT_DISPLAY, mContext.mPackageInfo); - } catch (Resources.NotFoundException cause) { - final NameNotFoundException ex = - new NameNotFoundException("Unable to open " + app.publicSourceDir); - ex.initCause(cause); - throw ex; + if (r != null) { + return r; } + throw new NameNotFoundException("Unable to open " + app.publicSourceDir); + } @Override diff --git a/core/java/com/android/internal/app/EphemeralResolveInfo.aidl b/core/java/android/app/EphemeralResolveInfo.aidl index 529527bd394b..db71d250ade2 100644 --- a/core/java/com/android/internal/app/EphemeralResolveInfo.aidl +++ b/core/java/android/app/EphemeralResolveInfo.aidl @@ -14,6 +14,6 @@ ** limitations under the License. */ -package com.android.internal.app; +package android.app; parcelable EphemeralResolveInfo; diff --git a/core/java/com/android/internal/app/EphemeralResolverService.java b/core/java/android/app/EphemeralResolverService.java index 68724a7fc4d2..ba791085d617 100644 --- a/core/java/com/android/internal/app/EphemeralResolverService.java +++ b/core/java/android/app/EphemeralResolverService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.internal.app; +package android.app; import android.annotation.SystemApi; import android.app.Service; @@ -37,9 +37,9 @@ import java.util.List; */ @SystemApi public abstract class EphemeralResolverService extends Service { - public static final String EXTRA_RESOLVE_INFO = "com.android.internal.app.RESOLVE_INFO"; - public static final String EXTRA_SEQUENCE = "com.android.internal.app.SEQUENCE"; - private static final String EXTRA_PREFIX = "com.android.internal.app.PREFIX"; + public static final String EXTRA_RESOLVE_INFO = "android.app.extra.RESOLVE_INFO"; + public static final String EXTRA_SEQUENCE = "android.app.extra.SEQUENCE"; + private static final String EXTRA_PREFIX = "android.app.PREFIX"; private Handler mHandler; /** @@ -50,11 +50,11 @@ public abstract class EphemeralResolverService extends Service { * be used when comparing against the digest prefixes as all bits might * not be set. */ - protected abstract List<EphemeralResolveInfo> getEphemeralResolveInfoList( + public abstract List<EphemeralResolveInfo> onEphemeralResolveInfoList( int digestPrefix[], int prefixMask); @Override - protected final void attachBaseContext(Context base) { + public final void attachBaseContext(Context base) { super.attachBaseContext(base); mHandler = new ServiceHandler(base.getMainLooper()); } @@ -91,7 +91,7 @@ public abstract class EphemeralResolverService extends Service { final IRemoteCallback callback = (IRemoteCallback) message.obj; final int[] digestPrefix = message.getData().getIntArray(EXTRA_PREFIX); final List<EphemeralResolveInfo> resolveInfo = - getEphemeralResolveInfoList(digestPrefix, message.arg1); + onEphemeralResolveInfoList(digestPrefix, message.arg1); final Bundle data = new Bundle(); data.putInt(EXTRA_SEQUENCE, message.arg2); data.putParcelableList(EXTRA_RESOLVE_INFO, resolveInfo); diff --git a/core/java/com/android/internal/app/IEphemeralResolver.aidl b/core/java/android/app/IEphemeralResolver.aidl index 9ff1322765f4..ee869eaa7936 100644 --- a/core/java/com/android/internal/app/IEphemeralResolver.aidl +++ b/core/java/android/app/IEphemeralResolver.aidl @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.android.internal.app; +package android.app; -import android.content.Intent; import android.os.IRemoteCallback; +/** @hide */ oneway interface IEphemeralResolver { void getEphemeralResolveInfoList(IRemoteCallback callback, in int[] digestPrefix, int prefixMask, int sequence); diff --git a/core/java/android/app/NotificationManager.java b/core/java/android/app/NotificationManager.java index 18b72e29e0e6..ff514bd7c81b 100644 --- a/core/java/android/app/NotificationManager.java +++ b/core/java/android/app/NotificationManager.java @@ -312,8 +312,8 @@ public class NotificationManager try { service.enqueueNotificationWithTag(pkg, mContext.getOpPackageName(), tag, id, copy, idOut, user.getIdentifier()); - if (id != idOut[0]) { - Log.w(TAG, "notify: id corrupted: sent " + id + ", got back " + idOut[0]); + if (localLOGV && id != idOut[0]) { + Log.v(TAG, "notify: id corrupted: sent " + id + ", got back " + idOut[0]); } } catch (RemoteException e) { throw e.rethrowFromSystemServer(); diff --git a/core/java/android/app/ResourcesManager.java b/core/java/android/app/ResourcesManager.java index 9a9f793bd307..d2e032721022 100644 --- a/core/java/android/app/ResourcesManager.java +++ b/core/java/android/app/ResourcesManager.java @@ -242,7 +242,7 @@ public class ResourcesManager { * @return a new AssetManager. */ @VisibleForTesting - protected @NonNull AssetManager createAssetManager(@NonNull final ResourcesKey key) { + protected @Nullable AssetManager createAssetManager(@NonNull final ResourcesKey key) { AssetManager assets = new AssetManager(); // resDir can be null if the 'android' package is creating a new Resources object. @@ -250,15 +250,16 @@ public class ResourcesManager { // already. if (key.mResDir != null) { if (assets.addAssetPath(key.mResDir) == 0) { - throw new Resources.NotFoundException("failed to add asset path " + key.mResDir); + Log.e(TAG, "failed to add asset path " + key.mResDir); + return null; } } if (key.mSplitResDirs != null) { for (final String splitResDir : key.mSplitResDirs) { if (assets.addAssetPath(splitResDir) == 0) { - throw new Resources.NotFoundException( - "failed to add split asset path " + splitResDir); + Log.e(TAG, "failed to add split asset path " + splitResDir); + return null; } } } @@ -303,11 +304,15 @@ public class ResourcesManager { return config; } - private @NonNull ResourcesImpl createResourcesImpl(@NonNull ResourcesKey key) { + private @Nullable ResourcesImpl createResourcesImpl(@NonNull ResourcesKey key) { final DisplayAdjustments daj = new DisplayAdjustments(key.mOverrideConfiguration); daj.setCompatibilityInfo(key.mCompatInfo); final AssetManager assets = createAssetManager(key); + if (assets == null) { + return null; + } + final DisplayMetrics dm = getDisplayMetrics(key.mDisplayId, daj); final Configuration config = generateConfig(key, dm); final ResourcesImpl impl = new ResourcesImpl(assets, dm, config, daj); @@ -323,7 +328,7 @@ public class ResourcesManager { * @param key The key to match. * @return a ResourcesImpl if the key matches a cache entry, null otherwise. */ - private ResourcesImpl findResourcesImplForKeyLocked(@NonNull ResourcesKey key) { + private @Nullable ResourcesImpl findResourcesImplForKeyLocked(@NonNull ResourcesKey key) { WeakReference<ResourcesImpl> weakImplRef = mResourceImpls.get(key); ResourcesImpl impl = weakImplRef != null ? weakImplRef.get() : null; if (impl != null && impl.getAssets().isUpToDate()) { @@ -338,12 +343,14 @@ public class ResourcesManager { * @param key The key to match. * @return a ResourcesImpl object matching the key. */ - private @NonNull ResourcesImpl findOrCreateResourcesImplForKeyLocked( + private @Nullable ResourcesImpl findOrCreateResourcesImplForKeyLocked( @NonNull ResourcesKey key) { ResourcesImpl impl = findResourcesImplForKeyLocked(key); if (impl == null) { impl = createResourcesImpl(key); - mResourceImpls.put(key, new WeakReference<>(impl)); + if (impl != null) { + mResourceImpls.put(key, new WeakReference<>(impl)); + } } return impl; } @@ -352,7 +359,8 @@ public class ResourcesManager { * Find the ResourcesKey that this ResourcesImpl object is associated with. * @return the ResourcesKey or null if none was found. */ - private ResourcesKey findKeyForResourceImplLocked(@NonNull ResourcesImpl resourceImpl) { + private @Nullable ResourcesKey findKeyForResourceImplLocked( + @NonNull ResourcesImpl resourceImpl) { final int refCount = mResourceImpls.size(); for (int i = 0; i < refCount; i++) { WeakReference<ResourcesImpl> weakImplRef = mResourceImpls.valueAt(i); @@ -480,7 +488,7 @@ public class ResourcesManager { * {@link ClassLoader#getSystemClassLoader()} is used. * @return a Resources object from which to access resources. */ - public @NonNull Resources createBaseActivityResources(@NonNull IBinder activityToken, + public @Nullable Resources createBaseActivityResources(@NonNull IBinder activityToken, @Nullable String resDir, @Nullable String[] splitResDirs, @Nullable String[] overlayDirs, @@ -534,7 +542,7 @@ public class ResourcesManager { * {@link #applyConfigurationToResourcesLocked(Configuration, CompatibilityInfo)} * is called. */ - private @NonNull Resources getOrCreateResources(@Nullable IBinder activityToken, + private @Nullable Resources getOrCreateResources(@Nullable IBinder activityToken, @NonNull ResourcesKey key, @NonNull ClassLoader classLoader) { synchronized (this) { if (DEBUG) { @@ -589,6 +597,9 @@ public class ResourcesManager { // If we're here, we didn't find a suitable ResourcesImpl to use, so create one now. ResourcesImpl resourcesImpl = createResourcesImpl(key); + if (resourcesImpl == null) { + return null; + } synchronized (this) { ResourcesImpl existingResourcesImpl = findResourcesImplForKeyLocked(key); @@ -642,7 +653,7 @@ public class ResourcesManager { * {@link ClassLoader#getSystemClassLoader()} is used. * @return a Resources object from which to access resources. */ - public @NonNull Resources getResources(@Nullable IBinder activityToken, + public @Nullable Resources getResources(@Nullable IBinder activityToken, @Nullable String resDir, @Nullable String[] splitResDirs, @Nullable String[] overlayDirs, @@ -765,10 +776,12 @@ public class ResourcesManager { ResourcesImpl resourcesImpl = findResourcesImplForKeyLocked(newKey); if (resourcesImpl == null) { resourcesImpl = createResourcesImpl(newKey); - mResourceImpls.put(newKey, new WeakReference<>(resourcesImpl)); + if (resourcesImpl != null) { + mResourceImpls.put(newKey, new WeakReference<>(resourcesImpl)); + } } - if (resourcesImpl != resources.getImpl()) { + if (resourcesImpl != null && resourcesImpl != resources.getImpl()) { // Set the ResourcesImpl, updating it for all users of this Resources // object. resources.setImpl(resourcesImpl); @@ -910,7 +923,11 @@ public class ResourcesManager { if (r != null) { final ResourcesKey key = updatedResourceKeys.get(r.getImpl()); if (key != null) { - r.setImpl(findOrCreateResourcesImplForKeyLocked(key)); + final ResourcesImpl impl = findOrCreateResourcesImplForKeyLocked(key); + if (impl == null) { + throw new Resources.NotFoundException("failed to load " + libAsset); + } + r.setImpl(impl); } } } @@ -923,7 +940,11 @@ public class ResourcesManager { if (r != null) { final ResourcesKey key = updatedResourceKeys.get(r.getImpl()); if (key != null) { - r.setImpl(findOrCreateResourcesImplForKeyLocked(key)); + final ResourcesImpl impl = findOrCreateResourcesImplForKeyLocked(key); + if (impl == null) { + throw new Resources.NotFoundException("failed to load " + libAsset); + } + r.setImpl(impl); } } } diff --git a/core/java/android/app/backup/FullBackup.java b/core/java/android/app/backup/FullBackup.java index 478024d7d27c..76828eeba785 100644 --- a/core/java/android/app/backup/FullBackup.java +++ b/core/java/android/app/backup/FullBackup.java @@ -21,6 +21,8 @@ import android.content.pm.PackageManager; import android.content.res.XmlResourceParser; import android.os.ParcelFileDescriptor; import android.os.Process; +import android.os.storage.StorageManager; +import android.os.storage.StorageVolume; import android.system.ErrnoException; import android.system.Os; import android.text.TextUtils; @@ -223,8 +225,12 @@ public class FullBackup { final int mFullBackupContent; final PackageManager mPackageManager; + final StorageManager mStorageManager; final String mPackageName; + // lazy initialized, only when needed + private StorageVolume[] mVolumes = null; + /** * Parse out the semantic domains into the correct physical location. */ @@ -260,16 +266,41 @@ public class FullBackup { } else { return null; } + } else if (domainToken.startsWith(FullBackup.SHARED_PREFIX)) { + return sharedDomainToPath(domainToken); } // Not a supported location Log.i(TAG, "Unrecognized domain " + domainToken); return null; - } catch (IOException e) { + } catch (Exception e) { Log.i(TAG, "Error reading directory for domain: " + domainToken); return null; } } + + private String sharedDomainToPath(String domain) throws IOException { + // already known to start with SHARED_PREFIX, so we just look after that + final String volume = domain.substring(FullBackup.SHARED_PREFIX.length()); + final StorageVolume[] volumes = getVolumeList(); + final int volNum = Integer.parseInt(volume); + if (volNum < mVolumes.length) { + return volumes[volNum].getPathFile().getCanonicalPath(); + } + return null; + } + + private StorageVolume[] getVolumeList() { + if (mStorageManager != null) { + if (mVolumes == null) { + mVolumes = mStorageManager.getVolumeList(); + } + } else { + Log.e(TAG, "Unable to access Storage Manager"); + } + return mVolumes; + } + /** * A map of domain -> list of canonical file names in that domain that are to be included. * We keep track of the domain so that we can go through the file system in order later on. @@ -283,6 +314,7 @@ public class FullBackup { BackupScheme(Context context) { mFullBackupContent = context.getApplicationInfo().fullBackupContent; + mStorageManager = (StorageManager) context.getSystemService(Context.STORAGE_SERVICE); mPackageManager = context.getPackageManager(); mPackageName = context.getPackageName(); diff --git a/core/java/android/os/Looper.java b/core/java/android/os/Looper.java index b58ff1fd4755..d299672ea1d5 100644 --- a/core/java/android/os/Looper.java +++ b/core/java/android/os/Looper.java @@ -147,7 +147,7 @@ public final class Looper { } final long traceTag = me.mTraceTag; - if (traceTag != 0) { + if (traceTag != 0 && Trace.isTagEnabled(traceTag)) { Trace.traceBegin(traceTag, msg.target.getTraceName(msg)); } try { diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 5da55b164f54..f4c642fafede 100755 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -5345,6 +5345,13 @@ public final class Settings { public static final String LONG_PRESS_TIMEOUT = "long_press_timeout"; /** + * The duration in milliseconds between the first tap's up event and the second tap's + * down event for an interaction to be considered part of the same multi-press. + * @hide + */ + public static final String MULTI_PRESS_TIMEOUT = "multi_press_timeout"; + + /** * List of the enabled print services. * * N and beyond uses {@link #DISABLED_PRINT_SERVICES}. But this might be used in an upgrade diff --git a/core/java/android/view/FrameMetrics.java b/core/java/android/view/FrameMetrics.java index 5c4450a4ed18..2b938d0df7eb 100644 --- a/core/java/android/view/FrameMetrics.java +++ b/core/java/android/view/FrameMetrics.java @@ -198,7 +198,7 @@ public final class FrameMetrics { int SWAP_BUFFERS = 12; int FRAME_COMPLETED = 13; - int FRAME_STATS_COUNT = 14; // must always be last + int FRAME_STATS_COUNT = 16; // must always be last } /* diff --git a/core/java/android/view/TextureView.java b/core/java/android/view/TextureView.java index b2e2505f5c5b..a42da8563ba0 100644 --- a/core/java/android/view/TextureView.java +++ b/core/java/android/view/TextureView.java @@ -218,15 +218,33 @@ public class TextureView extends View { /** @hide */ @Override protected void onDetachedFromWindowInternal() { - destroySurface(); + destroyHardwareLayer(); + releaseSurfaceTexture(); super.onDetachedFromWindowInternal(); } - private void destroySurface() { + /** + * @hide + */ + @Override + protected void destroyHardwareResources() { + destroyHardwareLayer(); + mUpdateSurface = mSurface != null; + } + + private void destroyHardwareLayer() { if (mLayer != null) { mLayer.detachSurfaceTexture(); + mLayer.destroy(); + mLayer = null; + mMatrixChanged = true; + } + } + private void releaseSurfaceTexture() { + if (mSurface != null) { boolean shouldRelease = true; + if (mListener != null) { shouldRelease = mListener.onSurfaceTextureDestroyed(mSurface); } @@ -235,14 +253,10 @@ public class TextureView extends View { nDestroyNativeWindow(); } - mLayer.destroy(); - if (shouldRelease) mSurface.release(); + if (shouldRelease) { + mSurface.release(); + } mSurface = null; - mLayer = null; - - // Make sure if/when new layer gets re-created, transform matrix will - // be re-applied. - mMatrixChanged = true; mHadSurface = true; } } @@ -366,9 +380,9 @@ public class TextureView extends View { // Create a new SurfaceTexture for the layer. mSurface = new SurfaceTexture(false); mLayer.setSurfaceTexture(mSurface); + nCreateNativeWindow(mSurface); } mSurface.setDefaultBufferSize(getWidth(), getHeight()); - nCreateNativeWindow(mSurface); mSurface.setOnFrameAvailableListener(mUpdateListener, mAttachInfo.mHandler); diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index dab494b385c4..0cdf5e115e3a 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -821,6 +821,17 @@ public class View implements Drawable.Callback, KeyEvent.Callback, static boolean sTextureViewIgnoresDrawableSetters = false; /** + * Prior to N, some ViewGroups would not convert LayoutParams properly even though both extend + * MarginLayoutParams. For instance, converting LinearLayout.LayoutParams to + * RelativeLayout.LayoutParams would lose margin information. This is fixed on N but target API + * check is implemented for backwards compatibility. + * + * {@hide} + */ + protected static boolean sPreserveMarginParamsInLayoutParamConversion; + + + /** * This view does not want keystrokes. Use with TAKES_FOCUS_MASK when * calling setFlags. */ @@ -4052,6 +4063,10 @@ public class View implements Drawable.Callback, KeyEvent.Callback, // On N+, we throw, but that breaks compatibility with apps that use these methods. sTextureViewIgnoresDrawableSetters = targetSdkVersion <= M; + // Prior to N, we would drop margins in LayoutParam conversions. The fix triggers bugs + // in apps so we target check it to avoid breaking existing apps. + sPreserveMarginParamsInLayoutParamConversion = targetSdkVersion >= N; + sCompatibilityDone = true; } } @@ -12359,6 +12374,10 @@ public class View implements Drawable.Callback, KeyEvent.Callback, public void setAlpha(@FloatRange(from=0.0, to=1.0) float alpha) { ensureTransformationInfo(); if (mTransformationInfo.mAlpha != alpha) { + // Report visibility changes, which can affect children, to accessibility + if ((alpha == 0) ^ (mTransformationInfo.mAlpha == 0)) { + notifySubtreeAccessibilityStateChangedIfNeeded(); + } mTransformationInfo.mAlpha = alpha; if (onSetAlpha((int) (alpha * 255))) { mPrivateFlags |= PFLAG_ALPHA_SET; @@ -12369,8 +12388,6 @@ public class View implements Drawable.Callback, KeyEvent.Callback, mPrivateFlags &= ~PFLAG_ALPHA_SET; invalidateViewProperty(true, false); mRenderNode.setAlpha(getFinalAlpha()); - notifyViewAccessibilityStateChangedIfNeeded( - AccessibilityEvent.CONTENT_CHANGE_TYPE_UNDEFINED); } } } diff --git a/core/java/android/view/ViewConfiguration.java b/core/java/android/view/ViewConfiguration.java index 4d584a3df4fb..9a73d0b1bfaa 100644 --- a/core/java/android/view/ViewConfiguration.java +++ b/core/java/android/view/ViewConfiguration.java @@ -64,6 +64,12 @@ public class ViewConfiguration { private static final int DEFAULT_LONG_PRESS_TIMEOUT = 500; /** + * Defines the default duration in milliseconds between the first tap's up event and the second + * tap's down event for an interaction to be considered part of the same multi-press. + */ + private static final int DEFAULT_MULTI_PRESS_TIMEOUT = 300; + + /** * Defines the time between successive key repeats in milliseconds. */ private static final int KEY_REPEAT_DELAY = 50; @@ -441,6 +447,16 @@ public class ViewConfiguration { } /** + * @return the duration in milliseconds between the first tap's up event and the second tap's + * down event for an interaction to be considered part of the same multi-press. + * @hide + */ + public static int getMultiPressTimeout() { + return AppGlobals.getIntCoreSetting(Settings.Secure.MULTI_PRESS_TIMEOUT, + DEFAULT_MULTI_PRESS_TIMEOUT); + } + + /** * @return the time before the first key repeat in milliseconds. */ public static int getKeyRepeatTimeout() { diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java index 4dc1009fe446..03c97bd9b00c 100644 --- a/core/java/android/view/ViewRootImpl.java +++ b/core/java/android/view/ViewRootImpl.java @@ -6039,7 +6039,8 @@ public final class ViewRootImpl implements ViewParent, return true; } return mEvent instanceof MotionEvent - && mEvent.isFromSource(InputDevice.SOURCE_CLASS_POINTER); + && (mEvent.isFromSource(InputDevice.SOURCE_CLASS_POINTER) + || mEvent.isFromSource(InputDevice.SOURCE_ROTARY_ENCODER)); } public boolean shouldSendToSynthesizer() { diff --git a/core/java/android/view/WindowManagerPolicy.java b/core/java/android/view/WindowManagerPolicy.java index 9a8c8a86499a..17d306eb8857 100644 --- a/core/java/android/view/WindowManagerPolicy.java +++ b/core/java/android/view/WindowManagerPolicy.java @@ -136,6 +136,12 @@ public interface WindowManagerPolicy { throws RemoteException; /** + * @return true if windows with FLAG_DISMISS_KEYGUARD should be allowed to show even if + * the keyguard is locked. + */ + boolean canShowDismissingWindowWhileLockedLw(); + + /** * Interface to the Window Manager state associated with a particular * window. You can hold on to an instance of this interface from the call * to prepareAddWindow() until removeWindow(). diff --git a/core/java/android/widget/FrameLayout.java b/core/java/android/widget/FrameLayout.java index 029313c53938..b8c74d88b580 100644 --- a/core/java/android/widget/FrameLayout.java +++ b/core/java/android/widget/FrameLayout.java @@ -382,13 +382,14 @@ public class FrameLayout extends ViewGroup { @Override protected ViewGroup.LayoutParams generateLayoutParams(ViewGroup.LayoutParams lp) { - if (lp instanceof LayoutParams) { - return new LayoutParams((LayoutParams) lp); - } else if (lp instanceof MarginLayoutParams) { - return new LayoutParams((MarginLayoutParams) lp); - } else { - return new LayoutParams(lp); + if (sPreserveMarginParamsInLayoutParamConversion) { + if (lp instanceof LayoutParams) { + return new LayoutParams((LayoutParams) lp); + } else if (lp instanceof MarginLayoutParams) { + return new LayoutParams((MarginLayoutParams) lp); + } } + return new LayoutParams(lp); } @Override diff --git a/core/java/android/widget/GridLayout.java b/core/java/android/widget/GridLayout.java index 726586ee8d5f..af2852cde22a 100644 --- a/core/java/android/widget/GridLayout.java +++ b/core/java/android/widget/GridLayout.java @@ -868,13 +868,14 @@ public class GridLayout extends ViewGroup { @Override protected LayoutParams generateLayoutParams(ViewGroup.LayoutParams lp) { - if (lp instanceof LayoutParams) { - return new LayoutParams((LayoutParams) lp); - } else if (lp instanceof MarginLayoutParams) { - return new LayoutParams((MarginLayoutParams) lp); - } else { - return new LayoutParams(lp); + if (sPreserveMarginParamsInLayoutParamConversion) { + if (lp instanceof LayoutParams) { + return new LayoutParams((LayoutParams) lp); + } else if (lp instanceof MarginLayoutParams) { + return new LayoutParams((MarginLayoutParams) lp); + } } + return new LayoutParams(lp); } // Draw grid diff --git a/core/java/android/widget/LinearLayout.java b/core/java/android/widget/LinearLayout.java index 38d7cd4acaf6..f897372c1f01 100644 --- a/core/java/android/widget/LinearLayout.java +++ b/core/java/android/widget/LinearLayout.java @@ -1844,13 +1844,14 @@ public class LinearLayout extends ViewGroup { @Override protected LayoutParams generateLayoutParams(ViewGroup.LayoutParams lp) { - if (lp instanceof LayoutParams) { - return new LayoutParams((LayoutParams) lp); - } else if (lp instanceof MarginLayoutParams) { - return new LayoutParams((MarginLayoutParams) lp); - } else { - return new LayoutParams(lp); + if (sPreserveMarginParamsInLayoutParamConversion) { + if (lp instanceof LayoutParams) { + return new LayoutParams((LayoutParams) lp); + } else if (lp instanceof MarginLayoutParams) { + return new LayoutParams((MarginLayoutParams) lp); + } } + return new LayoutParams(lp); } diff --git a/core/java/android/widget/RatingBar.java b/core/java/android/widget/RatingBar.java index 223096116adb..3ad05b5e7c01 100644 --- a/core/java/android/widget/RatingBar.java +++ b/core/java/android/widget/RatingBar.java @@ -110,8 +110,8 @@ public class RatingBar extends AbsSeekBar { } // A touch inside a star fill up to that fractional area (slightly more - // than 1 so boundaries round up). - mTouchProgressOffset = 1.1f; + // than 0.5 so boundaries round up). + mTouchProgressOffset = 0.6f; } public RatingBar(Context context, AttributeSet attrs) { diff --git a/core/java/android/widget/RelativeLayout.java b/core/java/android/widget/RelativeLayout.java index 0136542ef4ac..a189d3c0cc91 100644 --- a/core/java/android/widget/RelativeLayout.java +++ b/core/java/android/widget/RelativeLayout.java @@ -1104,13 +1104,14 @@ public class RelativeLayout extends ViewGroup { @Override protected ViewGroup.LayoutParams generateLayoutParams(ViewGroup.LayoutParams lp) { - if (lp instanceof LayoutParams) { - return new LayoutParams((LayoutParams) lp); - } else if (lp instanceof MarginLayoutParams) { - return new LayoutParams((MarginLayoutParams) lp); - } else { - return new LayoutParams(lp); + if (sPreserveMarginParamsInLayoutParamConversion) { + if (lp instanceof LayoutParams) { + return new LayoutParams((LayoutParams) lp); + } else if (lp instanceof MarginLayoutParams) { + return new LayoutParams((MarginLayoutParams) lp); + } } + return new LayoutParams(lp); } /** @hide */ diff --git a/core/java/com/android/internal/policy/IKeyguardService.aidl b/core/java/com/android/internal/policy/IKeyguardService.aidl index 171a264eea8b..83d75fba80f9 100644 --- a/core/java/com/android/internal/policy/IKeyguardService.aidl +++ b/core/java/com/android/internal/policy/IKeyguardService.aidl @@ -34,7 +34,7 @@ oneway interface IKeyguardService { void addStateMonitorCallback(IKeyguardStateCallback callback); void verifyUnlock(IKeyguardExitCallback callback); void keyguardDone(boolean authenticated, boolean wakeup); - void dismiss(); + void dismiss(boolean allowWhileOccluded); void onDreamingStarted(); void onDreamingStopped(); diff --git a/core/java/com/android/internal/policy/IKeyguardStateCallback.aidl b/core/java/com/android/internal/policy/IKeyguardStateCallback.aidl index db3b40b29903..419b1f8feac7 100644 --- a/core/java/com/android/internal/policy/IKeyguardStateCallback.aidl +++ b/core/java/com/android/internal/policy/IKeyguardStateCallback.aidl @@ -19,4 +19,5 @@ interface IKeyguardStateCallback { void onShowingStateChanged(boolean showing); void onSimSecureStateChanged(boolean simSecure); void onInputRestrictedStateChanged(boolean inputRestricted); + void onTrustedChanged(boolean trusted); }
\ No newline at end of file diff --git a/core/jni/android/graphics/Bitmap.cpp b/core/jni/android/graphics/Bitmap.cpp index d68124660a51..d7550a4d9695 100755 --- a/core/jni/android/graphics/Bitmap.cpp +++ b/core/jni/android/graphics/Bitmap.cpp @@ -18,6 +18,7 @@ #include "CreateJavaOutputStreamAdaptor.h" #include <Caches.h> #include <hwui/Paint.h> +#include <renderthread/RenderProxy.h> #include "core_jni_helpers.h" @@ -1361,6 +1362,14 @@ static jlong Bitmap_refPixelRef(JNIEnv* env, jobject, jlong bitmapHandle) { return reinterpret_cast<jlong>(pixelRef); } +static void Bitmap_prepareToDraw(JNIEnv* env, jobject, jlong bitmapPtr) { + LocalScopedBitmap bitmapHandle(bitmapPtr); + if (!bitmapHandle.valid()) return; + SkBitmap bitmap; + bitmapHandle->getSkBitmap(&bitmap); + android::uirenderer::renderthread::RenderProxy::prepareToDraw(bitmap); +} + /////////////////////////////////////////////////////////////////////////////// static const JNINativeMethod gBitmapMethods[] = { @@ -1404,6 +1413,7 @@ static const JNINativeMethod gBitmapMethods[] = { (void*)Bitmap_copyPixelsFromBuffer }, { "nativeSameAs", "(JJ)Z", (void*)Bitmap_sameAs }, { "nativeRefPixelRef", "(J)J", (void*)Bitmap_refPixelRef }, + { "nativePrepareToDraw", "(J)V", (void*)Bitmap_prepareToDraw }, }; int register_android_graphics_Bitmap(JNIEnv* env) diff --git a/core/jni/android_view_ThreadedRenderer.cpp b/core/jni/android_view_ThreadedRenderer.cpp index 3669da8a9cd8..7cd0d2a3e888 100644 --- a/core/jni/android_view_ThreadedRenderer.cpp +++ b/core/jni/android_view_ThreadedRenderer.cpp @@ -242,6 +242,16 @@ public: mPausedVDAnimators.clear(); } + // Move all the animators to the paused list, and send a delayed message to notify the finished + // listener. + void pauseAnimators() { + mPausedVDAnimators.insert(mRunningVDAnimators.begin(), mRunningVDAnimators.end()); + for (auto& anim : mRunningVDAnimators) { + detachVectorDrawableAnimator(anim.get()); + } + mRunningVDAnimators.clear(); + } + void doAttachAnimatingNodes(AnimationContext* context) { for (size_t i = 0; i < mPendingAnimatingRenderNodes.size(); i++) { RenderNode* node = mPendingAnimatingRenderNodes[i].get(); @@ -415,8 +425,8 @@ public: postOnFinishedEvents(); } - virtual void detachAnimators() override { - mRootNode->detachAnimators(); + virtual void pauseAnimators() override { + mRootNode->pauseAnimators(); } virtual void callOnFinished(BaseRenderNodeAnimator* animator, AnimationListener* listener) { @@ -426,7 +436,7 @@ public: virtual void destroy() { AnimationContext::destroy(); - detachAnimators(); + mRootNode->detachAnimators(); postOnFinishedEvents(); } diff --git a/core/res/res/anim/watch_switch_thumb_to_off_animation.xml b/core/res/res/anim/watch_switch_thumb_to_off_animation.xml index cd02e0db2fd5..c300894d5541 100644 --- a/core/res/res/anim/watch_switch_thumb_to_off_animation.xml +++ b/core/res/res/anim/watch_switch_thumb_to_off_animation.xml @@ -1,4 +1,5 @@ -<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2016 The Android Open Source Project +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2016 The Android Open Source Project Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at @@ -17,20 +18,34 @@ android:interpolator="@android:interpolator/linear" android:propertyName="pathData" android:valueFrom="M 0.0,-7.0 l 0.0,0.0 c 3.8659932486,0.0 7.0,3.1340067514 7.0,7.0 l 0.0,0.0 c 0.0,3.8659932486 -3.1340067514,7.0 -7.0,7.0 l 0.0,0.0 c -3.8659932486,0.0 -7.0,-3.1340067514 -7.0,-7.0 l 0.0,0.0 c 0.0,-3.8659932486 3.1340067514,-7.0 7.0,-7.0 Z" + android:valueTo="M 0.0,-7.0 l 0.0,0.0 c 3.8659932486,0.0 7.0,3.1340067514 7.0,7.0 l 0.0,0.0 c 0.0,3.8659932486 -3.1340067514,7.0 -7.0,7.0 l 0.0,0.0 c -3.8659932486,0.0 -7.0,-3.1340067514 -7.0,-7.0 l 0.0,0.0 c 0.0,-3.8659932486 3.1340067514,-7.0 7.0,-7.0 Z" + android:valueType="pathType" /> + <objectAnimator + android:duration="49" + android:interpolator="@android:interpolator/linear" + android:propertyName="pathData" + android:valueFrom="M 0.0,-7.0 l 0.0,0.0 c 3.8659932486,0.0 7.0,3.1340067514 7.0,7.0 l 0.0,0.0 c 0.0,3.8659932486 -3.1340067514,7.0 -7.0,7.0 l 0.0,0.0 c -3.8659932486,0.0 -7.0,-3.1340067514 -7.0,-7.0 l 0.0,0.0 c 0.0,-3.8659932486 3.1340067514,-7.0 7.0,-7.0 Z" android:valueTo="M -3.0,-7.0 l 6.0,0.0 c 3.8659932486,0.0 7.0,3.1340067514 7.0,7.0 l 0.0,0.0 c 0.0,3.8659932486 -3.1340067514,7.0 -7.0,7.0 l -6.0,0.0 c -3.8659932486,0.0 -7.0,-3.1340067514 -7.0,-7.0 l 0.0,0.0 c 0.0,-3.8659932486 3.1340067514,-7.0 7.0,-7.0 Z" android:valueType="pathType" /> <objectAnimator - android:duration="66" + android:duration="83" android:interpolator="@android:interpolator/linear" android:propertyName="pathData" android:valueFrom="M -3.0,-7.0 l 6.0,0.0 c 3.8659932486,0.0 7.0,3.1340067514 7.0,7.0 l 0.0,0.0 c 0.0,3.8659932486 -3.1340067514,7.0 -7.0,7.0 l -6.0,0.0 c -3.8659932486,0.0 -7.0,-3.1340067514 -7.0,-7.0 l 0.0,0.0 c 0.0,-3.8659932486 3.1340067514,-7.0 7.0,-7.0 Z" android:valueTo="M -3.0,-7.0 l 6.0,0.0 c 3.8659932486,0.0 7.0,3.1340067514 7.0,7.0 l 0.0,0.0 c 0.0,3.8659932486 -3.1340067514,7.0 -7.0,7.0 l -6.0,0.0 c -3.8659932486,0.0 -7.0,-3.1340067514 -7.0,-7.0 l 0.0,0.0 c 0.0,-3.8659932486 3.1340067514,-7.0 7.0,-7.0 Z" android:valueType="pathType" /> <objectAnimator - android:duration="66" + android:duration="50" android:interpolator="@android:interpolator/linear" android:propertyName="pathData" android:valueFrom="M -3.0,-7.0 l 6.0,0.0 c 3.8659932486,0.0 7.0,3.1340067514 7.0,7.0 l 0.0,0.0 c 0.0,3.8659932486 -3.1340067514,7.0 -7.0,7.0 l -6.0,0.0 c -3.8659932486,0.0 -7.0,-3.1340067514 -7.0,-7.0 l 0.0,0.0 c 0.0,-3.8659932486 3.1340067514,-7.0 7.0,-7.0 Z" android:valueTo="M 0.0,-7.0 l 0.0,0.0 c 3.8659932486,0.0 7.0,3.1340067514 7.0,7.0 l 0.0,0.0 c 0.0,3.8659932486 -3.1340067514,7.0 -7.0,7.0 l 0.0,0.0 c -3.8659932486,0.0 -7.0,-3.1340067514 -7.0,-7.0 l 0.0,0.0 c 0.0,-3.8659932486 3.1340067514,-7.0 7.0,-7.0 Z" android:valueType="pathType" /> + <objectAnimator + android:duration="33" + android:interpolator="@android:interpolator/linear" + android:propertyName="pathData" + android:valueFrom="M 0.0,-7.0 l 0.0,0.0 c 3.8659932486,0.0 7.0,3.1340067514 7.0,7.0 l 0.0,0.0 c 0.0,3.8659932486 -3.1340067514,7.0 -7.0,7.0 l 0.0,0.0 c -3.8659932486,0.0 -7.0,-3.1340067514 -7.0,-7.0 l 0.0,0.0 c 0.0,-3.8659932486 3.1340067514,-7.0 7.0,-7.0 Z" + android:valueTo="M 0.0,-7.0 l 0.0,0.0 c 3.8659932486,0.0 7.0,3.1340067514 7.0,7.0 l 0.0,0.0 c 0.0,3.8659932486 -3.1340067514,7.0 -7.0,7.0 l 0.0,0.0 c -3.8659932486,0.0 -7.0,-3.1340067514 -7.0,-7.0 l 0.0,0.0 c 0.0,-3.8659932486 3.1340067514,-7.0 7.0,-7.0 Z" + android:valueType="pathType" /> </set> diff --git a/core/res/res/anim/watch_switch_thumb_to_on_animation.xml b/core/res/res/anim/watch_switch_thumb_to_on_animation.xml index e64421776605..c300894d5541 100644 --- a/core/res/res/anim/watch_switch_thumb_to_on_animation.xml +++ b/core/res/res/anim/watch_switch_thumb_to_on_animation.xml @@ -18,20 +18,34 @@ android:interpolator="@android:interpolator/linear" android:propertyName="pathData" android:valueFrom="M 0.0,-7.0 l 0.0,0.0 c 3.8659932486,0.0 7.0,3.1340067514 7.0,7.0 l 0.0,0.0 c 0.0,3.8659932486 -3.1340067514,7.0 -7.0,7.0 l 0.0,0.0 c -3.8659932486,0.0 -7.0,-3.1340067514 -7.0,-7.0 l 0.0,0.0 c 0.0,-3.8659932486 3.1340067514,-7.0 7.0,-7.0 Z" + android:valueTo="M 0.0,-7.0 l 0.0,0.0 c 3.8659932486,0.0 7.0,3.1340067514 7.0,7.0 l 0.0,0.0 c 0.0,3.8659932486 -3.1340067514,7.0 -7.0,7.0 l 0.0,0.0 c -3.8659932486,0.0 -7.0,-3.1340067514 -7.0,-7.0 l 0.0,0.0 c 0.0,-3.8659932486 3.1340067514,-7.0 7.0,-7.0 Z" + android:valueType="pathType" /> + <objectAnimator + android:duration="49" + android:interpolator="@android:interpolator/linear" + android:propertyName="pathData" + android:valueFrom="M 0.0,-7.0 l 0.0,0.0 c 3.8659932486,0.0 7.0,3.1340067514 7.0,7.0 l 0.0,0.0 c 0.0,3.8659932486 -3.1340067514,7.0 -7.0,7.0 l 0.0,0.0 c -3.8659932486,0.0 -7.0,-3.1340067514 -7.0,-7.0 l 0.0,0.0 c 0.0,-3.8659932486 3.1340067514,-7.0 7.0,-7.0 Z" android:valueTo="M -3.0,-7.0 l 6.0,0.0 c 3.8659932486,0.0 7.0,3.1340067514 7.0,7.0 l 0.0,0.0 c 0.0,3.8659932486 -3.1340067514,7.0 -7.0,7.0 l -6.0,0.0 c -3.8659932486,0.0 -7.0,-3.1340067514 -7.0,-7.0 l 0.0,0.0 c 0.0,-3.8659932486 3.1340067514,-7.0 7.0,-7.0 Z" android:valueType="pathType" /> <objectAnimator - android:duration="66" + android:duration="83" android:interpolator="@android:interpolator/linear" android:propertyName="pathData" android:valueFrom="M -3.0,-7.0 l 6.0,0.0 c 3.8659932486,0.0 7.0,3.1340067514 7.0,7.0 l 0.0,0.0 c 0.0,3.8659932486 -3.1340067514,7.0 -7.0,7.0 l -6.0,0.0 c -3.8659932486,0.0 -7.0,-3.1340067514 -7.0,-7.0 l 0.0,0.0 c 0.0,-3.8659932486 3.1340067514,-7.0 7.0,-7.0 Z" android:valueTo="M -3.0,-7.0 l 6.0,0.0 c 3.8659932486,0.0 7.0,3.1340067514 7.0,7.0 l 0.0,0.0 c 0.0,3.8659932486 -3.1340067514,7.0 -7.0,7.0 l -6.0,0.0 c -3.8659932486,0.0 -7.0,-3.1340067514 -7.0,-7.0 l 0.0,0.0 c 0.0,-3.8659932486 3.1340067514,-7.0 7.0,-7.0 Z" android:valueType="pathType" /> <objectAnimator - android:duration="66" + android:duration="50" android:interpolator="@android:interpolator/linear" android:propertyName="pathData" android:valueFrom="M -3.0,-7.0 l 6.0,0.0 c 3.8659932486,0.0 7.0,3.1340067514 7.0,7.0 l 0.0,0.0 c 0.0,3.8659932486 -3.1340067514,7.0 -7.0,7.0 l -6.0,0.0 c -3.8659932486,0.0 -7.0,-3.1340067514 -7.0,-7.0 l 0.0,0.0 c 0.0,-3.8659932486 3.1340067514,-7.0 7.0,-7.0 Z" android:valueTo="M 0.0,-7.0 l 0.0,0.0 c 3.8659932486,0.0 7.0,3.1340067514 7.0,7.0 l 0.0,0.0 c 0.0,3.8659932486 -3.1340067514,7.0 -7.0,7.0 l 0.0,0.0 c -3.8659932486,0.0 -7.0,-3.1340067514 -7.0,-7.0 l 0.0,0.0 c 0.0,-3.8659932486 3.1340067514,-7.0 7.0,-7.0 Z" android:valueType="pathType" /> + <objectAnimator + android:duration="33" + android:interpolator="@android:interpolator/linear" + android:propertyName="pathData" + android:valueFrom="M 0.0,-7.0 l 0.0,0.0 c 3.8659932486,0.0 7.0,3.1340067514 7.0,7.0 l 0.0,0.0 c 0.0,3.8659932486 -3.1340067514,7.0 -7.0,7.0 l 0.0,0.0 c -3.8659932486,0.0 -7.0,-3.1340067514 -7.0,-7.0 l 0.0,0.0 c 0.0,-3.8659932486 3.1340067514,-7.0 7.0,-7.0 Z" + android:valueTo="M 0.0,-7.0 l 0.0,0.0 c 3.8659932486,0.0 7.0,3.1340067514 7.0,7.0 l 0.0,0.0 c 0.0,3.8659932486 -3.1340067514,7.0 -7.0,7.0 l 0.0,0.0 c -3.8659932486,0.0 -7.0,-3.1340067514 -7.0,-7.0 l 0.0,0.0 c 0.0,-3.8659932486 3.1340067514,-7.0 7.0,-7.0 Z" + android:valueType="pathType" /> </set> diff --git a/core/res/res/color/watch_switch_thumb_color_material.xml b/core/res/res/color/watch_switch_thumb_color_material.xml index a931724f3419..d4796a032631 100644 --- a/core/res/res/color/watch_switch_thumb_color_material.xml +++ b/core/res/res/color/watch_switch_thumb_color_material.xml @@ -12,6 +12,7 @@ --> <selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:color="?android:colorAccent" android:state_checked="true" /> - <item android:color="?android:colorButtonNormal" android:state_checked="false" /> + <item android:color="?android:colorButtonNormal" android:state_enabled="false" /> + <item android:color="?android:colorControlActivated" android:state_checked="true" /> + <item android:color="?android:colorButtonNormal" /> </selector>
\ No newline at end of file diff --git a/core/res/res/layout-notround-watch/alert_dialog_header_micro.xml b/core/res/res/layout-notround-watch/alert_dialog_title_material.xml index fc840d9fa73f..307c6db91c3a 100644 --- a/core/res/res/layout-notround-watch/alert_dialog_header_micro.xml +++ b/core/res/res/layout-notround-watch/alert_dialog_title_material.xml @@ -30,12 +30,9 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@null" /> - <com.android.internal.widget.DialogTitle android:id="@+id/alertTitle" + <TextView android:id="@+id/alertTitle" style="?android:attr/windowTitleStyle" - android:ellipsize="end" - android:layout_marginStart="8dp" android:layout_marginBottom="8dp" android:layout_width="match_parent" - android:layout_height="wrap_content" - android:textAlignment="viewStart" /> + android:layout_height="wrap_content" /> </LinearLayout> diff --git a/core/res/res/layout-round-watch/alert_dialog_header_micro.xml b/core/res/res/layout-round-watch/alert_dialog_title_material.xml index 6f7ae02388a3..027991106c5a 100644 --- a/core/res/res/layout-round-watch/alert_dialog_header_micro.xml +++ b/core/res/res/layout-round-watch/alert_dialog_title_material.xml @@ -27,12 +27,10 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@null" /> - <com.android.internal.widget.DialogTitle android:id="@+id/alertTitle" + <TextView android:id="@+id/alertTitle" style="?android:attr/windowTitleStyle" - android:ellipsize="end" android:layout_marginTop="36dp" - android:layout_marginBottom="4dp" + android:layout_marginBottom="8dp" android:layout_width="match_parent" - android:layout_height="wrap_content" - android:textAlignment="center" /> + android:layout_height="wrap_content" /> </FrameLayout> diff --git a/core/res/res/layout-watch/alert_dialog_material.xml b/core/res/res/layout-watch/alert_dialog_material.xml index ce8e20a12187..002dde83cd93 100644 --- a/core/res/res/layout-watch/alert_dialog_material.xml +++ b/core/res/res/layout-watch/alert_dialog_material.xml @@ -39,7 +39,7 @@ <include android:id="@+id/title_template" android:layout_width="match_parent" android:layout_height="wrap_content" - layout="@layout/alert_dialog_header_micro"/> + layout="@layout/alert_dialog_title_material"/> </FrameLayout> <!-- Content Panel --> @@ -50,7 +50,8 @@ <TextView android:id="@+id/message" android:layout_width="match_parent" android:layout_height="wrap_content" - android:textAppearance="@style/TextAppearance.Material.Body1" + android:gravity="@integer/config_dialogTextGravity" + android:textAppearance="@style/TextAppearance.Material.Subhead" android:paddingStart="?dialogPreferredPadding" android:paddingEnd="?dialogPreferredPadding" android:paddingTop="8dip" @@ -77,6 +78,7 @@ <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_gravity="bottom" android:orientation="vertical" android:minHeight="@dimen/alert_dialog_button_bar_height" android:paddingBottom="?dialogPreferredPadding" diff --git a/core/res/res/values-notround-watch/styles_material.xml b/core/res/res/layout-watch/date_picker_dialog.xml index cd8521f48421..b8772bc5ea3c 100644 --- a/core/res/res/values-notround-watch/styles_material.xml +++ b/core/res/res/layout-watch/date_picker_dialog.xml @@ -1,5 +1,6 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- Copyright (C) 2016 The Android Open Source Project +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2007 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. @@ -13,6 +14,13 @@ See the License for the specific language governing permissions and limitations under the License. --> -<resources> - <style name="TextAppearance.Material.AlertDialogMessage" parent="TextAppearance.Material.Body1"/> -</resources> + +<DatePicker xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/datePicker" + android:layout_gravity="center_horizontal" + android:gravity="center_horizontal" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:spinnersShown="true" + android:calendarViewShown="false" + android:datePickerMode="@integer/date_picker_mode" /> diff --git a/core/res/res/layout-watch/number_picker_material.xml b/core/res/res/layout-watch/time_picker_dialog.xml index a1c0921482ad..788602bf09ba 100644 --- a/core/res/res/layout-watch/number_picker_material.xml +++ b/core/res/res/layout-watch/time_picker_dialog.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <!-- ** -** Copyright 2012, The Android Open Source Project +** Copyright 2007, 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. @@ -17,15 +17,10 @@ */ --> -<merge xmlns:android="http://schemas.android.com/apk/res/android"> - - <view class="android.widget.NumberPicker$CustomEditText" - android:textAppearance="?android:attr/textAppearanceLarge" - android:id="@+id/numberpicker_input" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:gravity="center" - android:singleLine="true" - android:background="@null" /> - -</merge> +<TimePicker xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/timePicker" + android:layout_gravity="center_horizontal" + android:gravity="center_horizontal" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:timePickerMode="@integer/time_picker_mode" /> diff --git a/core/res/res/layout/date_picker_legacy_holo.xml b/core/res/res/layout/date_picker_legacy_holo.xml index b465d97339a2..a6e93c99160d 100644 --- a/core/res/res/layout/date_picker_legacy_holo.xml +++ b/core/res/res/layout/date_picker_legacy_holo.xml @@ -41,8 +41,8 @@ android:id="@+id/month" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="16dip" - android:layout_marginBottom="16dip" + android:layout_marginTop="@dimen/picker_top_margin" + android:layout_marginBottom="@dimen/picker_bottom_margin" android:layout_marginStart="8dip" android:layout_marginEnd="8dip" android:focusable="true" @@ -54,8 +54,8 @@ android:id="@+id/day" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="16dip" - android:layout_marginBottom="16dip" + android:layout_marginTop="@dimen/picker_top_margin" + android:layout_marginBottom="@dimen/picker_bottom_margin" android:layout_marginStart="8dip" android:layout_marginEnd="8dip" android:focusable="true" @@ -67,8 +67,8 @@ android:id="@+id/year" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="16dip" - android:layout_marginBottom="16dip" + android:layout_marginTop="@dimen/picker_top_margin" + android:layout_marginBottom="@dimen/picker_bottom_margin" android:layout_marginStart="8dip" android:layout_marginEnd="16dip" android:focusable="true" diff --git a/core/res/res/layout/number_picker_material.xml b/core/res/res/layout/number_picker_material.xml index b0455857e79e..6fbd2b279f0c 100644 --- a/core/res/res/layout/number_picker_material.xml +++ b/core/res/res/layout/number_picker_material.xml @@ -22,4 +22,4 @@ android:gravity="center" android:singleLine="true" android:background="@null" - android:textAppearance="@style/TextAppearance.Material.Body1" /> + android:textAppearance="@style/TextAppearance.Material.NumberPicker" /> diff --git a/core/res/res/layout/time_picker_legacy_material.xml b/core/res/res/layout/time_picker_legacy_material.xml index c6b7d3a70d97..ee56266390f1 100644 --- a/core/res/res/layout/time_picker_legacy_material.xml +++ b/core/res/res/layout/time_picker_legacy_material.xml @@ -40,8 +40,8 @@ android:id="@+id/hour" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="16dip" - android:layout_marginBottom="16dip" + android:layout_marginTop="@dimen/picker_top_margin" + android:layout_marginBottom="@dimen/picker_bottom_margin" android:focusable="true" android:focusableInTouchMode="true" /> @@ -62,8 +62,8 @@ android:id="@+id/minute" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="16dip" - android:layout_marginBottom="16dip" + android:layout_marginTop="@dimen/picker_top_margin" + android:layout_marginBottom="@dimen/picker_bottom_margin" android:focusable="true" android:focusableInTouchMode="true" /> @@ -75,8 +75,8 @@ android:id="@+id/amPm" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="16dip" - android:layout_marginBottom="16dip" + android:layout_marginTop="@dimen/picker_top_margin" + android:layout_marginBottom="@dimen/picker_bottom_margin" android:layout_marginStart="8dip" android:layout_marginEnd="8dip" android:focusable="true" diff --git a/core/res/res/values-af/strings.xml b/core/res/res/values-af/strings.xml index 923dea192ef2..ac59838a1394 100644 --- a/core/res/res/values-af/strings.xml +++ b/core/res/res/values-af/strings.xml @@ -678,6 +678,7 @@ <string name="lockscreen_pattern_correct" msgid="9039008650362261237">"Reg!"</string> <string name="lockscreen_pattern_wrong" msgid="4317955014948108794">"Probeer weer"</string> <string name="lockscreen_password_wrong" msgid="5737815393253165301">"Probeer weer"</string> + <string name="lockscreen_storage_locked" msgid="9167551160010625200">"Ontsluit vir alle kenmerke en data"</string> <string name="faceunlock_multiple_failures" msgid="754137583022792429">"Maksimum gesigontsluit-pogings oorskry"</string> <string name="lockscreen_missing_sim_message_short" msgid="5099439277819215399">"Geen SIM-kaart nie"</string> <string name="lockscreen_missing_sim_message" product="tablet" msgid="151659196095791474">"Geen SIM-kaart in tablet nie."</string> @@ -1022,7 +1023,8 @@ <string name="android_upgrading_title" msgid="1584192285441405746">"Android gradeer tans op..."</string> <string name="android_start_title" msgid="8418054686415318207">"Android begin tans …"</string> <string name="android_upgrading_fstrim" msgid="8036718871534640010">"Optimeer tans berging."</string> - <string name="android_upgrading_notification_title" msgid="1619393112444671028">"Android gradeer tans op"</string> + <!-- no translation found for android_upgrading_notification_title (8428357096969413169) --> + <skip /> <string name="android_upgrading_notification_body" msgid="5761201379457064286">"Sommige programme sal dalk nie behoorlik werk voordat die opgradering voltooi is nie"</string> <string name="app_upgrading_toast" msgid="3008139776215597053">"<xliff:g id="APPLICATION">%1$s</xliff:g> gradeer tans op …"</string> <string name="android_upgrading_apk" msgid="7904042682111526169">"Optimeer program <xliff:g id="NUMBER_0">%1$d</xliff:g> van <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string> diff --git a/core/res/res/values-am/strings.xml b/core/res/res/values-am/strings.xml index aca5cc5fa276..264c4adad9d3 100644 --- a/core/res/res/values-am/strings.xml +++ b/core/res/res/values-am/strings.xml @@ -678,6 +678,7 @@ <string name="lockscreen_pattern_correct" msgid="9039008650362261237">"ትክክል!"</string> <string name="lockscreen_pattern_wrong" msgid="4317955014948108794">"እንደገና ሞክር"</string> <string name="lockscreen_password_wrong" msgid="5737815393253165301">"እንደገና ሞክር"</string> + <string name="lockscreen_storage_locked" msgid="9167551160010625200">"ለሁሉም ባህሪያት እና ውሂብ ያስከፍቱ"</string> <string name="faceunlock_multiple_failures" msgid="754137583022792429">"የመጨረሻውን የገጽ ክፈት ሙከራዎችን አልፏል"</string> <string name="lockscreen_missing_sim_message_short" msgid="5099439277819215399">"ምንም ሲም ካርድ የለም"</string> <string name="lockscreen_missing_sim_message" product="tablet" msgid="151659196095791474">"በጡባዊ ውስጥ ምንም SIM ካርድ የለም።"</string> @@ -1022,7 +1023,8 @@ <string name="android_upgrading_title" msgid="1584192285441405746">"Android እያሻሻለ ነው..."</string> <string name="android_start_title" msgid="8418054686415318207">"Android በመጀመር ላይ ነው…"</string> <string name="android_upgrading_fstrim" msgid="8036718871534640010">"ማከማቻን በማመቻቸት ላይ።"</string> - <string name="android_upgrading_notification_title" msgid="1619393112444671028">"Android በማላቅ ላይ ነው"</string> + <!-- no translation found for android_upgrading_notification_title (8428357096969413169) --> + <skip /> <string name="android_upgrading_notification_body" msgid="5761201379457064286">"አንዳንድ መተግበሪያዎች ማላቁ እስኪጠናቀቅ ድረስ በአግባቡ ላይሰሩ ይችላሉ"</string> <string name="app_upgrading_toast" msgid="3008139776215597053">"<xliff:g id="APPLICATION">%1$s</xliff:g> በማላቅ ላይ…"</string> <string name="android_upgrading_apk" msgid="7904042682111526169">"መተግበሪያዎች በአግባቡ በመጠቀም ላይ <xliff:g id="NUMBER_0">%1$d</xliff:g> ከ <xliff:g id="NUMBER_1">%2$d</xliff:g> ፡፡"</string> diff --git a/core/res/res/values-ar/strings.xml b/core/res/res/values-ar/strings.xml index 2d8221f3eafe..28a3d1bf0595 100644 --- a/core/res/res/values-ar/strings.xml +++ b/core/res/res/values-ar/strings.xml @@ -690,6 +690,7 @@ <string name="lockscreen_pattern_correct" msgid="9039008650362261237">"صحيح!"</string> <string name="lockscreen_pattern_wrong" msgid="4317955014948108794">"أعد المحاولة"</string> <string name="lockscreen_password_wrong" msgid="5737815393253165301">"أعد المحاولة"</string> + <string name="lockscreen_storage_locked" msgid="9167551160010625200">"إلغاء قفل جميع الميزات والبيانات"</string> <string name="faceunlock_multiple_failures" msgid="754137583022792429">"تم تجاوز الحد الأقصى لعدد محاولات تأمين الجهاز بالوجه"</string> <string name="lockscreen_missing_sim_message_short" msgid="5099439277819215399">"ليست هناك شريحة SIM"</string> <string name="lockscreen_missing_sim_message" product="tablet" msgid="151659196095791474">"ليس هناك شريحة SIM في الجهاز اللوحي."</string> @@ -1114,7 +1115,8 @@ <string name="android_upgrading_title" msgid="1584192285441405746">"جارٍ ترقية Android..."</string> <string name="android_start_title" msgid="8418054686415318207">"جارٍ تشغيل Android…"</string> <string name="android_upgrading_fstrim" msgid="8036718871534640010">"جارٍ تحسين السعة التخزينية."</string> - <string name="android_upgrading_notification_title" msgid="1619393112444671028">"جارٍ ترقية Android"</string> + <!-- no translation found for android_upgrading_notification_title (8428357096969413169) --> + <skip /> <string name="android_upgrading_notification_body" msgid="5761201379457064286">"قد لا تعمل بعض التطبيقات بشكل مناسب إلا بعد انتهاء الترقية"</string> <string name="app_upgrading_toast" msgid="3008139776215597053">"جارٍ ترقية <xliff:g id="APPLICATION">%1$s</xliff:g>…"</string> <string name="android_upgrading_apk" msgid="7904042682111526169">"جارٍ تحسين التطبيق <xliff:g id="NUMBER_0">%1$d</xliff:g> من <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string> diff --git a/core/res/res/values-az-rAZ/strings.xml b/core/res/res/values-az-rAZ/strings.xml index f922c7fca438..1679dcc26140 100644 --- a/core/res/res/values-az-rAZ/strings.xml +++ b/core/res/res/values-az-rAZ/strings.xml @@ -678,6 +678,7 @@ <string name="lockscreen_pattern_correct" msgid="9039008650362261237">"Düzdür!"</string> <string name="lockscreen_pattern_wrong" msgid="4317955014948108794">"Bir də cəhd edin"</string> <string name="lockscreen_password_wrong" msgid="5737815393253165301">"Bir daha cəhd et"</string> + <string name="lockscreen_storage_locked" msgid="9167551160010625200">"Bütün funksiyalar və data üçün kiliddən çıxarın"</string> <string name="faceunlock_multiple_failures" msgid="754137583022792429">"Sifət kilidi cəhdləriniz bitdi"</string> <string name="lockscreen_missing_sim_message_short" msgid="5099439277819215399">"SIM kart yoxdur."</string> <string name="lockscreen_missing_sim_message" product="tablet" msgid="151659196095791474">"Planşetdə SIM kart yoxdur."</string> @@ -1022,7 +1023,8 @@ <string name="android_upgrading_title" msgid="1584192285441405746">"Android təkmilləşdirilir..."</string> <string name="android_start_title" msgid="8418054686415318207">"Android işə başlayır..."</string> <string name="android_upgrading_fstrim" msgid="8036718871534640010">"Yaddaş optimallaşdırılır."</string> - <string name="android_upgrading_notification_title" msgid="1619393112444671028">"Android təkmilləşdirilir"</string> + <!-- no translation found for android_upgrading_notification_title (8428357096969413169) --> + <skip /> <string name="android_upgrading_notification_body" msgid="5761201379457064286">"Güncəllənmə tamamlanana kimi bəzi tətbiqlər düzgün işləməyə bilər"</string> <string name="app_upgrading_toast" msgid="3008139776215597053">"<xliff:g id="APPLICATION">%1$s</xliff:g> təkmilləşdirilir…"</string> <string name="android_upgrading_apk" msgid="7904042682111526169">"<xliff:g id="NUMBER_1">%2$d</xliff:g> əddədən <xliff:g id="NUMBER_0">%1$d</xliff:g> tətbiq optimallaşır."</string> diff --git a/core/res/res/values-b+sr+Latn/strings.xml b/core/res/res/values-b+sr+Latn/strings.xml index 910886100c19..84f1fa6b158b 100644 --- a/core/res/res/values-b+sr+Latn/strings.xml +++ b/core/res/res/values-b+sr+Latn/strings.xml @@ -681,6 +681,7 @@ <string name="lockscreen_pattern_correct" msgid="9039008650362261237">"Tačno!"</string> <string name="lockscreen_pattern_wrong" msgid="4317955014948108794">"Pokušajte ponovo"</string> <string name="lockscreen_password_wrong" msgid="5737815393253165301">"Pokušajte ponovo"</string> + <string name="lockscreen_storage_locked" msgid="9167551160010625200">"Otključaj za sve funkcije i podatke"</string> <string name="faceunlock_multiple_failures" msgid="754137583022792429">"Premašen je najveći dozvoljeni broj pokušaja Otključavanja licem"</string> <string name="lockscreen_missing_sim_message_short" msgid="5099439277819215399">"Nema SIM kartice"</string> <string name="lockscreen_missing_sim_message" product="tablet" msgid="151659196095791474">"U tabletu nema SIM kartice."</string> @@ -1045,7 +1046,8 @@ <string name="android_upgrading_title" msgid="1584192285441405746">"Android se nadograđuje…"</string> <string name="android_start_title" msgid="8418054686415318207">"Android se pokreće…"</string> <string name="android_upgrading_fstrim" msgid="8036718871534640010">"Memorija se optimizuje."</string> - <string name="android_upgrading_notification_title" msgid="1619393112444671028">"Android se nadograđuje…"</string> + <!-- no translation found for android_upgrading_notification_title (8428357096969413169) --> + <skip /> <string name="android_upgrading_notification_body" msgid="5761201379457064286">"Neke aplikacije možda neće ispravno funkcionisati dok se nadogradnja ne dovrši"</string> <string name="app_upgrading_toast" msgid="3008139776215597053">"<xliff:g id="APPLICATION">%1$s</xliff:g> se nadograđuje…"</string> <string name="android_upgrading_apk" msgid="7904042682111526169">"Optimizovanje aplikacije <xliff:g id="NUMBER_0">%1$d</xliff:g> od <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string> diff --git a/core/res/res/values-be-rBY/strings.xml b/core/res/res/values-be-rBY/strings.xml index 99eee2366889..79b6a1dd14c8 100644 --- a/core/res/res/values-be-rBY/strings.xml +++ b/core/res/res/values-be-rBY/strings.xml @@ -684,6 +684,7 @@ <string name="lockscreen_pattern_correct" msgid="9039008650362261237">"Правільна!"</string> <string name="lockscreen_pattern_wrong" msgid="4317955014948108794">"Паспрабуйце яшчэ раз"</string> <string name="lockscreen_password_wrong" msgid="5737815393253165301">"Паўтарыце спробу"</string> + <string name="lockscreen_storage_locked" msgid="9167551160010625200">"Разблакіраваць для ўсіх функцый і даных"</string> <string name="faceunlock_multiple_failures" msgid="754137583022792429">"Перавышана максімальная колькасць спроб разблакоўкі праз Фэйскантроль"</string> <string name="lockscreen_missing_sim_message_short" msgid="5099439277819215399">"Няма SIM-карты"</string> <string name="lockscreen_missing_sim_message" product="tablet" msgid="151659196095791474">"Няма SIM-карты ў планшэце."</string> @@ -1068,7 +1069,8 @@ <string name="android_upgrading_title" msgid="1584192285441405746">"Абнаўленне Android..."</string> <string name="android_start_title" msgid="8418054686415318207">"Android запускаецца..."</string> <string name="android_upgrading_fstrim" msgid="8036718871534640010">"Аптымізацыя сховішча."</string> - <string name="android_upgrading_notification_title" msgid="1619393112444671028">"Абнаўленне Android"</string> + <!-- no translation found for android_upgrading_notification_title (8428357096969413169) --> + <skip /> <string name="android_upgrading_notification_body" msgid="5761201379457064286">"Пэўныя праграмы могуць не працаваць належным чынам, пакуль не скончыцца абнаўленне"</string> <string name="app_upgrading_toast" msgid="3008139776215597053">"<xliff:g id="APPLICATION">%1$s</xliff:g> абнаўляецца…"</string> <string name="android_upgrading_apk" msgid="7904042682111526169">"Аптымізацыя прыкладання <xliff:g id="NUMBER_0">%1$d</xliff:g> з <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string> diff --git a/core/res/res/values-bg/strings.xml b/core/res/res/values-bg/strings.xml index d80032016862..2f262de356d9 100644 --- a/core/res/res/values-bg/strings.xml +++ b/core/res/res/values-bg/strings.xml @@ -678,6 +678,7 @@ <string name="lockscreen_pattern_correct" msgid="9039008650362261237">"Правилно!"</string> <string name="lockscreen_pattern_wrong" msgid="4317955014948108794">"Опитайте отново"</string> <string name="lockscreen_password_wrong" msgid="5737815393253165301">"Опитайте отново"</string> + <string name="lockscreen_storage_locked" msgid="9167551160010625200">"Отключете за достъп до всички функции и данни"</string> <string name="faceunlock_multiple_failures" msgid="754137583022792429">"Максималният брой опити за отключване с лице е надвишен"</string> <string name="lockscreen_missing_sim_message_short" msgid="5099439277819215399">"Няма SIM карта"</string> <string name="lockscreen_missing_sim_message" product="tablet" msgid="151659196095791474">"В таблета няма SIM карта."</string> @@ -1022,7 +1023,8 @@ <string name="android_upgrading_title" msgid="1584192285441405746">"Android се надстройва..."</string> <string name="android_start_title" msgid="8418054686415318207">"Android се стартира…"</string> <string name="android_upgrading_fstrim" msgid="8036718871534640010">"Хранилището се оптимизира."</string> - <string name="android_upgrading_notification_title" msgid="1619393112444671028">"Android се надстройва"</string> + <!-- no translation found for android_upgrading_notification_title (8428357096969413169) --> + <skip /> <string name="android_upgrading_notification_body" msgid="5761201379457064286">"Някои приложения може да не работят правилно, докато надстройването не завърши"</string> <string name="app_upgrading_toast" msgid="3008139776215597053">"<xliff:g id="APPLICATION">%1$s</xliff:g> се надстройва…"</string> <string name="android_upgrading_apk" msgid="7904042682111526169">"Оптимизира се приложение <xliff:g id="NUMBER_0">%1$d</xliff:g> от <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string> diff --git a/core/res/res/values-bn-rBD/strings.xml b/core/res/res/values-bn-rBD/strings.xml index 79ea5864ef05..c41f4a7f9723 100644 --- a/core/res/res/values-bn-rBD/strings.xml +++ b/core/res/res/values-bn-rBD/strings.xml @@ -678,6 +678,7 @@ <string name="lockscreen_pattern_correct" msgid="9039008650362261237">"সঠিক!"</string> <string name="lockscreen_pattern_wrong" msgid="4317955014948108794">"আবার চেষ্টা করুন"</string> <string name="lockscreen_password_wrong" msgid="5737815393253165301">"আবার চেষ্টা করুন"</string> + <string name="lockscreen_storage_locked" msgid="9167551160010625200">"সমস্ত বৈশিষ্ট্য এবং ডেটার জন্য আনলক করুন"</string> <string name="faceunlock_multiple_failures" msgid="754137583022792429">"মুখের সাহায্যে আনলক করার প্রচেষ্টা যতবার করা যায় তার সীমা পেরিয়ে গেছে"</string> <string name="lockscreen_missing_sim_message_short" msgid="5099439277819215399">"কোনো সিম কার্ড নেই"</string> <string name="lockscreen_missing_sim_message" product="tablet" msgid="151659196095791474">"ট্যাবলেটের মধ্যে কোনো সিম কার্ড নেই৷"</string> @@ -1022,7 +1023,8 @@ <string name="android_upgrading_title" msgid="1584192285441405746">"Android আপগ্রেড করা হচ্ছে..."</string> <string name="android_start_title" msgid="8418054686415318207">"Android চালু হচ্ছে…"</string> <string name="android_upgrading_fstrim" msgid="8036718871534640010">"সঞ্চয়স্থান অপ্টিমাইজ করা হচ্ছে৷"</string> - <string name="android_upgrading_notification_title" msgid="1619393112444671028">"Android আপগ্রেড করা হচ্ছে"</string> + <!-- no translation found for android_upgrading_notification_title (8428357096969413169) --> + <skip /> <string name="android_upgrading_notification_body" msgid="5761201379457064286">"আপগ্রেড সম্পন্ন না হওয়া পর্যন্ত কিছু অ্যাপ্লিকেশান সঠিকভাবে কাজ নাও করতে পারে"</string> <string name="app_upgrading_toast" msgid="3008139776215597053">"<xliff:g id="APPLICATION">%1$s</xliff:g> আপগ্রেড করা হচ্ছে…"</string> <string name="android_upgrading_apk" msgid="7904042682111526169">"<xliff:g id="NUMBER_1">%2$d</xliff:g>টির মধ্যে <xliff:g id="NUMBER_0">%1$d</xliff:g>টি অ্যাপ্লিকেশান অপ্টিমাইজ করা হচ্ছে৷"</string> @@ -1069,8 +1071,8 @@ <item quantity="one">খোলা ওয়াই-ফাই নেটওয়ার্কগুলি উপলব্ধ রয়েছে</item> <item quantity="other">খোলা ওয়াই-ফাই নেটওয়ার্কগুলি উপলব্ধ রয়েছে</item> </plurals> - <string name="wifi_available_sign_in" msgid="9157196203958866662">"ওয়াই-ফাই নেটওয়ার্কে প্রবেশ করুন করুন"</string> - <string name="network_available_sign_in" msgid="1848877297365446605">"নেটওয়ার্কে প্রবেশ করুন করুন"</string> + <string name="wifi_available_sign_in" msgid="9157196203958866662">"ওয়াই-ফাই নেটওয়ার্কে প্রবেশ করুন"</string> + <string name="network_available_sign_in" msgid="1848877297365446605">"নেটওয়ার্কে প্রবেশ করুন"</string> <!-- no translation found for network_available_sign_in_detailed (8000081941447976118) --> <skip /> <string name="wifi_no_internet" msgid="8451173622563841546">"ওয়াই-ফাই -তে কোনো ইন্টারনেট অ্যাক্সেস নেই"</string> @@ -1400,7 +1402,7 @@ <string name="kg_login_instructions" msgid="1100551261265506448">"আনলক করতে আপনার Google অ্যাকাউন্টের মাধ্যমে প্রবেশ করুন করুন৷"</string> <string name="kg_login_username_hint" msgid="5718534272070920364">"ব্যবহারকারী নাম (ইমেল)"</string> <string name="kg_login_password_hint" msgid="9057289103827298549">"পাসওয়ার্ড"</string> - <string name="kg_login_submit_button" msgid="5355904582674054702">"প্রবেশ করুন করুন"</string> + <string name="kg_login_submit_button" msgid="5355904582674054702">"প্রবেশ করুন"</string> <string name="kg_login_invalid_input" msgid="5754664119319872197">"অবৈধ ব্যবহারকারী নাম অথবা পাসওয়ার্ড৷"</string> <string name="kg_login_account_recovery_hint" msgid="5690709132841752974">"আপনার ব্যবহারকারী নাম অথবা পাসওয়ার্ড ভুলে গেছেন?\n"<b>"google.com/accounts/recovery"</b>" এ যান৷"</string> <string name="kg_login_checking_password" msgid="1052685197710252395">"অ্যাকাউন্ট পরীক্ষা করা হচ্ছে..."</string> diff --git a/core/res/res/values-bs-rBA/strings.xml b/core/res/res/values-bs-rBA/strings.xml index 661548b70af4..b1cf0a598f70 100644 --- a/core/res/res/values-bs-rBA/strings.xml +++ b/core/res/res/values-bs-rBA/strings.xml @@ -681,6 +681,7 @@ <string name="lockscreen_pattern_correct" msgid="9039008650362261237">"Ispravno!"</string> <string name="lockscreen_pattern_wrong" msgid="4317955014948108794">"Pokušajte ponovo"</string> <string name="lockscreen_password_wrong" msgid="5737815393253165301">"Pokušajte ponovo"</string> + <string name="lockscreen_storage_locked" msgid="9167551160010625200">"Otključajte uređaj za sve funkcije i podatke"</string> <string name="faceunlock_multiple_failures" msgid="754137583022792429">"Premašen maksimalni broj pokušaja otključavanja licem"</string> <string name="lockscreen_missing_sim_message_short" msgid="5099439277819215399">"Nema SIM kartice"</string> <string name="lockscreen_missing_sim_message" product="tablet" msgid="151659196095791474">"Nema SIM kartice u tabletu."</string> @@ -1047,7 +1048,8 @@ <string name="android_upgrading_title" msgid="1584192285441405746">"Nadogradnja sistema Android u toku..."</string> <string name="android_start_title" msgid="8418054686415318207">"Android se pokreće..."</string> <string name="android_upgrading_fstrim" msgid="8036718871534640010">"Optimiziranje pohrane."</string> - <string name="android_upgrading_notification_title" msgid="1619393112444671028">"Android se nadograđuje"</string> + <!-- no translation found for android_upgrading_notification_title (8428357096969413169) --> + <skip /> <string name="android_upgrading_notification_body" msgid="5761201379457064286">"Neke aplikacije možda neće raditi ispravno dok traje nadogradnja"</string> <string name="app_upgrading_toast" msgid="3008139776215597053">"Aplikacija <xliff:g id="APPLICATION">%1$s</xliff:g> se nadograđuje…"</string> <string name="android_upgrading_apk" msgid="7904042682111526169">"Optimiziranje aplikacije <xliff:g id="NUMBER_0">%1$d</xliff:g> od <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string> diff --git a/core/res/res/values-ca/strings.xml b/core/res/res/values-ca/strings.xml index fffcc747d51a..bc555800f245 100644 --- a/core/res/res/values-ca/strings.xml +++ b/core/res/res/values-ca/strings.xml @@ -678,6 +678,7 @@ <string name="lockscreen_pattern_correct" msgid="9039008650362261237">"Correcte!"</string> <string name="lockscreen_pattern_wrong" msgid="4317955014948108794">"Torna-ho a provar"</string> <string name="lockscreen_password_wrong" msgid="5737815393253165301">"Torna-ho a provar"</string> + <string name="lockscreen_storage_locked" msgid="9167551160010625200">"Desbl. per accedir a totes les funcions i dades"</string> <string name="faceunlock_multiple_failures" msgid="754137583022792429">"S\'ha superat el nombre màxim d\'intents de desbloqueig facial"</string> <string name="lockscreen_missing_sim_message_short" msgid="5099439277819215399">"No hi ha cap targeta SIM."</string> <string name="lockscreen_missing_sim_message" product="tablet" msgid="151659196095791474">"No hi ha cap targeta SIM a la tauleta."</string> @@ -1022,7 +1023,8 @@ <string name="android_upgrading_title" msgid="1584192285441405746">"Android s\'està actualitzant..."</string> <string name="android_start_title" msgid="8418054686415318207">"S\'està iniciant Android…"</string> <string name="android_upgrading_fstrim" msgid="8036718871534640010">"S\'està optimitzant l\'emmagatzematge."</string> - <string name="android_upgrading_notification_title" msgid="1619393112444671028">"Android s\'està actualitzant"</string> + <!-- no translation found for android_upgrading_notification_title (8428357096969413169) --> + <skip /> <string name="android_upgrading_notification_body" msgid="5761201379457064286">"Pot ser que algunes aplicacions no funcionin correctament fins que no es completi l\'actualització"</string> <string name="app_upgrading_toast" msgid="3008139776215597053">"S\'està actualitzant <xliff:g id="APPLICATION">%1$s</xliff:g>…"</string> <string name="android_upgrading_apk" msgid="7904042682111526169">"S\'està optimitzant l\'aplicació <xliff:g id="NUMBER_0">%1$d</xliff:g> de <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string> diff --git a/core/res/res/values-cs/strings.xml b/core/res/res/values-cs/strings.xml index e7a7b60f269e..857d33d89566 100644 --- a/core/res/res/values-cs/strings.xml +++ b/core/res/res/values-cs/strings.xml @@ -684,6 +684,7 @@ <string name="lockscreen_pattern_correct" msgid="9039008650362261237">"Správně!"</string> <string name="lockscreen_pattern_wrong" msgid="4317955014948108794">"Zkusit znovu"</string> <string name="lockscreen_password_wrong" msgid="5737815393253165301">"Zkusit znovu"</string> + <string name="lockscreen_storage_locked" msgid="9167551160010625200">"Funkce a data jsou k dispozici po odemčení"</string> <string name="faceunlock_multiple_failures" msgid="754137583022792429">"Překročili jste maximální povolený počet pokusů o odemknutí obličejem."</string> <string name="lockscreen_missing_sim_message_short" msgid="5099439277819215399">"Není vložena SIM karta"</string> <string name="lockscreen_missing_sim_message" product="tablet" msgid="151659196095791474">"V tabletu není SIM karta."</string> @@ -1068,7 +1069,8 @@ <string name="android_upgrading_title" msgid="1584192285441405746">"Android se upgraduje..."</string> <string name="android_start_title" msgid="8418054686415318207">"Spouštění systému Android…"</string> <string name="android_upgrading_fstrim" msgid="8036718871534640010">"Probíhá optimalizace úložiště."</string> - <string name="android_upgrading_notification_title" msgid="1619393112444671028">"Android se upgraduje"</string> + <!-- no translation found for android_upgrading_notification_title (8428357096969413169) --> + <skip /> <string name="android_upgrading_notification_body" msgid="5761201379457064286">"Před dokončením upgradu nemusí některé aplikace fungovat správně"</string> <string name="app_upgrading_toast" msgid="3008139776215597053">"Aplikace <xliff:g id="APPLICATION">%1$s</xliff:g> se upgraduje…"</string> <string name="android_upgrading_apk" msgid="7904042682111526169">"Optimalizování aplikace <xliff:g id="NUMBER_0">%1$d</xliff:g> z <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string> diff --git a/core/res/res/values-da/strings.xml b/core/res/res/values-da/strings.xml index faa11be8ae13..49d5ac6c3dfc 100644 --- a/core/res/res/values-da/strings.xml +++ b/core/res/res/values-da/strings.xml @@ -245,7 +245,7 @@ <string name="permgrouplab_contacts" msgid="3657758145679177612">"Kontaktpersoner"</string> <string name="permgroupdesc_contacts" msgid="6951499528303668046">"have adgang til dine kontaktpersoner"</string> <string name="permgrouplab_location" msgid="7275582855722310164">"Placering"</string> - <string name="permgroupdesc_location" msgid="1346617465127855033">"få adgang til enhedens placering"</string> + <string name="permgroupdesc_location" msgid="1346617465127855033">"at få adgang til enhedens placering"</string> <string name="permgrouplab_calendar" msgid="5863508437783683902">"Kalender"</string> <string name="permgroupdesc_calendar" msgid="3889615280211184106">"have adgang til din kalender"</string> <string name="permgrouplab_sms" msgid="228308803364967808">"Sms"</string> @@ -678,6 +678,7 @@ <string name="lockscreen_pattern_correct" msgid="9039008650362261237">"Rigtigt!"</string> <string name="lockscreen_pattern_wrong" msgid="4317955014948108794">"Prøv igen"</string> <string name="lockscreen_password_wrong" msgid="5737815393253165301">"Prøv igen"</string> + <string name="lockscreen_storage_locked" msgid="9167551160010625200">"Lås op for at se alle funktioner og data"</string> <string name="faceunlock_multiple_failures" msgid="754137583022792429">"Det maksimale antal forsøg på at bruge Ansigtslås er overskredet"</string> <string name="lockscreen_missing_sim_message_short" msgid="5099439277819215399">"Intet SIM-kort"</string> <string name="lockscreen_missing_sim_message" product="tablet" msgid="151659196095791474">"Der er ikke noget SIM-kort i tabletcomputeren."</string> @@ -1022,7 +1023,8 @@ <string name="android_upgrading_title" msgid="1584192285441405746">"Android opgraderes..."</string> <string name="android_start_title" msgid="8418054686415318207">"Android starter..."</string> <string name="android_upgrading_fstrim" msgid="8036718871534640010">"Lageret optimeres."</string> - <string name="android_upgrading_notification_title" msgid="1619393112444671028">"Android opgraderes"</string> + <!-- no translation found for android_upgrading_notification_title (8428357096969413169) --> + <skip /> <string name="android_upgrading_notification_body" msgid="5761201379457064286">"Nogle apps fungerer muligvis ikke korrekt, før opgraderingen er gennemført"</string> <string name="app_upgrading_toast" msgid="3008139776215597053">"<xliff:g id="APPLICATION">%1$s</xliff:g> opgraderer…"</string> <string name="android_upgrading_apk" msgid="7904042682111526169">"Optimerer app <xliff:g id="NUMBER_0">%1$d</xliff:g> ud af <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string> diff --git a/core/res/res/values-de/strings.xml b/core/res/res/values-de/strings.xml index e98eda737838..4d3830b17fde 100644 --- a/core/res/res/values-de/strings.xml +++ b/core/res/res/values-de/strings.xml @@ -678,6 +678,7 @@ <string name="lockscreen_pattern_correct" msgid="9039008650362261237">"Korrekt!"</string> <string name="lockscreen_pattern_wrong" msgid="4317955014948108794">"Erneut versuchen"</string> <string name="lockscreen_password_wrong" msgid="5737815393253165301">"Erneut versuchen"</string> + <string name="lockscreen_storage_locked" msgid="9167551160010625200">"Entsperren, um alle Funktionen und Daten zu nutzen"</string> <string name="faceunlock_multiple_failures" msgid="754137583022792429">"Die maximal zulässige Anzahl an Face Unlock-Versuchen wurde überschritten."</string> <string name="lockscreen_missing_sim_message_short" msgid="5099439277819215399">"Keine SIM-Karte"</string> <string name="lockscreen_missing_sim_message" product="tablet" msgid="151659196095791474">"Keine SIM-Karte im Tablet"</string> @@ -1022,7 +1023,8 @@ <string name="android_upgrading_title" msgid="1584192285441405746">"Android wird aktualisiert..."</string> <string name="android_start_title" msgid="8418054686415318207">"Android wird gestartet…"</string> <string name="android_upgrading_fstrim" msgid="8036718871534640010">"Speicher wird optimiert"</string> - <string name="android_upgrading_notification_title" msgid="1619393112444671028">"Android wird aktualisiert"</string> + <!-- no translation found for android_upgrading_notification_title (8428357096969413169) --> + <skip /> <string name="android_upgrading_notification_body" msgid="5761201379457064286">"Einige Apps funktionieren unter Umständen nicht richtig, bis das Upgrade abgeschlossen ist"</string> <string name="app_upgrading_toast" msgid="3008139776215597053">"Für <xliff:g id="APPLICATION">%1$s</xliff:g> wird gerade ein Upgrade ausgeführt…"</string> <string name="android_upgrading_apk" msgid="7904042682111526169">"App <xliff:g id="NUMBER_0">%1$d</xliff:g> von <xliff:g id="NUMBER_1">%2$d</xliff:g> wird optimiert..."</string> @@ -1214,7 +1216,7 @@ <string name="deny" msgid="2081879885755434506">"Ablehnen"</string> <string name="permission_request_notification_title" msgid="6486759795926237907">"Berechtigung angefordert"</string> <string name="permission_request_notification_with_subtitle" msgid="8530393139639560189">"Berechtigung angefordert\nfür Konto <xliff:g id="ACCOUNT">%s</xliff:g>"</string> - <string name="forward_intent_to_owner" msgid="1207197447013960896">"Du verwendest diese App außerhalb deines Arbeitsprofils."</string> + <string name="forward_intent_to_owner" msgid="1207197447013960896">"Sie verwenden diese App außerhalb Ihres Arbeitsprofils"</string> <string name="forward_intent_to_work" msgid="621480743856004612">"Du verwendest diese App in deinem Arbeitsprofil."</string> <string name="input_method_binding_label" msgid="1283557179944992649">"Eingabemethode"</string> <string name="sync_binding_label" msgid="3687969138375092423">"Synchronisieren"</string> diff --git a/core/res/res/values-el/strings.xml b/core/res/res/values-el/strings.xml index 2ceaa7a5bd77..062fcbfd77e2 100644 --- a/core/res/res/values-el/strings.xml +++ b/core/res/res/values-el/strings.xml @@ -678,6 +678,7 @@ <string name="lockscreen_pattern_correct" msgid="9039008650362261237">"Σωστό!"</string> <string name="lockscreen_pattern_wrong" msgid="4317955014948108794">"Προσπαθήστε ξανά"</string> <string name="lockscreen_password_wrong" msgid="5737815393253165301">"Προσπαθήστε ξανά"</string> + <string name="lockscreen_storage_locked" msgid="9167551160010625200">"Ξεκλείδωμα για όλες τις λειτουργίες και δεδομένα"</string> <string name="faceunlock_multiple_failures" msgid="754137583022792429">"Έγινε υπέρβαση του μέγιστου αριθμού προσπαθειών Face Unlock"</string> <string name="lockscreen_missing_sim_message_short" msgid="5099439277819215399">"Δεν υπάρχει κάρτα SIM"</string> <string name="lockscreen_missing_sim_message" product="tablet" msgid="151659196095791474">"Δεν υπάρχει κάρτα SIM στο tablet."</string> @@ -1022,7 +1023,8 @@ <string name="android_upgrading_title" msgid="1584192285441405746">"Το Android αναβαθμίζεται..."</string> <string name="android_start_title" msgid="8418054686415318207">"Εκκίνηση Android…"</string> <string name="android_upgrading_fstrim" msgid="8036718871534640010">"Βελτιστοποίηση αποθηκευτικού χώρου."</string> - <string name="android_upgrading_notification_title" msgid="1619393112444671028">"Το Android αναβαθμίζεται"</string> + <!-- no translation found for android_upgrading_notification_title (8428357096969413169) --> + <skip /> <string name="android_upgrading_notification_body" msgid="5761201379457064286">"Ορισμένες εφαρμογές ενδέχεται να μην λειτουργούν σωστά μέχρι την ολοκλήρωση της αναβάθμισης"</string> <string name="app_upgrading_toast" msgid="3008139776215597053">"Η εφαρμογή <xliff:g id="APPLICATION">%1$s</xliff:g> αναβαθμίζεται…"</string> <string name="android_upgrading_apk" msgid="7904042682111526169">"Βελτιστοποίηση της εφαρμογής <xliff:g id="NUMBER_0">%1$d</xliff:g> από <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string> diff --git a/core/res/res/values-en-rAU/strings.xml b/core/res/res/values-en-rAU/strings.xml index 34952166758c..7bf185c5a0c1 100644 --- a/core/res/res/values-en-rAU/strings.xml +++ b/core/res/res/values-en-rAU/strings.xml @@ -678,6 +678,7 @@ <string name="lockscreen_pattern_correct" msgid="9039008650362261237">"Correct!"</string> <string name="lockscreen_pattern_wrong" msgid="4317955014948108794">"Try again"</string> <string name="lockscreen_password_wrong" msgid="5737815393253165301">"Try again"</string> + <string name="lockscreen_storage_locked" msgid="9167551160010625200">"Unlock for all features and data"</string> <string name="faceunlock_multiple_failures" msgid="754137583022792429">"Maximum Face Unlock attempts exceeded"</string> <string name="lockscreen_missing_sim_message_short" msgid="5099439277819215399">"No SIM card"</string> <string name="lockscreen_missing_sim_message" product="tablet" msgid="151659196095791474">"No SIM card in tablet."</string> @@ -1022,7 +1023,8 @@ <string name="android_upgrading_title" msgid="1584192285441405746">"Android is upgrading…"</string> <string name="android_start_title" msgid="8418054686415318207">"Android is starting…"</string> <string name="android_upgrading_fstrim" msgid="8036718871534640010">"Optimising storage."</string> - <string name="android_upgrading_notification_title" msgid="1619393112444671028">"Android is upgrading"</string> + <!-- no translation found for android_upgrading_notification_title (8428357096969413169) --> + <skip /> <string name="android_upgrading_notification_body" msgid="5761201379457064286">"Some apps may not work properly until the upgrade finishes"</string> <string name="app_upgrading_toast" msgid="3008139776215597053">"<xliff:g id="APPLICATION">%1$s</xliff:g> is upgrading…"</string> <string name="android_upgrading_apk" msgid="7904042682111526169">"Optimising app <xliff:g id="NUMBER_0">%1$d</xliff:g> of <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string> diff --git a/core/res/res/values-en-rGB/strings.xml b/core/res/res/values-en-rGB/strings.xml index 34952166758c..7bf185c5a0c1 100644 --- a/core/res/res/values-en-rGB/strings.xml +++ b/core/res/res/values-en-rGB/strings.xml @@ -678,6 +678,7 @@ <string name="lockscreen_pattern_correct" msgid="9039008650362261237">"Correct!"</string> <string name="lockscreen_pattern_wrong" msgid="4317955014948108794">"Try again"</string> <string name="lockscreen_password_wrong" msgid="5737815393253165301">"Try again"</string> + <string name="lockscreen_storage_locked" msgid="9167551160010625200">"Unlock for all features and data"</string> <string name="faceunlock_multiple_failures" msgid="754137583022792429">"Maximum Face Unlock attempts exceeded"</string> <string name="lockscreen_missing_sim_message_short" msgid="5099439277819215399">"No SIM card"</string> <string name="lockscreen_missing_sim_message" product="tablet" msgid="151659196095791474">"No SIM card in tablet."</string> @@ -1022,7 +1023,8 @@ <string name="android_upgrading_title" msgid="1584192285441405746">"Android is upgrading…"</string> <string name="android_start_title" msgid="8418054686415318207">"Android is starting…"</string> <string name="android_upgrading_fstrim" msgid="8036718871534640010">"Optimising storage."</string> - <string name="android_upgrading_notification_title" msgid="1619393112444671028">"Android is upgrading"</string> + <!-- no translation found for android_upgrading_notification_title (8428357096969413169) --> + <skip /> <string name="android_upgrading_notification_body" msgid="5761201379457064286">"Some apps may not work properly until the upgrade finishes"</string> <string name="app_upgrading_toast" msgid="3008139776215597053">"<xliff:g id="APPLICATION">%1$s</xliff:g> is upgrading…"</string> <string name="android_upgrading_apk" msgid="7904042682111526169">"Optimising app <xliff:g id="NUMBER_0">%1$d</xliff:g> of <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string> diff --git a/core/res/res/values-en-rIN/strings.xml b/core/res/res/values-en-rIN/strings.xml index 34952166758c..7bf185c5a0c1 100644 --- a/core/res/res/values-en-rIN/strings.xml +++ b/core/res/res/values-en-rIN/strings.xml @@ -678,6 +678,7 @@ <string name="lockscreen_pattern_correct" msgid="9039008650362261237">"Correct!"</string> <string name="lockscreen_pattern_wrong" msgid="4317955014948108794">"Try again"</string> <string name="lockscreen_password_wrong" msgid="5737815393253165301">"Try again"</string> + <string name="lockscreen_storage_locked" msgid="9167551160010625200">"Unlock for all features and data"</string> <string name="faceunlock_multiple_failures" msgid="754137583022792429">"Maximum Face Unlock attempts exceeded"</string> <string name="lockscreen_missing_sim_message_short" msgid="5099439277819215399">"No SIM card"</string> <string name="lockscreen_missing_sim_message" product="tablet" msgid="151659196095791474">"No SIM card in tablet."</string> @@ -1022,7 +1023,8 @@ <string name="android_upgrading_title" msgid="1584192285441405746">"Android is upgrading…"</string> <string name="android_start_title" msgid="8418054686415318207">"Android is starting…"</string> <string name="android_upgrading_fstrim" msgid="8036718871534640010">"Optimising storage."</string> - <string name="android_upgrading_notification_title" msgid="1619393112444671028">"Android is upgrading"</string> + <!-- no translation found for android_upgrading_notification_title (8428357096969413169) --> + <skip /> <string name="android_upgrading_notification_body" msgid="5761201379457064286">"Some apps may not work properly until the upgrade finishes"</string> <string name="app_upgrading_toast" msgid="3008139776215597053">"<xliff:g id="APPLICATION">%1$s</xliff:g> is upgrading…"</string> <string name="android_upgrading_apk" msgid="7904042682111526169">"Optimising app <xliff:g id="NUMBER_0">%1$d</xliff:g> of <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string> diff --git a/core/res/res/values-es-rUS/strings.xml b/core/res/res/values-es-rUS/strings.xml index 0e59e050d04c..425ce3531399 100644 --- a/core/res/res/values-es-rUS/strings.xml +++ b/core/res/res/values-es-rUS/strings.xml @@ -678,6 +678,7 @@ <string name="lockscreen_pattern_correct" msgid="9039008650362261237">"Correcto"</string> <string name="lockscreen_pattern_wrong" msgid="4317955014948108794">"Vuelve a intentarlo."</string> <string name="lockscreen_password_wrong" msgid="5737815393253165301">"Volver a intentarlo"</string> + <string name="lockscreen_storage_locked" msgid="9167551160010625200">"Desbloquea para acceder a funciones y datos"</string> <string name="faceunlock_multiple_failures" msgid="754137583022792429">"Se superó el máximo de intentos permitido para el desbloqueo facial del dispositivo."</string> <string name="lockscreen_missing_sim_message_short" msgid="5099439277819215399">"Sin tarjeta SIM"</string> <string name="lockscreen_missing_sim_message" product="tablet" msgid="151659196095791474">"No hay tarjeta SIM en el tablet."</string> @@ -1022,7 +1023,8 @@ <string name="android_upgrading_title" msgid="1584192285441405746">"Android se está actualizando..."</string> <string name="android_start_title" msgid="8418054686415318207">"Iniciando Android…"</string> <string name="android_upgrading_fstrim" msgid="8036718871534640010">"Optimizando almacenamiento"</string> - <string name="android_upgrading_notification_title" msgid="1619393112444671028">"Android se está actualizando"</string> + <!-- no translation found for android_upgrading_notification_title (8428357096969413169) --> + <skip /> <string name="android_upgrading_notification_body" msgid="5761201379457064286">"Es posible que algunas apps no funcionen correctamente hasta que termine la actualización"</string> <string name="app_upgrading_toast" msgid="3008139776215597053">"Se está actualizando <xliff:g id="APPLICATION">%1$s</xliff:g>…"</string> <string name="android_upgrading_apk" msgid="7904042682111526169">"Optimizando la aplicación <xliff:g id="NUMBER_0">%1$d</xliff:g> de <xliff:g id="NUMBER_1">%2$d</xliff:g>"</string> diff --git a/core/res/res/values-es/strings.xml b/core/res/res/values-es/strings.xml index 946a23a668b9..395684266e6f 100644 --- a/core/res/res/values-es/strings.xml +++ b/core/res/res/values-es/strings.xml @@ -678,6 +678,7 @@ <string name="lockscreen_pattern_correct" msgid="9039008650362261237">"Correcto"</string> <string name="lockscreen_pattern_wrong" msgid="4317955014948108794">"Vuelve a intentarlo"</string> <string name="lockscreen_password_wrong" msgid="5737815393253165301">"Vuelve a intentarlo"</string> + <string name="lockscreen_storage_locked" msgid="9167551160010625200">"Desbloquear para todos los datos y funciones"</string> <string name="faceunlock_multiple_failures" msgid="754137583022792429">"Se ha superado el número máximo de intentos de desbloqueo facial."</string> <string name="lockscreen_missing_sim_message_short" msgid="5099439277819215399">"Falta la tarjeta SIM."</string> <string name="lockscreen_missing_sim_message" product="tablet" msgid="151659196095791474">"No se ha insertado ninguna tarjeta SIM en el tablet."</string> @@ -1022,7 +1023,8 @@ <string name="android_upgrading_title" msgid="1584192285441405746">"Actualizando Android"</string> <string name="android_start_title" msgid="8418054686415318207">"Android se está iniciando…"</string> <string name="android_upgrading_fstrim" msgid="8036718871534640010">"Optimizando almacenamiento."</string> - <string name="android_upgrading_notification_title" msgid="1619393112444671028">"Actualizando Android"</string> + <!-- no translation found for android_upgrading_notification_title (8428357096969413169) --> + <skip /> <string name="android_upgrading_notification_body" msgid="5761201379457064286">"Es posible que algunas aplicaciones no funcionen correctamente hasta que finalice la actualización"</string> <string name="app_upgrading_toast" msgid="3008139776215597053">"<xliff:g id="APPLICATION">%1$s</xliff:g> se está actualizando…"</string> <string name="android_upgrading_apk" msgid="7904042682111526169">"Optimizando aplicación <xliff:g id="NUMBER_0">%1$d</xliff:g> de <xliff:g id="NUMBER_1">%2$d</xliff:g>..."</string> diff --git a/core/res/res/values-et-rEE/strings.xml b/core/res/res/values-et-rEE/strings.xml index aa1a25216c4d..388edd897f36 100644 --- a/core/res/res/values-et-rEE/strings.xml +++ b/core/res/res/values-et-rEE/strings.xml @@ -678,6 +678,7 @@ <string name="lockscreen_pattern_correct" msgid="9039008650362261237">"Õige."</string> <string name="lockscreen_pattern_wrong" msgid="4317955014948108794">"Proovige uuesti"</string> <string name="lockscreen_password_wrong" msgid="5737815393253165301">"Proovige uuesti"</string> + <string name="lockscreen_storage_locked" msgid="9167551160010625200">"Ava kõigi funktsioonide ja andmete nägemiseks"</string> <string name="faceunlock_multiple_failures" msgid="754137583022792429">"Maksimaalne teenusega Face Unlock avamise katsete arv on ületatud"</string> <string name="lockscreen_missing_sim_message_short" msgid="5099439277819215399">"SIM-kaarti pole"</string> <string name="lockscreen_missing_sim_message" product="tablet" msgid="151659196095791474">"Tahvelarvutis pole SIM-kaarti."</string> @@ -1022,7 +1023,8 @@ <string name="android_upgrading_title" msgid="1584192285441405746">"Android viiakse üle uuemale versioonile ..."</string> <string name="android_start_title" msgid="8418054686415318207">"Android käivitub ..."</string> <string name="android_upgrading_fstrim" msgid="8036718871534640010">"Salvestusruumi optimeerimine."</string> - <string name="android_upgrading_notification_title" msgid="1619393112444671028">"Android viiakse üle uuemale versioonile"</string> + <!-- no translation found for android_upgrading_notification_title (8428357096969413169) --> + <skip /> <string name="android_upgrading_notification_body" msgid="5761201379457064286">"Mõned rakendused ei pruugi enne uuemale versioonile ülemineku lõpetamist korralikult töötada"</string> <string name="app_upgrading_toast" msgid="3008139776215597053">"Rakenduse <xliff:g id="APPLICATION">%1$s</xliff:g> versiooni uuendatakse …"</string> <string name="android_upgrading_apk" msgid="7904042682111526169">"<xliff:g id="NUMBER_0">%1$d</xliff:g>. rakenduse <xliff:g id="NUMBER_1">%2$d</xliff:g>-st optimeerimine."</string> diff --git a/core/res/res/values-eu-rES/strings.xml b/core/res/res/values-eu-rES/strings.xml index cf3cdf7810ec..9d82e8d40e09 100644 --- a/core/res/res/values-eu-rES/strings.xml +++ b/core/res/res/values-eu-rES/strings.xml @@ -439,7 +439,7 @@ <string name="fingerprint_acquired_partial" msgid="735082772341716043">"Hatz-marka digitala ez da osorik hauteman. Saiatu berriro."</string> <string name="fingerprint_acquired_insufficient" msgid="4596546021310923214">"Ezin izan da hatza-marka prozesatu. Saiatu berriro."</string> <string name="fingerprint_acquired_imager_dirty" msgid="1087209702421076105">"Hatz-marka digitalen sentsorea zikina dago. Garbi ezazu, eta saiatu berriro."</string> - <string name="fingerprint_acquired_too_fast" msgid="6470642383109155969">"Hatza bizkorregi mugitu duzu. Saiatu berriro."</string> + <string name="fingerprint_acquired_too_fast" msgid="6470642383109155969">"Hatza azkarregi mugitu duzu. Saiatu berriro."</string> <string name="fingerprint_acquired_too_slow" msgid="59250885689661653">"Mantsoegi mugitu duzu hatza. Saiatu berriro."</string> <string-array name="fingerprint_acquired_vendor"> </string-array> @@ -678,6 +678,7 @@ <string name="lockscreen_pattern_correct" msgid="9039008650362261237">"Eredua zuzena da!"</string> <string name="lockscreen_pattern_wrong" msgid="4317955014948108794">"Saiatu berriro"</string> <string name="lockscreen_password_wrong" msgid="5737815393253165301">"Saiatu berriro"</string> + <string name="lockscreen_storage_locked" msgid="9167551160010625200">"Desblokeatu eginbide eta datu guztiak erabiltzeko"</string> <string name="faceunlock_multiple_failures" msgid="754137583022792429">"Aurpegiaren bidez desblokeatzeko saiakera muga gainditu da"</string> <string name="lockscreen_missing_sim_message_short" msgid="5099439277819215399">"Ez dago SIM txartelik"</string> <string name="lockscreen_missing_sim_message" product="tablet" msgid="151659196095791474">"Ez dago SIM txartelik tabletan."</string> @@ -1022,7 +1023,8 @@ <string name="android_upgrading_title" msgid="1584192285441405746">"Android bertsio-berritzen ari da…"</string> <string name="android_start_title" msgid="8418054686415318207">"Android abiarazten ari da…"</string> <string name="android_upgrading_fstrim" msgid="8036718871534640010">"Memoria optimizatzen."</string> - <string name="android_upgrading_notification_title" msgid="1619393112444671028">"Android bertsioa berritzen ari gara"</string> + <!-- no translation found for android_upgrading_notification_title (8428357096969413169) --> + <skip /> <string name="android_upgrading_notification_body" msgid="5761201379457064286">"Aplikazio batzuek agian ez dute behar bezala funtzionatuko bertsioa berritzen amaitu arte"</string> <string name="app_upgrading_toast" msgid="3008139776215597053">"<xliff:g id="APPLICATION">%1$s</xliff:g> bertsio-berritzen ari da…"</string> <string name="android_upgrading_apk" msgid="7904042682111526169">"<xliff:g id="NUMBER_0">%1$d</xliff:g>/<xliff:g id="NUMBER_1">%2$d</xliff:g> aplikazio optimizatzen."</string> diff --git a/core/res/res/values-fa/strings.xml b/core/res/res/values-fa/strings.xml index 638b49e0d4e7..edabde3a6c23 100644 --- a/core/res/res/values-fa/strings.xml +++ b/core/res/res/values-fa/strings.xml @@ -127,7 +127,7 @@ <item msgid="2254967670088539682">"برای برقراری تماس و ارسال پیام از طریق Wi-Fi، ابتدا از شرکت مخابراتیتان درخواست کنید این سرویس را راهاندازی کند. سپس دوباره از تنظیمات، تماس Wi-Fi را روشن کنید."</item> </string-array> <string-array name="wfcOperatorErrorNotificationMessages"> - <item msgid="6177300162212449033">"ثبت نام با شرکت مخابراتی شما"</item> + <item msgid="6177300162212449033">"ثبتنام با شرکت مخابراتی شما"</item> </string-array> <string-array name="wfcSpnFormats"> <item msgid="6830082633573257149">"%s"</item> @@ -678,6 +678,7 @@ <string name="lockscreen_pattern_correct" msgid="9039008650362261237">"صحیح است!"</string> <string name="lockscreen_pattern_wrong" msgid="4317955014948108794">"دوباره امتحان کنید"</string> <string name="lockscreen_password_wrong" msgid="5737815393253165301">"دوباره امتحان کنید"</string> + <string name="lockscreen_storage_locked" msgid="9167551160010625200">"باز کردن قفل تمام قابلیتها و دادهها"</string> <string name="faceunlock_multiple_failures" msgid="754137583022792429">"دفعات تلاش برای Face Unlock از حداکثر مجاز بیشتر شد"</string> <string name="lockscreen_missing_sim_message_short" msgid="5099439277819215399">"سیم کارت موجود نیست"</string> <string name="lockscreen_missing_sim_message" product="tablet" msgid="151659196095791474">"سیم کارت درون رایانهٔ لوحی نیست."</string> @@ -1022,7 +1023,8 @@ <string name="android_upgrading_title" msgid="1584192285441405746">"Android در حال ارتقا است..."</string> <string name="android_start_title" msgid="8418054686415318207">"Android در حال راهاندازی است..."</string> <string name="android_upgrading_fstrim" msgid="8036718871534640010">"بهینهسازی فضای ذخیرهسازی."</string> - <string name="android_upgrading_notification_title" msgid="1619393112444671028">"Android درحال ارتقا است"</string> + <!-- no translation found for android_upgrading_notification_title (8428357096969413169) --> + <skip /> <string name="android_upgrading_notification_body" msgid="5761201379457064286">"تا پایان ارتقا، ممکن است برخی از برنامهها بهدرستی کار نکنند."</string> <string name="app_upgrading_toast" msgid="3008139776215597053">"<xliff:g id="APPLICATION">%1$s</xliff:g> درحال ارتقا است...."</string> <string name="android_upgrading_apk" msgid="7904042682111526169">"در حال بهینهسازی برنامهٔ <xliff:g id="NUMBER_0">%1$d</xliff:g> از <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string> @@ -1511,8 +1513,8 @@ <string name="mediasize_japanese_kahu" msgid="6872696027560065173">"Kahu"</string> <string name="mediasize_japanese_kaku2" msgid="2359077233775455405">"Kaku2"</string> <string name="mediasize_japanese_you4" msgid="2091777168747058008">"You4"</string> - <string name="mediasize_unknown_portrait" msgid="3088043641616409762">"عمودی ناشناخته"</string> - <string name="mediasize_unknown_landscape" msgid="4876995327029361552">"افقی ناشناخته"</string> + <string name="mediasize_unknown_portrait" msgid="3088043641616409762">"عمودی ناشناس"</string> + <string name="mediasize_unknown_landscape" msgid="4876995327029361552">"افقی ناشناس"</string> <string name="write_fail_reason_cancelled" msgid="7091258378121627624">"لغو شد"</string> <string name="write_fail_reason_cannot_write" msgid="8132505417935337724">"خطا هنگام نوشتن محتوا"</string> <string name="reason_unknown" msgid="6048913880184628119">"نامعلوم"</string> diff --git a/core/res/res/values-fi/strings.xml b/core/res/res/values-fi/strings.xml index 75d44f5d3bc2..054f5c4ce4c8 100644 --- a/core/res/res/values-fi/strings.xml +++ b/core/res/res/values-fi/strings.xml @@ -678,6 +678,7 @@ <string name="lockscreen_pattern_correct" msgid="9039008650362261237">"Oikein!"</string> <string name="lockscreen_pattern_wrong" msgid="4317955014948108794">"Yritä uudelleen"</string> <string name="lockscreen_password_wrong" msgid="5737815393253165301">"Yritä uudelleen"</string> + <string name="lockscreen_storage_locked" msgid="9167551160010625200">"Käytä kaikkia ominaisuuksia avaamalla lukitus."</string> <string name="faceunlock_multiple_failures" msgid="754137583022792429">"Face Unlock -yrityksiä tehty suurin sallittu määrä."</string> <string name="lockscreen_missing_sim_message_short" msgid="5099439277819215399">"Ei SIM-korttia"</string> <string name="lockscreen_missing_sim_message" product="tablet" msgid="151659196095791474">"Tablet-laitteessa ei ole SIM-korttia."</string> @@ -1022,7 +1023,8 @@ <string name="android_upgrading_title" msgid="1584192285441405746">"Androidia päivitetään…"</string> <string name="android_start_title" msgid="8418054686415318207">"Android käynnistyy…"</string> <string name="android_upgrading_fstrim" msgid="8036718871534640010">"Optimoidaan tallennustilaa."</string> - <string name="android_upgrading_notification_title" msgid="1619393112444671028">"Androidia päivitetään"</string> + <!-- no translation found for android_upgrading_notification_title (8428357096969413169) --> + <skip /> <string name="android_upgrading_notification_body" msgid="5761201379457064286">"Kaikki sovellukset eivät ehkä toimi oikein, ennen kuin päivitys on valmis."</string> <string name="app_upgrading_toast" msgid="3008139776215597053">"<xliff:g id="APPLICATION">%1$s</xliff:g> päivittyy…"</string> <string name="android_upgrading_apk" msgid="7904042682111526169">"Optimoidaan sovellusta <xliff:g id="NUMBER_0">%1$d</xliff:g>/<xliff:g id="NUMBER_1">%2$d</xliff:g>."</string> diff --git a/core/res/res/values-fr-rCA/strings.xml b/core/res/res/values-fr-rCA/strings.xml index 5d4210ac2f7b..3d2ea6acd876 100644 --- a/core/res/res/values-fr-rCA/strings.xml +++ b/core/res/res/values-fr-rCA/strings.xml @@ -678,6 +678,7 @@ <string name="lockscreen_pattern_correct" msgid="9039008650362261237">"C\'est exact!"</string> <string name="lockscreen_pattern_wrong" msgid="4317955014948108794">"Réessayer"</string> <string name="lockscreen_password_wrong" msgid="5737815393253165301">"Réessayer"</string> + <string name="lockscreen_storage_locked" msgid="9167551160010625200">"Déverr. pour acc. aux autres fonction. et données"</string> <string name="faceunlock_multiple_failures" msgid="754137583022792429">"Nombre maximal autorisé de tentatives Face Unlock atteint."</string> <string name="lockscreen_missing_sim_message_short" msgid="5099439277819215399">"Aucune carte SIM"</string> <string name="lockscreen_missing_sim_message" product="tablet" msgid="151659196095791474">"Aucune carte SIM n\'est insérée dans la tablette."</string> @@ -1022,7 +1023,8 @@ <string name="android_upgrading_title" msgid="1584192285441405746">"Mise à jour d\'Android…"</string> <string name="android_start_title" msgid="8418054686415318207">"Android en cours de démarrage..."</string> <string name="android_upgrading_fstrim" msgid="8036718871534640010">"Optimisation du stockage."</string> - <string name="android_upgrading_notification_title" msgid="1619393112444671028">"Installation de la m. à niveau d\'Android"</string> + <!-- no translation found for android_upgrading_notification_title (8428357096969413169) --> + <skip /> <string name="android_upgrading_notification_body" msgid="5761201379457064286">"Il se peut que certaines applications ne fonctionnent pas correctement jusqu\'à ce que la mise à niveau soit terminée"</string> <string name="app_upgrading_toast" msgid="3008139776215597053">"Mise à niveau de <xliff:g id="APPLICATION">%1$s</xliff:g> en cours…"</string> <string name="android_upgrading_apk" msgid="7904042682111526169">"Optimisation de l\'application <xliff:g id="NUMBER_0">%1$d</xliff:g> sur <xliff:g id="NUMBER_1">%2$d</xliff:g>…"</string> diff --git a/core/res/res/values-fr/strings.xml b/core/res/res/values-fr/strings.xml index bbe2223f418e..29dcc576d078 100644 --- a/core/res/res/values-fr/strings.xml +++ b/core/res/res/values-fr/strings.xml @@ -678,6 +678,7 @@ <string name="lockscreen_pattern_correct" msgid="9039008650362261237">"Combinaison correcte !"</string> <string name="lockscreen_pattern_wrong" msgid="4317955014948108794">"Veuillez réessayer."</string> <string name="lockscreen_password_wrong" msgid="5737815393253165301">"Veuillez réessayer."</string> + <string name="lockscreen_storage_locked" msgid="9167551160010625200">"Déverr. pour autres fonctionnalités et données"</string> <string name="faceunlock_multiple_failures" msgid="754137583022792429">"Nombre maximal autorisé de tentatives Face Unlock atteint."</string> <string name="lockscreen_missing_sim_message_short" msgid="5099439277819215399">"Pas de carte SIM"</string> <string name="lockscreen_missing_sim_message" product="tablet" msgid="151659196095791474">"Aucune carte SIM n\'est insérée dans la tablette."</string> @@ -1022,7 +1023,8 @@ <string name="android_upgrading_title" msgid="1584192285441405746">"Mise à jour d\'Android…"</string> <string name="android_start_title" msgid="8418054686415318207">"Démarrage d\'Android en cours"</string> <string name="android_upgrading_fstrim" msgid="8036718871534640010">"Optimisation du stockage en cours…"</string> - <string name="android_upgrading_notification_title" msgid="1619393112444671028">"Mise à jour d\'Android…"</string> + <!-- no translation found for android_upgrading_notification_title (8428357096969413169) --> + <skip /> <string name="android_upgrading_notification_body" msgid="5761201379457064286">"Certaines applications peuvent ne pas fonctionner correctement jusqu\'à ce que la mise à jour soit terminée."</string> <string name="app_upgrading_toast" msgid="3008139776215597053">"Mise à jour de l\'application <xliff:g id="APPLICATION">%1$s</xliff:g>…"</string> <string name="android_upgrading_apk" msgid="7904042682111526169">"Optimisation de l\'application <xliff:g id="NUMBER_0">%1$d</xliff:g> sur <xliff:g id="NUMBER_1">%2$d</xliff:g>…"</string> diff --git a/core/res/res/values-gl-rES/strings.xml b/core/res/res/values-gl-rES/strings.xml index 5b5b3a32cfaf..6a28f592b1aa 100644 --- a/core/res/res/values-gl-rES/strings.xml +++ b/core/res/res/values-gl-rES/strings.xml @@ -249,7 +249,7 @@ <string name="permgrouplab_calendar" msgid="5863508437783683902">"Calendario"</string> <string name="permgroupdesc_calendar" msgid="3889615280211184106">"acceder ao teu calendario"</string> <string name="permgrouplab_sms" msgid="228308803364967808">"SMS"</string> - <string name="permgroupdesc_sms" msgid="4656988620100940350">"envíar e consultar mensaxes de SMS"</string> + <string name="permgroupdesc_sms" msgid="4656988620100940350">"enviar e consultar mensaxes de SMS"</string> <string name="permgrouplab_storage" msgid="1971118770546336966">"Almacenamento"</string> <string name="permgroupdesc_storage" msgid="637758554581589203">"acceder a fotos, contido multimedia e ficheiros no teu dispositivo"</string> <string name="permgrouplab_microphone" msgid="171539900250043464">"Micrófono"</string> @@ -259,7 +259,7 @@ <string name="permgrouplab_phone" msgid="5229115638567440675">"Teléfono"</string> <string name="permgroupdesc_phone" msgid="6234224354060641055">"facer e xestionar chamadas telefónicas"</string> <string name="permgrouplab_sensors" msgid="416037179223226722">"Sensores corporais"</string> - <string name="permgroupdesc_sensors" msgid="7147968539346634043">"accede aos datos do sensor sobre as túas constantes vitais"</string> + <string name="permgroupdesc_sensors" msgid="7147968539346634043">"acceder aos datos do sensor sobre as túas constantes vitais"</string> <string name="capability_title_canRetrieveWindowContent" msgid="3901717936930170320">"Recuperar contido da ventá"</string> <string name="capability_desc_canRetrieveWindowContent" msgid="3772225008605310672">"Inspecciona o contido dunha ventá coa que estás interactuando."</string> <string name="capability_title_canRequestTouchExploration" msgid="3108723364676667320">"Activar a exploración táctil"</string> @@ -678,6 +678,7 @@ <string name="lockscreen_pattern_correct" msgid="9039008650362261237">"Correcto!"</string> <string name="lockscreen_pattern_wrong" msgid="4317955014948108794">"Téntao de novo"</string> <string name="lockscreen_password_wrong" msgid="5737815393253165301">"Téntao de novo"</string> + <string name="lockscreen_storage_locked" msgid="9167551160010625200">"Desbloquea para gozar todas as funcións e datos"</string> <string name="faceunlock_multiple_failures" msgid="754137583022792429">"Superouse o número máximo de intentos de desbloqueo facial"</string> <string name="lockscreen_missing_sim_message_short" msgid="5099439277819215399">"Non hai ningunha tarxeta SIM"</string> <string name="lockscreen_missing_sim_message" product="tablet" msgid="151659196095791474">"Non hai ningunha tarxeta SIM na tableta."</string> @@ -1022,7 +1023,8 @@ <string name="android_upgrading_title" msgid="1584192285441405746">"Estase actualizando Android…"</string> <string name="android_start_title" msgid="8418054686415318207">"Estase iniciando Android…"</string> <string name="android_upgrading_fstrim" msgid="8036718871534640010">"Optimizando almacenamento."</string> - <string name="android_upgrading_notification_title" msgid="1619393112444671028">"Estase actualizando Android"</string> + <!-- no translation found for android_upgrading_notification_title (8428357096969413169) --> + <skip /> <string name="android_upgrading_notification_body" msgid="5761201379457064286">"É posible que algunhas aplicacións non funcionen correctamente ata que finalice o proceso de actualización"</string> <string name="app_upgrading_toast" msgid="3008139776215597053">"Actualizando <xliff:g id="APPLICATION">%1$s</xliff:g>…"</string> <string name="android_upgrading_apk" msgid="7904042682111526169">"Optimizando aplicación <xliff:g id="NUMBER_0">%1$d</xliff:g> de <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string> diff --git a/core/res/res/values-gu-rIN/strings.xml b/core/res/res/values-gu-rIN/strings.xml index 2982c857402d..31bbe4594718 100644 --- a/core/res/res/values-gu-rIN/strings.xml +++ b/core/res/res/values-gu-rIN/strings.xml @@ -678,6 +678,7 @@ <string name="lockscreen_pattern_correct" msgid="9039008650362261237">"સાચું!"</string> <string name="lockscreen_pattern_wrong" msgid="4317955014948108794">"ફરી પ્રયાસ કરો"</string> <string name="lockscreen_password_wrong" msgid="5737815393253165301">"ફરી પ્રયાસ કરો"</string> + <string name="lockscreen_storage_locked" msgid="9167551160010625200">"તમામ સુવિધાઓ અને ડેટા માટે અનલૉક કરો"</string> <string name="faceunlock_multiple_failures" msgid="754137583022792429">"મહત્તમ ફેસ અનલૉક પ્રયાસો ઓળંગાયા"</string> <string name="lockscreen_missing_sim_message_short" msgid="5099439277819215399">"કોઈ SIM કાર્ડ નથી"</string> <string name="lockscreen_missing_sim_message" product="tablet" msgid="151659196095791474">"ટેબ્લેટમાં SIM કાર્ડ નથી."</string> @@ -1022,7 +1023,8 @@ <string name="android_upgrading_title" msgid="1584192285441405746">"Android અપગ્રેડ થઈ રહ્યું છે..."</string> <string name="android_start_title" msgid="8418054686415318207">"Android પ્રારંભ થઈ રહ્યું છે…"</string> <string name="android_upgrading_fstrim" msgid="8036718871534640010">"સંગ્રહ ઓપ્ટિમાઇઝ કરી રહ્યું છે."</string> - <string name="android_upgrading_notification_title" msgid="1619393112444671028">"Android અપગ્રેડ થઈ રહ્યું છે"</string> + <!-- no translation found for android_upgrading_notification_title (8428357096969413169) --> + <skip /> <string name="android_upgrading_notification_body" msgid="5761201379457064286">"અપગ્રેડ સમાપ્ત ન થાય ત્યાં સુધી કેટલીક ઍપ્લિકેશનો કદાચ યોગ્ય રીતે કામ ન કરે"</string> <string name="app_upgrading_toast" msgid="3008139776215597053">"<xliff:g id="APPLICATION">%1$s</xliff:g> અપગ્રેડ થઈ રહી છે…"</string> <string name="android_upgrading_apk" msgid="7904042682111526169">"<xliff:g id="NUMBER_1">%2$d</xliff:g> માંથી <xliff:g id="NUMBER_0">%1$d</xliff:g> ઍપ્લિકેશન ઓપ્ટિમાઇઝ કરી રહ્યું છે."</string> diff --git a/core/res/res/values-hi/strings.xml b/core/res/res/values-hi/strings.xml index 722788042ae0..ab0a42f9eba5 100644 --- a/core/res/res/values-hi/strings.xml +++ b/core/res/res/values-hi/strings.xml @@ -678,6 +678,7 @@ <string name="lockscreen_pattern_correct" msgid="9039008650362261237">"सही!"</string> <string name="lockscreen_pattern_wrong" msgid="4317955014948108794">"फिर से प्रयास करें"</string> <string name="lockscreen_password_wrong" msgid="5737815393253165301">"फिर से प्रयास करें"</string> + <string name="lockscreen_storage_locked" msgid="9167551160010625200">"सभी सुविधाओं और डेटा के लिए अनलॉक करें"</string> <string name="faceunlock_multiple_failures" msgid="754137583022792429">"फेस अनलॉक के अधिकतम प्रयासों की सीमा पार हो गई"</string> <string name="lockscreen_missing_sim_message_short" msgid="5099439277819215399">"कोई सिम कार्ड नहीं है"</string> <string name="lockscreen_missing_sim_message" product="tablet" msgid="151659196095791474">"टेबलेट में कोई सिम कार्ड नहीं है."</string> @@ -1022,7 +1023,8 @@ <string name="android_upgrading_title" msgid="1584192285441405746">"Android अपग्रेड हो रहा है..."</string> <string name="android_start_title" msgid="8418054686415318207">"Android प्रारंभ हो रहा है…"</string> <string name="android_upgrading_fstrim" msgid="8036718871534640010">"मेमोरी ऑप्टिमाइज़ हो रही है."</string> - <string name="android_upgrading_notification_title" msgid="1619393112444671028">"Android अपग्रेड हो रहा है"</string> + <!-- no translation found for android_upgrading_notification_title (8428357096969413169) --> + <skip /> <string name="android_upgrading_notification_body" msgid="5761201379457064286">"जब तक अपग्रेड पूरा नहीं हो जाता, तब तक संभव है कि कुछ ऐप्लिकेशन ठीक से कार्य ना करें"</string> <string name="app_upgrading_toast" msgid="3008139776215597053">"<xliff:g id="APPLICATION">%1$s</xliff:g> अपग्रेड हो रहा है…"</string> <string name="android_upgrading_apk" msgid="7904042682111526169">"<xliff:g id="NUMBER_1">%2$d</xliff:g> में से <xliff:g id="NUMBER_0">%1$d</xliff:g> ऐप्स अनुकूलित हो रहा है."</string> diff --git a/core/res/res/values-hr/strings.xml b/core/res/res/values-hr/strings.xml index 71337e23b6df..0beaaea39123 100644 --- a/core/res/res/values-hr/strings.xml +++ b/core/res/res/values-hr/strings.xml @@ -681,6 +681,7 @@ <string name="lockscreen_pattern_correct" msgid="9039008650362261237">"Ispravno!"</string> <string name="lockscreen_pattern_wrong" msgid="4317955014948108794">"Pokušajte ponovo"</string> <string name="lockscreen_password_wrong" msgid="5737815393253165301">"Pokušajte ponovo"</string> + <string name="lockscreen_storage_locked" msgid="9167551160010625200">"Otključajte za sve značajke i podatke"</string> <string name="faceunlock_multiple_failures" msgid="754137583022792429">"Premašen je maksimalni broj Otključavanja licem"</string> <string name="lockscreen_missing_sim_message_short" msgid="5099439277819215399">"Nema SIM kartice"</string> <string name="lockscreen_missing_sim_message" product="tablet" msgid="151659196095791474">"U tabletnom uređaju nema SIM kartice."</string> @@ -1045,7 +1046,8 @@ <string name="android_upgrading_title" msgid="1584192285441405746">"Android se nadograđuje…"</string> <string name="android_start_title" msgid="8418054686415318207">"Pokretanje Androida..."</string> <string name="android_upgrading_fstrim" msgid="8036718871534640010">"Optimiziranje pohrane."</string> - <string name="android_upgrading_notification_title" msgid="1619393112444671028">"Android se nadograđuje"</string> + <!-- no translation found for android_upgrading_notification_title (8428357096969413169) --> + <skip /> <string name="android_upgrading_notification_body" msgid="5761201379457064286">"Neke aplikacije možda neće funkcionirati pravilno dok nadogradnja ne završi"</string> <string name="app_upgrading_toast" msgid="3008139776215597053">"Nadogradnja aplikacije <xliff:g id="APPLICATION">%1$s</xliff:g>…"</string> <string name="android_upgrading_apk" msgid="7904042682111526169">"Optimiziranje aplikacije <xliff:g id="NUMBER_0">%1$d</xliff:g> od <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string> diff --git a/core/res/res/values-hu/strings.xml b/core/res/res/values-hu/strings.xml index ce4bef5a5b84..c1c04ad1474a 100644 --- a/core/res/res/values-hu/strings.xml +++ b/core/res/res/values-hu/strings.xml @@ -678,6 +678,7 @@ <string name="lockscreen_pattern_correct" msgid="9039008650362261237">"Helyes!"</string> <string name="lockscreen_pattern_wrong" msgid="4317955014948108794">"Próbálja újra"</string> <string name="lockscreen_password_wrong" msgid="5737815393253165301">"Újra"</string> + <string name="lockscreen_storage_locked" msgid="9167551160010625200">"Oldja fel a funkciók és adatok eléréséhez"</string> <string name="faceunlock_multiple_failures" msgid="754137583022792429">"Elérte az arcalapú feloldási kísérletek maximális számát"</string> <string name="lockscreen_missing_sim_message_short" msgid="5099439277819215399">"Nincs SIM-kártya."</string> <string name="lockscreen_missing_sim_message" product="tablet" msgid="151659196095791474">"Nincs SIM-kártya a táblagépben."</string> @@ -1022,7 +1023,8 @@ <string name="android_upgrading_title" msgid="1584192285441405746">"Android frissítése folyamatban..."</string> <string name="android_start_title" msgid="8418054686415318207">"Az Android indítása…"</string> <string name="android_upgrading_fstrim" msgid="8036718871534640010">"Tárhely-optimalizálás."</string> - <string name="android_upgrading_notification_title" msgid="1619393112444671028">"Android frissítése folyamatban"</string> + <!-- no translation found for android_upgrading_notification_title (8428357096969413169) --> + <skip /> <string name="android_upgrading_notification_body" msgid="5761201379457064286">"A frissítés befejezéséig előfordulhat, hogy egyes alkalmazások nem megfelelően működnek."</string> <string name="app_upgrading_toast" msgid="3008139776215597053">"A(z) <xliff:g id="APPLICATION">%1$s</xliff:g> frissítése folyamatban van"</string> <string name="android_upgrading_apk" msgid="7904042682111526169">"Alkalmazás optimalizálása: <xliff:g id="NUMBER_0">%1$d</xliff:g>/<xliff:g id="NUMBER_1">%2$d</xliff:g>."</string> diff --git a/core/res/res/values-hy-rAM/strings.xml b/core/res/res/values-hy-rAM/strings.xml index 25a069d43be4..4f03608c79d6 100644 --- a/core/res/res/values-hy-rAM/strings.xml +++ b/core/res/res/values-hy-rAM/strings.xml @@ -678,6 +678,7 @@ <string name="lockscreen_pattern_correct" msgid="9039008650362261237">"Ճիշտ է:"</string> <string name="lockscreen_pattern_wrong" msgid="4317955014948108794">"Կրկին փորձեք"</string> <string name="lockscreen_password_wrong" msgid="5737815393253165301">"Կրկին փորձեք"</string> + <string name="lockscreen_storage_locked" msgid="9167551160010625200">"Ապակողպեք՝ բոլոր գործառույթներն ու տվյալներն օգտագործելու համար"</string> <string name="faceunlock_multiple_failures" msgid="754137583022792429">"Առավելագույն Դեմքով ապակողպման փորձերը գերազանցված են"</string> <string name="lockscreen_missing_sim_message_short" msgid="5099439277819215399">"SIM քարտ չկա"</string> <string name="lockscreen_missing_sim_message" product="tablet" msgid="151659196095791474">"Գրասալիկում SIM քարտ չկա:"</string> @@ -1022,7 +1023,8 @@ <string name="android_upgrading_title" msgid="1584192285441405746">"Android-ը նորացվում է..."</string> <string name="android_start_title" msgid="8418054686415318207">"Android-ը մեկնարկում է…"</string> <string name="android_upgrading_fstrim" msgid="8036718871534640010">"Պահեստի օպտիմալացում:"</string> - <string name="android_upgrading_notification_title" msgid="1619393112444671028">"Android-ը նորացվում է"</string> + <!-- no translation found for android_upgrading_notification_title (8428357096969413169) --> + <skip /> <string name="android_upgrading_notification_body" msgid="5761201379457064286">"Հնարավոր է՝ որոշ հավելվածներ մինչև նորացման ավարտը ճիշտ չաշխատեն"</string> <string name="app_upgrading_toast" msgid="3008139776215597053">"<xliff:g id="APPLICATION">%1$s</xliff:g> հավելվածը նորացվում է…"</string> <string name="android_upgrading_apk" msgid="7904042682111526169">"Օպտիմալացվում է հավելված <xliff:g id="NUMBER_0">%1$d</xliff:g>-ը <xliff:g id="NUMBER_1">%2$d</xliff:g>-ից:"</string> diff --git a/core/res/res/values-in/strings.xml b/core/res/res/values-in/strings.xml index 213d9b642cfa..c08a8e0e8070 100644 --- a/core/res/res/values-in/strings.xml +++ b/core/res/res/values-in/strings.xml @@ -678,6 +678,7 @@ <string name="lockscreen_pattern_correct" msgid="9039008650362261237">"Perbaiki!"</string> <string name="lockscreen_pattern_wrong" msgid="4317955014948108794">"Coba lagi"</string> <string name="lockscreen_password_wrong" msgid="5737815393253165301">"Coba lagi"</string> + <string name="lockscreen_storage_locked" msgid="9167551160010625200">"Membuka kunci untuk semua fitur dan data"</string> <string name="faceunlock_multiple_failures" msgid="754137583022792429">"Percobaan Face Unlock melebihi batas maksimum"</string> <string name="lockscreen_missing_sim_message_short" msgid="5099439277819215399">"Tidak ada kartu SIM"</string> <string name="lockscreen_missing_sim_message" product="tablet" msgid="151659196095791474">"Tidak ada kartu SIM dalam tablet."</string> @@ -1022,7 +1023,8 @@ <string name="android_upgrading_title" msgid="1584192285441405746">"Android sedang meningkatkan versi..."</string> <string name="android_start_title" msgid="8418054686415318207">"Memulai Android…"</string> <string name="android_upgrading_fstrim" msgid="8036718871534640010">"Mengoptimalkan penyimpanan."</string> - <string name="android_upgrading_notification_title" msgid="1619393112444671028">"Android sedang meningkatkan versi"</string> + <!-- no translation found for android_upgrading_notification_title (8428357096969413169) --> + <skip /> <string name="android_upgrading_notification_body" msgid="5761201379457064286">"Beberapa aplikasi mungkin tidak berfungsi dengan baik jika peningkatan versi belum selesai"</string> <string name="app_upgrading_toast" msgid="3008139776215597053">"<xliff:g id="APPLICATION">%1$s</xliff:g> sedang ditingkatkan versinya…"</string> <string name="android_upgrading_apk" msgid="7904042682111526169">"Mengoptimalkan aplikasi <xliff:g id="NUMBER_0">%1$d</xliff:g> dari <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string> diff --git a/core/res/res/values-is-rIS/strings.xml b/core/res/res/values-is-rIS/strings.xml index 20a5b170bb7c..55e14c49d09a 100644 --- a/core/res/res/values-is-rIS/strings.xml +++ b/core/res/res/values-is-rIS/strings.xml @@ -678,6 +678,7 @@ <string name="lockscreen_pattern_correct" msgid="9039008650362261237">"Rétt!"</string> <string name="lockscreen_pattern_wrong" msgid="4317955014948108794">"Reyndu aftur"</string> <string name="lockscreen_password_wrong" msgid="5737815393253165301">"Reyndu aftur"</string> + <string name="lockscreen_storage_locked" msgid="9167551160010625200">"Taktu úr lás til að sjá alla eiginleika og gögn"</string> <string name="faceunlock_multiple_failures" msgid="754137583022792429">"Hámarksfjölda tilrauna til að opna með andliti náð"</string> <string name="lockscreen_missing_sim_message_short" msgid="5099439277819215399">"Ekkert SIM-kort"</string> <string name="lockscreen_missing_sim_message" product="tablet" msgid="151659196095791474">"Ekkert SIM-kort í spjaldtölvunni."</string> @@ -1022,7 +1023,8 @@ <string name="android_upgrading_title" msgid="1584192285441405746">"Android er að uppfæra…"</string> <string name="android_start_title" msgid="8418054686415318207">"Android er að ræsast…"</string> <string name="android_upgrading_fstrim" msgid="8036718871534640010">"Fínstillir geymslu."</string> - <string name="android_upgrading_notification_title" msgid="1619393112444671028">"Android er að uppfæra"</string> + <!-- no translation found for android_upgrading_notification_title (8428357096969413169) --> + <skip /> <string name="android_upgrading_notification_body" msgid="5761201379457064286">"Hugsanlega virka sum forrit ekki fyrr en uppfærslunni lýkur"</string> <string name="app_upgrading_toast" msgid="3008139776215597053">"<xliff:g id="APPLICATION">%1$s</xliff:g> uppfærir…"</string> <string name="android_upgrading_apk" msgid="7904042682111526169">"Fínstillir forrit <xliff:g id="NUMBER_0">%1$d</xliff:g> af <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string> diff --git a/core/res/res/values-it/strings.xml b/core/res/res/values-it/strings.xml index d89bf1b81733..0fb42a86e4a9 100644 --- a/core/res/res/values-it/strings.xml +++ b/core/res/res/values-it/strings.xml @@ -310,7 +310,7 @@ <string name="permdesc_enableCarMode" msgid="4853187425751419467">"Consente all\'applicazione di abilitare la modalità automobile."</string> <string name="permlab_killBackgroundProcesses" msgid="3914026687420177202">"chiusura altre applicazioni"</string> <string name="permdesc_killBackgroundProcesses" msgid="4593353235959733119">"Consente all\'applicazione di terminare i processi in background di altre applicazioni. Ciò potrebbe causare l\'interruzione di altre applicazioni."</string> - <string name="permlab_systemAlertWindow" msgid="3543347980839518613">"posizionamento davanti ad altre app"</string> + <string name="permlab_systemAlertWindow" msgid="3543347980839518613">"visualizzazione sopra altre app"</string> <string name="permdesc_systemAlertWindow" msgid="8584678381972820118">"Consente all\'applicazione di spostarsi sopra ad altre applicazioni o parti dell\'interfaccia utente. Potrebbe interferire con il tuo utilizzo dell\'interfaccia in qualsiasi applicazione o cambiare ciò che credi di vedere in altre applicazioni."</string> <string name="permlab_persistentActivity" msgid="8841113627955563938">"esecuzione permanente delle applicazioni"</string> <string name="permdesc_persistentActivity" product="tablet" msgid="8525189272329086137">"Consente all\'applicazione di rendere persistenti in memoria alcune sue parti. Ciò può limitare la memoria disponibile per altre applicazioni, rallentando il tablet."</string> @@ -678,6 +678,7 @@ <string name="lockscreen_pattern_correct" msgid="9039008650362261237">"Corretta."</string> <string name="lockscreen_pattern_wrong" msgid="4317955014948108794">"Riprova"</string> <string name="lockscreen_password_wrong" msgid="5737815393253165301">"Riprova"</string> + <string name="lockscreen_storage_locked" msgid="9167551160010625200">"Sblocca per accedere a funzioni e dati"</string> <string name="faceunlock_multiple_failures" msgid="754137583022792429">"Numero massimo di tentativi di Sblocco col sorriso superato"</string> <string name="lockscreen_missing_sim_message_short" msgid="5099439277819215399">"Nessuna scheda SIM"</string> <string name="lockscreen_missing_sim_message" product="tablet" msgid="151659196095791474">"Nessuna scheda SIM presente nel tablet."</string> @@ -1022,7 +1023,8 @@ <string name="android_upgrading_title" msgid="1584192285441405746">"Aggiornamento di Android..."</string> <string name="android_start_title" msgid="8418054686415318207">"Avvio di Android…"</string> <string name="android_upgrading_fstrim" msgid="8036718871534640010">"Ottimizzazione archiviazione."</string> - <string name="android_upgrading_notification_title" msgid="1619393112444671028">"Aggiornamento di Android in corso"</string> + <!-- no translation found for android_upgrading_notification_title (8428357096969413169) --> + <skip /> <string name="android_upgrading_notification_body" msgid="5761201379457064286">"Alcune app potrebbero non funzionare correttamente fino al completamento dell\'upgrade"</string> <string name="app_upgrading_toast" msgid="3008139776215597053">"Upgrade dell\'app <xliff:g id="APPLICATION">%1$s</xliff:g>…"</string> <string name="android_upgrading_apk" msgid="7904042682111526169">"Ottimizzazione applicazione <xliff:g id="NUMBER_0">%1$d</xliff:g> di <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string> diff --git a/core/res/res/values-iw/strings.xml b/core/res/res/values-iw/strings.xml index 69077736c296..68a6f2b93aa0 100644 --- a/core/res/res/values-iw/strings.xml +++ b/core/res/res/values-iw/strings.xml @@ -684,6 +684,7 @@ <string name="lockscreen_pattern_correct" msgid="9039008650362261237">"נכון!"</string> <string name="lockscreen_pattern_wrong" msgid="4317955014948108794">"נסה שוב"</string> <string name="lockscreen_password_wrong" msgid="5737815393253165301">"נסה שוב"</string> + <string name="lockscreen_storage_locked" msgid="9167551160010625200">"בטל את הנעילה לכל התכונות והנתונים"</string> <string name="faceunlock_multiple_failures" msgid="754137583022792429">"חרגת ממספר הניסיונות המרבי של זיהוי פנים"</string> <string name="lockscreen_missing_sim_message_short" msgid="5099439277819215399">"אין כרטיס SIM"</string> <string name="lockscreen_missing_sim_message" product="tablet" msgid="151659196095791474">"אין כרטיס SIM בטאבלט."</string> @@ -1068,7 +1069,8 @@ <string name="android_upgrading_title" msgid="1584192285441405746">"Android מבצע שדרוג…"</string> <string name="android_start_title" msgid="8418054686415318207">"הפעלת Android מתחילה…"</string> <string name="android_upgrading_fstrim" msgid="8036718871534640010">"מתבצעת אופטימיזציה של האחסון."</string> - <string name="android_upgrading_notification_title" msgid="1619393112444671028">"Android מבצע שדרוג"</string> + <!-- no translation found for android_upgrading_notification_title (8428357096969413169) --> + <skip /> <string name="android_upgrading_notification_body" msgid="5761201379457064286">"ייתכן שאפליקציות מסוימות לא יפעלו כראוי עד סיום השדרוג"</string> <string name="app_upgrading_toast" msgid="3008139776215597053">"<xliff:g id="APPLICATION">%1$s</xliff:g> מבצעת שדרוג…"</string> <string name="android_upgrading_apk" msgid="7904042682111526169">"מבצע אופטימיזציה של אפליקציה <xliff:g id="NUMBER_0">%1$d</xliff:g> מתוך <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string> diff --git a/core/res/res/values-ja/strings.xml b/core/res/res/values-ja/strings.xml index 2327c7222dfb..4dabe60729f1 100644 --- a/core/res/res/values-ja/strings.xml +++ b/core/res/res/values-ja/strings.xml @@ -678,6 +678,7 @@ <string name="lockscreen_pattern_correct" msgid="9039008650362261237">"一致しました"</string> <string name="lockscreen_pattern_wrong" msgid="4317955014948108794">"もう一度お試しください"</string> <string name="lockscreen_password_wrong" msgid="5737815393253165301">"もう一度お試しください"</string> + <string name="lockscreen_storage_locked" msgid="9167551160010625200">"すべての機能とデータを利用するにはロック解除"</string> <string name="faceunlock_multiple_failures" msgid="754137583022792429">"フェイスアンロックの最大試行回数を超えました"</string> <string name="lockscreen_missing_sim_message_short" msgid="5099439277819215399">"SIMカードが挿入されていません"</string> <string name="lockscreen_missing_sim_message" product="tablet" msgid="151659196095791474">"タブレット内にSIMカードがありません。"</string> @@ -1022,7 +1023,8 @@ <string name="android_upgrading_title" msgid="1584192285441405746">"Androidをアップグレードしています..."</string> <string name="android_start_title" msgid="8418054686415318207">"Androidの起動中…"</string> <string name="android_upgrading_fstrim" msgid="8036718871534640010">"ストレージを最適化しています。"</string> - <string name="android_upgrading_notification_title" msgid="1619393112444671028">"Android のアップグレード中"</string> + <!-- no translation found for android_upgrading_notification_title (8428357096969413169) --> + <skip /> <string name="android_upgrading_notification_body" msgid="5761201379457064286">"アップグレードが完了するまで一部のアプリが正常に動作しない可能性があります"</string> <string name="app_upgrading_toast" msgid="3008139776215597053">"「<xliff:g id="APPLICATION">%1$s</xliff:g>」をアップグレードしています…"</string> <string name="android_upgrading_apk" msgid="7904042682111526169">"<xliff:g id="NUMBER_1">%2$d</xliff:g>個中<xliff:g id="NUMBER_0">%1$d</xliff:g>個のアプリを最適化しています。"</string> diff --git a/core/res/res/values-ka-rGE/strings.xml b/core/res/res/values-ka-rGE/strings.xml index e22602a2d64e..213b856c721c 100644 --- a/core/res/res/values-ka-rGE/strings.xml +++ b/core/res/res/values-ka-rGE/strings.xml @@ -678,6 +678,7 @@ <string name="lockscreen_pattern_correct" msgid="9039008650362261237">"სწორია!"</string> <string name="lockscreen_pattern_wrong" msgid="4317955014948108794">"კიდევ სცადეთ"</string> <string name="lockscreen_password_wrong" msgid="5737815393253165301">"კიდევ სცადეთ"</string> + <string name="lockscreen_storage_locked" msgid="9167551160010625200">"ყველა ფუნქციისა და მონაცემის განბლოკვა"</string> <string name="faceunlock_multiple_failures" msgid="754137583022792429">"სახის ამოცნობით განბლოკვის მცდელობამ დაშვებულ რაოდენობას გადააჭარბა"</string> <string name="lockscreen_missing_sim_message_short" msgid="5099439277819215399">"SIM ბარათი არ არის"</string> <string name="lockscreen_missing_sim_message" product="tablet" msgid="151659196095791474">"ტაბლეტში არ დევს SIM ბარათი."</string> @@ -1022,7 +1023,8 @@ <string name="android_upgrading_title" msgid="1584192285441405746">"Android ახალ ვერსიაზე გადადის…"</string> <string name="android_start_title" msgid="8418054686415318207">"Android იწყება…"</string> <string name="android_upgrading_fstrim" msgid="8036718871534640010">"მეხსიერების ოპტიმიზირება."</string> - <string name="android_upgrading_notification_title" msgid="1619393112444671028">"Android ახალ ვერსიაზე გადადის"</string> + <!-- no translation found for android_upgrading_notification_title (8428357096969413169) --> + <skip /> <string name="android_upgrading_notification_body" msgid="5761201379457064286">"ახალ ვერსიაზე გადასვლის დასრულებამდე, ზოგიერთმა აპმა შეიძლება არასწორად იმუშაოს"</string> <string name="app_upgrading_toast" msgid="3008139776215597053">"<xliff:g id="APPLICATION">%1$s</xliff:g> ახალ ვერსიაზე გადადის…"</string> <string name="android_upgrading_apk" msgid="7904042682111526169">"მიმდინარეობს აპლიკაციების ოპტიმიზაცია. დასრულებულია <xliff:g id="NUMBER_0">%1$d</xliff:g>, სულ <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string> diff --git a/core/res/res/values-kk-rKZ/strings.xml b/core/res/res/values-kk-rKZ/strings.xml index 88c1136485b3..142bf05bb0aa 100644 --- a/core/res/res/values-kk-rKZ/strings.xml +++ b/core/res/res/values-kk-rKZ/strings.xml @@ -678,6 +678,7 @@ <string name="lockscreen_pattern_correct" msgid="9039008650362261237">"Дұрыс!"</string> <string name="lockscreen_pattern_wrong" msgid="4317955014948108794">"Қайталап көріңіз"</string> <string name="lockscreen_password_wrong" msgid="5737815393253165301">"Қайталап көріңіз"</string> + <string name="lockscreen_storage_locked" msgid="9167551160010625200">"Мүмкіндіктер мен деректер үшін құлыпты ашыңыз"</string> <string name="faceunlock_multiple_failures" msgid="754137583022792429">"Бет-әлпет арқылы ашу әрекеттері анықталған шегінен асып кетті"</string> <string name="lockscreen_missing_sim_message_short" msgid="5099439277819215399">"SIM картасы жоқ"</string> <string name="lockscreen_missing_sim_message" product="tablet" msgid="151659196095791474">"Планшетте SIM картасы жоқ."</string> @@ -1022,7 +1023,8 @@ <string name="android_upgrading_title" msgid="1584192285441405746">"Android жаңартылуда…"</string> <string name="android_start_title" msgid="8418054686415318207">"Android іске қосылуда…"</string> <string name="android_upgrading_fstrim" msgid="8036718871534640010">"Қойманы оңтайландыру."</string> - <string name="android_upgrading_notification_title" msgid="1619393112444671028">"Android жаңартылуда"</string> + <!-- no translation found for android_upgrading_notification_title (8428357096969413169) --> + <skip /> <string name="android_upgrading_notification_body" msgid="5761201379457064286">"Жаңарту аяқталғанға дейін кейбір қолданбалар дұрыс жұмыс істемеуі мүмкін"</string> <string name="app_upgrading_toast" msgid="3008139776215597053">"<xliff:g id="APPLICATION">%1$s</xliff:g> жаңартылуда…"</string> <string name="android_upgrading_apk" msgid="7904042682111526169">"<xliff:g id="NUMBER_1">%2$d</xliff:g> ішінен <xliff:g id="NUMBER_0">%1$d</xliff:g> қолданба оңтайландырылуда."</string> diff --git a/core/res/res/values-km-rKH/strings.xml b/core/res/res/values-km-rKH/strings.xml index 1bf6ae528e64..177b4bbb726b 100644 --- a/core/res/res/values-km-rKH/strings.xml +++ b/core/res/res/values-km-rKH/strings.xml @@ -678,6 +678,7 @@ <string name="lockscreen_pattern_correct" msgid="9039008650362261237">"ត្រឹមត្រូវ!"</string> <string name="lockscreen_pattern_wrong" msgid="4317955014948108794">"ព្យាយាមម្ដងទៀត"</string> <string name="lockscreen_password_wrong" msgid="5737815393253165301">"ព្យាយាមម្ដងទៀត"</string> + <string name="lockscreen_storage_locked" msgid="9167551160010625200">"ដោះសោលក្ខណៈពិសេស និងទិន្នន័យទាំងអស់"</string> <string name="faceunlock_multiple_failures" msgid="754137583022792429">"បានលើសការព្យាយាមដោះសោតាមទម្រង់មុខ"</string> <string name="lockscreen_missing_sim_message_short" msgid="5099439277819215399">"គ្មានស៊ីមកាត"</string> <string name="lockscreen_missing_sim_message" product="tablet" msgid="151659196095791474">"គ្មានស៊ីមកាតក្នុងកុំព្យូទ័របន្ទះ។"</string> @@ -1024,7 +1025,8 @@ <string name="android_upgrading_title" msgid="1584192285441405746">"Android កំពុងធ្វើបច្ចុប្បន្នភាព..."</string> <string name="android_start_title" msgid="8418054686415318207">"Android កំពុងចាប់ផ្ដើម…"</string> <string name="android_upgrading_fstrim" msgid="8036718871534640010">"កំពុងធ្វើឲ្យឧបករណ៍ផ្ទុកមានប្រសិទ្ធភាព។"</string> - <string name="android_upgrading_notification_title" msgid="1619393112444671028">"Android កំពុងអាប់គ្រេត..."</string> + <!-- no translation found for android_upgrading_notification_title (8428357096969413169) --> + <skip /> <string name="android_upgrading_notification_body" msgid="5761201379457064286">"កម្មវិធីមួយចំនួនអាចនឹងមិនដំណើរការប្រក្រតីនោះទេ រហូតដល់ការអាប់គ្រេតបញ្ចប់"</string> <string name="app_upgrading_toast" msgid="3008139776215597053">"<xliff:g id="APPLICATION">%1$s</xliff:g> អាប់គ្រេត…"</string> <string name="android_upgrading_apk" msgid="7904042682111526169">"ធ្វើឲ្យកម្មវិធីប្រសើរឡើង <xliff:g id="NUMBER_0">%1$d</xliff:g> នៃ <xliff:g id="NUMBER_1">%2$d</xliff:g> ។"</string> diff --git a/core/res/res/values-kn-rIN/strings.xml b/core/res/res/values-kn-rIN/strings.xml index 99739727bee9..c338c923d104 100644 --- a/core/res/res/values-kn-rIN/strings.xml +++ b/core/res/res/values-kn-rIN/strings.xml @@ -678,6 +678,7 @@ <string name="lockscreen_pattern_correct" msgid="9039008650362261237">"ಸರಿಯಾಗಿದೆ!"</string> <string name="lockscreen_pattern_wrong" msgid="4317955014948108794">"ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ"</string> <string name="lockscreen_password_wrong" msgid="5737815393253165301">"ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ"</string> + <string name="lockscreen_storage_locked" msgid="9167551160010625200">"ಎಲ್ಲ ವೈಶಿಷ್ಟ್ಯಗಳು ಮತ್ತು ಡೇಟಾಗೆ ಅನ್ಲಾಕ್ ಮಾಡಿ"</string> <string name="faceunlock_multiple_failures" msgid="754137583022792429">"ಗರಿಷ್ಠ ಫೇಸ್ ಅನ್ಲಾಕ್ ಪ್ರಯತ್ನಗಳು ಮೀರಿವೆ"</string> <string name="lockscreen_missing_sim_message_short" msgid="5099439277819215399">"ಯಾವುದೇ ಸಿಮ್ ಕಾರ್ಡ್ ಇಲ್ಲ"</string> <string name="lockscreen_missing_sim_message" product="tablet" msgid="151659196095791474">"ಟ್ಯಾಬ್ಲೆಟ್ನಲ್ಲಿ ಸಿಮ್ ಕಾರ್ಡ್ ಇಲ್ಲ."</string> @@ -969,9 +970,9 @@ <string name="whichViewApplication" msgid="3272778576700572102">"ಇದರ ಮೂಲಕ ತೆರೆಯಿರಿ"</string> <string name="whichViewApplicationNamed" msgid="2286418824011249620">"%1$s ಜೊತೆಗೆ ತೆರೆಯಿರಿ"</string> <string name="whichViewApplicationLabel" msgid="2666774233008808473">"ತೆರೆ"</string> - <string name="whichEditApplication" msgid="144727838241402655">"ಇವರ ಜೊತೆಗೆ ಸಂಪಾದಿಸಿ"</string> - <string name="whichEditApplicationNamed" msgid="1775815530156447790">"%1$s ಜೊತೆಗೆ ಸಂಪಾದಿಸಿ"</string> - <string name="whichEditApplicationLabel" msgid="7183524181625290300">"ಸಂಪಾದಿಸು"</string> + <string name="whichEditApplication" msgid="144727838241402655">"ಇವರ ಜೊತೆಗೆ ಎಡಿಟ್ ಮಾಡಿ"</string> + <string name="whichEditApplicationNamed" msgid="1775815530156447790">"%1$s ಜೊತೆಗೆ ಎಡಿಟ್ ಮಾಡಿ"</string> + <string name="whichEditApplicationLabel" msgid="7183524181625290300">"ಎಡಿಟ್"</string> <string name="whichSendApplication" msgid="6902512414057341668">"ಹಂಚಿಕೊಳ್ಳಿ"</string> <string name="whichSendApplicationNamed" msgid="2799370240005424391">"%1$s ಜೊತೆಗೆ ಹಂಚಿಕೊಳ್ಳಿ"</string> <string name="whichSendApplicationLabel" msgid="4579076294675975354">"ಹಂಚಿಕೊಳ್ಳಿ"</string> @@ -1022,7 +1023,8 @@ <string name="android_upgrading_title" msgid="1584192285441405746">"Android ಅಪ್ಗ್ರೇಡ್ ಮಾಡಲಾಗುತ್ತಿದೆ…"</string> <string name="android_start_title" msgid="8418054686415318207">"Android ಪ್ರಾರಂಭಿಸಲಾಗುತ್ತಿದೆ…"</string> <string name="android_upgrading_fstrim" msgid="8036718871534640010">"ಸಂಗ್ರಹಣೆಯನ್ನು ಆಪ್ಟಿಮೈಸ್ ಮಾಡಲಾಗುತ್ತಿದೆ."</string> - <string name="android_upgrading_notification_title" msgid="1619393112444671028">"Android ಅಪ್ಗ್ರೇಡ್ ಮಾಡಲಾಗುತ್ತಿದೆ"</string> + <!-- no translation found for android_upgrading_notification_title (8428357096969413169) --> + <skip /> <string name="android_upgrading_notification_body" msgid="5761201379457064286">"ಅಪ್ಗ್ರೇಡ್ ಮುಗಿಯುವ ತನಕ ಕೆಲವು ಅಪ್ಲಿಕೇಶನ್ಗಳು ಸರಿಯಾಗಿ ಕೆಲಸ ಮಾಡದಿರಬಹುದು"</string> <string name="app_upgrading_toast" msgid="3008139776215597053">"<xliff:g id="APPLICATION">%1$s</xliff:g> ಅಪ್ಗ್ರೇಡ್ ಆಗುತ್ತಿದೆ..."</string> <string name="android_upgrading_apk" msgid="7904042682111526169">"<xliff:g id="NUMBER_1">%2$d</xliff:g> ರಲ್ಲಿ <xliff:g id="NUMBER_0">%1$d</xliff:g> ಅಪ್ಲಿಕೇಶನ್ ಆಪ್ಟಿಮೈಸ್ ಮಾಡಲಾಗುತ್ತಿದೆ."</string> @@ -1315,7 +1317,7 @@ <string name="storage_usb_drive" msgid="6261899683292244209">"USB ಡ್ರೈವ್"</string> <string name="storage_usb_drive_label" msgid="4501418548927759953">"<xliff:g id="MANUFACTURER">%s</xliff:g> USB ಡ್ರೈವ್"</string> <string name="storage_usb" msgid="3017954059538517278">"USB ಸಂಗ್ರಹಣೆ"</string> - <string name="extract_edit_menu_button" msgid="8940478730496610137">"ಸಂಪಾದಿಸು"</string> + <string name="extract_edit_menu_button" msgid="8940478730496610137">"ಎಡಿಟ್"</string> <string name="data_usage_warning_title" msgid="1955638862122232342">"ಡೇಟಾ ಬಳಕೆಯ ಎಚ್ಚರಿಕೆ"</string> <string name="data_usage_warning_body" msgid="6660692274311972007">"ಬಳಕೆ ಮತ್ತು ಸೆಟ್ಟಿಂಗ್ಗಳನ್ನು ವೀಕ್ಷಿಸಲು ಟ್ಯಾಪ್ ಮಾಡಿ."</string> <string name="data_usage_3g_limit_title" msgid="4361523876818447683">"2G-3G ಡೇಟಾ ಮೀತಿಯನ್ನು ತಲುಪಿದೆ"</string> diff --git a/core/res/res/values-ko/strings.xml b/core/res/res/values-ko/strings.xml index 8392b8de458e..728f036961c9 100644 --- a/core/res/res/values-ko/strings.xml +++ b/core/res/res/values-ko/strings.xml @@ -245,17 +245,17 @@ <string name="permgrouplab_contacts" msgid="3657758145679177612">"주소록"</string> <string name="permgroupdesc_contacts" msgid="6951499528303668046">"주소록에 접근할 수 있도록"</string> <string name="permgrouplab_location" msgid="7275582855722310164">"위치"</string> - <string name="permgroupdesc_location" msgid="1346617465127855033">"이 기기의 위치정보에 접근할 수 있도록"</string> + <string name="permgroupdesc_location" msgid="1346617465127855033">"이 기기의 위치정보에 액세스"</string> <string name="permgrouplab_calendar" msgid="5863508437783683902">"캘린더"</string> <string name="permgroupdesc_calendar" msgid="3889615280211184106">"일정에 접근할 수 있도록"</string> <string name="permgrouplab_sms" msgid="228308803364967808">"SMS"</string> <string name="permgroupdesc_sms" msgid="4656988620100940350">"문자 메시지를 보내고 확인할 수 있도록"</string> <string name="permgrouplab_storage" msgid="1971118770546336966">"저장"</string> - <string name="permgroupdesc_storage" msgid="637758554581589203">"기기 사진, 미디어, 파일에 접근할 수 있도록"</string> + <string name="permgroupdesc_storage" msgid="637758554581589203">"기기 사진, 미디어, 파일 액세스"</string> <string name="permgrouplab_microphone" msgid="171539900250043464">"마이크"</string> <string name="permgroupdesc_microphone" msgid="4988812113943554584">"오디오를 녹음할 수 있도록"</string> <string name="permgrouplab_camera" msgid="4820372495894586615">"카메라"</string> - <string name="permgroupdesc_camera" msgid="3250611594678347720">"사진 및 동영상을 촬영할 수 있도록"</string> + <string name="permgroupdesc_camera" msgid="3250611594678347720">"사진 및 동영상 촬영"</string> <string name="permgrouplab_phone" msgid="5229115638567440675">"전화"</string> <string name="permgroupdesc_phone" msgid="6234224354060641055">"통화 상태를 관리하거나 전화를 걸 수 있도록"</string> <string name="permgrouplab_sensors" msgid="416037179223226722">"신체 센서"</string> @@ -678,6 +678,7 @@ <string name="lockscreen_pattern_correct" msgid="9039008650362261237">"맞습니다."</string> <string name="lockscreen_pattern_wrong" msgid="4317955014948108794">"다시 시도"</string> <string name="lockscreen_password_wrong" msgid="5737815393253165301">"다시 시도"</string> + <string name="lockscreen_storage_locked" msgid="9167551160010625200">"모든 기능 및 데이터 잠금 해제"</string> <string name="faceunlock_multiple_failures" msgid="754137583022792429">"얼굴 인식 잠금해제 최대 시도 횟수를 초과했습니다."</string> <string name="lockscreen_missing_sim_message_short" msgid="5099439277819215399">"SIM 카드가 없습니다."</string> <string name="lockscreen_missing_sim_message" product="tablet" msgid="151659196095791474">"태블릿에 SIM 카드가 없습니다."</string> @@ -1022,7 +1023,8 @@ <string name="android_upgrading_title" msgid="1584192285441405746">"Android 업그레이드 중.."</string> <string name="android_start_title" msgid="8418054686415318207">"Android가 시작되는 중…"</string> <string name="android_upgrading_fstrim" msgid="8036718871534640010">"저장소 최적화 중"</string> - <string name="android_upgrading_notification_title" msgid="1619393112444671028">"Android 업그레이드 중"</string> + <!-- no translation found for android_upgrading_notification_title (8428357096969413169) --> + <skip /> <string name="android_upgrading_notification_body" msgid="5761201379457064286">"특정 앱은 업그레이드가 완료될 때까지 제대로 작동하지 않을 수 있습니다."</string> <string name="app_upgrading_toast" msgid="3008139776215597053">"<xliff:g id="APPLICATION">%1$s</xliff:g> 업그레이드 중…"</string> <string name="android_upgrading_apk" msgid="7904042682111526169">"앱 <xliff:g id="NUMBER_1">%2$d</xliff:g>개 중 <xliff:g id="NUMBER_0">%1$d</xliff:g>개 최적화 중"</string> diff --git a/core/res/res/values-ky-rKG/strings.xml b/core/res/res/values-ky-rKG/strings.xml index 367652282208..f7bb4509712e 100644 --- a/core/res/res/values-ky-rKG/strings.xml +++ b/core/res/res/values-ky-rKG/strings.xml @@ -678,6 +678,7 @@ <string name="lockscreen_pattern_correct" msgid="9039008650362261237">"Туура!"</string> <string name="lockscreen_pattern_wrong" msgid="4317955014948108794">"Дагы аракет кылыңыз"</string> <string name="lockscreen_password_wrong" msgid="5737815393253165301">"Дагы аракет кылыңыз"</string> + <string name="lockscreen_storage_locked" msgid="9167551160010625200">"Элементтердин жана дайындардын кулпусун ачуу"</string> <string name="faceunlock_multiple_failures" msgid="754137583022792429">"Жүзүнөн таанып ачуу аракеттеринин чегинен аштыңыз"</string> <string name="lockscreen_missing_sim_message_short" msgid="5099439277819215399">"SIM-карта жок"</string> <string name="lockscreen_missing_sim_message" product="tablet" msgid="151659196095791474">"Планшетте SIM-карта жок."</string> @@ -1022,7 +1023,8 @@ <string name="android_upgrading_title" msgid="1584192285441405746">"Android жаңыртылууда…"</string> <string name="android_start_title" msgid="8418054686415318207">"Android жүргүзүлүүдө…"</string> <string name="android_upgrading_fstrim" msgid="8036718871534640010">"Сактагыч ыңгайлаштырылууда."</string> - <string name="android_upgrading_notification_title" msgid="1619393112444671028">"Android жаңыртылууда"</string> + <!-- no translation found for android_upgrading_notification_title (8428357096969413169) --> + <skip /> <string name="android_upgrading_notification_body" msgid="5761201379457064286">"Жаңыртуу аягына чыкмайынча айрым колдонмолор талаптагыдай иштебей калышы мүмкүн"</string> <string name="app_upgrading_toast" msgid="3008139776215597053">"<xliff:g id="APPLICATION">%1$s</xliff:g> жаңыртылууда..."</string> <string name="android_upgrading_apk" msgid="7904042682111526169">"<xliff:g id="NUMBER_1">%2$d</xliff:g> ичинен <xliff:g id="NUMBER_0">%1$d</xliff:g> колдонмо ыңгайлаштырылууда."</string> diff --git a/core/res/res/values-lo-rLA/strings.xml b/core/res/res/values-lo-rLA/strings.xml index aa4d46858daf..c48a07c0fea6 100644 --- a/core/res/res/values-lo-rLA/strings.xml +++ b/core/res/res/values-lo-rLA/strings.xml @@ -678,6 +678,7 @@ <string name="lockscreen_pattern_correct" msgid="9039008650362261237">"ຖືກຕ້ອງ!"</string> <string name="lockscreen_pattern_wrong" msgid="4317955014948108794">"ລອງໃໝ່ອີກຄັ້ງ"</string> <string name="lockscreen_password_wrong" msgid="5737815393253165301">"ທົດລອງອີກຄັ້ງ"</string> + <string name="lockscreen_storage_locked" msgid="9167551160010625200">"ປົດລັອກຄຸນສົມບັດ ແລະ ຂໍ້ມູນທັງໝົດ"</string> <string name="faceunlock_multiple_failures" msgid="754137583022792429">"ຄວາມພະຍາຍາມປົດລັອກດ້ວຍໜ້ານັ້ນ ເກີນຈຳນວນທີ່ກຳນົດແລ້ວ"</string> <string name="lockscreen_missing_sim_message_short" msgid="5099439277819215399">"ບໍ່ມີ SIM card."</string> <string name="lockscreen_missing_sim_message" product="tablet" msgid="151659196095791474">"ບໍ່ມີຊິມກາດໃນແທັບເລັດ."</string> @@ -1022,7 +1023,8 @@ <string name="android_upgrading_title" msgid="1584192285441405746">"ກຳລັງອັບເກຣດ Android..."</string> <string name="android_start_title" msgid="8418054686415318207">"ກຳລັງເລີ່ມລະບົບ Android …"</string> <string name="android_upgrading_fstrim" msgid="8036718871534640010">"ການປັບບ່ອນເກັບຂໍ້ມູນໃຫ້ເໝາະສົມ."</string> - <string name="android_upgrading_notification_title" msgid="1619393112444671028">"ກຳລັງອັບເກຣດ Android"</string> + <!-- no translation found for android_upgrading_notification_title (8428357096969413169) --> + <skip /> <string name="android_upgrading_notification_body" msgid="5761201379457064286">"ບາງແອັບອາດບໍ່ສາມາດເຮັດວຽກໄດ້ປົກກະຕິຈົນກວ່າຈະອັບເກຣດສຳເລັດ"</string> <string name="app_upgrading_toast" msgid="3008139776215597053">"ກຳລັງອັບເກຣດ<xliff:g id="APPLICATION">%1$s</xliff:g>…"</string> <string name="android_upgrading_apk" msgid="7904042682111526169">"ກຳລັງປັບປຸງປະສິດທິພາບແອັບຯທີ <xliff:g id="NUMBER_0">%1$d</xliff:g> ຈາກທັງໝົດ <xliff:g id="NUMBER_1">%2$d</xliff:g> ແອັບຯ."</string> diff --git a/core/res/res/values-lt/strings.xml b/core/res/res/values-lt/strings.xml index 8d67b18b6b04..9e9b25f6801a 100644 --- a/core/res/res/values-lt/strings.xml +++ b/core/res/res/values-lt/strings.xml @@ -684,6 +684,7 @@ <string name="lockscreen_pattern_correct" msgid="9039008650362261237">"Teisingai!"</string> <string name="lockscreen_pattern_wrong" msgid="4317955014948108794">"Bandykite dar kartą"</string> <string name="lockscreen_password_wrong" msgid="5737815393253165301">"Bandykite dar kartą"</string> + <string name="lockscreen_storage_locked" msgid="9167551160010625200">"Atrakinę pasieksite visas funkcijas ir duomenis"</string> <string name="faceunlock_multiple_failures" msgid="754137583022792429">"Viršijote maksimalų atrakinimo pagal veidą bandymų skaičių"</string> <string name="lockscreen_missing_sim_message_short" msgid="5099439277819215399">"Nėra SIM kortelės"</string> <string name="lockscreen_missing_sim_message" product="tablet" msgid="151659196095791474">"Planšetiniame kompiuteryje nėra SIM kortelės."</string> @@ -1068,7 +1069,8 @@ <string name="android_upgrading_title" msgid="1584192285441405746">"„Android“ naujovinama..."</string> <string name="android_start_title" msgid="8418054686415318207">"Paleidžiama „Android“…"</string> <string name="android_upgrading_fstrim" msgid="8036718871534640010">"Optimizuojama saugykla."</string> - <string name="android_upgrading_notification_title" msgid="1619393112444671028">"„Android“ naujovinama"</string> + <!-- no translation found for android_upgrading_notification_title (8428357096969413169) --> + <skip /> <string name="android_upgrading_notification_body" msgid="5761201379457064286">"Kai kurios programos gali tinkamai neveikti, kol naujovinimo procesas nebus baigtas"</string> <string name="app_upgrading_toast" msgid="3008139776215597053">"„<xliff:g id="APPLICATION">%1$s</xliff:g>“ naujovinama..."</string> <string name="android_upgrading_apk" msgid="7904042682111526169">"Optimizuojama <xliff:g id="NUMBER_0">%1$d</xliff:g> progr. iš <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string> diff --git a/core/res/res/values-lv/strings.xml b/core/res/res/values-lv/strings.xml index d18a59b79ab7..1f82ad27365b 100644 --- a/core/res/res/values-lv/strings.xml +++ b/core/res/res/values-lv/strings.xml @@ -681,6 +681,7 @@ <string name="lockscreen_pattern_correct" msgid="9039008650362261237">"Pareizi!"</string> <string name="lockscreen_pattern_wrong" msgid="4317955014948108794">"Mēģināt vēlreiz"</string> <string name="lockscreen_password_wrong" msgid="5737815393253165301">"Mēģināt vēlreiz"</string> + <string name="lockscreen_storage_locked" msgid="9167551160010625200">"Atbloķēt visām funkcijām un datiem"</string> <string name="faceunlock_multiple_failures" msgid="754137583022792429">"Ir pārsniegts maksimālais Autorizācijas pēc sejas mēģinājumu skaits."</string> <string name="lockscreen_missing_sim_message_short" msgid="5099439277819215399">"Nav SIM kartes"</string> <string name="lockscreen_missing_sim_message" product="tablet" msgid="151659196095791474">"Planšetdatorā nav SIM kartes."</string> @@ -1045,7 +1046,8 @@ <string name="android_upgrading_title" msgid="1584192285441405746">"Notiek Android jaunināšana..."</string> <string name="android_start_title" msgid="8418054686415318207">"Notiek Android palaišana…"</string> <string name="android_upgrading_fstrim" msgid="8036718871534640010">"Notiek krātuves optimizēšana."</string> - <string name="android_upgrading_notification_title" msgid="1619393112444671028">"Notiek Android jaunināšana..."</string> + <!-- no translation found for android_upgrading_notification_title (8428357096969413169) --> + <skip /> <string name="android_upgrading_notification_body" msgid="5761201379457064286">"Kamēr jaunināšana nebūs pabeigta, dažas lietotnes, iespējams, nedarbosies pareizi."</string> <string name="app_upgrading_toast" msgid="3008139776215597053">"Notiek lietotnes <xliff:g id="APPLICATION">%1$s</xliff:g> jaunināšana…"</string> <string name="android_upgrading_apk" msgid="7904042682111526169">"Tiek optimizēta <xliff:g id="NUMBER_0">%1$d</xliff:g>. lietotne no <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string> diff --git a/core/res/res/values-mk-rMK/strings.xml b/core/res/res/values-mk-rMK/strings.xml index 913099045810..87a5eb0993ca 100644 --- a/core/res/res/values-mk-rMK/strings.xml +++ b/core/res/res/values-mk-rMK/strings.xml @@ -254,7 +254,7 @@ <string name="permgroupdesc_storage" msgid="637758554581589203">"пристапува до фотографии, аудио-видео и датотеки на уредот"</string> <string name="permgrouplab_microphone" msgid="171539900250043464">"Микрофон"</string> <string name="permgroupdesc_microphone" msgid="4988812113943554584">"снима аудио"</string> - <string name="permgrouplab_camera" msgid="4820372495894586615">"Фотоапарат"</string> + <string name="permgrouplab_camera" msgid="4820372495894586615">"Камера"</string> <string name="permgroupdesc_camera" msgid="3250611594678347720">"фотографира и снима видео"</string> <string name="permgrouplab_phone" msgid="5229115638567440675">"Телефон"</string> <string name="permgroupdesc_phone" msgid="6234224354060641055">"упатува и управува со телефонски повици"</string> @@ -678,6 +678,7 @@ <string name="lockscreen_pattern_correct" msgid="9039008650362261237">"Точно!"</string> <string name="lockscreen_pattern_wrong" msgid="4317955014948108794">"Обидете се повторно"</string> <string name="lockscreen_password_wrong" msgid="5737815393253165301">"Обидете се повторно"</string> + <string name="lockscreen_storage_locked" msgid="9167551160010625200">"Отклучи за сите функции и податоци"</string> <string name="faceunlock_multiple_failures" msgid="754137583022792429">"Максималниот број обиди на отклучување со лице е надминат"</string> <string name="lockscreen_missing_sim_message_short" msgid="5099439277819215399">"Нема СИМ картичка"</string> <string name="lockscreen_missing_sim_message" product="tablet" msgid="151659196095791474">"Во таблетот нема СИМ картичка."</string> @@ -740,7 +741,7 @@ <string name="keyguard_accessibility_widget" msgid="6527131039741808240">"Виџет <xliff:g id="WIDGET_INDEX">%1$s</xliff:g>."</string> <string name="keyguard_accessibility_user_selector" msgid="1226798370913698896">"Избирач на корисник"</string> <string name="keyguard_accessibility_status" msgid="8008264603935930611">"Статус"</string> - <string name="keyguard_accessibility_camera" msgid="8904231194181114603">"Фотоапарат"</string> + <string name="keyguard_accessibility_camera" msgid="8904231194181114603">"Камера"</string> <string name="keygaurd_accessibility_media_controls" msgid="262209654292161806">"Контроли на медиуми"</string> <string name="keyguard_accessibility_widget_reorder_start" msgid="8736853615588828197">"Прередувањето виџети започна."</string> <string name="keyguard_accessibility_widget_reorder_end" msgid="7170190950870468320">"Прередувањето виџети заврши."</string> @@ -1022,7 +1023,8 @@ <string name="android_upgrading_title" msgid="1584192285441405746">"Android се ажурира…"</string> <string name="android_start_title" msgid="8418054686415318207">"Android стартува…"</string> <string name="android_upgrading_fstrim" msgid="8036718871534640010">"Оптимизирање на складирањето."</string> - <string name="android_upgrading_notification_title" msgid="1619393112444671028">"Android се ажурира"</string> + <!-- no translation found for android_upgrading_notification_title (8428357096969413169) --> + <skip /> <string name="android_upgrading_notification_body" msgid="5761201379457064286">"Некои апликации може да не работат правилно додека не се заврши надградбата"</string> <string name="app_upgrading_toast" msgid="3008139776215597053">"<xliff:g id="APPLICATION">%1$s</xliff:g> се надградува…"</string> <string name="android_upgrading_apk" msgid="7904042682111526169">"Се оптимизира апликација <xliff:g id="NUMBER_0">%1$d</xliff:g> од <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string> diff --git a/core/res/res/values-ml-rIN/strings.xml b/core/res/res/values-ml-rIN/strings.xml index 33764f577625..02668a009045 100644 --- a/core/res/res/values-ml-rIN/strings.xml +++ b/core/res/res/values-ml-rIN/strings.xml @@ -678,6 +678,7 @@ <string name="lockscreen_pattern_correct" msgid="9039008650362261237">"ശരി!"</string> <string name="lockscreen_pattern_wrong" msgid="4317955014948108794">"വീണ്ടും ശ്രമിക്കുക"</string> <string name="lockscreen_password_wrong" msgid="5737815393253165301">"വീണ്ടും ശ്രമിക്കുക"</string> + <string name="lockscreen_storage_locked" msgid="9167551160010625200">"എല്ലാ ഫീച്ചറുകളും വിവരങ്ങളും ലഭിക്കാൻ അൺലോക്കുചെയ്യുക"</string> <string name="faceunlock_multiple_failures" msgid="754137583022792429">"മുഖം തിരിച്ചറിഞ്ഞുള്ള അൺലോക്ക് ശ്രമങ്ങളുടെ പരമാവധി കഴിഞ്ഞു"</string> <string name="lockscreen_missing_sim_message_short" msgid="5099439277819215399">"സിം കാർഡില്ല"</string> <string name="lockscreen_missing_sim_message" product="tablet" msgid="151659196095791474">"ടാബ്ലെറ്റിൽ സിം കാർഡൊന്നുമില്ല."</string> @@ -1022,7 +1023,8 @@ <string name="android_upgrading_title" msgid="1584192285441405746">"Android അപ്ഗ്രേഡുചെയ്യുന്നു…"</string> <string name="android_start_title" msgid="8418054686415318207">"Android ആരംഭിക്കുന്നു…"</string> <string name="android_upgrading_fstrim" msgid="8036718871534640010">"സ്റ്റോറേജ് ഒപ്റ്റിമൈസ് ചെയ്യുന്നു."</string> - <string name="android_upgrading_notification_title" msgid="1619393112444671028">"Android അപ്ഗ്രേഡുചെയ്യുന്നു"</string> + <!-- no translation found for android_upgrading_notification_title (8428357096969413169) --> + <skip /> <string name="android_upgrading_notification_body" msgid="5761201379457064286">"അപ്ഗ്രേഡ് പൂർത്തിയാകുന്നത് വരെ ചില ആപ്സ് ശരിയായി പ്രവർത്തിച്ചേക്കില്ല"</string> <string name="app_upgrading_toast" msgid="3008139776215597053">"<xliff:g id="APPLICATION">%1$s</xliff:g> അപ്ഗ്രേഡ് ചെയ്യുന്നു…"</string> <string name="android_upgrading_apk" msgid="7904042682111526169">"<xliff:g id="NUMBER_0">%1$d</xliff:g> / <xliff:g id="NUMBER_1">%2$d</xliff:g> അപ്ലിക്കേഷൻ ഓപ്റ്റിമൈസ് ചെയ്യുന്നു."</string> diff --git a/core/res/res/values-mn-rMN/strings.xml b/core/res/res/values-mn-rMN/strings.xml index 543f4cca8d1b..8f70a2551623 100644 --- a/core/res/res/values-mn-rMN/strings.xml +++ b/core/res/res/values-mn-rMN/strings.xml @@ -678,6 +678,7 @@ <string name="lockscreen_pattern_correct" msgid="9039008650362261237">"Зөв!"</string> <string name="lockscreen_pattern_wrong" msgid="4317955014948108794">"Дахин оролдох"</string> <string name="lockscreen_password_wrong" msgid="5737815393253165301">"Дахин оролдох"</string> + <string name="lockscreen_storage_locked" msgid="9167551160010625200">"Бүх онцлог, өгөгдлийн түгжээг тайлах"</string> <string name="faceunlock_multiple_failures" msgid="754137583022792429">"Нүүрээр түгжээ тайлах оролдлогын тоо дээд хэмжээнээс хэтэрсэн"</string> <string name="lockscreen_missing_sim_message_short" msgid="5099439277819215399">"SIM карт байхгүй"</string> <string name="lockscreen_missing_sim_message" product="tablet" msgid="151659196095791474">"Таблет SIM картгүй."</string> @@ -1022,7 +1023,8 @@ <string name="android_upgrading_title" msgid="1584192285441405746">"Андройдыг дэвшүүлж байна…"</string> <string name="android_start_title" msgid="8418054686415318207">"Андройд эхэлж байна..."</string> <string name="android_upgrading_fstrim" msgid="8036718871534640010">"Хадгалалтыг сайжруулж байна."</string> - <string name="android_upgrading_notification_title" msgid="1619393112444671028">"Андройдыг дэвшүүлж байна"</string> + <!-- no translation found for android_upgrading_notification_title (8428357096969413169) --> + <skip /> <string name="android_upgrading_notification_body" msgid="5761201379457064286">"Шинэчилж дуустал зарим апп хэвийн бус ажиллаж болзошгүй"</string> <string name="app_upgrading_toast" msgid="3008139776215597053">"<xliff:g id="APPLICATION">%1$s</xliff:g>-г сайжруулж байна…"</string> <string name="android_upgrading_apk" msgid="7904042682111526169">"<xliff:g id="NUMBER_1">%2$d</xliff:g>-н <xliff:g id="NUMBER_0">%1$d</xliff:g> апп-г тохируулж байна."</string> diff --git a/core/res/res/values-mr-rIN/strings.xml b/core/res/res/values-mr-rIN/strings.xml index 90bbc6b3b427..86ddb15f2fce 100644 --- a/core/res/res/values-mr-rIN/strings.xml +++ b/core/res/res/values-mr-rIN/strings.xml @@ -678,6 +678,7 @@ <string name="lockscreen_pattern_correct" msgid="9039008650362261237">"अचूक!"</string> <string name="lockscreen_pattern_wrong" msgid="4317955014948108794">"पुन्हा प्रयत्न करा"</string> <string name="lockscreen_password_wrong" msgid="5737815393253165301">"पुन्हा प्रयत्न करा"</string> + <string name="lockscreen_storage_locked" msgid="9167551160010625200">"सर्व वैशिष्ट्ये आणि डेटासाठी अनलॉक करा"</string> <string name="faceunlock_multiple_failures" msgid="754137583022792429">"कमाल चेहरा अनलॉक प्रयत्न ओलांडले"</string> <string name="lockscreen_missing_sim_message_short" msgid="5099439277819215399">"सिम कार्ड नाही"</string> <string name="lockscreen_missing_sim_message" product="tablet" msgid="151659196095791474">"टॅब्लेटमध्ये सिम कार्ड नाही."</string> @@ -1022,7 +1023,8 @@ <string name="android_upgrading_title" msgid="1584192285441405746">"Android श्रेणीसुधारित होत आहे..."</string> <string name="android_start_title" msgid="8418054686415318207">"Android प्रारंभ करत आहे…"</string> <string name="android_upgrading_fstrim" msgid="8036718871534640010">"संचयन ऑप्टिमाइझ करत आहे."</string> - <string name="android_upgrading_notification_title" msgid="1619393112444671028">"Android श्रेणीसुधारित होत आहे"</string> + <!-- no translation found for android_upgrading_notification_title (8428357096969413169) --> + <skip /> <string name="android_upgrading_notification_body" msgid="5761201379457064286">"श्रेणीसुधारणा पूर्ण होईपर्यंत काही अॅप्स योग्यरित्या कार्य करणार नाहीत"</string> <string name="app_upgrading_toast" msgid="3008139776215597053">"<xliff:g id="APPLICATION">%1$s</xliff:g> श्रेणीसुधारित करीत आहे…"</string> <string name="android_upgrading_apk" msgid="7904042682111526169">"<xliff:g id="NUMBER_1">%2$d</xliff:g> पैकी <xliff:g id="NUMBER_0">%1$d</xliff:g> अॅप ऑप्टिमाइझ करत आहे."</string> diff --git a/core/res/res/values-ms-rMY/strings.xml b/core/res/res/values-ms-rMY/strings.xml index 98f00ccdd802..dee4268e47cf 100644 --- a/core/res/res/values-ms-rMY/strings.xml +++ b/core/res/res/values-ms-rMY/strings.xml @@ -678,6 +678,7 @@ <string name="lockscreen_pattern_correct" msgid="9039008650362261237">"Betul!"</string> <string name="lockscreen_pattern_wrong" msgid="4317955014948108794">"Cuba lagi"</string> <string name="lockscreen_password_wrong" msgid="5737815393253165301">"Cuba lagi"</string> + <string name="lockscreen_storage_locked" msgid="9167551160010625200">"Buka kunci semua ciri dan data"</string> <string name="faceunlock_multiple_failures" msgid="754137583022792429">"Telah melepasi had cubaan Buka Kunci Wajah"</string> <string name="lockscreen_missing_sim_message_short" msgid="5099439277819215399">"Tiada kad SIM"</string> <string name="lockscreen_missing_sim_message" product="tablet" msgid="151659196095791474">"Tiada kad SIM dalam tablet."</string> @@ -1022,7 +1023,8 @@ <string name="android_upgrading_title" msgid="1584192285441405746">"Android sedang menaik taraf..."</string> <string name="android_start_title" msgid="8418054686415318207">"Android sedang dimulakan…"</string> <string name="android_upgrading_fstrim" msgid="8036718871534640010">"Mengoptimumkan storan."</string> - <string name="android_upgrading_notification_title" msgid="1619393112444671028">"Android sedang ditingkatkan"</string> + <!-- no translation found for android_upgrading_notification_title (8428357096969413169) --> + <skip /> <string name="android_upgrading_notification_body" msgid="5761201379457064286">"Sesetengah apl mungkin tidak berfungsi dengan betul sehingga peningkatan selesai"</string> <string name="app_upgrading_toast" msgid="3008139776215597053">"<xliff:g id="APPLICATION">%1$s</xliff:g> sedang ditingkatkan…"</string> <string name="android_upgrading_apk" msgid="7904042682111526169">"Mengoptimumkan apl <xliff:g id="NUMBER_0">%1$d</xliff:g> daripada <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string> diff --git a/core/res/res/values-my-rMM/strings.xml b/core/res/res/values-my-rMM/strings.xml index e95906576c89..fd9ff7a896f8 100644 --- a/core/res/res/values-my-rMM/strings.xml +++ b/core/res/res/values-my-rMM/strings.xml @@ -678,6 +678,7 @@ <string name="lockscreen_pattern_correct" msgid="9039008650362261237">"မှန်ပါသည်"</string> <string name="lockscreen_pattern_wrong" msgid="4317955014948108794">"ထပ် စမ်းပါ"</string> <string name="lockscreen_password_wrong" msgid="5737815393253165301">"ထပ် စမ်းပါ"</string> + <string name="lockscreen_storage_locked" msgid="9167551160010625200">"ဝန်ဆောင်မှုနှင့် ဒေတာအားလုံးအတွက် လော့ခ်ဖွင့်ပါ"</string> <string name="faceunlock_multiple_failures" msgid="754137583022792429">"မျက်မှာမှတ် သော့ဖွင့်ခြင်း ခွင့်ပြုသော အကြိမ်ရေထက် ကျော်လွန်သွားပါပြီ"</string> <string name="lockscreen_missing_sim_message_short" msgid="5099439277819215399">"ဆင်းကဒ် မရှိပါ"</string> <string name="lockscreen_missing_sim_message" product="tablet" msgid="151659196095791474">"တက်ပလက်ထဲတွင်း ဆင်းကဒ် မရှိပါ"</string> @@ -1022,7 +1023,8 @@ <string name="android_upgrading_title" msgid="1584192285441405746">"အန်ဒရွိုက်ကို မွမ်းမံနေ…"</string> <string name="android_start_title" msgid="8418054686415318207">"Android စတင်နေ…"</string> <string name="android_upgrading_fstrim" msgid="8036718871534640010">"သိုလှောင်မှုအား ပြုပြင်ခြင်း။"</string> - <string name="android_upgrading_notification_title" msgid="1619393112444671028">"Android ကိုအဆင့်မြှင့်တင်နေပါသည်"</string> + <!-- no translation found for android_upgrading_notification_title (8428357096969413169) --> + <skip /> <string name="android_upgrading_notification_body" msgid="5761201379457064286">"အဆင့်မြှင့်တင်ခြင်း မပြီးဆုံးသေးသ၍ အချို့အက်ပ်များကို ကောင်းမွန်စွာအသုံးပြုနိုင်ဦးမည် မဟုတ်ပါ"</string> <string name="app_upgrading_toast" msgid="3008139776215597053">"<xliff:g id="APPLICATION">%1$s</xliff:g> ကို အဆင့်မြှင့်တင်နေပါသည်…"</string> <string name="android_upgrading_apk" msgid="7904042682111526169">"<xliff:g id="NUMBER_0">%1$d</xliff:g> ထဲက အက်ပ်<xliff:g id="NUMBER_1">%2$d</xliff:g>ကို ဆီလျော်အောင် လုပ်နေ"</string> diff --git a/core/res/res/values-nb/strings.xml b/core/res/res/values-nb/strings.xml index f45d26dfc6c6..82584d7a9d02 100644 --- a/core/res/res/values-nb/strings.xml +++ b/core/res/res/values-nb/strings.xml @@ -678,6 +678,7 @@ <string name="lockscreen_pattern_correct" msgid="9039008650362261237">"Riktig!"</string> <string name="lockscreen_pattern_wrong" msgid="4317955014948108794">"Prøv på nytt"</string> <string name="lockscreen_password_wrong" msgid="5737815393253165301">"Prøv på nytt"</string> + <string name="lockscreen_storage_locked" msgid="9167551160010625200">"Lås opp for å få alle funksjoner og data"</string> <string name="faceunlock_multiple_failures" msgid="754137583022792429">"Du har overskredet grensen for opplåsingsforsøk med Ansiktslås"</string> <string name="lockscreen_missing_sim_message_short" msgid="5099439277819215399">"SIM-kortet mangler"</string> <string name="lockscreen_missing_sim_message" product="tablet" msgid="151659196095791474">"Nettbrettet mangler SIM-kort."</string> @@ -1022,7 +1023,8 @@ <string name="android_upgrading_title" msgid="1584192285441405746">"Android oppgraderes …"</string> <string name="android_start_title" msgid="8418054686415318207">"Android starter …"</string> <string name="android_upgrading_fstrim" msgid="8036718871534640010">"Optimaliser lagring."</string> - <string name="android_upgrading_notification_title" msgid="1619393112444671028">"Android oppgraderes"</string> + <!-- no translation found for android_upgrading_notification_title (8428357096969413169) --> + <skip /> <string name="android_upgrading_notification_body" msgid="5761201379457064286">"Noen apper fungerer kanskje ikke skikkelig før oppgraderingen er fullført"</string> <string name="app_upgrading_toast" msgid="3008139776215597053">"<xliff:g id="APPLICATION">%1$s</xliff:g> oppgraderes …"</string> <string name="android_upgrading_apk" msgid="7904042682111526169">"Optimaliserer app <xliff:g id="NUMBER_0">%1$d</xliff:g> av <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string> diff --git a/core/res/res/values-ne-rNP/strings.xml b/core/res/res/values-ne-rNP/strings.xml index 88e9c5dd779a..c130c500f828 100644 --- a/core/res/res/values-ne-rNP/strings.xml +++ b/core/res/res/values-ne-rNP/strings.xml @@ -678,6 +678,7 @@ <string name="lockscreen_pattern_correct" msgid="9039008650362261237">"सही!"</string> <string name="lockscreen_pattern_wrong" msgid="4317955014948108794">"फेरि प्रयास गर्नुहोस्"</string> <string name="lockscreen_password_wrong" msgid="5737815393253165301">"फेरि प्रयास गर्नुहोस्"</string> + <string name="lockscreen_storage_locked" msgid="9167551160010625200">"सबै सुविधाहरू र डेटाका लागि अनलक गर्नुहोस्"</string> <string name="faceunlock_multiple_failures" msgid="754137583022792429">"अत्याधिक मोहडा खोल्ने प्रयासहरू बढी भए।"</string> <string name="lockscreen_missing_sim_message_short" msgid="5099439277819215399">"SIM कार्ड छैन"</string> <string name="lockscreen_missing_sim_message" product="tablet" msgid="151659196095791474">"ट्याब्लेटमा SIM कार्ड छैन।"</string> @@ -1028,7 +1029,8 @@ <string name="android_upgrading_title" msgid="1584192285441405746">"एन्ड्रोइड अपग्रेड हुँदैछ…"</string> <string name="android_start_title" msgid="8418054686415318207">"Android शुरू हुँदैछ..."</string> <string name="android_upgrading_fstrim" msgid="8036718871534640010">"भण्डारण अनुकूलन गर्दै।"</string> - <string name="android_upgrading_notification_title" msgid="1619393112444671028">"Android को स्तरवृद्धि हुँदैछ"</string> + <!-- no translation found for android_upgrading_notification_title (8428357096969413169) --> + <skip /> <string name="android_upgrading_notification_body" msgid="5761201379457064286">"स्तरवृद्धि सम्पन्न नभएसम्म केही अनुप्रयोगहरू राम्ररी काम नगर्न सक्छन्"</string> <string name="app_upgrading_toast" msgid="3008139776215597053">"<xliff:g id="APPLICATION">%1$s</xliff:g> को स्तरवृद्धि हुँदैछ…"</string> <string name="android_upgrading_apk" msgid="7904042682111526169">"अनुप्रयोग अनुकुल हुँदै <xliff:g id="NUMBER_0">%1$d</xliff:g> को <xliff:g id="NUMBER_1">%2$d</xliff:g>।"</string> diff --git a/core/res/res/values-nl/strings.xml b/core/res/res/values-nl/strings.xml index b4d9f6e9b6e7..35c58fe16432 100644 --- a/core/res/res/values-nl/strings.xml +++ b/core/res/res/values-nl/strings.xml @@ -678,6 +678,7 @@ <string name="lockscreen_pattern_correct" msgid="9039008650362261237">"Juist!"</string> <string name="lockscreen_pattern_wrong" msgid="4317955014948108794">"Opnieuw proberen"</string> <string name="lockscreen_password_wrong" msgid="5737815393253165301">"Nogmaals proberen"</string> + <string name="lockscreen_storage_locked" msgid="9167551160010625200">"Ontgrendelen voor alle functies en gegevens"</string> <string name="faceunlock_multiple_failures" msgid="754137583022792429">"Maximaal aantal pogingen voor Ontgrendelen via gezichtsherkenning overschreden"</string> <string name="lockscreen_missing_sim_message_short" msgid="5099439277819215399">"Geen simkaart"</string> <string name="lockscreen_missing_sim_message" product="tablet" msgid="151659196095791474">"Geen SIM-kaart in tablet."</string> @@ -1022,7 +1023,8 @@ <string name="android_upgrading_title" msgid="1584192285441405746">"Android wordt bijgewerkt..."</string> <string name="android_start_title" msgid="8418054686415318207">"Android wordt gestart…"</string> <string name="android_upgrading_fstrim" msgid="8036718871534640010">"Opslagruimte wordt geoptimaliseerd."</string> - <string name="android_upgrading_notification_title" msgid="1619393112444671028">"Android wordt geüpgraded"</string> + <!-- no translation found for android_upgrading_notification_title (8428357096969413169) --> + <skip /> <string name="android_upgrading_notification_body" msgid="5761201379457064286">"Sommige apps werken mogelijk pas correct nadat de upgrade is voltooid"</string> <string name="app_upgrading_toast" msgid="3008139776215597053">"<xliff:g id="APPLICATION">%1$s</xliff:g> upgraden…"</string> <string name="android_upgrading_apk" msgid="7904042682111526169">"App <xliff:g id="NUMBER_0">%1$d</xliff:g> van <xliff:g id="NUMBER_1">%2$d</xliff:g> optimaliseren."</string> @@ -1214,7 +1216,7 @@ <string name="deny" msgid="2081879885755434506">"Weigeren"</string> <string name="permission_request_notification_title" msgid="6486759795926237907">"Toestemming gevraagd"</string> <string name="permission_request_notification_with_subtitle" msgid="8530393139639560189">"Toestemming gevraagd\nvoor account <xliff:g id="ACCOUNT">%s</xliff:g>."</string> - <string name="forward_intent_to_owner" msgid="1207197447013960896">"U gebruikt deze app buiten je werkprofiel"</string> + <string name="forward_intent_to_owner" msgid="1207197447013960896">"Je gebruikt deze app buiten je werkprofiel"</string> <string name="forward_intent_to_work" msgid="621480743856004612">"U gebruikt deze app in je werkprofiel"</string> <string name="input_method_binding_label" msgid="1283557179944992649">"Invoermethode"</string> <string name="sync_binding_label" msgid="3687969138375092423">"Synchroniseren"</string> diff --git a/core/res/res/values-round-watch/styles_material.xml b/core/res/res/values-notround-watch/config_material.xml index a2f3c0243189..a99674f3f060 100644 --- a/core/res/res/values-round-watch/styles_material.xml +++ b/core/res/res/values-notround-watch/config_material.xml @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="UTF-8"?> +<?xml version="1.0" encoding="utf-8"?> <!-- Copyright (C) 2016 The Android Open Source Project Licensed under the Apache License, Version 2.0 (the "License"); @@ -13,8 +13,13 @@ See the License for the specific language governing permissions and limitations under the License. --> -<resources> - <style name="TextAppearance.Material.AlertDialogMessage" parent="TextAppearance.Material.Body1"> - <item name="textAlignment">center</item> - </style> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds, only for Material theme. Do not translate. + + NOTE: The naming convention is "config_camelCaseValue". --> + +<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- Gravity that should be used for dialog text styles. Equivalent to: Gravity.START | Gravity.TOP --> + <integer name="config_dialogTextGravity">0x00800033</integer> </resources> diff --git a/core/res/res/values-pa-rIN/strings.xml b/core/res/res/values-pa-rIN/strings.xml index 578767c861b2..0a05af3525b5 100644 --- a/core/res/res/values-pa-rIN/strings.xml +++ b/core/res/res/values-pa-rIN/strings.xml @@ -678,6 +678,7 @@ <string name="lockscreen_pattern_correct" msgid="9039008650362261237">"ਸਹੀ!"</string> <string name="lockscreen_pattern_wrong" msgid="4317955014948108794">"ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ"</string> <string name="lockscreen_password_wrong" msgid="5737815393253165301">"ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ"</string> + <string name="lockscreen_storage_locked" msgid="9167551160010625200">"ਸਾਰੀਆਂ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਅਤੇ ਡੈਟੇ ਲਈ ਅਨਲੌਕ ਕਰੋ"</string> <string name="faceunlock_multiple_failures" msgid="754137583022792429">"ਅਧਿਕਤਮ ਚਿਹਰਾ ਅਨਲੌਕ ਕੋਸ਼ਿਸ਼ਾਂ ਵਧੀਆਂ"</string> <string name="lockscreen_missing_sim_message_short" msgid="5099439277819215399">"ਕੋਈ SIM ਕਾਰਡ ਨਹੀਂ"</string> <string name="lockscreen_missing_sim_message" product="tablet" msgid="151659196095791474">"ਟੈਬਲੇਟ ਵਿੱਚ ਕੋਈ SIM ਕਾਰਡ ਨਹੀਂ।"</string> @@ -1022,7 +1023,8 @@ <string name="android_upgrading_title" msgid="1584192285441405746">"Android ਅਪਗ੍ਰੇਡ ਕਰ ਰਿਹਾ ਹੈ…"</string> <string name="android_start_title" msgid="8418054686415318207">"Android ਚਾਲੂ ਕਰ ਰਿਹਾ ਹੈ…"</string> <string name="android_upgrading_fstrim" msgid="8036718871534640010">"ਸਟੋਰੇਜ ਅਨੁਕੂਲ ਕਰ ਰਿਹਾ ਹੈ।"</string> - <string name="android_upgrading_notification_title" msgid="1619393112444671028">"Android ਅੱਪਗ੍ਰੇਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"</string> + <!-- no translation found for android_upgrading_notification_title (8428357096969413169) --> + <skip /> <string name="android_upgrading_notification_body" msgid="5761201379457064286">"ਹੋ ਸਕਦਾ ਹੈ ਕਿ ਕੁਝ ਐਪਾਂ ਅੱਪਗ੍ਰੇਡ ਦੇ ਪੂਰੀ ਹੋਣ ਤੱਕ ਸਹੀ ਢੰਗ ਨਾਲ ਕੰਮ ਨਾ ਕਰਨ"</string> <string name="app_upgrading_toast" msgid="3008139776215597053">"<xliff:g id="APPLICATION">%1$s</xliff:g> ਅੱਪਗ੍ਰੇਡ ਹੋ ਰਹੀ ਹੈ…"</string> <string name="android_upgrading_apk" msgid="7904042682111526169">"<xliff:g id="NUMBER_0">%1$d</xliff:g> <xliff:g id="NUMBER_1">%2$d</xliff:g> ਦਾ ਐਪ ਅਨੁਕੂਲ ਕਰ ਰਿਹਾ ਹੈ।"</string> diff --git a/core/res/res/values-pl/strings.xml b/core/res/res/values-pl/strings.xml index 8d0f70793b19..cb968e6b197f 100644 --- a/core/res/res/values-pl/strings.xml +++ b/core/res/res/values-pl/strings.xml @@ -684,6 +684,7 @@ <string name="lockscreen_pattern_correct" msgid="9039008650362261237">"Poprawnie!"</string> <string name="lockscreen_pattern_wrong" msgid="4317955014948108794">"Spróbuj ponownie."</string> <string name="lockscreen_password_wrong" msgid="5737815393253165301">"Spróbuj ponownie."</string> + <string name="lockscreen_storage_locked" msgid="9167551160010625200">"Odblokowanie wszystkich funkcji i danych"</string> <string name="faceunlock_multiple_failures" msgid="754137583022792429">"Przekroczono maksymalną liczbę prób rozpoznania twarzy."</string> <string name="lockscreen_missing_sim_message_short" msgid="5099439277819215399">"Brak karty SIM"</string> <string name="lockscreen_missing_sim_message" product="tablet" msgid="151659196095791474">"Brak karty SIM w tablecie."</string> @@ -1068,7 +1069,8 @@ <string name="android_upgrading_title" msgid="1584192285441405746">"Android jest uaktualniany..."</string> <string name="android_start_title" msgid="8418054686415318207">"Android się uruchamia…"</string> <string name="android_upgrading_fstrim" msgid="8036718871534640010">"Optymalizacja pamięci."</string> - <string name="android_upgrading_notification_title" msgid="1619393112444671028">"Android jest uaktualniany"</string> + <!-- no translation found for android_upgrading_notification_title (8428357096969413169) --> + <skip /> <string name="android_upgrading_notification_body" msgid="5761201379457064286">"Niektóre aplikacje mogą nie działać prawidłowo, dopóki nie zakończy się aktualizacja."</string> <string name="app_upgrading_toast" msgid="3008139776215597053">"Uaktualniam aplikację <xliff:g id="APPLICATION">%1$s</xliff:g>…"</string> <string name="android_upgrading_apk" msgid="7904042682111526169">"Optymalizowanie aplikacji <xliff:g id="NUMBER_0">%1$d</xliff:g> z <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string> diff --git a/core/res/res/values-pt-rBR/strings.xml b/core/res/res/values-pt-rBR/strings.xml index dcacac642fc2..9feac659978c 100644 --- a/core/res/res/values-pt-rBR/strings.xml +++ b/core/res/res/values-pt-rBR/strings.xml @@ -678,6 +678,7 @@ <string name="lockscreen_pattern_correct" msgid="9039008650362261237">"Correto!"</string> <string name="lockscreen_pattern_wrong" msgid="4317955014948108794">"Tente novamente"</string> <string name="lockscreen_password_wrong" msgid="5737815393253165301">"Tente novamente"</string> + <string name="lockscreen_storage_locked" msgid="9167551160010625200">"Desbloqueio para todos os recursos e dados"</string> <string name="faceunlock_multiple_failures" msgid="754137583022792429">"O número máximo de tentativas de Desbloqueio por reconhecimento facial foi excedido"</string> <string name="lockscreen_missing_sim_message_short" msgid="5099439277819215399">"Sem cartão SIM"</string> <string name="lockscreen_missing_sim_message" product="tablet" msgid="151659196095791474">"Não há um cartão SIM no tablet."</string> @@ -1022,7 +1023,8 @@ <string name="android_upgrading_title" msgid="1584192285441405746">"O Android está sendo atualizado..."</string> <string name="android_start_title" msgid="8418054686415318207">"O Android está iniciando..."</string> <string name="android_upgrading_fstrim" msgid="8036718871534640010">"Otimizando o armazenamento."</string> - <string name="android_upgrading_notification_title" msgid="1619393112444671028">"O Android está sendo atualizado"</string> + <!-- no translation found for android_upgrading_notification_title (8428357096969413169) --> + <skip /> <string name="android_upgrading_notification_body" msgid="5761201379457064286">"Alguns apps podem não funcionar corretamente até que a atualização seja concluída"</string> <string name="app_upgrading_toast" msgid="3008139776215597053">"<xliff:g id="APPLICATION">%1$s</xliff:g> está fazendo upgrade…"</string> <string name="android_upgrading_apk" msgid="7904042682111526169">"Otimizando app <xliff:g id="NUMBER_0">%1$d</xliff:g> de <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string> diff --git a/core/res/res/values-pt-rPT/strings.xml b/core/res/res/values-pt-rPT/strings.xml index 3acdc91fd171..5435a57fa1e1 100644 --- a/core/res/res/values-pt-rPT/strings.xml +++ b/core/res/res/values-pt-rPT/strings.xml @@ -678,6 +678,7 @@ <string name="lockscreen_pattern_correct" msgid="9039008650362261237">"Correcto!"</string> <string name="lockscreen_pattern_wrong" msgid="4317955014948108794">"Tentar novamente"</string> <string name="lockscreen_password_wrong" msgid="5737815393253165301">"Tentar novamente"</string> + <string name="lockscreen_storage_locked" msgid="9167551160010625200">"Desbloqueio de todas as funcionalidades e dados"</string> <string name="faceunlock_multiple_failures" msgid="754137583022792429">"Excedido o n.º máximo de tentativas de Desbloqueio Através do Rosto"</string> <string name="lockscreen_missing_sim_message_short" msgid="5099439277819215399">"Nenhum cartão SIM"</string> <string name="lockscreen_missing_sim_message" product="tablet" msgid="151659196095791474">"Nenhum cartão SIM no tablet."</string> @@ -1022,7 +1023,8 @@ <string name="android_upgrading_title" msgid="1584192285441405746">"O Android está a ser atualizado..."</string> <string name="android_start_title" msgid="8418054686415318207">"O Android está a iniciar…"</string> <string name="android_upgrading_fstrim" msgid="8036718871534640010">"A otimizar o armazenamento."</string> - <string name="android_upgrading_notification_title" msgid="1619393112444671028">"O Android está a ser atualizado"</string> + <!-- no translation found for android_upgrading_notification_title (8428357096969413169) --> + <skip /> <string name="android_upgrading_notification_body" msgid="5761201379457064286">"Algumas aplicações podem não funcionar corretamente enquanto a atualização não for concluída"</string> <string name="app_upgrading_toast" msgid="3008139776215597053">"O <xliff:g id="APPLICATION">%1$s</xliff:g> está a ser atualizado…"</string> <string name="android_upgrading_apk" msgid="7904042682111526169">"A otimizar a aplicação <xliff:g id="NUMBER_0">%1$d</xliff:g> de <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string> diff --git a/core/res/res/values-pt/strings.xml b/core/res/res/values-pt/strings.xml index dcacac642fc2..9feac659978c 100644 --- a/core/res/res/values-pt/strings.xml +++ b/core/res/res/values-pt/strings.xml @@ -678,6 +678,7 @@ <string name="lockscreen_pattern_correct" msgid="9039008650362261237">"Correto!"</string> <string name="lockscreen_pattern_wrong" msgid="4317955014948108794">"Tente novamente"</string> <string name="lockscreen_password_wrong" msgid="5737815393253165301">"Tente novamente"</string> + <string name="lockscreen_storage_locked" msgid="9167551160010625200">"Desbloqueio para todos os recursos e dados"</string> <string name="faceunlock_multiple_failures" msgid="754137583022792429">"O número máximo de tentativas de Desbloqueio por reconhecimento facial foi excedido"</string> <string name="lockscreen_missing_sim_message_short" msgid="5099439277819215399">"Sem cartão SIM"</string> <string name="lockscreen_missing_sim_message" product="tablet" msgid="151659196095791474">"Não há um cartão SIM no tablet."</string> @@ -1022,7 +1023,8 @@ <string name="android_upgrading_title" msgid="1584192285441405746">"O Android está sendo atualizado..."</string> <string name="android_start_title" msgid="8418054686415318207">"O Android está iniciando..."</string> <string name="android_upgrading_fstrim" msgid="8036718871534640010">"Otimizando o armazenamento."</string> - <string name="android_upgrading_notification_title" msgid="1619393112444671028">"O Android está sendo atualizado"</string> + <!-- no translation found for android_upgrading_notification_title (8428357096969413169) --> + <skip /> <string name="android_upgrading_notification_body" msgid="5761201379457064286">"Alguns apps podem não funcionar corretamente até que a atualização seja concluída"</string> <string name="app_upgrading_toast" msgid="3008139776215597053">"<xliff:g id="APPLICATION">%1$s</xliff:g> está fazendo upgrade…"</string> <string name="android_upgrading_apk" msgid="7904042682111526169">"Otimizando app <xliff:g id="NUMBER_0">%1$d</xliff:g> de <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string> diff --git a/core/res/res/values-ro/strings.xml b/core/res/res/values-ro/strings.xml index fa5a188ccf79..4743ac101110 100644 --- a/core/res/res/values-ro/strings.xml +++ b/core/res/res/values-ro/strings.xml @@ -27,11 +27,11 @@ <string name="terabyteShort" msgid="231613018159186962">"TO"</string> <string name="petabyteShort" msgid="5637816680144990219">"PO"</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> (de) zile"</string> + <string name="durationDays" msgid="6652371460511178259">"<xliff:g id="DAYS">%1$d</xliff:g> zile"</string> <string name="durationDayHours" msgid="2713107458736744435">"<xliff:g id="DAYS">%1$d</xliff:g> zile <xliff:g id="HOURS">%2$d</xliff:g> h"</string> <string name="durationDayHour" msgid="7293789639090958917">"<xliff:g id="DAYS">%1$d</xliff:g> zi <xliff:g id="HOURS">%2$d</xliff:g> h"</string> <string name="durationHours" msgid="4266858287167358988">"<xliff:g id="HOURS">%1$d</xliff:g> h"</string> - <string name="durationHourMinutes" msgid="9029176248692041549">"<xliff:g id="HOURS">%1$d</xliff:g> h <xliff:g id="MINUTES">%2$d</xliff:g> (de) min"</string> + <string name="durationHourMinutes" msgid="9029176248692041549">"<xliff:g id="HOURS">%1$d</xliff:g> h <xliff:g id="MINUTES">%2$d</xliff:g> min"</string> <string name="durationHourMinute" msgid="2741677355177402539">"<xliff:g id="HOURS">%1$d</xliff:g> h <xliff:g id="MINUTES">%2$d</xliff:g> min"</string> <string name="durationMinutes" msgid="3134226679883579347">"<xliff:g id="MINUTES">%1$d</xliff:g> min"</string> <string name="durationMinute" msgid="7155301744174623818">"<xliff:g id="MINUTES">%1$d</xliff:g> min."</string> @@ -140,7 +140,7 @@ <string name="wfc_mode_wifi_only_summary" msgid="2379919155237869320">"Numai Wi-Fi"</string> <string name="cfTemplateNotForwarded" msgid="1683685883841272560">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: neredirecționată"</string> <string name="cfTemplateForwarded" msgid="1302922117498590521">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g>"</string> - <string name="cfTemplateForwardedTime" msgid="9206251736527085256">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g> după <xliff:g id="TIME_DELAY">{2}</xliff:g> (de) secunde"</string> + <string name="cfTemplateForwardedTime" msgid="9206251736527085256">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g> după <xliff:g id="TIME_DELAY">{2}</xliff:g> secunde"</string> <string name="cfTemplateRegistered" msgid="5073237827620166285">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: neredirecționat"</string> <string name="cfTemplateRegisteredTime" msgid="6781621964320635172">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: neredirecționat"</string> <string name="fcComplete" msgid="3118848230966886575">"Cod de funcție complet."</string> @@ -681,6 +681,7 @@ <string name="lockscreen_pattern_correct" msgid="9039008650362261237">"Corect!"</string> <string name="lockscreen_pattern_wrong" msgid="4317955014948108794">"Încercați din nou"</string> <string name="lockscreen_password_wrong" msgid="5737815393253165301">"Încercați din nou"</string> + <string name="lockscreen_storage_locked" msgid="9167551160010625200">"Deblocați pentru toate funcțiile și datele"</string> <string name="faceunlock_multiple_failures" msgid="754137583022792429">"S-a depășit numărul maxim de încercări pentru Deblocare facială"</string> <string name="lockscreen_missing_sim_message_short" msgid="5099439277819215399">"Fără SIM"</string> <string name="lockscreen_missing_sim_message" product="tablet" msgid="151659196095791474">"Nu există card SIM în computerul tablet PC."</string> @@ -703,19 +704,19 @@ <string name="lockscreen_sim_puk_locked_instructions" msgid="8127916255245181063">"Consultați Ghidul de utilizare sau contactați Serviciul de relații cu clienții."</string> <string name="lockscreen_sim_locked_message" msgid="8066660129206001039">"Cardul SIM este blocat."</string> <string name="lockscreen_sim_unlock_progress_dialog_message" msgid="595323214052881264">"Se deblochează cardul SIM..."</string> - <string name="lockscreen_too_many_failed_attempts_dialog_message" msgid="6481623830344107222">"Ați desenat incorect modelul pentru deblocare de <xliff:g id="NUMBER_0">%1$d</xliff:g> ori. \n\nÎncercați din nou peste <xliff:g id="NUMBER_1">%2$d</xliff:g> (de) secunde."</string> - <string name="lockscreen_too_many_failed_password_attempts_dialog_message" msgid="2725973286239344555">"Ați introdus incorect parola de <xliff:g id="NUMBER_0">%1$d</xliff:g> ori. \n\nÎncercați din nou peste <xliff:g id="NUMBER_1">%2$d</xliff:g> (de) secunde."</string> - <string name="lockscreen_too_many_failed_pin_attempts_dialog_message" msgid="6216672706545696955">"Ați introdus incorect codul PIN de <xliff:g id="NUMBER_0">%1$d</xliff:g> ori.\n\nÎncercați din nou peste <xliff:g id="NUMBER_1">%2$d</xliff:g> (de) secunde."</string> - <string name="lockscreen_failed_attempts_almost_glogin" product="tablet" msgid="9191611984625460820">"Ați desenat incorect modelul pentru deblocare de <xliff:g id="NUMBER_0">%1$d</xliff:g> ori. După încă <xliff:g id="NUMBER_1">%2$d</xliff:g> încercări nereușite, vi se va solicita să deblocați tableta cu ajutorul datelor de conectare la Google.\n\n Încercați din nou peste <xliff:g id="NUMBER_2">%3$d</xliff:g> (de) secunde."</string> - <string name="lockscreen_failed_attempts_almost_glogin" product="tv" msgid="5316664559603394684">"Ați desenat incorect modelul pentru deblocare de <xliff:g id="NUMBER_0">%1$d</xliff:g> ori. După încă <xliff:g id="NUMBER_1">%2$d</xliff:g> încercări nereușite, vi se va solicita să deblocați televizorul cu ajutorul datelor de conectare la Google.\n\n Încercați din nou peste <xliff:g id="NUMBER_2">%3$d</xliff:g> (de) secunde."</string> - <string name="lockscreen_failed_attempts_almost_glogin" product="default" msgid="2590227559763762751">"Ați desenat incorect modelul pentru deblocare de <xliff:g id="NUMBER_0">%1$d</xliff:g> ori. După încă <xliff:g id="NUMBER_1">%2$d</xliff:g> încercări nereușite, vi se va solicita să deblocați telefonul cu ajutorul datelor de conectare la Google.\n\n Încercați din nou peste <xliff:g id="NUMBER_2">%3$d</xliff:g> (de) secunde."</string> + <string name="lockscreen_too_many_failed_attempts_dialog_message" msgid="6481623830344107222">"Ați desenat incorect modelul pentru deblocare de <xliff:g id="NUMBER_0">%1$d</xliff:g> ori. \n\nÎncercați din nou peste <xliff:g id="NUMBER_1">%2$d</xliff:g> secunde."</string> + <string name="lockscreen_too_many_failed_password_attempts_dialog_message" msgid="2725973286239344555">"Ați introdus incorect parola de <xliff:g id="NUMBER_0">%1$d</xliff:g> ori. \n\nÎncercați din nou peste <xliff:g id="NUMBER_1">%2$d</xliff:g> secunde."</string> + <string name="lockscreen_too_many_failed_pin_attempts_dialog_message" msgid="6216672706545696955">"Ați introdus incorect codul PIN de <xliff:g id="NUMBER_0">%1$d</xliff:g> ori.\n\nÎncercați din nou peste <xliff:g id="NUMBER_1">%2$d</xliff:g> secunde."</string> + <string name="lockscreen_failed_attempts_almost_glogin" product="tablet" msgid="9191611984625460820">"Ați desenat incorect modelul pentru deblocare de <xliff:g id="NUMBER_0">%1$d</xliff:g> ori. După încă <xliff:g id="NUMBER_1">%2$d</xliff:g> încercări nereușite, vi se va solicita să deblocați tableta cu ajutorul datelor de conectare la Google.\n\n Încercați din nou peste <xliff:g id="NUMBER_2">%3$d</xliff:g> secunde."</string> + <string name="lockscreen_failed_attempts_almost_glogin" product="tv" msgid="5316664559603394684">"Ați desenat incorect modelul pentru deblocare de <xliff:g id="NUMBER_0">%1$d</xliff:g> ori. După încă <xliff:g id="NUMBER_1">%2$d</xliff:g> încercări nereușite, vi se va solicita să deblocați televizorul cu ajutorul datelor de conectare la Google.\n\n Încercați din nou peste <xliff:g id="NUMBER_2">%3$d</xliff:g> secunde."</string> + <string name="lockscreen_failed_attempts_almost_glogin" product="default" msgid="2590227559763762751">"Ați desenat incorect modelul pentru deblocare de <xliff:g id="NUMBER_0">%1$d</xliff:g> ori. După încă <xliff:g id="NUMBER_1">%2$d</xliff:g> încercări nereușite, vi se va solicita să deblocați telefonul cu ajutorul datelor de conectare la Google.\n\n Încercați din nou peste <xliff:g id="NUMBER_2">%3$d</xliff:g> secunde."</string> <string name="lockscreen_failed_attempts_almost_at_wipe" product="tablet" msgid="6128106399745755604">"Ați efectuat <xliff:g id="NUMBER_0">%1$d</xliff:g> încercări incorecte de deblocare a tabletei. După încă <xliff:g id="NUMBER_1">%2$d</xliff:g> încercări nereușite, aceasta va fi resetată la setările prestabilite din fabrică, iar toate datele de utilizator vor fi pierdute."</string> <string name="lockscreen_failed_attempts_almost_at_wipe" product="tv" msgid="950408382418270260">"Ați efectuat <xliff:g id="NUMBER_0">%1$d</xliff:g> încercări incorecte de deblocare a televizorului. După încă <xliff:g id="NUMBER_1">%2$d</xliff:g> încercări nereușite, televizorul va reveni la setările prestabilite din fabrică, iar toate datele de utilizator se vor pierde."</string> <string name="lockscreen_failed_attempts_almost_at_wipe" product="default" msgid="8603565142156826565">"Ați efectuat <xliff:g id="NUMBER_0">%1$d</xliff:g> încercări incorecte de deblocare a telefonului. După încă <xliff:g id="NUMBER_1">%2$d</xliff:g> încercări nereușite, acesta va fi resetat la setările prestabilite din fabrică, iar toate datele de utilizator vor fi pierdute."</string> <string name="lockscreen_failed_attempts_now_wiping" product="tablet" msgid="280873516493934365">"Ați efectuat <xliff:g id="NUMBER">%d</xliff:g> încercări incorecte de deblocare a tabletei. Tableta va fi acum resetată la setările prestabilite din fabrică."</string> <string name="lockscreen_failed_attempts_now_wiping" product="tv" msgid="3195755534096192191">"Ați efectuat <xliff:g id="NUMBER">%d</xliff:g> încercări incorecte de deblocare a televizorului. Televizorul va reveni acum la setările prestabilite din fabrică."</string> <string name="lockscreen_failed_attempts_now_wiping" product="default" msgid="3025504721764922246">"Ați efectuat <xliff:g id="NUMBER">%d</xliff:g> încercări incorecte de deblocare a telefonului. Acesta va fi acum resetat la setările prestabilite din fabrică."</string> - <string name="lockscreen_too_many_failed_attempts_countdown" msgid="6251480343394389665">"Încercați din nou peste <xliff:g id="NUMBER">%d</xliff:g> (de) secunde."</string> + <string name="lockscreen_too_many_failed_attempts_countdown" msgid="6251480343394389665">"Încercați din nou peste <xliff:g id="NUMBER">%d</xliff:g> secunde."</string> <string name="lockscreen_forgot_pattern_button_text" msgid="2626999449610695930">"Ați uitat modelul?"</string> <string name="lockscreen_glogin_forgot_pattern" msgid="2588521501166032747">"Deblocare cont"</string> <string name="lockscreen_glogin_too_many_attempts" msgid="2751368605287288808">"Prea multe încercări de desenare a modelului"</string> @@ -839,7 +840,7 @@ <string name="preposition_for_time" msgid="5506831244263083793">"la <xliff:g id="TIME">%s</xliff:g>"</string> <string name="preposition_for_year" msgid="5040395640711867177">"în <xliff:g id="YEAR">%s</xliff:g>"</string> <string name="day" msgid="8144195776058119424">"zi"</string> - <string name="days" msgid="4774547661021344602">" (de) zile"</string> + <string name="days" msgid="4774547661021344602">" zile"</string> <string name="hour" msgid="2126771916426189481">"oră"</string> <string name="hours" msgid="894424005266852993">"ore"</string> <string name="minute" msgid="9148878657703769868">"min"</string> @@ -1045,7 +1046,8 @@ <string name="android_upgrading_title" msgid="1584192285441405746">"Android trece la o versiune superioară..."</string> <string name="android_start_title" msgid="8418054686415318207">"Android pornește..."</string> <string name="android_upgrading_fstrim" msgid="8036718871534640010">"Se optimizează stocarea."</string> - <string name="android_upgrading_notification_title" msgid="1619393112444671028">"Android face upgrade"</string> + <!-- no translation found for android_upgrading_notification_title (8428357096969413169) --> + <skip /> <string name="android_upgrading_notification_body" msgid="5761201379457064286">"Este posibil ca unele aplicații să nu funcționeze corespunzător până când nu se finalizează upgrade-ul"</string> <string name="app_upgrading_toast" msgid="3008139776215597053">"Se face upgrade pentru <xliff:g id="APPLICATION">%1$s</xliff:g>…"</string> <string name="android_upgrading_apk" msgid="7904042682111526169">"Se optimizează aplicația <xliff:g id="NUMBER_0">%1$d</xliff:g> din <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string> @@ -1290,7 +1292,7 @@ <string name="gpsVerifYes" msgid="2346566072867213563">"Da"</string> <string name="gpsVerifNo" msgid="1146564937346454865">"Nu"</string> <string name="sync_too_many_deletes" msgid="5296321850662746890">"Limita pentru ștergere a fost depășită"</string> - <string name="sync_too_many_deletes_desc" msgid="496551671008694245">"Există <xliff:g id="NUMBER_OF_DELETED_ITEMS">%1$d</xliff:g> (de) elemente șterse pentru <xliff:g id="TYPE_OF_SYNC">%2$s</xliff:g>, contul <xliff:g id="ACCOUNT_NAME">%3$s</xliff:g>. Ce doriți să faceți?"</string> + <string name="sync_too_many_deletes_desc" msgid="496551671008694245">"Există <xliff:g id="NUMBER_OF_DELETED_ITEMS">%1$d</xliff:g> elemente șterse pentru <xliff:g id="TYPE_OF_SYNC">%2$s</xliff:g>, contul <xliff:g id="ACCOUNT_NAME">%3$s</xliff:g>. Ce doriți să faceți?"</string> <string name="sync_really_delete" msgid="2572600103122596243">"Ștergeți elementele"</string> <string name="sync_undo_deletes" msgid="2941317360600338602">"Anulați aceste ștergeri"</string> <string name="sync_do_nothing" msgid="3743764740430821845">"Nu trebuie să luați nicio măsură deocamdată"</string> @@ -1408,7 +1410,7 @@ <string name="kg_wrong_pattern" msgid="1850806070801358830">"Model greșit"</string> <string name="kg_wrong_password" msgid="2333281762128113157">"Parolă greșită"</string> <string name="kg_wrong_pin" msgid="1131306510833563801">"Cod PIN greșit"</string> - <string name="kg_too_many_failed_attempts_countdown" msgid="6358110221603297548">"Încercați din nou peste <xliff:g id="NUMBER">%1$d</xliff:g> (de) secunde."</string> + <string name="kg_too_many_failed_attempts_countdown" msgid="6358110221603297548">"Încercați din nou peste <xliff:g id="NUMBER">%1$d</xliff:g> secunde."</string> <string name="kg_pattern_instructions" msgid="398978611683075868">"Desenați modelul"</string> <string name="kg_sim_pin_instructions" msgid="2319508550934557331">"Introduceți codul PIN al cardului SIM"</string> <string name="kg_pin_instructions" msgid="2377242233495111557">"Introduceți codul PIN"</string> @@ -1430,18 +1432,18 @@ <string name="kg_login_invalid_input" msgid="5754664119319872197">"Nume de utilizator sau parolă nevalide."</string> <string name="kg_login_account_recovery_hint" msgid="5690709132841752974">"Ați uitat numele de utilizator sau parola?\nAccesați "<b>"google.com/accounts/recovery"</b>"."</string> <string name="kg_login_checking_password" msgid="1052685197710252395">"Se verifică contul…"</string> - <string name="kg_too_many_failed_pin_attempts_dialog_message" msgid="8276745642049502550">"Ați introdus incorect codul PIN de <xliff:g id="NUMBER_0">%1$d</xliff:g> ori.\n\nÎncercați din nou peste <xliff:g id="NUMBER_1">%2$d</xliff:g> (de) secunde."</string> - <string name="kg_too_many_failed_password_attempts_dialog_message" msgid="7813713389422226531">"Ați introdus incorect parola de <xliff:g id="NUMBER_0">%1$d</xliff:g> ori. \n\nÎncercați din nou peste <xliff:g id="NUMBER_1">%2$d</xliff:g> (de) secunde."</string> - <string name="kg_too_many_failed_pattern_attempts_dialog_message" msgid="74089475965050805">"Ați desenat incorect modelul pentru deblocare de <xliff:g id="NUMBER_0">%1$d</xliff:g> ori. \n\nÎncercați din nou peste <xliff:g id="NUMBER_1">%2$d</xliff:g> (de) secunde."</string> + <string name="kg_too_many_failed_pin_attempts_dialog_message" msgid="8276745642049502550">"Ați introdus incorect codul PIN de <xliff:g id="NUMBER_0">%1$d</xliff:g> ori.\n\nÎncercați din nou peste <xliff:g id="NUMBER_1">%2$d</xliff:g> secunde."</string> + <string name="kg_too_many_failed_password_attempts_dialog_message" msgid="7813713389422226531">"Ați introdus incorect parola de <xliff:g id="NUMBER_0">%1$d</xliff:g> ori. \n\nÎncercați din nou peste <xliff:g id="NUMBER_1">%2$d</xliff:g> secunde."</string> + <string name="kg_too_many_failed_pattern_attempts_dialog_message" msgid="74089475965050805">"Ați desenat incorect modelul pentru deblocare de <xliff:g id="NUMBER_0">%1$d</xliff:g> ori. \n\nÎncercați din nou peste <xliff:g id="NUMBER_1">%2$d</xliff:g> secunde."</string> <string name="kg_failed_attempts_almost_at_wipe" product="tablet" msgid="1575557200627128949">"Ați efectuat <xliff:g id="NUMBER_0">%1$d</xliff:g> încercări incorecte de deblocare a tabletei. După încă <xliff:g id="NUMBER_1">%2$d</xliff:g> încercări nereușite, aceasta va fi resetată la setările prestabilite din fabrică, iar toate datele de utilizator se vor pierde."</string> <string name="kg_failed_attempts_almost_at_wipe" product="tv" msgid="5621231220154419413">"Ați efectuat <xliff:g id="NUMBER_0">%1$d</xliff:g> încercări incorecte de deblocare a televizorului. După încă <xliff:g id="NUMBER_1">%2$d</xliff:g> încercări nereușite, televizorul va reveni la setările prestabilite din fabrică, iar toate datele de utilizator se vor pierde."</string> <string name="kg_failed_attempts_almost_at_wipe" product="default" msgid="4051015943038199910">"Ați efectuat <xliff:g id="NUMBER_0">%1$d</xliff:g> încercări incorecte de deblocare a telefonului. După încă <xliff:g id="NUMBER_1">%2$d</xliff:g> încercări nereușite, acesta va fi resetat la setările prestabilite din fabrică, iar toate datele de utilizator se vor pierde."</string> <string name="kg_failed_attempts_now_wiping" product="tablet" msgid="2072996269148483637">"Ați efectuat <xliff:g id="NUMBER">%d</xliff:g> încercări incorecte de deblocare a tabletei. Tableta va fi acum resetată la setările prestabilite din fabrică."</string> <string name="kg_failed_attempts_now_wiping" product="tv" msgid="4987878286750741463">"Ați efectuat <xliff:g id="NUMBER">%d</xliff:g> încercări incorecte de deblocare a televizorului. Televizorul va reveni acum la setările prestabilite din fabrică."</string> <string name="kg_failed_attempts_now_wiping" product="default" msgid="4817627474419471518">"Ați efectuat <xliff:g id="NUMBER">%d</xliff:g> încercări incorecte de deblocare a telefonului. Telefonul va fi acum resetat la setările prestabilite din fabrică."</string> - <string name="kg_failed_attempts_almost_at_login" product="tablet" msgid="3253575572118914370">"Ați desenat incorect modelul pentru deblocare de <xliff:g id="NUMBER_0">%1$d</xliff:g> ori. După încă <xliff:g id="NUMBER_1">%2$d</xliff:g> încercări nereușite, vi se va solicita să deblocați tableta cu ajutorul unui cont de e-mail.\n\n Încercați din nou peste <xliff:g id="NUMBER_2">%3$d</xliff:g> (de) secunde."</string> - <string name="kg_failed_attempts_almost_at_login" product="tv" msgid="4224651132862313471">"Ați desenat incorect modelul pentru deblocare de <xliff:g id="NUMBER_0">%1$d</xliff:g> ori. După încă <xliff:g id="NUMBER_1">%2$d</xliff:g> încercări nereușite, vi se va solicita să deblocați televizorul cu ajutorul unui cont de e-mail.\n\n Încercați din nou peste <xliff:g id="NUMBER_2">%3$d</xliff:g> (de) secunde."</string> - <string name="kg_failed_attempts_almost_at_login" product="default" msgid="1437638152015574839">"Ați desenat incorect modelul pentru deblocare de <xliff:g id="NUMBER_0">%1$d</xliff:g> ori. După încă <xliff:g id="NUMBER_1">%2$d</xliff:g> încercări nereușite, vi se va solicita să deblocați telefonul cu ajutorul unui cont de e-mail.\n\n Încercați din nou peste <xliff:g id="NUMBER_2">%3$d</xliff:g> (de) secunde."</string> + <string name="kg_failed_attempts_almost_at_login" product="tablet" msgid="3253575572118914370">"Ați desenat incorect modelul pentru deblocare de <xliff:g id="NUMBER_0">%1$d</xliff:g> ori. După încă <xliff:g id="NUMBER_1">%2$d</xliff:g> încercări nereușite, vi se va solicita să deblocați tableta cu ajutorul unui cont de e-mail.\n\n Încercați din nou peste <xliff:g id="NUMBER_2">%3$d</xliff:g> secunde."</string> + <string name="kg_failed_attempts_almost_at_login" product="tv" msgid="4224651132862313471">"Ați desenat incorect modelul pentru deblocare de <xliff:g id="NUMBER_0">%1$d</xliff:g> ori. După încă <xliff:g id="NUMBER_1">%2$d</xliff:g> încercări nereușite, vi se va solicita să deblocați televizorul cu ajutorul unui cont de e-mail.\n\n Încercați din nou peste <xliff:g id="NUMBER_2">%3$d</xliff:g> secunde."</string> + <string name="kg_failed_attempts_almost_at_login" product="default" msgid="1437638152015574839">"Ați desenat incorect modelul pentru deblocare de <xliff:g id="NUMBER_0">%1$d</xliff:g> ori. După încă <xliff:g id="NUMBER_1">%2$d</xliff:g> încercări nereușite, vi se va solicita să deblocați telefonul cu ajutorul unui cont de e-mail.\n\n Încercați din nou peste <xliff:g id="NUMBER_2">%3$d</xliff:g> secunde."</string> <string name="kg_text_message_separator" product="default" msgid="4160700433287233771">" — "</string> <string name="kg_reordering_delete_drop_target_text" msgid="7899202978204438708">"Eliminați"</string> <string name="safe_media_volume_warning" product="default" msgid="2276318909314492312">"Ridicați volumul mai sus de nivelul recomandat?\n\nAscultarea la volum ridicat pe perioade lungi de timp vă poate afecta auzul."</string> diff --git a/core/res/res/values-round-watch/config_material.xml b/core/res/res/values-round-watch/config_material.xml index bf445ef3fd0e..871e910eb042 100644 --- a/core/res/res/values-round-watch/config_material.xml +++ b/core/res/res/values-round-watch/config_material.xml @@ -19,4 +19,7 @@ <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <!-- Don't clip on round screens so the list can scroll past the rounded edges. --> <bool name="config_preferenceFragmentClipToPadding">false</bool> + + <!-- Gravity that should be used for dialog text styles. Equivalent to: Gravity.CENTER_HORIZONTAL | Gravity.TOP --> + <integer name="config_dialogTextGravity">0x00000031</integer> </resources> diff --git a/core/res/res/values-ru/strings.xml b/core/res/res/values-ru/strings.xml index 67cb5192590b..d5bd7bff65f5 100644 --- a/core/res/res/values-ru/strings.xml +++ b/core/res/res/values-ru/strings.xml @@ -268,7 +268,7 @@ <string name="permgroupdesc_sensors" msgid="7147968539346634043">"доступ к данным датчиков о состоянии организма"</string> <string name="capability_title_canRetrieveWindowContent" msgid="3901717936930170320">"Получать содержимое окна"</string> <string name="capability_desc_canRetrieveWindowContent" msgid="3772225008605310672">"Анализировать содержимое активного окна."</string> - <string name="capability_title_canRequestTouchExploration" msgid="3108723364676667320">"Включать аудиоподсказки"</string> + <string name="capability_title_canRequestTouchExploration" msgid="3108723364676667320">"Включать Изучение касанием"</string> <string name="capability_desc_canRequestTouchExploration" msgid="7543249041581408313">"Озвучивать нажимаемые элементы и разрешать управление устройством с помощью жестов."</string> <string name="capability_title_canRequestEnhancedWebAccessibility" msgid="1739881766522594073">"Включать спец. возможности для Интернета"</string> <string name="capability_desc_canRequestEnhancedWebAccessibility" msgid="7881063961507511765">"Могут быть установлены дополнительные скрипты."</string> @@ -684,6 +684,7 @@ <string name="lockscreen_pattern_correct" msgid="9039008650362261237">"Правильно!"</string> <string name="lockscreen_pattern_wrong" msgid="4317955014948108794">"Повторите попытку"</string> <string name="lockscreen_password_wrong" msgid="5737815393253165301">"Повторите попытку"</string> + <string name="lockscreen_storage_locked" msgid="9167551160010625200">"Разблок. для доступа ко всем функциям и данным"</string> <string name="faceunlock_multiple_failures" msgid="754137583022792429">"Все попытки войти с помощью Фейсконтроля использованы"</string> <string name="lockscreen_missing_sim_message_short" msgid="5099439277819215399">"Нет SIM-карты"</string> <string name="lockscreen_missing_sim_message" product="tablet" msgid="151659196095791474">"SIM-карта не установлена."</string> @@ -826,9 +827,9 @@ <string name="searchview_description_clear" msgid="1330281990951833033">"Удалить запрос"</string> <string name="searchview_description_submit" msgid="2688450133297983542">"Отправить запрос"</string> <string name="searchview_description_voice" msgid="2453203695674994440">"Голосовой поиск"</string> - <string name="enable_explore_by_touch_warning_title" msgid="7460694070309730149">"Включить аудиоподсказки?"</string> - <string name="enable_explore_by_touch_warning_message" product="tablet" msgid="8655887539089910577">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> хочет включить функцию \"Аудиоподсказки\". Она позволяет прослушивать или просматривать описание элементов, которых вы касаетесь, и управлять планшетным ПК с помощью жестов."</string> - <string name="enable_explore_by_touch_warning_message" product="default" msgid="2708199672852373195">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> хочет включить функцию \"Аудиоподсказки\". Она позволяет прослушивать или просматривать описание элементов, которых вы касаетесь, и управлять телефоном с помощью жестов."</string> + <string name="enable_explore_by_touch_warning_title" msgid="7460694070309730149">"Включить Изучение касанием?"</string> + <string name="enable_explore_by_touch_warning_message" product="tablet" msgid="8655887539089910577">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> хочет включить Изучение касанием. Вы сможете прослушивать или просматривать описание элементов, которых касаетесь, и управлять планшетом с помощью жестов."</string> + <string name="enable_explore_by_touch_warning_message" product="default" msgid="2708199672852373195">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> хочет включить Изучение касанием. Вы сможете прослушивать или просматривать описание элементов, которых касаетесь, и управлять телефоном с помощью жестов."</string> <string name="oneMonthDurationPast" msgid="7396384508953779925">"1 месяц назад"</string> <string name="beforeOneMonthDurationPast" msgid="909134546836499826">"Более месяца назад"</string> <plurals name="last_num_days" formatted="false" msgid="5104533550723932025"> @@ -1068,7 +1069,8 @@ <string name="android_upgrading_title" msgid="1584192285441405746">"Обновление Android..."</string> <string name="android_start_title" msgid="8418054686415318207">"Запуск Android…"</string> <string name="android_upgrading_fstrim" msgid="8036718871534640010">"Оптимизация хранилища…"</string> - <string name="android_upgrading_notification_title" msgid="1619393112444671028">"Обновление Android"</string> + <!-- no translation found for android_upgrading_notification_title (8428357096969413169) --> + <skip /> <string name="android_upgrading_notification_body" msgid="5761201379457064286">"Во время обновления возможны неполадки в работе приложений."</string> <string name="app_upgrading_toast" msgid="3008139776215597053">"Обновление приложения \"<xliff:g id="APPLICATION">%1$s</xliff:g>\"…"</string> <string name="android_upgrading_apk" msgid="7904042682111526169">"Оптимизация приложения <xliff:g id="NUMBER_0">%1$d</xliff:g> из <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string> diff --git a/core/res/res/values-si-rLK/strings.xml b/core/res/res/values-si-rLK/strings.xml index e68b2a712f4a..bfce9eef3689 100644 --- a/core/res/res/values-si-rLK/strings.xml +++ b/core/res/res/values-si-rLK/strings.xml @@ -678,6 +678,7 @@ <string name="lockscreen_pattern_correct" msgid="9039008650362261237">"නිවැරදියි!"</string> <string name="lockscreen_pattern_wrong" msgid="4317955014948108794">"නැවත උත්සාහ කරන්න"</string> <string name="lockscreen_password_wrong" msgid="5737815393253165301">"නැවත උත්සාහ කරන්න"</string> + <string name="lockscreen_storage_locked" msgid="9167551160010625200">"සියලු විශේෂාංග සහ දත්ත අනවහිර කරන්න"</string> <string name="faceunlock_multiple_failures" msgid="754137583022792429">"මුහුණ භාවිතයෙන් අඟුළු හැරීමේ උපරිම ප්රයන්තයන් ගණන ඉක්මවා ඇත"</string> <string name="lockscreen_missing_sim_message_short" msgid="5099439277819215399">"SIM පත නැත"</string> <string name="lockscreen_missing_sim_message" product="tablet" msgid="151659196095791474">"ටැබ්ලටයේ SIM පත නොමැත."</string> @@ -1024,7 +1025,8 @@ <string name="android_upgrading_title" msgid="1584192285441405746">"Android උත්ශ්රේණි වෙමින් පවතී..."</string> <string name="android_start_title" msgid="8418054686415318207">"Android ආරම්භ කරමින්…"</string> <string name="android_upgrading_fstrim" msgid="8036718871534640010">"ආචයනය ප්රශස්තිකරණය කිරීම."</string> - <string name="android_upgrading_notification_title" msgid="1619393112444671028">"Android උත්ශ්රේණි කරමින්"</string> + <!-- no translation found for android_upgrading_notification_title (8428357096969413169) --> + <skip /> <string name="android_upgrading_notification_body" msgid="5761201379457064286">"උත්ශ්රේණි කිරීම අවසන් වන තෙක් සමහර යෙදුම් නිසි ලෙස ක්රියා නොකළ හැකිය"</string> <string name="app_upgrading_toast" msgid="3008139776215597053">"<xliff:g id="APPLICATION">%1$s</xliff:g> උත්ශ්රේණි කරමින්…"</string> <string name="android_upgrading_apk" msgid="7904042682111526169">"<xliff:g id="NUMBER_1">%2$d</xliff:g> කින් <xliff:g id="NUMBER_0">%1$d</xliff:g> වැනි යෙදුම ප්රශස්ත කරමින්."</string> diff --git a/core/res/res/values-sk/strings.xml b/core/res/res/values-sk/strings.xml index 09401e37ccc6..9065aea63722 100644 --- a/core/res/res/values-sk/strings.xml +++ b/core/res/res/values-sk/strings.xml @@ -249,23 +249,23 @@ <string name="user_owner_label" msgid="1119010402169916617">"Prepnúť na osobný"</string> <string name="managed_profile_label" msgid="5289992269827577857">"Prepnúť na pracovný"</string> <string name="permgrouplab_contacts" msgid="3657758145679177612">"Kontakty"</string> - <string name="permgroupdesc_contacts" msgid="6951499528303668046">"prístup k vašim kontaktom"</string> + <string name="permgroupdesc_contacts" msgid="6951499528303668046">"prístup ku kontaktom"</string> <string name="permgrouplab_location" msgid="7275582855722310164">"Poloha"</string> <string name="permgroupdesc_location" msgid="1346617465127855033">"prístup k polohe tohto zariadenia"</string> <string name="permgrouplab_calendar" msgid="5863508437783683902">"Kalendár"</string> <string name="permgroupdesc_calendar" msgid="3889615280211184106">"prístup ku kalendáru"</string> <string name="permgrouplab_sms" msgid="228308803364967808">"SMS"</string> - <string name="permgroupdesc_sms" msgid="4656988620100940350">"posielať a zobrazovať SMS"</string> + <string name="permgroupdesc_sms" msgid="4656988620100940350">"posielanie a zobrazovanie SMS"</string> <string name="permgrouplab_storage" msgid="1971118770546336966">"Úložisko"</string> - <string name="permgroupdesc_storage" msgid="637758554581589203">"prístup k fotkám, médiám a súborom na zariadení"</string> + <string name="permgroupdesc_storage" msgid="637758554581589203">"prístup k fotkám, médiám a súborom v zariadení"</string> <string name="permgrouplab_microphone" msgid="171539900250043464">"Mikrofón"</string> - <string name="permgroupdesc_microphone" msgid="4988812113943554584">"zaznamenávanie zvuku"</string> + <string name="permgroupdesc_microphone" msgid="4988812113943554584">"nahrávanie zvuku"</string> <string name="permgrouplab_camera" msgid="4820372495894586615">"Fotoaparát"</string> <string name="permgroupdesc_camera" msgid="3250611594678347720">"fotenie a natáčanie videí"</string> <string name="permgrouplab_phone" msgid="5229115638567440675">"Telefón"</string> - <string name="permgroupdesc_phone" msgid="6234224354060641055">"telefonovať a spravovať hovory"</string> + <string name="permgroupdesc_phone" msgid="6234224354060641055">"telefonovanie a správu hovorov"</string> <string name="permgrouplab_sensors" msgid="416037179223226722">"Telesné senzory"</string> - <string name="permgroupdesc_sensors" msgid="7147968539346634043">"prístup k údajom senzorov o životných funkciách"</string> + <string name="permgroupdesc_sensors" msgid="7147968539346634043">"prístup k dátam senzorov vašich životných funkcií"</string> <string name="capability_title_canRetrieveWindowContent" msgid="3901717936930170320">"Načítať obsah okna"</string> <string name="capability_desc_canRetrieveWindowContent" msgid="3772225008605310672">"Môžete preskúmať obsah okna, s ktorým pracujete."</string> <string name="capability_title_canRequestTouchExploration" msgid="3108723364676667320">"Zapnúť funkciu Preskúmanie dotykom"</string> @@ -684,6 +684,7 @@ <string name="lockscreen_pattern_correct" msgid="9039008650362261237">"Správne!"</string> <string name="lockscreen_pattern_wrong" msgid="4317955014948108794">"Skúsiť znova"</string> <string name="lockscreen_password_wrong" msgid="5737815393253165301">"Skúsiť znova"</string> + <string name="lockscreen_storage_locked" msgid="9167551160010625200">"Všetky funkcie a dáta získate po odomknutí"</string> <string name="faceunlock_multiple_failures" msgid="754137583022792429">"Prekročili ste maximálny povolený počet pokusov o odomknutie tvárou"</string> <string name="lockscreen_missing_sim_message_short" msgid="5099439277819215399">"Nie je vložená SIM karta"</string> <string name="lockscreen_missing_sim_message" product="tablet" msgid="151659196095791474">"V tablete nie je žiadna SIM karta."</string> @@ -1068,7 +1069,8 @@ <string name="android_upgrading_title" msgid="1584192285441405746">"Prebieha inovácia systému Android..."</string> <string name="android_start_title" msgid="8418054686415318207">"Systém Android sa spúšťa…"</string> <string name="android_upgrading_fstrim" msgid="8036718871534640010">"Optimalizuje sa úložisko"</string> - <string name="android_upgrading_notification_title" msgid="1619393112444671028">"Prebieha inovácia systému Android"</string> + <!-- no translation found for android_upgrading_notification_title (8428357096969413169) --> + <skip /> <string name="android_upgrading_notification_body" msgid="5761201379457064286">"Niektoré aplikácie môžu správne fungovať až po dokončení inovácie"</string> <string name="app_upgrading_toast" msgid="3008139776215597053">"Aplikácia <xliff:g id="APPLICATION">%1$s</xliff:g> sa inovuje…"</string> <string name="android_upgrading_apk" msgid="7904042682111526169">"Prebieha optimalizácia aplikácie <xliff:g id="NUMBER_0">%1$d</xliff:g> z <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string> diff --git a/core/res/res/values-sl/strings.xml b/core/res/res/values-sl/strings.xml index e64ecbde8087..a5a2c8b6ecd8 100644 --- a/core/res/res/values-sl/strings.xml +++ b/core/res/res/values-sl/strings.xml @@ -684,6 +684,7 @@ <string name="lockscreen_pattern_correct" msgid="9039008650362261237">"Pravilno."</string> <string name="lockscreen_pattern_wrong" msgid="4317955014948108794">"Poskusi znova"</string> <string name="lockscreen_password_wrong" msgid="5737815393253165301">"Poskusite znova"</string> + <string name="lockscreen_storage_locked" msgid="9167551160010625200">"Odklenite za dostop do vseh funkcij in podatkov"</string> <string name="faceunlock_multiple_failures" msgid="754137583022792429">"Presegli ste dovoljeno število poskusov odklepanja z obrazom"</string> <string name="lockscreen_missing_sim_message_short" msgid="5099439277819215399">"Ni kartice SIM"</string> <string name="lockscreen_missing_sim_message" product="tablet" msgid="151659196095791474">"V tabličnem računalniku ni kartice SIM."</string> @@ -1068,7 +1069,8 @@ <string name="android_upgrading_title" msgid="1584192285441405746">"Poteka nadgradnja Androida ..."</string> <string name="android_start_title" msgid="8418054686415318207">"Android se zaganja …"</string> <string name="android_upgrading_fstrim" msgid="8036718871534640010">"Optimiziranje shrambe."</string> - <string name="android_upgrading_notification_title" msgid="1619393112444671028">"Poteka nadgradnja Androida."</string> + <!-- no translation found for android_upgrading_notification_title (8428357096969413169) --> + <skip /> <string name="android_upgrading_notification_body" msgid="5761201379457064286">"Nekatere aplikacije morda ne bodo delovale pravilno, dokler ne bo dokončana nadgradnja."</string> <string name="app_upgrading_toast" msgid="3008139776215597053">"<xliff:g id="APPLICATION">%1$s</xliff:g> se nadgrajuje …"</string> <string name="android_upgrading_apk" msgid="7904042682111526169">"Optimiranje aplikacije <xliff:g id="NUMBER_0">%1$d</xliff:g> od <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string> diff --git a/core/res/res/values-sq-rAL/strings.xml b/core/res/res/values-sq-rAL/strings.xml index f7433a488ea3..61c38ff6ee1c 100644 --- a/core/res/res/values-sq-rAL/strings.xml +++ b/core/res/res/values-sq-rAL/strings.xml @@ -245,7 +245,7 @@ <string name="permgrouplab_contacts" msgid="3657758145679177612">"Kontaktet"</string> <string name="permgroupdesc_contacts" msgid="6951499528303668046">"qasu te kontaktet e tua"</string> <string name="permgrouplab_location" msgid="7275582855722310164">"Vendndodhja"</string> - <string name="permgroupdesc_location" msgid="1346617465127855033">"qasjen te vendndodhja e kësaj pajisjeje"</string> + <string name="permgroupdesc_location" msgid="1346617465127855033">"qaset te vendndodhja e kësaj pajisjeje"</string> <string name="permgrouplab_calendar" msgid="5863508437783683902">"Kalendari"</string> <string name="permgroupdesc_calendar" msgid="3889615280211184106">"qasje te kalendari yt"</string> <string name="permgrouplab_sms" msgid="228308803364967808">"SMS"</string> @@ -678,6 +678,7 @@ <string name="lockscreen_pattern_correct" msgid="9039008650362261237">"Saktë!"</string> <string name="lockscreen_pattern_wrong" msgid="4317955014948108794">"Provo sërish"</string> <string name="lockscreen_password_wrong" msgid="5737815393253165301">"Provo sërish"</string> + <string name="lockscreen_storage_locked" msgid="9167551160010625200">"Shkyçe për të gjitha funksionet dhe të dhënat"</string> <string name="faceunlock_multiple_failures" msgid="754137583022792429">"Tentativat maksimale të \"Shkyçjes me fytyrë\" u tejkaluan"</string> <string name="lockscreen_missing_sim_message_short" msgid="5099439277819215399">"Nuk ka kartë SIM"</string> <string name="lockscreen_missing_sim_message" product="tablet" msgid="151659196095791474">"Nuk ka kartë SIM në tablet."</string> @@ -1022,7 +1023,8 @@ <string name="android_upgrading_title" msgid="1584192285441405746">"\"Androidi\" po përditësohet…"</string> <string name="android_start_title" msgid="8418054686415318207">"\"Androidi\" po fillon…"</string> <string name="android_upgrading_fstrim" msgid="8036718871534640010">"Po përshtat ruajtjen."</string> - <string name="android_upgrading_notification_title" msgid="1619393112444671028">"Android po përmirësohet"</string> + <!-- no translation found for android_upgrading_notification_title (8428357096969413169) --> + <skip /> <string name="android_upgrading_notification_body" msgid="5761201379457064286">"Disa aplikacione mund të mos funksionojnë si duhet deri sa të përfundojë përmirësimi"</string> <string name="app_upgrading_toast" msgid="3008139776215597053">"<xliff:g id="APPLICATION">%1$s</xliff:g> po përmirësohet…"</string> <string name="android_upgrading_apk" msgid="7904042682111526169">"Po përshtat aplikacionin <xliff:g id="NUMBER_0">%1$d</xliff:g> nga gjithsej <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string> diff --git a/core/res/res/values-sr/strings.xml b/core/res/res/values-sr/strings.xml index b68869246682..881b1c7c55c7 100644 --- a/core/res/res/values-sr/strings.xml +++ b/core/res/res/values-sr/strings.xml @@ -681,6 +681,7 @@ <string name="lockscreen_pattern_correct" msgid="9039008650362261237">"Тачно!"</string> <string name="lockscreen_pattern_wrong" msgid="4317955014948108794">"Покушајте поново"</string> <string name="lockscreen_password_wrong" msgid="5737815393253165301">"Покушајте поново"</string> + <string name="lockscreen_storage_locked" msgid="9167551160010625200">"Откључај за све функције и податке"</string> <string name="faceunlock_multiple_failures" msgid="754137583022792429">"Премашен је највећи дозвољени број покушаја Откључавања лицем"</string> <string name="lockscreen_missing_sim_message_short" msgid="5099439277819215399">"Нема SIM картице"</string> <string name="lockscreen_missing_sim_message" product="tablet" msgid="151659196095791474">"У таблету нема SIM картице."</string> @@ -1045,7 +1046,8 @@ <string name="android_upgrading_title" msgid="1584192285441405746">"Android се надограђује…"</string> <string name="android_start_title" msgid="8418054686415318207">"Android се покреће…"</string> <string name="android_upgrading_fstrim" msgid="8036718871534640010">"Меморија се оптимизује."</string> - <string name="android_upgrading_notification_title" msgid="1619393112444671028">"Android се надограђује…"</string> + <!-- no translation found for android_upgrading_notification_title (8428357096969413169) --> + <skip /> <string name="android_upgrading_notification_body" msgid="5761201379457064286">"Неке апликације можда неће исправно функционисати док се надоградња не доврши"</string> <string name="app_upgrading_toast" msgid="3008139776215597053">"<xliff:g id="APPLICATION">%1$s</xliff:g> се надограђује…"</string> <string name="android_upgrading_apk" msgid="7904042682111526169">"Оптимизовање апликације <xliff:g id="NUMBER_0">%1$d</xliff:g> од <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string> diff --git a/core/res/res/values-sv/strings.xml b/core/res/res/values-sv/strings.xml index 0fd61b7ec66a..228e0b90e85c 100644 --- a/core/res/res/values-sv/strings.xml +++ b/core/res/res/values-sv/strings.xml @@ -678,6 +678,7 @@ <string name="lockscreen_pattern_correct" msgid="9039008650362261237">"Korrekt!"</string> <string name="lockscreen_pattern_wrong" msgid="4317955014948108794">"Försök igen"</string> <string name="lockscreen_password_wrong" msgid="5737815393253165301">"Försök igen"</string> + <string name="lockscreen_storage_locked" msgid="9167551160010625200">"Lås upp för alla funktioner och all data"</string> <string name="faceunlock_multiple_failures" msgid="754137583022792429">"Du har försökt låsa upp med Ansiktslås för många gånger"</string> <string name="lockscreen_missing_sim_message_short" msgid="5099439277819215399">"Inget SIM-kort"</string> <string name="lockscreen_missing_sim_message" product="tablet" msgid="151659196095791474">"Inget SIM-kort i surfplattan."</string> @@ -1022,7 +1023,8 @@ <string name="android_upgrading_title" msgid="1584192285441405746">"Android uppgraderas ..."</string> <string name="android_start_title" msgid="8418054686415318207">"Android startar …"</string> <string name="android_upgrading_fstrim" msgid="8036718871534640010">"Lagringsutrymmet optimeras."</string> - <string name="android_upgrading_notification_title" msgid="1619393112444671028">"Android uppgraderas"</string> + <!-- no translation found for android_upgrading_notification_title (8428357096969413169) --> + <skip /> <string name="android_upgrading_notification_body" msgid="5761201379457064286">"En del appar kanske inte fungerar som de ska innan uppgraderingen har slutförts"</string> <string name="app_upgrading_toast" msgid="3008139776215597053">"<xliff:g id="APPLICATION">%1$s</xliff:g> uppgraderas …"</string> <string name="android_upgrading_apk" msgid="7904042682111526169">"Optimerar app <xliff:g id="NUMBER_0">%1$d</xliff:g> av <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string> diff --git a/core/res/res/values-sw/strings.xml b/core/res/res/values-sw/strings.xml index 2bde55db4737..b9c995f95cc8 100644 --- a/core/res/res/values-sw/strings.xml +++ b/core/res/res/values-sw/strings.xml @@ -676,6 +676,7 @@ <string name="lockscreen_pattern_correct" msgid="9039008650362261237">"Sahihi!"</string> <string name="lockscreen_pattern_wrong" msgid="4317955014948108794">"Jaribu tena"</string> <string name="lockscreen_password_wrong" msgid="5737815393253165301">"Jaribu tena"</string> + <string name="lockscreen_storage_locked" msgid="9167551160010625200">"Fungua kifaa ili upate data na vipengele vyote"</string> <string name="faceunlock_multiple_failures" msgid="754137583022792429">"Majaribio ya Juu ya Kufungua Uso yamezidishwa"</string> <string name="lockscreen_missing_sim_message_short" msgid="5099439277819215399">"Hakuna SIM kadi"</string> <string name="lockscreen_missing_sim_message" product="tablet" msgid="151659196095791474">"Hakuna SIM kadi katika kompyuta ndogo."</string> @@ -1020,7 +1021,8 @@ <string name="android_upgrading_title" msgid="1584192285441405746">"Toleo jipya la Android linawekwa..."</string> <string name="android_start_title" msgid="8418054686415318207">"Inaanzisha Android..."</string> <string name="android_upgrading_fstrim" msgid="8036718871534640010">"Inaboresha hifadhi."</string> - <string name="android_upgrading_notification_title" msgid="1619393112444671028">"Tunasasisha Android"</string> + <!-- no translation found for android_upgrading_notification_title (8428357096969413169) --> + <skip /> <string name="android_upgrading_notification_body" msgid="5761201379457064286">"Huenda baadhi ya programu zisifanye kazi vizuri hadi itakapomaliza kusasisha"</string> <string name="app_upgrading_toast" msgid="3008139776215597053">"<xliff:g id="APPLICATION">%1$s</xliff:g> inapata toleo jipya…"</string> <string name="android_upgrading_apk" msgid="7904042682111526169">"Inaboresha programu <xliff:g id="NUMBER_0">%1$d</xliff:g> kutoka <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string> diff --git a/core/res/res/values-ta-rIN/strings.xml b/core/res/res/values-ta-rIN/strings.xml index 6ace6e12aef8..99488eebac64 100644 --- a/core/res/res/values-ta-rIN/strings.xml +++ b/core/res/res/values-ta-rIN/strings.xml @@ -678,6 +678,7 @@ <string name="lockscreen_pattern_correct" msgid="9039008650362261237">"சரி!"</string> <string name="lockscreen_pattern_wrong" msgid="4317955014948108794">"மீண்டும் முயற்சிக்கவும்"</string> <string name="lockscreen_password_wrong" msgid="5737815393253165301">"மீண்டும் முயற்சிக்கவும்"</string> + <string name="lockscreen_storage_locked" msgid="9167551160010625200">"எல்லா அம்சங்கள் & தரவை பெற, சாதனத்தை திறக்கவும்"</string> <string name="faceunlock_multiple_failures" msgid="754137583022792429">"முகம் திறப்பதற்கான அதிகபட்ச முயற்சிகள் கடந்தன"</string> <string name="lockscreen_missing_sim_message_short" msgid="5099439277819215399">"சிம் கார்டு இல்லை"</string> <string name="lockscreen_missing_sim_message" product="tablet" msgid="151659196095791474">"டேப்லெட்டில் சிம் கார்டு இல்லை."</string> @@ -1022,7 +1023,8 @@ <string name="android_upgrading_title" msgid="1584192285441405746">"Android மேம்படுத்தப்படுகிறது…"</string> <string name="android_start_title" msgid="8418054686415318207">"Android துவங்குகிறது..."</string> <string name="android_upgrading_fstrim" msgid="8036718871534640010">"சேமிப்பகத்தை உகந்ததாக்குகிறது."</string> - <string name="android_upgrading_notification_title" msgid="1619393112444671028">"Android மேம்படுத்தப்படுகிறது"</string> + <!-- no translation found for android_upgrading_notification_title (8428357096969413169) --> + <skip /> <string name="android_upgrading_notification_body" msgid="5761201379457064286">"மேம்படுத்துவது முடியும் வரை, சில பயன்பாடுகள் சரியாக வேலைசெய்யாமல் போகக்கூடும்"</string> <string name="app_upgrading_toast" msgid="3008139776215597053">"<xliff:g id="APPLICATION">%1$s</xliff:g>ஐ மேம்படுத்துகிறது…"</string> <string name="android_upgrading_apk" msgid="7904042682111526169">"<xliff:g id="NUMBER_0">%1$d</xliff:g> / <xliff:g id="NUMBER_1">%2$d</xliff:g> பயன்பாட்டை ஒருங்கிணைக்கிறது."</string> diff --git a/core/res/res/values-te-rIN/strings.xml b/core/res/res/values-te-rIN/strings.xml index d00403216a7c..51f9175a5fee 100644 --- a/core/res/res/values-te-rIN/strings.xml +++ b/core/res/res/values-te-rIN/strings.xml @@ -678,6 +678,7 @@ <string name="lockscreen_pattern_correct" msgid="9039008650362261237">"సరైనది!"</string> <string name="lockscreen_pattern_wrong" msgid="4317955014948108794">"మళ్లీ ప్రయత్నించండి"</string> <string name="lockscreen_password_wrong" msgid="5737815393253165301">"మళ్లీ ప్రయత్నించండి"</string> + <string name="lockscreen_storage_locked" msgid="9167551160010625200">"అన్ని లక్షణాలు మరియు డేటా కోసం అన్లాక్ చేయండి"</string> <string name="faceunlock_multiple_failures" msgid="754137583022792429">"ముఖంతో అన్లాక్ ప్రయత్నాల గరిష్ట పరిమితి మించిపోయారు"</string> <string name="lockscreen_missing_sim_message_short" msgid="5099439277819215399">"సిమ్ కార్డు లేదు"</string> <string name="lockscreen_missing_sim_message" product="tablet" msgid="151659196095791474">"టాబ్లెట్లో సిమ్ కార్డు లేదు."</string> @@ -1022,7 +1023,8 @@ <string name="android_upgrading_title" msgid="1584192285441405746">"Android అప్గ్రేడ్ అవుతోంది…"</string> <string name="android_start_title" msgid="8418054686415318207">"Android ప్రారంభమవుతోంది…"</string> <string name="android_upgrading_fstrim" msgid="8036718871534640010">"నిల్వను అనుకూలపరుస్తోంది."</string> - <string name="android_upgrading_notification_title" msgid="1619393112444671028">"Android అప్గ్రేడ్ అవుతోంది"</string> + <!-- no translation found for android_upgrading_notification_title (8428357096969413169) --> + <skip /> <string name="android_upgrading_notification_body" msgid="5761201379457064286">"అప్గ్రేడ్ పూర్తయ్యే వరకు కొన్ని అనువర్తనాలు సరిగ్గా పని చేయకపోవచ్చు"</string> <string name="app_upgrading_toast" msgid="3008139776215597053">"<xliff:g id="APPLICATION">%1$s</xliff:g>ని అప్గ్రేడ్ చేస్తోంది…"</string> <string name="android_upgrading_apk" msgid="7904042682111526169">"<xliff:g id="NUMBER_1">%2$d</xliff:g>లో <xliff:g id="NUMBER_0">%1$d</xliff:g> అనువర్తనాన్ని అనుకూలీకరిస్తోంది."</string> diff --git a/core/res/res/values-th/strings.xml b/core/res/res/values-th/strings.xml index 458fc7214315..d2b7a1b061ac 100644 --- a/core/res/res/values-th/strings.xml +++ b/core/res/res/values-th/strings.xml @@ -678,6 +678,7 @@ <string name="lockscreen_pattern_correct" msgid="9039008650362261237">"ถูกต้อง!"</string> <string name="lockscreen_pattern_wrong" msgid="4317955014948108794">"ลองอีกครั้ง"</string> <string name="lockscreen_password_wrong" msgid="5737815393253165301">"ลองอีกครั้ง"</string> + <string name="lockscreen_storage_locked" msgid="9167551160010625200">"ปลดล็อกคุณลักษณะและข้อมูลทั้งหมด"</string> <string name="faceunlock_multiple_failures" msgid="754137583022792429">"มีความพยายามที่จะใช้ Face Unlock เกินขีดจำกัด"</string> <string name="lockscreen_missing_sim_message_short" msgid="5099439277819215399">"ไม่มีซิมการ์ด"</string> <string name="lockscreen_missing_sim_message" product="tablet" msgid="151659196095791474">"ไม่มีซิมการ์ดในแท็บเล็ต"</string> @@ -1022,7 +1023,8 @@ <string name="android_upgrading_title" msgid="1584192285441405746">"กำลังอัปเกรด Android ..."</string> <string name="android_start_title" msgid="8418054686415318207">"Android กำลังเริ่มต้น…"</string> <string name="android_upgrading_fstrim" msgid="8036718871534640010">"กำลังเพิ่มประสิทธิภาพพื้นที่จัดเก็บข้อมูล"</string> - <string name="android_upgrading_notification_title" msgid="1619393112444671028">"Android กำลังอัปเกรด"</string> + <!-- no translation found for android_upgrading_notification_title (8428357096969413169) --> + <skip /> <string name="android_upgrading_notification_body" msgid="5761201379457064286">"แอปบางแอปอาจทำงานไม่ถูกต้องจนกว่าจะอัปเกรดเสร็จ"</string> <string name="app_upgrading_toast" msgid="3008139776215597053">"กำลังอัปเกรด <xliff:g id="APPLICATION">%1$s</xliff:g>…"</string> <string name="android_upgrading_apk" msgid="7904042682111526169">"กำลังเพิ่มประสิทธิภาพแอปพลิเคชัน <xliff:g id="NUMBER_0">%1$d</xliff:g> จาก <xliff:g id="NUMBER_1">%2$d</xliff:g> รายการ"</string> diff --git a/core/res/res/values-tl/strings.xml b/core/res/res/values-tl/strings.xml index fbf1f491578f..7dedd2ad54b3 100644 --- a/core/res/res/values-tl/strings.xml +++ b/core/res/res/values-tl/strings.xml @@ -678,6 +678,7 @@ <string name="lockscreen_pattern_correct" msgid="9039008650362261237">"Tama!"</string> <string name="lockscreen_pattern_wrong" msgid="4317955014948108794">"Subukang muli"</string> <string name="lockscreen_password_wrong" msgid="5737815393253165301">"Subukang muli"</string> + <string name="lockscreen_storage_locked" msgid="9167551160010625200">"I-unlock para sa lahat ng feature at data"</string> <string name="faceunlock_multiple_failures" msgid="754137583022792429">"Nalagpasan na ang maximum na mga pagtatangka sa Face Unlock"</string> <string name="lockscreen_missing_sim_message_short" msgid="5099439277819215399">"Walang SIM card"</string> <string name="lockscreen_missing_sim_message" product="tablet" msgid="151659196095791474">"Walang SIM card sa tablet."</string> @@ -1022,7 +1023,8 @@ <string name="android_upgrading_title" msgid="1584192285441405746">"Nag-a-upgrade ang Android…"</string> <string name="android_start_title" msgid="8418054686415318207">"Nagsisimula ang Android…"</string> <string name="android_upgrading_fstrim" msgid="8036718871534640010">"Ino-optimize ang storage."</string> - <string name="android_upgrading_notification_title" msgid="1619393112444671028">"Nag-a-upgrade ang Android"</string> + <!-- no translation found for android_upgrading_notification_title (8428357096969413169) --> + <skip /> <string name="android_upgrading_notification_body" msgid="5761201379457064286">"Maaaring hindi gumana nang maayos ang ilang app hangga\'t hindi pa natatapos ang pag-upgrade"</string> <string name="app_upgrading_toast" msgid="3008139776215597053">"Nag-a-upgrade ang <xliff:g id="APPLICATION">%1$s</xliff:g>…"</string> <string name="android_upgrading_apk" msgid="7904042682111526169">"Ino-optimize ang app <xliff:g id="NUMBER_0">%1$d</xliff:g> ng <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string> diff --git a/core/res/res/values-tr/strings.xml b/core/res/res/values-tr/strings.xml index 119cd6d2e690..7ae29cd8868b 100644 --- a/core/res/res/values-tr/strings.xml +++ b/core/res/res/values-tr/strings.xml @@ -678,6 +678,7 @@ <string name="lockscreen_pattern_correct" msgid="9039008650362261237">"Doğru!"</string> <string name="lockscreen_pattern_wrong" msgid="4317955014948108794">"Tekrar deneyin"</string> <string name="lockscreen_password_wrong" msgid="5737815393253165301">"Tekrar deneyin"</string> + <string name="lockscreen_storage_locked" msgid="9167551160010625200">"Tüm özellikler ve veriler için kilidi açın"</string> <string name="faceunlock_multiple_failures" msgid="754137583022792429">"Yüz Tanıma Kilidi için maksimum deneme sayısı aşıldı"</string> <string name="lockscreen_missing_sim_message_short" msgid="5099439277819215399">"SIM kart yok"</string> <string name="lockscreen_missing_sim_message" product="tablet" msgid="151659196095791474">"Tablette SIM kart yok."</string> @@ -1022,7 +1023,8 @@ <string name="android_upgrading_title" msgid="1584192285441405746">"Android yeni sürüme geçiriliyor..."</string> <string name="android_start_title" msgid="8418054686415318207">"Android başlatılıyor…"</string> <string name="android_upgrading_fstrim" msgid="8036718871534640010">"Depolama optimize ediliyor."</string> - <string name="android_upgrading_notification_title" msgid="1619393112444671028">"Android yeni sürüme geçiriliyor"</string> + <!-- no translation found for android_upgrading_notification_title (8428357096969413169) --> + <skip /> <string name="android_upgrading_notification_body" msgid="5761201379457064286">"Yeni sürüme geçiş işlemi tamamlanana kadar bazı uygulamalar düzgün çalışmayabilir"</string> <string name="app_upgrading_toast" msgid="3008139776215597053">"<xliff:g id="APPLICATION">%1$s</xliff:g> yeni sürüme geçiriliyor…"</string> <string name="android_upgrading_apk" msgid="7904042682111526169">"<xliff:g id="NUMBER_0">%1$d</xliff:g>/<xliff:g id="NUMBER_1">%2$d</xliff:g> uygulama optimize ediliyor."</string> diff --git a/core/res/res/values-uk/strings.xml b/core/res/res/values-uk/strings.xml index f1a7a19b0d63..fdf337e429eb 100644 --- a/core/res/res/values-uk/strings.xml +++ b/core/res/res/values-uk/strings.xml @@ -684,6 +684,7 @@ <string name="lockscreen_pattern_correct" msgid="9039008650362261237">"Правильно!"</string> <string name="lockscreen_pattern_wrong" msgid="4317955014948108794">"Повторіть спробу"</string> <string name="lockscreen_password_wrong" msgid="5737815393253165301">"Повторіть спробу"</string> + <string name="lockscreen_storage_locked" msgid="9167551160010625200">"Розблокуйте, щоб бачити всі функції й дані"</string> <string name="faceunlock_multiple_failures" msgid="754137583022792429">"Перевищено максимальну кількість спроб розблокування за допомогою функції \"Фейсконтроль\""</string> <string name="lockscreen_missing_sim_message_short" msgid="5099439277819215399">"Відсутня SIM-карта"</string> <string name="lockscreen_missing_sim_message" product="tablet" msgid="151659196095791474">"У пристр. нема SIM-карти."</string> @@ -1068,7 +1069,8 @@ <string name="android_upgrading_title" msgid="1584192285441405746">"Android оновлюється..."</string> <string name="android_start_title" msgid="8418054686415318207">"Запуск ОС Android…"</string> <string name="android_upgrading_fstrim" msgid="8036718871534640010">"Оптимізація пам’яті."</string> - <string name="android_upgrading_notification_title" msgid="1619393112444671028">"Android оновлюється"</string> + <!-- no translation found for android_upgrading_notification_title (8428357096969413169) --> + <skip /> <string name="android_upgrading_notification_body" msgid="5761201379457064286">"Деякі додатки можуть не працювати належним чином, доки не завершиться оновлення"</string> <string name="app_upgrading_toast" msgid="3008139776215597053">"Додаток <xliff:g id="APPLICATION">%1$s</xliff:g> оновлюється…"</string> <string name="android_upgrading_apk" msgid="7904042682111526169">"Оптимізація програми <xliff:g id="NUMBER_0">%1$d</xliff:g> з <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string> diff --git a/core/res/res/values-ur-rPK/strings.xml b/core/res/res/values-ur-rPK/strings.xml index 9bf9a016fa7a..3b3fc3504646 100644 --- a/core/res/res/values-ur-rPK/strings.xml +++ b/core/res/res/values-ur-rPK/strings.xml @@ -678,6 +678,7 @@ <string name="lockscreen_pattern_correct" msgid="9039008650362261237">"صحیح!"</string> <string name="lockscreen_pattern_wrong" msgid="4317955014948108794">"دوبارہ کوشش کریں"</string> <string name="lockscreen_password_wrong" msgid="5737815393253165301">"دوبارہ کوشش کریں"</string> + <string name="lockscreen_storage_locked" msgid="9167551160010625200">"تمام خصوصیات اور ڈیٹا کیلئے غیر مقفل کریں"</string> <string name="faceunlock_multiple_failures" msgid="754137583022792429">"چہرہ کے ذریعے غیر مقفل کریں کی زیادہ سے زیادہ کوششوں سے تجاوز کرگیا"</string> <string name="lockscreen_missing_sim_message_short" msgid="5099439277819215399">"کوئی SIM کارڈ نہیں ہے"</string> <string name="lockscreen_missing_sim_message" product="tablet" msgid="151659196095791474">"ٹیبلیٹ میں کوئی SIM کارڈ نہیں ہے۔"</string> @@ -1022,7 +1023,8 @@ <string name="android_upgrading_title" msgid="1584192285441405746">"Android اپ گریڈ ہو رہا ہے…"</string> <string name="android_start_title" msgid="8418054686415318207">"Android شروع ہو رہا ہے…"</string> <string name="android_upgrading_fstrim" msgid="8036718871534640010">"اسٹوریج کو بہترین بنایا جا رہا ہے۔"</string> - <string name="android_upgrading_notification_title" msgid="1619393112444671028">"Android اپ گریڈ ہو رہا ہے"</string> + <!-- no translation found for android_upgrading_notification_title (8428357096969413169) --> + <skip /> <string name="android_upgrading_notification_body" msgid="5761201379457064286">"اپ گریڈ ختم ہونے تک شاید کچھ ایپس ٹھیک طرح سے کام نہ کریں"</string> <string name="app_upgrading_toast" msgid="3008139776215597053">"<xliff:g id="APPLICATION">%1$s</xliff:g> اپ گریڈ ہو رہی ہے…"</string> <string name="android_upgrading_apk" msgid="7904042682111526169">"ایپ <xliff:g id="NUMBER_0">%1$d</xliff:g> از <xliff:g id="NUMBER_1">%2$d</xliff:g> کو بہتر بنایا جا رہا ہے۔"</string> diff --git a/core/res/res/values-uz-rUZ/strings.xml b/core/res/res/values-uz-rUZ/strings.xml index f4684c799490..232b63b798b1 100644 --- a/core/res/res/values-uz-rUZ/strings.xml +++ b/core/res/res/values-uz-rUZ/strings.xml @@ -245,7 +245,7 @@ <string name="permgrouplab_contacts" msgid="3657758145679177612">"Kontaktlar"</string> <string name="permgroupdesc_contacts" msgid="6951499528303668046">"kontaktlarga kirish"</string> <string name="permgrouplab_location" msgid="7275582855722310164">"Joylashuv"</string> - <string name="permgroupdesc_location" msgid="1346617465127855033">"shu qurilmaning joylashuvi haqidagi ma’lumotlarga kirish"</string> + <string name="permgroupdesc_location" msgid="1346617465127855033">"shu qurilmaning joylashuvi haqidagi axborotga kirish"</string> <string name="permgrouplab_calendar" msgid="5863508437783683902">"Taqvim"</string> <string name="permgroupdesc_calendar" msgid="3889615280211184106">"taqvimingizga kirish"</string> <string name="permgrouplab_sms" msgid="228308803364967808">"SMS"</string> @@ -678,6 +678,7 @@ <string name="lockscreen_pattern_correct" msgid="9039008650362261237">"To‘g‘ri!"</string> <string name="lockscreen_pattern_wrong" msgid="4317955014948108794">"Qaytadan urining"</string> <string name="lockscreen_password_wrong" msgid="5737815393253165301">"Qaytadan urining"</string> + <string name="lockscreen_storage_locked" msgid="9167551160010625200">"Barcha funksiya va ma’lumotlardan foydalanish uchun qulfdan chiqaring"</string> <string name="faceunlock_multiple_failures" msgid="754137583022792429">"Yuzni tanitib qulfni ochishga urinish miqdoridan oshib ketdi"</string> <string name="lockscreen_missing_sim_message_short" msgid="5099439277819215399">"SIM karta yo‘q"</string> <string name="lockscreen_missing_sim_message" product="tablet" msgid="151659196095791474">"Planshetingizda SIM karta yo‘q."</string> @@ -1022,7 +1023,8 @@ <string name="android_upgrading_title" msgid="1584192285441405746">"Android yangilanmoqda…"</string> <string name="android_start_title" msgid="8418054686415318207">"Android ishga tushmoqda…"</string> <string name="android_upgrading_fstrim" msgid="8036718871534640010">"Xotira optimallashtirilmoqda."</string> - <string name="android_upgrading_notification_title" msgid="1619393112444671028">"Android yangilanmoqda"</string> + <!-- no translation found for android_upgrading_notification_title (8428357096969413169) --> + <skip /> <string name="android_upgrading_notification_body" msgid="5761201379457064286">"Yangilanish vaqtida ba’zi ilovalar to‘g‘ri ishlamasligi mumkin"</string> <string name="app_upgrading_toast" msgid="3008139776215597053">"<xliff:g id="APPLICATION">%1$s</xliff:g> ilovasi yangilanmoqda…"</string> <string name="android_upgrading_apk" msgid="7904042682111526169">"Ilovalar optimallashtirilmoqda (<xliff:g id="NUMBER_0">%1$d</xliff:g> / <xliff:g id="NUMBER_1">%2$d</xliff:g>)."</string> diff --git a/core/res/res/values-vi/strings.xml b/core/res/res/values-vi/strings.xml index 6d5805450269..9dcf6bf982f1 100644 --- a/core/res/res/values-vi/strings.xml +++ b/core/res/res/values-vi/strings.xml @@ -678,6 +678,7 @@ <string name="lockscreen_pattern_correct" msgid="9039008650362261237">"Chính xác!"</string> <string name="lockscreen_pattern_wrong" msgid="4317955014948108794">"Thử lại"</string> <string name="lockscreen_password_wrong" msgid="5737815393253165301">"Thử lại"</string> + <string name="lockscreen_storage_locked" msgid="9167551160010625200">"Mở khóa đối với tất cả các tính năng và dữ liệu"</string> <string name="faceunlock_multiple_failures" msgid="754137583022792429">"Đã vượt quá số lần Mở khóa bằng khuôn mặt tối đa"</string> <string name="lockscreen_missing_sim_message_short" msgid="5099439277819215399">"Không có thẻ SIM nào"</string> <string name="lockscreen_missing_sim_message" product="tablet" msgid="151659196095791474">"Không có thẻ SIM nào trong máy tính bảng."</string> @@ -1022,7 +1023,8 @@ <string name="android_upgrading_title" msgid="1584192285441405746">"Android đang nâng cấp..."</string> <string name="android_start_title" msgid="8418054686415318207">"Android đang khởi động..."</string> <string name="android_upgrading_fstrim" msgid="8036718871534640010">"Tối ưu hóa lưu trữ."</string> - <string name="android_upgrading_notification_title" msgid="1619393112444671028">"Android đang nâng cấp"</string> + <!-- no translation found for android_upgrading_notification_title (8428357096969413169) --> + <skip /> <string name="android_upgrading_notification_body" msgid="5761201379457064286">"Một số ứng dụng có thể không hoạt động bình thường cho đến khi nâng cấp xong"</string> <string name="app_upgrading_toast" msgid="3008139776215597053">"<xliff:g id="APPLICATION">%1$s</xliff:g> đang nâng cấp…"</string> <string name="android_upgrading_apk" msgid="7904042682111526169">"Đang tối ưu hóa ứng dụng <xliff:g id="NUMBER_0">%1$d</xliff:g> trong tổng số <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string> diff --git a/core/res/res/values-w180dp-notround-watch/dimens_material.xml b/core/res/res/values-w180dp-notround-watch/dimens_material.xml new file mode 100644 index 000000000000..79acf84b7e3f --- /dev/null +++ b/core/res/res/values-w180dp-notround-watch/dimens_material.xml @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2016 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<resources> + <dimen name="text_size_display_4_material">80sp</dimen> + <dimen name="text_size_display_3_material">50sp</dimen> + <dimen name="text_size_display_2_material">40sp</dimen> + <dimen name="text_size_display_1_material">30sp</dimen> + <dimen name="text_size_headline_material">20sp</dimen> + <dimen name="text_size_title_material">18sp</dimen> + <dimen name="text_size_subhead_material">18sp</dimen> + <dimen name="text_size_title_material_toolbar">18dp</dimen> + <dimen name="text_size_subtitle_material_toolbar">18dp</dimen> + <dimen name="text_size_menu_material">18sp</dimen> + <dimen name="text_size_menu_header_material">16sp</dimen> + <dimen name="text_size_body_2_material">16sp</dimen> + <dimen name="text_size_body_1_material">16sp</dimen> + <dimen name="text_size_caption_material">14sp</dimen> + <dimen name="text_size_button_material">16sp</dimen> + + <dimen name="text_size_large_material">18sp</dimen> + <dimen name="text_size_medium_material">16sp</dimen> + <dimen name="text_size_small_material">14sp</dimen> +</resources> diff --git a/core/res/res/values-w210dp-round-watch/dimens_material.xml b/core/res/res/values-w210dp-round-watch/dimens_material.xml new file mode 100644 index 000000000000..79acf84b7e3f --- /dev/null +++ b/core/res/res/values-w210dp-round-watch/dimens_material.xml @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2016 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<resources> + <dimen name="text_size_display_4_material">80sp</dimen> + <dimen name="text_size_display_3_material">50sp</dimen> + <dimen name="text_size_display_2_material">40sp</dimen> + <dimen name="text_size_display_1_material">30sp</dimen> + <dimen name="text_size_headline_material">20sp</dimen> + <dimen name="text_size_title_material">18sp</dimen> + <dimen name="text_size_subhead_material">18sp</dimen> + <dimen name="text_size_title_material_toolbar">18dp</dimen> + <dimen name="text_size_subtitle_material_toolbar">18dp</dimen> + <dimen name="text_size_menu_material">18sp</dimen> + <dimen name="text_size_menu_header_material">16sp</dimen> + <dimen name="text_size_body_2_material">16sp</dimen> + <dimen name="text_size_body_1_material">16sp</dimen> + <dimen name="text_size_caption_material">14sp</dimen> + <dimen name="text_size_button_material">16sp</dimen> + + <dimen name="text_size_large_material">18sp</dimen> + <dimen name="text_size_medium_material">16sp</dimen> + <dimen name="text_size_small_material">14sp</dimen> +</resources> diff --git a/core/res/res/values-watch/config_material.xml b/core/res/res/values-watch/config_material.xml index 81b53e71b5d7..104d122e01d3 100644 --- a/core/res/res/values-watch/config_material.xml +++ b/core/res/res/values-watch/config_material.xml @@ -29,7 +29,4 @@ <!-- Always overscan by default to ensure onApplyWindowInsets will always be called. --> <bool name="config_windowOverscanByDefault">true</bool> - - <!-- Due to the smaller screen size, have dialog titles occupy more than 1 line. --> - <integer name="config_dialogWindowTitleMaxLines">3</integer> </resources> diff --git a/core/res/res/values-watch/dimens_material.xml b/core/res/res/values-watch/dimens_material.xml index d579434d5e30..b48cde62158a 100644 --- a/core/res/res/values-watch/dimens_material.xml +++ b/core/res/res/values-watch/dimens_material.xml @@ -14,5 +14,29 @@ limitations under the License. --> <resources> + <dimen name="text_size_display_4_material">71sp</dimen> + <dimen name="text_size_display_3_material">44sp</dimen> + <dimen name="text_size_display_2_material">36sp</dimen> + <dimen name="text_size_display_1_material">27sp</dimen> + <dimen name="text_size_headline_material">18sp</dimen> + <dimen name="text_size_title_material">16sp</dimen> + <dimen name="text_size_subhead_material">16sp</dimen> + <dimen name="text_size_title_material_toolbar">16dp</dimen> + <dimen name="text_size_subtitle_material_toolbar">16dp</dimen> + <dimen name="text_size_menu_material">16sp</dimen> + <dimen name="text_size_menu_header_material">14sp</dimen> + <dimen name="text_size_body_2_material">14sp</dimen> + <dimen name="text_size_body_1_material">14sp</dimen> + <dimen name="text_size_caption_material">12sp</dimen> + <dimen name="text_size_button_material">14sp</dimen> + + <dimen name="text_size_large_material">16sp</dimen> + <dimen name="text_size_medium_material">14sp</dimen> + <dimen name="text_size_small_material">12sp</dimen> + <item name="text_line_spacing_multiplier_material" format="float" type="dimen">1.2</item> + + <!-- Date and time picker legacy dimens --> + <dimen name="picker_top_margin">1dip</dimen> + <dimen name="picker_bottom_margin">1dip</dimen> </resources> diff --git a/core/res/res/values-watch/strings.xml b/core/res/res/values-watch/strings.xml index dde8b2e3ec50..75a6f2438377 100644 --- a/core/res/res/values-watch/strings.xml +++ b/core/res/res/values-watch/strings.xml @@ -26,4 +26,10 @@ <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. Override from base which says "Body Sensors". [CHAR_LIMIT=25] --> <string name="permgrouplab_sensors">Sensors</string> + + <!-- Do not translate. timepicker mode, overridden for watch --> + <string name="time_picker_mode" translatable="false">"spinner"</string> + + <!-- Do not translate. datepicker mode, overridden for watch --> + <string name="date_picker_mode" translatable="false">"spinner"</string> </resources> diff --git a/core/res/res/values-watch/styles_material.xml b/core/res/res/values-watch/styles_material.xml index f5735e69347a..d09119fc7d6b 100644 --- a/core/res/res/values-watch/styles_material.xml +++ b/core/res/res/values-watch/styles_material.xml @@ -61,12 +61,19 @@ please see styles_device_defaults.xml. <item name="divider">@empty</item> </style> + <style name="TextAppearance.Material.ListItem" parent="TextAppearance.Material.Body1" /> + <style name="TextAppearance.Material.ListItemSecondary" parent="TextAppearance.Material.Caption" /> + <style name="Widget.Material.TextView" parent="Widget.TextView"> <item name="breakStrategy">balanced</item> </style> <style name="Widget.Material.ButtonBar" parent="Widget.Material.BaseButtonBar" /> + <style name="TextAppearance.Material.NumberPicker" parent="TextAppearance.Material.Body1"> + <item name="textSize">@dimen/text_size_medium_material</item> + </style> + <!-- Alert dialog button bar button --> <style name="Widget.Material.Button.ButtonBar.AlertDialog" parent="Widget.Material.Button.Borderless.Small"> <item name="paddingStart">@dimen/list_item_padding_start_material</item> @@ -82,13 +89,21 @@ please see styles_device_defaults.xml. <item name="solidColor">@color/transparent</item> <item name="selectionDivider">@drawable/numberpicker_selection_divider</item> <item name="selectionDividerHeight">2dp</item> - <item name="selectionDividersDistance">48dp</item> - <item name="internalMinWidth">64dp</item> - <item name="internalMaxHeight">180dp</item> + <item name="selectionDividersDistance">24dp</item> + <item name="internalMinWidth">32dp</item> + <item name="internalMaxHeight">90dp</item> <item name="virtualButtonPressedDrawable">?selectableItemBackground</item> <item name="descendantFocusability">blocksDescendants</item> </style> + <style name="DialogWindowTitle.Material"> + <item name="maxLines">3</item> + <item name="scrollHorizontally">false</item> + <item name="textAppearance">@style/TextAppearance.Material.DialogWindowTitle</item> + <item name="gravity">@integer/config_dialogTextGravity</item> + <item name="ellipsize">end</item> + </style> + <!-- DO NOTE TRANSLATE Spans within this text are applied to style composing regions within an EditText widget. The text content is ignored and not used. Note: This is @color/material_deep_teal_200, cannot use @color references here. --> diff --git a/core/res/res/values-watch/themes_material.xml b/core/res/res/values-watch/themes_material.xml index 4ae4367e8bc7..84bc25f26db4 100644 --- a/core/res/res/values-watch/themes_material.xml +++ b/core/res/res/values-watch/themes_material.xml @@ -59,4 +59,17 @@ please see styles_device_defaults.xml. <item name="colorBackgroundCacheHint">@color/background_cache_hint_selector_material_light</item> <item name="windowIsFloating">false</item> </style> + + <!-- Force all settings themes to use normal Material theme. --> + <style name="Theme.Material.Settings" parent="Theme.Material"/> + <style name="Theme.Material.Settings.NoActionBar" parent="Theme.Material"/> + <style name="Theme.Material.Settings.BaseDialog" parent="Theme.Material.Dialog"/> + <style name="Theme.Material.Settings.Dialog" parent="Theme.Material.Settings.BaseDialog"/> + <style name="Theme.Material.Settings.Dialog.BaseAlert" parent="Theme.Material.Dialog.BaseAlert"/> + <style name="Theme.Material.Settings.Dialog.Alert" parent="Theme.Material.Settings.Dialog.BaseAlert"/> + <style name="Theme.Material.Settings.DialogWhenLarge" parent="Theme.Material.DialogWhenLarge"/> + <style name="Theme.Material.Settings.DialogWhenLarge.NoActionBar" parent="Theme.Material.DialogWhenLarge.NoActionBar"/> + <style name="Theme.Material.Settings.Dialog.Presentation" parent="Theme.Material.Dialog.Presentation"/> + <style name="Theme.Material.Settings.SearchBar" parent="Theme.Material.SearchBar"/> + <style name="Theme.Material.Settings.CompactMenu" parent="Theme.Material.CompactMenu"/> </resources> diff --git a/core/res/res/values-zh-rCN/strings.xml b/core/res/res/values-zh-rCN/strings.xml index 69c3f7eff3bc..0ffc3819c56f 100644 --- a/core/res/res/values-zh-rCN/strings.xml +++ b/core/res/res/values-zh-rCN/strings.xml @@ -310,7 +310,7 @@ <string name="permdesc_enableCarMode" msgid="4853187425751419467">"允许应用启用车载模式。"</string> <string name="permlab_killBackgroundProcesses" msgid="3914026687420177202">"关闭其他应用"</string> <string name="permdesc_killBackgroundProcesses" msgid="4593353235959733119">"允许该应用结束其他应用的后台进程。此权限可导致其他应用停止运行。"</string> - <string name="permlab_systemAlertWindow" msgid="3543347980839518613">"在其他应用之上显示内容"</string> + <string name="permlab_systemAlertWindow" msgid="3543347980839518613">"出现在其他应用上"</string> <string name="permdesc_systemAlertWindow" msgid="8584678381972820118">"允许该应用在其他应用之上或用户界面的特定部分绘图。这可能会干扰您对所有应用界面的使用，或使您在其他应用中看到的内容发生变化。"</string> <string name="permlab_persistentActivity" msgid="8841113627955563938">"让应用始终运行"</string> <string name="permdesc_persistentActivity" product="tablet" msgid="8525189272329086137">"允许该应用在内存中持续保留其自身的某些组件。这会限制其他应用可用的内存，从而减缓平板电脑运行速度。"</string> @@ -678,6 +678,7 @@ <string name="lockscreen_pattern_correct" msgid="9039008650362261237">"正确！"</string> <string name="lockscreen_pattern_wrong" msgid="4317955014948108794">"重试"</string> <string name="lockscreen_password_wrong" msgid="5737815393253165301">"重试"</string> + <string name="lockscreen_storage_locked" msgid="9167551160010625200">"解锁即可使用所有功能和数据"</string> <string name="faceunlock_multiple_failures" msgid="754137583022792429">"已超过“人脸解锁”尝试次数上限"</string> <string name="lockscreen_missing_sim_message_short" msgid="5099439277819215399">"没有 SIM 卡"</string> <string name="lockscreen_missing_sim_message" product="tablet" msgid="151659196095791474">"平板电脑中没有SIM卡。"</string> @@ -1022,7 +1023,8 @@ <string name="android_upgrading_title" msgid="1584192285441405746">"Android正在升级..."</string> <string name="android_start_title" msgid="8418054686415318207">"Android 正在启动…"</string> <string name="android_upgrading_fstrim" msgid="8036718871534640010">"正在优化存储空间。"</string> - <string name="android_upgrading_notification_title" msgid="1619393112444671028">"Android 正在升级"</string> + <!-- no translation found for android_upgrading_notification_title (8428357096969413169) --> + <skip /> <string name="android_upgrading_notification_body" msgid="5761201379457064286">"在升级完成之前，部分应用可能无法正常运行"</string> <string name="app_upgrading_toast" msgid="3008139776215597053">"正在升级<xliff:g id="APPLICATION">%1$s</xliff:g>…"</string> <string name="android_upgrading_apk" msgid="7904042682111526169">"正在优化第<xliff:g id="NUMBER_0">%1$d</xliff:g>个应用（共<xliff:g id="NUMBER_1">%2$d</xliff:g>个）。"</string> diff --git a/core/res/res/values-zh-rHK/strings.xml b/core/res/res/values-zh-rHK/strings.xml index eb9e2fbc39a0..a453eba2ebe0 100644 --- a/core/res/res/values-zh-rHK/strings.xml +++ b/core/res/res/values-zh-rHK/strings.xml @@ -678,6 +678,7 @@ <string name="lockscreen_pattern_correct" msgid="9039008650362261237">"正確！"</string> <string name="lockscreen_pattern_wrong" msgid="4317955014948108794">"再試一次"</string> <string name="lockscreen_password_wrong" msgid="5737815393253165301">"再試一次"</string> + <string name="lockscreen_storage_locked" msgid="9167551160010625200">"解鎖即可使用所有功能和資料"</string> <string name="faceunlock_multiple_failures" msgid="754137583022792429">"已超過臉容解鎖嘗試次數上限"</string> <string name="lockscreen_missing_sim_message_short" msgid="5099439277819215399">"找不到 SIM 卡"</string> <string name="lockscreen_missing_sim_message" product="tablet" msgid="151659196095791474">"平板電腦中沒有 SIM 卡。"</string> @@ -1022,7 +1023,8 @@ <string name="android_upgrading_title" msgid="1584192285441405746">"正在升級 Android..."</string> <string name="android_start_title" msgid="8418054686415318207">"Android 正在啟動…"</string> <string name="android_upgrading_fstrim" msgid="8036718871534640010">"正在優化儲存空間。"</string> - <string name="android_upgrading_notification_title" msgid="1619393112444671028">"正在升級 Android"</string> + <!-- no translation found for android_upgrading_notification_title (8428357096969413169) --> + <skip /> <string name="android_upgrading_notification_body" msgid="5761201379457064286">"部分應用程式需要完成升級方可正常運作"</string> <string name="app_upgrading_toast" msgid="3008139776215597053">"「<xliff:g id="APPLICATION">%1$s</xliff:g>」正在升級…"</string> <string name="android_upgrading_apk" msgid="7904042682111526169">"正在優化第 <xliff:g id="NUMBER_0">%1$d</xliff:g> 個應用程式 (共 <xliff:g id="NUMBER_1">%2$d</xliff:g> 個)。"</string> diff --git a/core/res/res/values-zh-rTW/strings.xml b/core/res/res/values-zh-rTW/strings.xml index 9bd200215e7d..4dd8d8ffcf0e 100644 --- a/core/res/res/values-zh-rTW/strings.xml +++ b/core/res/res/values-zh-rTW/strings.xml @@ -678,6 +678,7 @@ <string name="lockscreen_pattern_correct" msgid="9039008650362261237">"正確！"</string> <string name="lockscreen_pattern_wrong" msgid="4317955014948108794">"再試一次"</string> <string name="lockscreen_password_wrong" msgid="5737815393253165301">"再試一次"</string> + <string name="lockscreen_storage_locked" msgid="9167551160010625200">"解鎖即可使用所有功能和資料"</string> <string name="faceunlock_multiple_failures" msgid="754137583022792429">"已超過人臉解鎖嘗試次數上限"</string> <string name="lockscreen_missing_sim_message_short" msgid="5099439277819215399">"找不到 SIM 卡"</string> <string name="lockscreen_missing_sim_message" product="tablet" msgid="151659196095791474">"平板電腦中沒有 SIM 卡。"</string> @@ -1022,7 +1023,8 @@ <string name="android_upgrading_title" msgid="1584192285441405746">"正在升級 Android…"</string> <string name="android_start_title" msgid="8418054686415318207">"Android 正在啟動…"</string> <string name="android_upgrading_fstrim" msgid="8036718871534640010">"正在對儲存空間進行最佳化處理。"</string> - <string name="android_upgrading_notification_title" msgid="1619393112444671028">"正在升級 Android"</string> + <!-- no translation found for android_upgrading_notification_title (8428357096969413169) --> + <skip /> <string name="android_upgrading_notification_body" msgid="5761201379457064286">"升級完成前，部分應用程式可能無法正常運作"</string> <string name="app_upgrading_toast" msgid="3008139776215597053">"正在升級「<xliff:g id="APPLICATION">%1$s</xliff:g>」…"</string> <string name="android_upgrading_apk" msgid="7904042682111526169">"正在最佳化第 <xliff:g id="NUMBER_0">%1$d</xliff:g> 個應用程式 (共 <xliff:g id="NUMBER_1">%2$d</xliff:g> 個)。"</string> diff --git a/core/res/res/values-zu/strings.xml b/core/res/res/values-zu/strings.xml index cdd071d48b2f..c6e8988c1b05 100644 --- a/core/res/res/values-zu/strings.xml +++ b/core/res/res/values-zu/strings.xml @@ -678,6 +678,7 @@ <string name="lockscreen_pattern_correct" msgid="9039008650362261237">"Lungile!"</string> <string name="lockscreen_pattern_wrong" msgid="4317955014948108794">"Zama futhi"</string> <string name="lockscreen_password_wrong" msgid="5737815393253165301">"Zama futhi"</string> + <string name="lockscreen_storage_locked" msgid="9167551160010625200">"Vulela zonke izici nedatha"</string> <string name="faceunlock_multiple_failures" msgid="754137583022792429">"Ukuzama Kokuvula Ubuso Okuningi kudluliwe"</string> <string name="lockscreen_missing_sim_message_short" msgid="5099439277819215399">"Alikho ikhadi le-SIM."</string> <string name="lockscreen_missing_sim_message" product="tablet" msgid="151659196095791474">"Alikho ikhadi le-SIM efonini."</string> @@ -1022,7 +1023,8 @@ <string name="android_upgrading_title" msgid="1584192285441405746">"I-Android ifaka ezakamuva..."</string> <string name="android_start_title" msgid="8418054686415318207">"I-Android iyaqala…"</string> <string name="android_upgrading_fstrim" msgid="8036718871534640010">"Ikhulisa isitoreji."</string> - <string name="android_upgrading_notification_title" msgid="1619393112444671028">"I-Android iyathuthukiswa"</string> + <!-- no translation found for android_upgrading_notification_title (8428357096969413169) --> + <skip /> <string name="android_upgrading_notification_body" msgid="5761201379457064286">"Ezinye izinhlelo zokusebenza kungenzeka zingasebenzi kahle kuze kuqedwe ukuthuthukiswa"</string> <string name="app_upgrading_toast" msgid="3008139776215597053">"<xliff:g id="APPLICATION">%1$s</xliff:g> iyathuthukisa…"</string> <string name="android_upgrading_apk" msgid="7904042682111526169">"Ukubeka ezingeni eliphezulu <xliff:g id="NUMBER_0">%1$d</xliff:g> uhlelo lokusebenza <xliff:g id="NUMBER_1">%2$d</xliff:g>"</string> diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index 2835c6f5fa0a..18a6a839f900 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -796,6 +796,12 @@ --> <integer name="config_longPressOnBackBehavior">0</integer> + <!-- Control the behavior when the user panic presses the back button. + 0 - Nothing + 1 - Go to home + --> + <integer name="config_backPanicBehavior">0</integer> + <!-- Control the behavior when the user short presses the power button. 0 - Nothing 1 - Go to sleep (doze) @@ -2513,4 +2519,7 @@ Note: Also update appropriate overlay files. --> <string-array translatable="false" name="config_defaultFirstUserRestrictions"> </string-array> + + <string name="config_networkOverLimitComponent" translatable="false">com.android.systemui/com.android.systemui.net.NetworkOverLimitActivity</string> + <string name="config_dataUsageSummaryComponent" translatable="false">com.android.settings/com.android.settings.Settings$DataUsageSummaryActivity</string> </resources> diff --git a/core/res/res/values/config_material.xml b/core/res/res/values/config_material.xml index a37be837d9f1..397635f402b1 100644 --- a/core/res/res/values/config_material.xml +++ b/core/res/res/values/config_material.xml @@ -32,9 +32,6 @@ <!-- True if windowOverscan should be on by default. --> <bool name="config_windowOverscanByDefault">false</bool> - <!-- Max number of lines for the dialog title. --> - <integer name="config_dialogWindowTitleMaxLines">1</integer> - <!-- True if preference fragment should clip to padding. --> <bool name="config_preferenceFragmentClipToPadding">true</bool> </resources> diff --git a/core/res/res/values/dimens_material.xml b/core/res/res/values/dimens_material.xml index f96cef9ad1c5..ae3116584e5d 100644 --- a/core/res/res/values/dimens_material.xml +++ b/core/res/res/values/dimens_material.xml @@ -189,4 +189,8 @@ <dimen name="day_picker_button_margin_top">0dp</dimen> <dimen name="datepicker_view_animator_height">226dp</dimen> + + <!-- Date and time picker legacy dimens --> + <dimen name="picker_top_margin">16dip</dimen> + <dimen name="picker_bottom_margin">16dip</dimen> </resources> diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index 8d3cd487e644..3c46517abc9f 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -1953,7 +1953,7 @@ <string name="lockscreen_access_pattern_cleared">Pattern cleared</string> <!-- Accessibility description sent when user adds a dot to the pattern. [CHAR LIMIT=NONE] --> <string name="lockscreen_access_pattern_cell_added">Cell added</string> - <!-- Accessibility description sent when user adds a dot to the pattern. Announces the + <!-- Accessibility description sent when user adds a dot to the pattern. Announces the actual cell when headphones are connected [CHAR LIMIT=NONE] --> <string name="lockscreen_access_pattern_cell_added_verbose"> Cell <xliff:g id="cell_index" example="3">%1$s</xliff:g> added</string> @@ -2033,6 +2033,12 @@ <!-- Button to restart the device after the factory test. --> <string name="factorytest_reboot">Reboot</string> + <!-- Do not translate. timepicker mode, overridden for watch --> + <string name="time_picker_mode" translatable="false">"clock"</string> + + <!-- Do not translate. datepicker mode, overridden for watch --> + <string name="date_picker_mode" translatable="false">"calendar"</string> + <!-- Do not translate. WebView User Agent string --> <string name="web_user_agent" translatable="false">Mozilla/5.0 (Linux; U; <xliff:g id="x">Android %s</xliff:g>) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 <xliff:g id="mobile">%s</xliff:g>Safari/534.30</string> diff --git a/core/res/res/values/styles_material.xml b/core/res/res/values/styles_material.xml index 443553754193..132402bd245e 100644 --- a/core/res/res/values/styles_material.xml +++ b/core/res/res/values/styles_material.xml @@ -255,6 +255,8 @@ please see styles_device_defaults.xml. <item name="textColor">?attr/textColorPrimary</item> </style> + <style name="TextAppearance.Material.NumberPicker" parent="TextAppearance.Material.Body1"/> + <!-- Deprecated text styles --> <style name="TextAppearance.Material.Inverse"> @@ -475,6 +477,9 @@ please see styles_device_defaults.xml. <item name="textColor">#66000000</item> </style> + <style name="TextAppearance.Material.ListItem" parent="TextAppearance.Material.Subhead" /> + <style name="TextAppearance.Material.ListItemSecondary" parent="TextAppearance.Material.Body1" /> + <style name="Widget.Material.Notification.ProgressBar" parent="Widget.Material.Light.ProgressBar.Horizontal" /> <style name="Widget.Material.Notification.MessagingText" parent="Widget.Material.Light.TextView"> @@ -684,7 +689,7 @@ please see styles_device_defaults.xml. </style> <style name="Widget.Material.TimePicker"> - <item name="timePickerMode">clock</item> + <item name="timePickerMode">@string/time_picker_mode</item> <item name="legacyLayout">@layout/time_picker_legacy_material</item> <!-- Attributes for new-style TimePicker. --> <item name="internalLayout">@layout/time_picker_material</item> @@ -698,7 +703,7 @@ please see styles_device_defaults.xml. </style> <style name="Widget.Material.DatePicker"> - <item name="datePickerMode">calendar</item> + <item name="datePickerMode">@string/date_picker_mode</item> <item name="legacyLayout">@layout/date_picker_legacy_holo</item> <item name="calendarViewShown">true</item> <!-- Attributes for new-style DatePicker. --> @@ -1246,7 +1251,7 @@ please see styles_device_defaults.xml. <style name="DialogWindowTitleBackground.Material.Light" /> <style name="DialogWindowTitle.Material"> - <item name="maxLines">@integer/config_dialogWindowTitleMaxLines</item> + <item name="maxLines">1</item> <item name="scrollHorizontally">true</item> <item name="textAppearance">@style/TextAppearance.Material.DialogWindowTitle</item> </style> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 2a40c0836ae5..45e4520f4fdc 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -375,6 +375,7 @@ <java-symbol type="integer" name="config_immersive_mode_confirmation_panic" /> <java-symbol type="integer" name="config_longPressOnPowerBehavior" /> <java-symbol type="integer" name="config_longPressOnBackBehavior" /> + <java-symbol type="integer" name="config_backPanicBehavior" /> <java-symbol type="integer" name="config_lowMemoryKillerMinFreeKbytesAdjust" /> <java-symbol type="integer" name="config_lowMemoryKillerMinFreeKbytesAbsolute" /> <java-symbol type="integer" name="config_max_pan_devices" /> @@ -2646,6 +2647,10 @@ <!-- Colon separated list of package names that should be granted DND access --> <java-symbol type="string" name="config_defaultDndAccessPackages" /> + <!-- For NetworkPolicyManagerService --> + <java-symbol type="string" name="config_networkOverLimitComponent" /> + <java-symbol type="string" name="config_dataUsageSummaryComponent" /> + <java-symbol type="string" name="lockscreen_storage_locked" /> <!-- Used for MimeIconUtils. --> diff --git a/core/res/res/values/themes_material.xml b/core/res/res/values/themes_material.xml index 7e2867de1d7a..0eb4c8d86928 100644 --- a/core/res/res/values/themes_material.xml +++ b/core/res/res/values/themes_material.xml @@ -114,9 +114,9 @@ please see themes_device_defaults.xml. <item name="listPreferredItemHeightSmall">48dip</item> <item name="listPreferredItemHeightLarge">80dip</item> <item name="dropdownListPreferredItemHeight">?attr/listPreferredItemHeightSmall</item> - <item name="textAppearanceListItem">@style/TextAppearance.Material.Subhead</item> - <item name="textAppearanceListItemSmall">@style/TextAppearance.Material.Subhead</item> - <item name="textAppearanceListItemSecondary">@style/TextAppearance.Material.Body1</item> + <item name="textAppearanceListItem">@style/TextAppearance.Material.ListItem</item> + <item name="textAppearanceListItemSmall">@style/TextAppearance.Material.ListItem</item> + <item name="textAppearanceListItemSecondary">@style/TextAppearance.Material.ListItemSecondary</item> <item name="listPreferredItemPaddingLeft">@dimen/list_item_padding_horizontal_material</item> <item name="listPreferredItemPaddingRight">@dimen/list_item_padding_horizontal_material</item> <item name="listPreferredItemPaddingStart">@dimen/list_item_padding_start_material</item> @@ -475,9 +475,9 @@ please see themes_device_defaults.xml. <item name="listPreferredItemHeightSmall">48dip</item> <item name="listPreferredItemHeightLarge">80dip</item> <item name="dropdownListPreferredItemHeight">?attr/listPreferredItemHeightSmall</item> - <item name="textAppearanceListItem">@style/TextAppearance.Material.Subhead</item> - <item name="textAppearanceListItemSmall">@style/TextAppearance.Material.Subhead</item> - <item name="textAppearanceListItemSecondary">@style/TextAppearance.Material.Body1</item> + <item name="textAppearanceListItem">@style/TextAppearance.Material.ListItem</item> + <item name="textAppearanceListItemSmall">@style/TextAppearance.Material.ListItem</item> + <item name="textAppearanceListItemSecondary">@style/TextAppearance.Material.ListItemSecondary</item> <item name="listPreferredItemPaddingLeft">@dimen/list_item_padding_horizontal_material</item> <item name="listPreferredItemPaddingRight">@dimen/list_item_padding_horizontal_material</item> <item name="listPreferredItemPaddingStart">@dimen/list_item_padding_start_material</item> diff --git a/core/res/res/xml-watch/default_zen_mode_config.xml b/core/res/res/xml-watch/default_zen_mode_config.xml index 26af10c1809e..938cc0c3f7c0 100644 --- a/core/res/res/xml-watch/default_zen_mode_config.xml +++ b/core/res/res/xml-watch/default_zen_mode_config.xml @@ -17,8 +17,8 @@ <!-- Default configuration for zen mode. See android.service.notification.ZenModeConfig. --> <zen version="2"> - <!-- Allow starred contacts to go through only. Repeated calls on. - Calls, messages, reminders, events off.--> - <allow from="2" repeatCallers="true" calls="false" messages="false" reminders="false" + <!-- Allow starred contacts to go through only. + Repeated calls, calls, messages, reminders, events off. --> + <allow from="2" repeatCallers="false" calls="false" messages="false" reminders="false" events="false"/> </zen> diff --git a/docs/html-intl/intl/es/training/articles/direct-boot.jd b/docs/html-intl/intl/es/training/articles/direct-boot.jd index e1d99e9d2b0e..0ce3f5b2db27 100644 --- a/docs/html-intl/intl/es/training/articles/direct-boot.jd +++ b/docs/html-intl/intl/es/training/articles/direct-boot.jd @@ -5,8 +5,8 @@ page.image=images/cards/card-nyc_2x.jpg @jd:body -<div id="qv-wrapper"> -<div id="qv"> +<div id="tb-wrapper"> +<div id="tb"> <h2>En este documento</h2> <ol> <li><a href="#run">Solicitar acceso para ejecutar durante el inicio directo</a></li> diff --git a/docs/html-intl/intl/es/training/articles/scoped-directory-access.jd b/docs/html-intl/intl/es/training/articles/scoped-directory-access.jd index 67f9ad672d76..194bfd74d354 100644 --- a/docs/html-intl/intl/es/training/articles/scoped-directory-access.jd +++ b/docs/html-intl/intl/es/training/articles/scoped-directory-access.jd @@ -4,8 +4,8 @@ page.tags=androidn @jd:body -<div id="qv-wrapper"> -<div id="qv"> +<div id="tb-wrapper"> +<div id="tb"> <h2>En este documento</h2> <ol> <li><a href="#accessing">Acceder a un directorio de almacenamiento externo</a></li> diff --git a/docs/html-intl/intl/es/training/tv/playback/picture-in-picture.jd b/docs/html-intl/intl/es/training/tv/playback/picture-in-picture.jd index 0aa46dcaa980..30c9e8bf9cf0 100644 --- a/docs/html-intl/intl/es/training/tv/playback/picture-in-picture.jd +++ b/docs/html-intl/intl/es/training/tv/playback/picture-in-picture.jd @@ -4,8 +4,8 @@ page.tags=androidn @jd:body -<div id="qv-wrapper"> -<div id="qv"> +<div id="tb-wrapper"> +<div id="tb"> <h2>En este documento</h2> <ol> diff --git a/docs/html-intl/intl/es/training/tv/tif/content-recording.jd b/docs/html-intl/intl/es/training/tv/tif/content-recording.jd index 855db8d5fffe..9e8a34679de4 100644 --- a/docs/html-intl/intl/es/training/tv/tif/content-recording.jd +++ b/docs/html-intl/intl/es/training/tv/tif/content-recording.jd @@ -5,8 +5,8 @@ page.image=images/cards/card-nyc_2x.jpg @jd:body -<div id="qv-wrapper"> -<div id="qv"> +<div id="tb-wrapper"> +<div id="tb"> <h2>En este documento</h2> <ol> <li><a href="#supporting">Indicar la compatibilidad para la grabación</a></li> diff --git a/docs/html-intl/intl/in/training/articles/direct-boot.jd b/docs/html-intl/intl/in/training/articles/direct-boot.jd index b06a7dd7864d..a7e3cf3cad77 100644 --- a/docs/html-intl/intl/in/training/articles/direct-boot.jd +++ b/docs/html-intl/intl/in/training/articles/direct-boot.jd @@ -5,8 +5,8 @@ page.image=images/cards/card-nyc_2x.jpg @jd:body -<div id="qv-wrapper"> -<div id="qv"> +<div id="tb-wrapper"> +<div id="tb"> <h2>Dalam dokumen ini</h2> <ol> <li><a href="#run">Meminta Akses untuk Berjalan Selama Direct Boot</a></li> diff --git a/docs/html-intl/intl/in/training/articles/scoped-directory-access.jd b/docs/html-intl/intl/in/training/articles/scoped-directory-access.jd index 855993f0b15c..30aed6fbb2a4 100644 --- a/docs/html-intl/intl/in/training/articles/scoped-directory-access.jd +++ b/docs/html-intl/intl/in/training/articles/scoped-directory-access.jd @@ -4,8 +4,8 @@ page.tags=androidn @jd:body -<div id="qv-wrapper"> -<div id="qv"> +<div id="tb-wrapper"> +<div id="tb"> <h2>Dalam dokumen ini</h2> <ol> <li><a href="#accessing">Mengakses Direktori Penyimpanan Eksternal</a></li> diff --git a/docs/html-intl/intl/in/training/tv/playback/picture-in-picture.jd b/docs/html-intl/intl/in/training/tv/playback/picture-in-picture.jd index 1cad9550e40c..41af6de97723 100644 --- a/docs/html-intl/intl/in/training/tv/playback/picture-in-picture.jd +++ b/docs/html-intl/intl/in/training/tv/playback/picture-in-picture.jd @@ -4,8 +4,8 @@ page.tags=androidn @jd:body -<div id="qv-wrapper"> -<div id="qv"> +<div id="tb-wrapper"> +<div id="tb"> <h2>Dalam dokumen ini</h2> <ol> diff --git a/docs/html-intl/intl/in/training/tv/tif/content-recording.jd b/docs/html-intl/intl/in/training/tv/tif/content-recording.jd index afedf8f31b21..3389dbf84cbf 100644 --- a/docs/html-intl/intl/in/training/tv/tif/content-recording.jd +++ b/docs/html-intl/intl/in/training/tv/tif/content-recording.jd @@ -5,8 +5,8 @@ page.image=images/cards/card-nyc_2x.jpg @jd:body -<div id="qv-wrapper"> -<div id="qv"> +<div id="tb-wrapper"> +<div id="tb"> <h2>Dalam dokumen ini</h2> <ol> <li><a href="#supporting">Menunjukkan Dukungan untuk Perekaman</a></li> diff --git a/docs/html-intl/intl/ja/training/articles/direct-boot.jd b/docs/html-intl/intl/ja/training/articles/direct-boot.jd index 933e682c062b..eaa684c76292 100644 --- a/docs/html-intl/intl/ja/training/articles/direct-boot.jd +++ b/docs/html-intl/intl/ja/training/articles/direct-boot.jd @@ -5,8 +5,8 @@ page.image=images/cards/card-nyc_2x.jpg @jd:body -<div id="qv-wrapper"> -<div id="qv"> +<div id="tb-wrapper"> +<div id="tb"> <h2>このドキュメントの内容</h2> <ol> <li><a href="#run">ダイレクト ブート中に実行するためのアクセスを要求する</a></li> diff --git a/docs/html-intl/intl/ja/training/articles/scoped-directory-access.jd b/docs/html-intl/intl/ja/training/articles/scoped-directory-access.jd index 32681a03620e..076768933792 100644 --- a/docs/html-intl/intl/ja/training/articles/scoped-directory-access.jd +++ b/docs/html-intl/intl/ja/training/articles/scoped-directory-access.jd @@ -4,8 +4,8 @@ page.tags=androidn @jd:body -<div id="qv-wrapper"> -<div id="qv"> +<div id="tb-wrapper"> +<div id="tb"> <h2>このドキュメントの内容</h2> <ol> <li><a href="#accessing">外部ストレージのディレクトリへのアクセス</a></li> diff --git a/docs/html-intl/intl/ja/training/tv/playback/picture-in-picture.jd b/docs/html-intl/intl/ja/training/tv/playback/picture-in-picture.jd index 7593670c98fc..1df16cd54393 100644 --- a/docs/html-intl/intl/ja/training/tv/playback/picture-in-picture.jd +++ b/docs/html-intl/intl/ja/training/tv/playback/picture-in-picture.jd @@ -4,8 +4,8 @@ page.tags=androidn @jd:body -<div id="qv-wrapper"> -<div id="qv"> +<div id="tb-wrapper"> +<div id="tb"> <h2>このドキュメントの内容</h2> <ol> diff --git a/docs/html-intl/intl/ja/training/tv/tif/content-recording.jd b/docs/html-intl/intl/ja/training/tv/tif/content-recording.jd index bf5f9a961a3b..3c58cfd31204 100644 --- a/docs/html-intl/intl/ja/training/tv/tif/content-recording.jd +++ b/docs/html-intl/intl/ja/training/tv/tif/content-recording.jd @@ -5,8 +5,8 @@ page.image=images/cards/card-nyc_2x.jpg @jd:body -<div id="qv-wrapper"> -<div id="qv"> +<div id="tb-wrapper"> +<div id="tb"> <h2>このドキュメントの内容</h2> <ol> <li><a href="#supporting">録画のサポートを示す</a></li> diff --git a/docs/html-intl/intl/ko/training/articles/direct-boot.jd b/docs/html-intl/intl/ko/training/articles/direct-boot.jd index 2674481181a4..e58a4f98019b 100644 --- a/docs/html-intl/intl/ko/training/articles/direct-boot.jd +++ b/docs/html-intl/intl/ko/training/articles/direct-boot.jd @@ -5,8 +5,8 @@ page.image=images/cards/card-nyc_2x.jpg @jd:body -<div id="qv-wrapper"> -<div id="qv"> +<div id="tb-wrapper"> +<div id="tb"> <h2>이 문서의 내용</h2> <ol> <li><a href="#run">직접 부팅 시 실행하기 위한 액세스 요청</a></li> diff --git a/docs/html-intl/intl/ko/training/articles/scoped-directory-access.jd b/docs/html-intl/intl/ko/training/articles/scoped-directory-access.jd index efd05f3e3a69..f2ce6500327d 100644 --- a/docs/html-intl/intl/ko/training/articles/scoped-directory-access.jd +++ b/docs/html-intl/intl/ko/training/articles/scoped-directory-access.jd @@ -4,8 +4,8 @@ page.tags=androidn @jd:body -<div id="qv-wrapper"> -<div id="qv"> +<div id="tb-wrapper"> +<div id="tb"> <h2>이 문서의 내용</h2> <ol> <li><a href="#accessing">외부 저장소 디렉터리 액세스</a></li> diff --git a/docs/html-intl/intl/ko/training/tv/playback/picture-in-picture.jd b/docs/html-intl/intl/ko/training/tv/playback/picture-in-picture.jd index 15d85fa4626e..96129ce216e1 100644 --- a/docs/html-intl/intl/ko/training/tv/playback/picture-in-picture.jd +++ b/docs/html-intl/intl/ko/training/tv/playback/picture-in-picture.jd @@ -4,8 +4,8 @@ page.tags=androidn @jd:body -<div id="qv-wrapper"> -<div id="qv"> +<div id="tb-wrapper"> +<div id="tb"> <h2>이 문서의 내용</h2> <ol> diff --git a/docs/html-intl/intl/ko/training/tv/tif/content-recording.jd b/docs/html-intl/intl/ko/training/tv/tif/content-recording.jd index fa557bcf14fd..ed8b6e04ec85 100644 --- a/docs/html-intl/intl/ko/training/tv/tif/content-recording.jd +++ b/docs/html-intl/intl/ko/training/tv/tif/content-recording.jd @@ -5,8 +5,8 @@ page.image=images/cards/card-nyc_2x.jpg @jd:body -<div id="qv-wrapper"> -<div id="qv"> +<div id="tb-wrapper"> +<div id="tb"> <h2>이 문서의 내용</h2> <ol> <li><a href="#supporting">녹화 지원 나타내기</a></li> diff --git a/docs/html-intl/intl/pt-br/training/articles/direct-boot.jd b/docs/html-intl/intl/pt-br/training/articles/direct-boot.jd index 8f588411a612..d95f4cded3c1 100644 --- a/docs/html-intl/intl/pt-br/training/articles/direct-boot.jd +++ b/docs/html-intl/intl/pt-br/training/articles/direct-boot.jd @@ -5,8 +5,8 @@ page.image=images/cards/card-nyc_2x.jpg @jd:body -<div id="qv-wrapper"> -<div id="qv"> +<div id="tb-wrapper"> +<div id="tb"> <h2>Neste documento</h2> <ol> <li><a href="#run">Solicitar acesso para executar durante a inicialização direta</a></li> diff --git a/docs/html-intl/intl/pt-br/training/articles/scoped-directory-access.jd b/docs/html-intl/intl/pt-br/training/articles/scoped-directory-access.jd index a4c51abe3398..215afd14b931 100644 --- a/docs/html-intl/intl/pt-br/training/articles/scoped-directory-access.jd +++ b/docs/html-intl/intl/pt-br/training/articles/scoped-directory-access.jd @@ -4,8 +4,8 @@ page.tags=androidn @jd:body -<div id="qv-wrapper"> -<div id="qv"> +<div id="tb-wrapper"> +<div id="tb"> <h2>Neste documento</h2> <ol> <li><a href="#accessing">Acessar um diretório de armazenamento externo</a></li> diff --git a/docs/html-intl/intl/pt-br/training/tv/playback/picture-in-picture.jd b/docs/html-intl/intl/pt-br/training/tv/playback/picture-in-picture.jd index 14f52091c86b..baa7d61b1390 100644 --- a/docs/html-intl/intl/pt-br/training/tv/playback/picture-in-picture.jd +++ b/docs/html-intl/intl/pt-br/training/tv/playback/picture-in-picture.jd @@ -4,8 +4,8 @@ page.tags=androidn @jd:body -<div id="qv-wrapper"> -<div id="qv"> +<div id="tb-wrapper"> +<div id="tb"> <h2>Neste documento</h2> <ol> diff --git a/docs/html-intl/intl/pt-br/training/tv/tif/content-recording.jd b/docs/html-intl/intl/pt-br/training/tv/tif/content-recording.jd index 890e1403793b..c6d7bb7f4fe5 100644 --- a/docs/html-intl/intl/pt-br/training/tv/tif/content-recording.jd +++ b/docs/html-intl/intl/pt-br/training/tv/tif/content-recording.jd @@ -5,8 +5,8 @@ page.image=images/cards/card-nyc_2x.jpg @jd:body -<div id="qv-wrapper"> -<div id="qv"> +<div id="tb-wrapper"> +<div id="tb"> <h2>Neste documento</h2> <ol> <li><a href="#supporting">Indicar suporte para gravação</a></li> diff --git a/docs/html-intl/intl/ru/training/articles/direct-boot.jd b/docs/html-intl/intl/ru/training/articles/direct-boot.jd index 3392c1355f8f..98849feeebb3 100644 --- a/docs/html-intl/intl/ru/training/articles/direct-boot.jd +++ b/docs/html-intl/intl/ru/training/articles/direct-boot.jd @@ -5,8 +5,8 @@ page.image=images/cards/card-nyc_2x.jpg @jd:body -<div id="qv-wrapper"> -<div id="qv"> +<div id="tb-wrapper"> +<div id="tb"> <h2>Содержание документа</h2> <ol> <li><a href="#run">Запрос доступа для запуска в режиме Direct Boot</a></li> diff --git a/docs/html-intl/intl/ru/training/articles/scoped-directory-access.jd b/docs/html-intl/intl/ru/training/articles/scoped-directory-access.jd index f70c92c4e14d..3e67d358f8ee 100644 --- a/docs/html-intl/intl/ru/training/articles/scoped-directory-access.jd +++ b/docs/html-intl/intl/ru/training/articles/scoped-directory-access.jd @@ -4,8 +4,8 @@ page.tags=androidn @jd:body -<div id="qv-wrapper"> -<div id="qv"> +<div id="tb-wrapper"> +<div id="tb"> <h2>Содержание документа</h2> <ol> <li><a href="#accessing">Доступ к каталогу во внешнем хранилище</a></li> diff --git a/docs/html-intl/intl/ru/training/tv/playback/picture-in-picture.jd b/docs/html-intl/intl/ru/training/tv/playback/picture-in-picture.jd index f0ffd482d86a..fc26368bb126 100644 --- a/docs/html-intl/intl/ru/training/tv/playback/picture-in-picture.jd +++ b/docs/html-intl/intl/ru/training/tv/playback/picture-in-picture.jd @@ -4,8 +4,8 @@ page.tags=androidn @jd:body -<div id="qv-wrapper"> -<div id="qv"> +<div id="tb-wrapper"> +<div id="tb"> <h2>Содержание документа</h2> <ol> diff --git a/docs/html-intl/intl/ru/training/tv/tif/content-recording.jd b/docs/html-intl/intl/ru/training/tv/tif/content-recording.jd index 5e6ce45b99ec..19d6db37eb02 100644 --- a/docs/html-intl/intl/ru/training/tv/tif/content-recording.jd +++ b/docs/html-intl/intl/ru/training/tv/tif/content-recording.jd @@ -5,8 +5,8 @@ page.image=images/cards/card-nyc_2x.jpg @jd:body -<div id="qv-wrapper"> -<div id="qv"> +<div id="tb-wrapper"> +<div id="tb"> <h2>Содержание документа</h2> <ol> <li><a href="#supporting">Указание на поддержку записи</a></li> diff --git a/docs/html-intl/intl/vi/training/articles/direct-boot.jd b/docs/html-intl/intl/vi/training/articles/direct-boot.jd index 9b2a557c2b16..c93e2552e208 100644 --- a/docs/html-intl/intl/vi/training/articles/direct-boot.jd +++ b/docs/html-intl/intl/vi/training/articles/direct-boot.jd @@ -5,8 +5,8 @@ page.image=images/cards/card-nyc_2x.jpg @jd:body -<div id="qv-wrapper"> -<div id="qv"> +<div id="tb-wrapper"> +<div id="tb"> <h2>Trong tài liệu này</h2> <ol> <li><a href="#run">Yêu cầu Truy cập để Chạy trong quá trình Khởi động Trực tiếp</a></li> diff --git a/docs/html-intl/intl/vi/training/articles/scoped-directory-access.jd b/docs/html-intl/intl/vi/training/articles/scoped-directory-access.jd index d3b71743dcae..a4d97796aaa3 100644 --- a/docs/html-intl/intl/vi/training/articles/scoped-directory-access.jd +++ b/docs/html-intl/intl/vi/training/articles/scoped-directory-access.jd @@ -4,8 +4,8 @@ page.tags=androidn @jd:body -<div id="qv-wrapper"> -<div id="qv"> +<div id="tb-wrapper"> +<div id="tb"> <h2>Trong tài liệu này</h2> <ol> <li><a href="#accessing">Truy cập một Thư mục lưu trữ bên ngoài</a></li> diff --git a/docs/html-intl/intl/vi/training/tv/playback/picture-in-picture.jd b/docs/html-intl/intl/vi/training/tv/playback/picture-in-picture.jd index 8146a1578682..9156152eb0d0 100644 --- a/docs/html-intl/intl/vi/training/tv/playback/picture-in-picture.jd +++ b/docs/html-intl/intl/vi/training/tv/playback/picture-in-picture.jd @@ -4,8 +4,8 @@ page.tags=androidn @jd:body -<div id="qv-wrapper"> -<div id="qv"> +<div id="tb-wrapper"> +<div id="tb"> <h2>Trong tài liệu này</h2> <ol> diff --git a/docs/html-intl/intl/vi/training/tv/tif/content-recording.jd b/docs/html-intl/intl/vi/training/tv/tif/content-recording.jd index 6dfb53ea3c9a..bfd718b28986 100644 --- a/docs/html-intl/intl/vi/training/tv/tif/content-recording.jd +++ b/docs/html-intl/intl/vi/training/tv/tif/content-recording.jd @@ -5,8 +5,8 @@ page.image=images/cards/card-nyc_2x.jpg @jd:body -<div id="qv-wrapper"> -<div id="qv"> +<div id="tb-wrapper"> +<div id="tb"> <h2>Trong tài liệu này</h2> <ol> <li><a href="#supporting">Chỉ báo Hỗ trợ ghi lại</a></li> diff --git a/docs/html-intl/intl/zh-cn/training/articles/direct-boot.jd b/docs/html-intl/intl/zh-cn/training/articles/direct-boot.jd index 306a7a4130ca..20f8b57822b0 100644 --- a/docs/html-intl/intl/zh-cn/training/articles/direct-boot.jd +++ b/docs/html-intl/intl/zh-cn/training/articles/direct-boot.jd @@ -5,8 +5,8 @@ page.image=images/cards/card-nyc_2x.jpg @jd:body -<div id="qv-wrapper"> -<div id="qv"> +<div id="tb-wrapper"> +<div id="tb"> <h2>本文内容</h2> <ol> <li><a href="#run">请求在直接启动时运行</a></li> diff --git a/docs/html-intl/intl/zh-cn/training/articles/scoped-directory-access.jd b/docs/html-intl/intl/zh-cn/training/articles/scoped-directory-access.jd index 6473fc85c8d5..83d50b42f277 100644 --- a/docs/html-intl/intl/zh-cn/training/articles/scoped-directory-access.jd +++ b/docs/html-intl/intl/zh-cn/training/articles/scoped-directory-access.jd @@ -8,8 +8,8 @@ page.tags=Android N -<div id="qv-wrapper"> -<div id="qv"> +<div id="tb-wrapper"> +<div id="tb"> <h2>本文内容</h2> <ol> <li><a href="#accessing">访问外部存储目录</a></li> diff --git a/docs/html-intl/intl/zh-cn/training/tv/playback/picture-in-picture.jd b/docs/html-intl/intl/zh-cn/training/tv/playback/picture-in-picture.jd index 782b5b868d63..6cfa815eca8b 100644 --- a/docs/html-intl/intl/zh-cn/training/tv/playback/picture-in-picture.jd +++ b/docs/html-intl/intl/zh-cn/training/tv/playback/picture-in-picture.jd @@ -4,8 +4,8 @@ page.tags=androidn @jd:body -<div id="qv-wrapper"> -<div id="qv"> +<div id="tb-wrapper"> +<div id="tb"> <h2>本文内容</h2> <ol> diff --git a/docs/html-intl/intl/zh-cn/training/tv/tif/content-recording.jd b/docs/html-intl/intl/zh-cn/training/tv/tif/content-recording.jd index 2dec87d68724..754e0651fcb9 100644 --- a/docs/html-intl/intl/zh-cn/training/tv/tif/content-recording.jd +++ b/docs/html-intl/intl/zh-cn/training/tv/tif/content-recording.jd @@ -5,8 +5,8 @@ page.image=images/cards/card-nyc_2x.jpg @jd:body -<div id="qv-wrapper"> -<div id="qv"> +<div id="tb-wrapper"> +<div id="tb"> <h2>本文内容</h2> <ol> <li><a href="#supporting">指示支持录制</a></li> diff --git a/docs/html-intl/intl/zh-tw/training/articles/direct-boot.jd b/docs/html-intl/intl/zh-tw/training/articles/direct-boot.jd index 7e4ea732b244..fdcb1727cea4 100644 --- a/docs/html-intl/intl/zh-tw/training/articles/direct-boot.jd +++ b/docs/html-intl/intl/zh-tw/training/articles/direct-boot.jd @@ -5,8 +5,8 @@ page.image=images/cards/card-nyc_2x.jpg @jd:body -<div id="qv-wrapper"> -<div id="qv"> +<div id="tb-wrapper"> +<div id="tb"> <h2>此文件內容</h2> <ol> <li><a href="#run">要求直接開機期間的執行權限</a></li> diff --git a/docs/html-intl/intl/zh-tw/training/articles/scoped-directory-access.jd b/docs/html-intl/intl/zh-tw/training/articles/scoped-directory-access.jd index 0aa0034a1d1e..b1c1a76ebb09 100644 --- a/docs/html-intl/intl/zh-tw/training/articles/scoped-directory-access.jd +++ b/docs/html-intl/intl/zh-tw/training/articles/scoped-directory-access.jd @@ -4,8 +4,8 @@ page.tags=androidn @jd:body -<div id="qv-wrapper"> -<div id="qv"> +<div id="tb-wrapper"> +<div id="tb"> <h2>此文件內容</h2> <ol> <li><a href="#accessing">存取外部儲存空間目錄</a></li> diff --git a/docs/html-intl/intl/zh-tw/training/tv/playback/picture-in-picture.jd b/docs/html-intl/intl/zh-tw/training/tv/playback/picture-in-picture.jd index b05198573eba..e643f65dbc1a 100644 --- a/docs/html-intl/intl/zh-tw/training/tv/playback/picture-in-picture.jd +++ b/docs/html-intl/intl/zh-tw/training/tv/playback/picture-in-picture.jd @@ -4,8 +4,8 @@ page.tags=androidn @jd:body -<div id="qv-wrapper"> -<div id="qv"> +<div id="tb-wrapper"> +<div id="tb"> <h2>此文件內容</h2> <ol> diff --git a/docs/html-intl/intl/zh-tw/training/tv/tif/content-recording.jd b/docs/html-intl/intl/zh-tw/training/tv/tif/content-recording.jd index d857477d760b..8b3a5ce62cac 100644 --- a/docs/html-intl/intl/zh-tw/training/tv/tif/content-recording.jd +++ b/docs/html-intl/intl/zh-tw/training/tv/tif/content-recording.jd @@ -5,8 +5,8 @@ page.image=images/cards/card-nyc_2x.jpg @jd:body -<div id="qv-wrapper"> -<div id="qv"> +<div id="tb-wrapper"> +<div id="tb"> <h2>此文件內容</h2> <ol> <li><a href="#supporting">指出錄製支援</a></li> diff --git a/docs/html/_redirects.yaml b/docs/html/_redirects.yaml index 3dcc736d3c90..fd54b7d8aa3d 100644 --- a/docs/html/_redirects.yaml +++ b/docs/html/_redirects.yaml @@ -479,6 +479,14 @@ redirects: to: /distribute/stories/index.html - from: /distribute/stories/tablets.html to: /distribute/stories/index.html +- from: /distribute/stories/glu-dh.html + to: /distribute/stories/games/glu-dh.html +- from: /distribute/stories/apps/tapps.html + to: /distribute/stories/games/tapps.html +- from: /distribute/stories/apps/upbeat-games.html + to: /distribute/stories/games/upbeat-games.html +- from: /distribute/stories/games/two-dots.html + to: /distribute/stories/games/dots.html - from: /distribute/googleplay/edu/index.html to: /distribute/googleplay/edu/about.html - from: /distribute/googleplay/edu/contact.html @@ -811,8 +819,8 @@ redirects: to: /about/versions/marshmallow/android-6.0-changes.html#behavior-apache-http-client - from: /shareables/... to: https://commondatastorage.googleapis.com/androiddevelopers/shareables/... -- from: /downloads/ - to: https://commondatastorage.googleapis.com/androiddevelopers/ +- from: /downloads/... + to: https://commondatastorage.googleapis.com/androiddevelopers/... - from: /training/performance/battery/network/action-any-traffic.html to: /topic/performance/power/network/action-any-traffic.html - from: /training/performance/battery/network/action-app-traffic.html diff --git a/docs/html/about/dashboards/index.jd b/docs/html/about/dashboards/index.jd index 3cbfde9cc386..f5d23e8b4032 100644 --- a/docs/html/about/dashboards/index.jd +++ b/docs/html/about/dashboards/index.jd @@ -59,7 +59,7 @@ Platform Versions</a>.</p> </div> -<p style="clear:both"><em>Data collected during a 7-day period ending on July 11, 2016. +<p style="clear:both"><em>Data collected during a 7-day period ending on August 1, 2016. <br/>Any versions with less than 0.1% distribution are not shown.</em> </p> @@ -81,7 +81,7 @@ Screens</a>.</p> </div> -<p style="clear:both"><em>Data collected during a 7-day period ending on July 11, 2016. +<p style="clear:both"><em>Data collected during a 7-day period ending on August 1, 2016. <br/>Any screen configurations with less than 0.1% distribution are not shown.</em></p> @@ -101,7 +101,7 @@ support for any lower version (for example, support for version 2.0 also implies <img alt="" style="float:right" -src="//chart.googleapis.com/chart?chl=GL%202.0%7CGL%203.0%7CGL%203.1&chf=bg%2Cs%2C00000000&chd=t%3A47.5%2C41.9%2C10.6&chco=c4df9b%2C6fad0c&cht=p&chs=400x250"> +src="//chart.googleapis.com/chart?chl=GL%202.0%7CGL%203.0%7CGL%203.1&chf=bg%2Cs%2C00000000&chd=t%3A46.0%2C42.6%2C11.4&chco=c4df9b%2C6fad0c&cht=p&chs=400x250"> <p>To declare which version of OpenGL ES your application requires, you should use the {@code android:glEsVersion} attribute of the <a @@ -119,21 +119,21 @@ uses.</p> </tr> <tr> <td>2.0</td> -<td>47.5%</td> +<td>46.0%</td> </tr> <tr> <td>3.0</td> -<td>41.9%</td> +<td>42.6%</td> </tr> <tr> <td>3.1</td> -<td>10.6%</td> +<td>11.4%</td> </tr> </table> -<p style="clear:both"><em>Data collected during a 7-day period ending on July 11, 2016</em></p> +<p style="clear:both"><em>Data collected during a 7-day period ending on August 1, 2016</em></p> @@ -147,19 +147,19 @@ var SCREEN_DATA = "Large": { "hdpi": "0.5", "ldpi": "0.2", - "mdpi": "4.4", + "mdpi": "4.3", "tvdpi": "2.1", "xhdpi": "0.5" }, "Normal": { - "hdpi": "40.9", - "mdpi": "4.1", + "hdpi": "40.0", + "mdpi": "3.8", "tvdpi": "0.1", - "xhdpi": "26.3", - "xxhdpi": "15.1" + "xhdpi": "27.3", + "xxhdpi": "15.5" }, "Small": { - "ldpi": "1.9" + "ldpi": "1.8" }, "Xlarge": { "hdpi": "0.3", @@ -167,8 +167,8 @@ var SCREEN_DATA = "xhdpi": "0.7" } }, - "densitychart": "//chart.googleapis.com/chart?chco=c4df9b%2C6fad0c&chd=t%3A2.1%2C11.4%2C2.2%2C41.7%2C27.5%2C15.1&chf=bg%2Cs%2C00000000&chl=ldpi%7Cmdpi%7Ctvdpi%7Chdpi%7Cxhdpi%7Cxxhdpi&chs=400x250&cht=p", - "layoutchart": "//chart.googleapis.com/chart?chco=c4df9b%2C6fad0c&chd=t%3A3.9%2C7.7%2C86.5%2C1.9&chf=bg%2Cs%2C00000000&chl=Xlarge%7CLarge%7CNormal%7CSmall&chs=400x250&cht=p" + "densitychart": "//chart.googleapis.com/chart?chd=t%3A2.0%2C11.0%2C2.2%2C40.8%2C28.5%2C15.5&chf=bg%2Cs%2C00000000&chl=ldpi%7Cmdpi%7Ctvdpi%7Chdpi%7Cxhdpi%7Cxxhdpi&cht=p&chs=400x250&chco=c4df9b%2C6fad0c", + "layoutchart": "//chart.googleapis.com/chart?chd=t%3A3.9%2C7.6%2C86.7%2C1.8&chf=bg%2Cs%2C00000000&chl=Xlarge%7CLarge%7CNormal%7CSmall&cht=p&chs=400x250&chco=c4df9b%2C6fad0c" } ]; @@ -176,7 +176,7 @@ var SCREEN_DATA = var VERSION_DATA = [ { - "chart": "//chart.googleapis.com/chart?chco=c4df9b%2C6fad0c&chd=t%3A0.1%2C1.9%2C1.7%2C17.8%2C30.2%2C35.1%2C13.3&chf=bg%2Cs%2C00000000&chl=Froyo%7CGingerbread%7CIce%20Cream%20Sandwich%7CJelly%20Bean%7CKitKat%7CLollipop%7CMarshmallow&chs=500x250&cht=p", + "chart": "//chart.googleapis.com/chart?chd=t%3A0.1%2C1.7%2C1.6%2C16.7%2C29.2%2C35.5%2C15.2&chf=bg%2Cs%2C00000000&chl=Froyo%7CGingerbread%7CIce%20Cream%20Sandwich%7CJelly%20Bean%7CKitKat%7CLollipop%7CMarshmallow&cht=p&chs=500x250&chco=c4df9b%2C6fad0c", "data": [ { "api": 8, @@ -186,47 +186,47 @@ var VERSION_DATA = { "api": 10, "name": "Gingerbread", - "perc": "1.9" + "perc": "1.7" }, { "api": 15, "name": "Ice Cream Sandwich", - "perc": "1.7" + "perc": "1.6" }, { "api": 16, "name": "Jelly Bean", - "perc": "6.4" + "perc": "6.0" }, { "api": 17, "name": "Jelly Bean", - "perc": "8.8" + "perc": "8.3" }, { "api": 18, "name": "Jelly Bean", - "perc": "2.6" + "perc": "2.4" }, { "api": 19, "name": "KitKat", - "perc": "30.1" + "perc": "29.2" }, { "api": 21, "name": "Lollipop", - "perc": "14.3" + "perc": "14.1" }, { "api": 22, "name": "Lollipop", - "perc": "20.8" + "perc": "21.4" }, { "api": 23, "name": "Marshmallow", - "perc": "13.3" + "perc": "15.2" } ] } diff --git a/docs/html/auto/images/logos/auto/gmc.png b/docs/html/auto/images/logos/auto/gmc.png Binary files differindex ab36da152944..ee0c1bf68bf7 100644 --- a/docs/html/auto/images/logos/auto/gmc.png +++ b/docs/html/auto/images/logos/auto/gmc.png diff --git a/docs/html/auto/images/logos/auto/koenigsegg.png b/docs/html/auto/images/logos/auto/koenigsegg.png Binary files differnew file mode 100644 index 000000000000..f2cf17ba828c --- /dev/null +++ b/docs/html/auto/images/logos/auto/koenigsegg.png diff --git a/docs/html/auto/images/logos/auto/lada.png b/docs/html/auto/images/logos/auto/lada.png Binary files differindex d1724601a98e..77bb5a447026 100644 --- a/docs/html/auto/images/logos/auto/lada.png +++ b/docs/html/auto/images/logos/auto/lada.png diff --git a/docs/html/auto/images/logos/auto/opel.png b/docs/html/auto/images/logos/auto/opel.png Binary files differindex fcb70402b30c..ecae4dba48d3 100644 --- a/docs/html/auto/images/logos/auto/opel.png +++ b/docs/html/auto/images/logos/auto/opel.png diff --git a/docs/html/auto/images/logos/auto/peugeot.png b/docs/html/auto/images/logos/auto/peugeot.png Binary files differindex d76a4bc09e17..e2bce369c3ab 100644 --- a/docs/html/auto/images/logos/auto/peugeot.png +++ b/docs/html/auto/images/logos/auto/peugeot.png diff --git a/docs/html/auto/images/logos/auto/renault.png b/docs/html/auto/images/logos/auto/renault.png Binary files differindex 297043068e03..c676bd1ed01e 100644 --- a/docs/html/auto/images/logos/auto/renault.png +++ b/docs/html/auto/images/logos/auto/renault.png diff --git a/docs/html/auto/images/logos/auto/seat.png b/docs/html/auto/images/logos/auto/seat.png Binary files differindex 9802ccf8b6b2..ddd9d054eab0 100644 --- a/docs/html/auto/images/logos/auto/seat.png +++ b/docs/html/auto/images/logos/auto/seat.png diff --git a/docs/html/auto/images/logos/auto/ssangyong.png b/docs/html/auto/images/logos/auto/ssangyong.png Binary files differindex 9e0f1177b8d2..c50237a9bc11 100644 --- a/docs/html/auto/images/logos/auto/ssangyong.png +++ b/docs/html/auto/images/logos/auto/ssangyong.png diff --git a/docs/html/auto/images/logos/auto/tata.png b/docs/html/auto/images/logos/auto/tata.png Binary files differindex dfc4a5f8eed8..fc405446e97f 100644 --- a/docs/html/auto/images/logos/auto/tata.png +++ b/docs/html/auto/images/logos/auto/tata.png diff --git a/docs/html/auto/images/logos/auto/volvo.png b/docs/html/auto/images/logos/auto/volvo.png Binary files differindex 683af2644ef8..4d39db01e1d0 100644 --- a/docs/html/auto/images/logos/auto/volvo.png +++ b/docs/html/auto/images/logos/auto/volvo.png diff --git a/docs/html/auto/index.jd b/docs/html/auto/index.jd index 167ed7b8bd45..e6fde38342d0 100644 --- a/docs/html/auto/index.jd +++ b/docs/html/auto/index.jd @@ -499,6 +499,12 @@ nonavpage=true </div> <div class="cols cols-leftp"> <div class="col-5"> + <a href=" http://koenigsegg.com/"> + <img src="/auto/images/logos/auto/koenigsegg.png" + width="120" height="120" class="img-logo" /> + </a> + </div> + <div class="col-5"> <a href=" http://www.lada.ru/en/"> <img src="{@docRoot}auto/images/logos/auto/lada.png" width="120" height="120" class="img-logo" /> @@ -516,14 +522,14 @@ nonavpage=true width="120" height="120" class="img-logo" /> </a> </div> + </div> + <div class="cols cols-leftp"> <div class="col-5"> <a href=" http://www.lincoln.com/"> <img src="{@docRoot}auto/images/logos/auto/lincoln.png" width="120" height="120" class="img-logo" /> </a> </div> - </div> - <div class="cols cols-leftp"> <div class="col-5"> <a href="http://www.mahindra.com/"> <img src="{@docRoot}auto/images/logos/auto/mahindra.png" @@ -542,15 +548,14 @@ nonavpage=true width="120" height="120" class="img-logo" /> </a> </div> - + </div> + <div class="cols cols-leftp"> <div class="col-5"> <a href="http://www.mercedes-benz.com/"> <img src="{@docRoot}auto/images/logos/auto/mbenz.png" width="120" height="120" class="img-logo" /> </a> </div> - </div> - <div class="cols cols-leftp"> <div class="col-5"> <a href="http://www.mitsubishi-motors.com/"> <img src="{@docRoot}auto/images/logos/auto/mitsubishi.png" @@ -569,16 +574,14 @@ nonavpage=true width="120" height="120" class="img-logo" /> </a> </div> - + </div> + <div class="cols cols-leftp"> <div class="col-5"> <a href="http://www.peugeot.com/"> <img src="{@docRoot}auto/images/logos/auto/peugeot.png" width="120" height="120" class="img-logo" /> </a> </div> - </div> - - <div class="cols cols-leftp"> <div class="col-5"> <a href="http://www.ramtrucks.com/"> <img src="{@docRoot}auto/images/logos/auto/ram.png" @@ -597,15 +600,14 @@ nonavpage=true width="120" height="120" class="img-logo" /> </a> </div> - + </div> + <div class="cols cols-leftp"> <div class="col-5"> <a href="http://www.seat.com/"> <img src="{@docRoot}auto/images/logos/auto/seat.png" width="120" height="120" class="img-logo" /> </a> </div> - </div> - <div class="cols cols-leftp"> <div class="col-5"> <a href="http://www.skoda-auto.com/"> <img src="{@docRoot}auto/images/logos/auto/skoda.png" @@ -624,16 +626,14 @@ nonavpage=true width="120" height="120" class="img-logo" /> </a> </div> - + </div> + <div class="cols cols-leftp"> <div class="col-5"> <a href="http://www.globalsuzuki.com/automobile/"> <img src="{@docRoot}auto/images/logos/auto/suzuki.png" width="120" height="120" class="img-logo" /> </a> </div> - </div> - - <div class="cols cols-leftp"> <div class="col-5"> <a href="http://www.tatamotors.com/"> <img src="{@docRoot}auto/images/logos/auto/tata.png" @@ -652,8 +652,8 @@ nonavpage=true width="120" height="120" class="img-logo" /> </a> </div> - - + </div> + <div class="cols cols-leftp"> <div class="col-5"> <a href="http://www.volvocars.com/intl"> <img src="{@docRoot}auto/images/logos/auto/volvo.png" @@ -661,7 +661,6 @@ nonavpage=true </a> </div> </div> - </div> </div> <div class="landing-section landing-red-background"> diff --git a/docs/html/distribute/stories/apps/aftenposten.jd b/docs/html/distribute/stories/apps/aftenposten.jd index 149e6bbe5a4a..a813c00addca 100644 --- a/docs/html/distribute/stories/apps/aftenposten.jd +++ b/docs/html/distribute/stories/apps/aftenposten.jd @@ -2,7 +2,7 @@ page.title=Aftenposten Improves Retention by Allowing Readers to Customize Notif page.metaDescription=Aftenposten upgraded their app and improved user retention. page.tags="developerstory", "apps", "googleplay" page.image=images/cards/distribute/stories/aftenposten.png -page.timestamp=1468270114 +page.timestamp=1468901834 @jd:body diff --git a/docs/html/distribute/stories/apps/el-mundo.jd b/docs/html/distribute/stories/apps/el-mundo.jd index 2ee813d55d11..2dbaeea7c8f0 100644 --- a/docs/html/distribute/stories/apps/el-mundo.jd +++ b/docs/html/distribute/stories/apps/el-mundo.jd @@ -2,7 +2,7 @@ page.title=El Mundo Improves User Ratings and Engagement with Material Design page.metaDescription=El Mundo uses Material Design principles to enhance their app's user experience. page.tags="developerstory", "apps", "googleplay" page.image=images/cards/distribute/stories/el-mundo.png -page.timestamp=1468270112 +page.timestamp=1468901833 @jd:body diff --git a/docs/html/distribute/stories/apps/segundamano.jd b/docs/html/distribute/stories/apps/segundamano.jd index 4cbf817c6d43..7ed4d8e88a5d 100644 --- a/docs/html/distribute/stories/apps/segundamano.jd +++ b/docs/html/distribute/stories/apps/segundamano.jd @@ -2,7 +2,7 @@ page.title=Segundamano Develops Android-First as Its Fastest Channel for Growth page.metaDescription=Segundamano developed Android app to increase potential for growth. page.tags="developerstory", "apps", "googleplay" page.image=images/cards/distribute/stories/segundamano.png -page.timestamp=1468270110 +page.timestamp=1468901832 @jd:body diff --git a/docs/html/distribute/stories/glu-dh.jd b/docs/html/distribute/stories/games/glu-dh.jd index 3353f6998ee1..3353f6998ee1 100644 --- a/docs/html/distribute/stories/glu-dh.jd +++ b/docs/html/distribute/stories/games/glu-dh.jd diff --git a/docs/html/distribute/stories/apps/tapps.jd b/docs/html/distribute/stories/games/tapps.jd index 129213946630..221b9a88622f 100644 --- a/docs/html/distribute/stories/apps/tapps.jd +++ b/docs/html/distribute/stories/games/tapps.jd @@ -1,8 +1,8 @@ page.title=Tapps Games Increases Installs by More Than 20% with Store Listing Experiments page.metaDescription=Tapps Games increased their use of store listing experiments in the Developer Console, with impressive results. -page.tags="developerstory", "apps", "googleplay" +page.tags="developerstory", "games", "googleplay" page.image=images/cards/distribute/stories/tapps.png -page.timestamp=1468270108 +page.timestamp=1468901831 @jd:body diff --git a/docs/html/distribute/stories/games/two-dots.jd b/docs/html/distribute/stories/games/two-dots.jd deleted file mode 100644 index a2299ce1f7f9..000000000000 --- a/docs/html/distribute/stories/games/two-dots.jd +++ /dev/null @@ -1,77 +0,0 @@ -page.title=Two Dots increased installs by 7 percent using Store Listing Experiments -page.metaDescription=Two Dots, the sequel to the popular game Dots, is a free-to-play puzzle game launched by Playdots, Inc. Playdots decided to use Store Listing Experiments to see if adding a call to action in the games’ store listing short descriptions had an impact on installs. -page.tags="developerstory", "games", "googleplay" -page.image=images/cards/distribute/stories/two-dots.png -page.timestamp=1456431511 - -@jd:body - - -<h3>Background</h3> - -<div class="figure" style="width:113px"> - <img src="{@docRoot}images/distribute/stories/two-dots-icon.png" - height="113" /> -</div> - -<p> - <a class="external-link" - href="https://play.google.com/store/apps/details?id=com.weplaydots.twodotsandroid&hl=en"> - Two Dots</a>, the sequel to the popular game - <a class="external-link" - href="https://play.google.com/store/apps/details?id=com.nerdyoctopus.gamedots&hl=en"> - Dots</a>, is a free-to-play puzzle game launched by Playdots, Inc. in May - 2014. Since launch it has gained over 30 million downloads, seen over five - billion games played, and achieved 15 times the revenue of the original Dots - game within a year. Dots decided to use - <a class="external-link" - href="https://support.google.com/googleplay/android-developer/answer/6227309"> - Store Listing Experiments</a> to see if adding a call to action in the games' - store listing short descriptions had an impact on installs. - -</p> - -<h3>What they did</h3> - -<p> - Dots used localized store listing experiments in the Google Play Developer - Console to test both games’ short descriptions. They compared the games’ - current descriptions — the control, with no call to action — against variant - descriptions, targeting half of their traffic with the variant descriptions. -</p> - -<h3>Results</h3> - -<p> - The results showed that the addition of a call to action in the short - description had a positive impact on installs. -</p> - - - <img - src="{@docRoot}images/distribute/stories/two-dots-screenshot.png" - srcset= - "{@docRoot}images/distribute/stories/two-dots-screenshot.png 1x - {@docRoot}images/distribute/stories/two-dots-screenshot_2x.png 2x"> - <p class="img-caption"> - Beautifully designed achievements badges encourage unlock - </p> - - -<p> - In Dots, the conversion rate increased by 2 percent with a simple call to - action in the variant text. In Two Dots, where a call to action was combined - with messaging that the game is the “best puzzle game on Android”, conversion - rates increased by 7 percent compared to the control description. -</p> - -<h3>Get started</h3> - -<p> - Learn how to run - <a clas="external-link" - href="https://support.google.com/googleplay/android-developer/answer/6227309"> - Store Listing Experiments</a> and read our best practices for - <a href="https://developer.android.com/distribute/users/experiments.html"> - running successful experiments</a>. -</p> diff --git a/docs/html/distribute/stories/apps/upbeat-games.jd b/docs/html/distribute/stories/games/upbeat-games.jd index 02222d39e686..16a1d51c19c9 100644 --- a/docs/html/distribute/stories/apps/upbeat-games.jd +++ b/docs/html/distribute/stories/games/upbeat-games.jd @@ -1,8 +1,8 @@ page.title=Witch Puzzle Achieves 98% of International Installs on Android page.metaDescription=Witch Puzzle localized their app into 12 languages. -page.tags="developerstory", "apps", "googleplay" +page.tags="developerstory", "games", "googleplay" page.image=images/cards/distribute/stories/witch-puzzle.png -page.timestamp=1468270106 +page.timestamp=1468901832 @jd:body diff --git a/docs/html/distribute/stories/index.jd b/docs/html/distribute/stories/index.jd index 8fe10191247d..1adc5aeb4eba 100644 --- a/docs/html/distribute/stories/index.jd +++ b/docs/html/distribute/stories/index.jd @@ -19,21 +19,43 @@ page.metaDescription=Android developers, their apps, and their successes with An <section class="dac-section dac-small" id="latest-apps"><div class="wrap"> <h2 class="norule">Latest from apps</h2> + <h3 class="norule">Videos</h3> + + <div class="resource-widget resource-flow-layout col-16" + data-query="type:youtube+tag:developerstory+tag:apps" + data-sortOrder="-timestamp" + data-cardSizes="6x6" + data-items-per-page="15" + data-initial-results="6"></div> + + <h3 class="norule">Articles</h3> + <div class="resource-widget resource-flow-layout col-16" - data-query="type:distribute+tag:developerstory+tag:apps, type:youtube+tag:developerstory+tag:apps" + data-query="type:distribute+tag:developerstory+tag:apps" data-sortOrder="-timestamp" data-cardSizes="6x6" data-items-per-page="15" - data-initial-results="9"></div> + data-initial-results="6"></div> </div></section> <section class="dac-section dac-small" id="latest-games"><div class="wrap"> <h2 class="norule">Latest from games</h2> + <h3 class="norule">Videos</h3> + + <div class="resource-widget resource-flow-layout col-16" + data-query="type:youtube+tag:developerstory+tag:games" + data-sortOrder="-timestamp" + data-cardSizes="6x6" + data-items-per-page="15" + data-initial-results="6"></div> + + <h3 class="norule">Articles</h3> + <div class="resource-widget resource-flow-layout col-16" - data-query="type:distribute+tag:developerstory+tag:games,type:youtube+tag:developerstory+tag:games" + data-query="type:distribute+tag:developerstory+tag:games" data-sortOrder="-timestamp" data-cardSizes="6x6" data-items-per-page="15" - data-initial-results="9"></div> + data-initial-results="6"></div> </div></section> diff --git a/docs/html/guide/topics/manifest/manifest-intro.jd b/docs/html/guide/topics/manifest/manifest-intro.jd index c843567488e5..851674c0f780 100644 --- a/docs/html/guide/topics/manifest/manifest-intro.jd +++ b/docs/html/guide/topics/manifest/manifest-intro.jd @@ -6,50 +6,53 @@ page.title=App Manifest <h2>In this document</h2> <ol> -<li><a href="#filestruct">Structure of the Manifest File</a></li> -<li><a href="#filec">File Conventions</a> -<li><a href="#filef">File Features</a> - <ol> - <li><a href="#ifs">Intent Filters</a></li> - <li><a href="#iconlabel">Icons and Labels</a></li> - <li><a href="#perms">Permissions</a></li> - <li><a href="#libs">Libraries</a></li> - </ol></li> +<li><a href="#filestruct">Manifest file structure</a></li> +<li><a href="#filec">File conventions</a> +<li><a href="#filef">File features</a> + <ol> + <li><a href="#ifs">Intent filters</a></li> + <li><a href="#iconlabel">Icons and labels</a></li> + <li><a href="#perms">Permissions</a></li> + <li><a href="#libs">Libraries</a></li> + </ol></li> </ol> </div> </div> <p> - Every application must have an AndroidManifest.xml file (with precisely that + Every application must have an {@code AndroidManifest.xml} file (with precisely that name) in its root directory. <span itemprop="description">The manifest file - presents essential information about your app to the Android system, - information the system must have before it can run any of the app's - code.</span> Among other things, the manifest does the following: + provides essential information about your app to the Android system, which + the system must have before it can run any of the app's + code.</span> +</p> + +<p> +Among other things, the manifest file does the following: </p> <ul> <li>It names the Java package for the application. The package name serves as a unique identifier for the application.</li> -<li>It describes the components of the application — the activities, -services, broadcast receivers, and content providers that the application is -composed of. It names the classes that implement each of the components and -publishes their capabilities (for example, which {@link android.content.Intent -Intent} messages they can handle). These declarations let the Android system -know what the components are and under what conditions they can be launched.</li> +<li>It describes the components of the application, which include the activities, +services, broadcast receivers, and content providers that compose the application. +It also names the classes that implement each of the components and +publishes their capabilities, such as the {@link android.content.Intent +Intent} messages that they can handle. These declarations inform the Android system +of the components and the conditions in which they can be launched.</li> -<li>It determines which processes will host application components.</li> +<li>It determines the processes that host the application components.</li> -<li>It declares which permissions the application must have in order to -access protected parts of the API and interact with other applications.</li> - -<li>It also declares the permissions that others are required to have in +<li>It declares the permissions that the application must have in order to +access protected parts of the API and interact with other applications. It also declares +the permissions that others are required to have in order to interact with the application's components.</li> <li>It lists the {@link android.app.Instrumentation} classes that provide -profiling and other information as the application is running. These declarations +profiling and other information as the application runs. These declarations are present in the manifest only while the application is being developed and -tested; they're removed before the application is published.</li> +are removed before the application is published.</li> <li>It declares the minimum level of the Android API that the application requires.</li> @@ -57,16 +60,27 @@ requires.</li> <li>It lists the libraries that the application must be linked against.</li> </ul> +<p class="note"><strong>Note</strong>: As you prepare your Android app to run on Chromebooks, +there are some important hardware and software feature limitations that you should consider. See +the <a href="{@docRoot}topic/arc/manifest.html"> +App Manifest Compatibility for Chromebooks</a> document for more information. +</p> + +<h2 id="filestruct">Manifest file structure</h2> -<h2 id="filestruct">Structure of the Manifest File</h2> +<p> +The code snippet below shows the general structure of the manifest file and +every element that it can contain. Each element, along with all of its +attributes, is fully documented in a separate file. +</p> + +<p class="note"><strong>Tip</strong>: To view detailed +information about any of the elements that are mentioned within the text of this document, +simply click the element name. +</p> <p> -The diagram below shows the general structure of the manifest file and -every element that it can contain. Each element, along with all of its -attributes, is documented in full in a separate file. To view detailed -information about any element, click on the element name in the diagram, -in the alphabetical list of elements that follows the diagram, or on any -other mention of the element name. +Here is an example of the manifest file: </p> <pre> @@ -126,45 +140,45 @@ other mention of the element name. </pre> <p> -All the elements that can appear in the manifest file are listed below -in alphabetical order. These are the only legal elements; you cannot -add your own elements or attributes. +The following list contains all of the elements that can appear in the manifest file, +in alphabetical order: </p> -<p style="margin-left: 2em"> -<code><a href="{@docRoot}guide/topics/manifest/action-element.html"><action></a></code> -<br/><code><a href="{@docRoot}guide/topics/manifest/activity-element.html"><activity></a></code> -<br/><code><a href="{@docRoot}guide/topics/manifest/activity-alias-element.html"><activity-alias></a></code> -<br/><code><a href="{@docRoot}guide/topics/manifest/application-element.html"><application></a></code> -<br/><code><a href="{@docRoot}guide/topics/manifest/category-element.html"><category></a></code> -<br/><code><a href="{@docRoot}guide/topics/manifest/data-element.html"><data></a></code> -<br/><code><a href="{@docRoot}guide/topics/manifest/grant-uri-permission-element.html"><grant-uri-permission></a></code> -<br/><code><a href="{@docRoot}guide/topics/manifest/instrumentation-element.html"><instrumentation></a></code> -<br/><code><a href="{@docRoot}guide/topics/manifest/intent-filter-element.html"><intent-filter></a></code> -<br/><code><a href="{@docRoot}guide/topics/manifest/manifest-element.html"><manifest></a></code> -<br/><code><a href="{@docRoot}guide/topics/manifest/meta-data-element.html"><meta-data></a></code> -<br/><code><a href="{@docRoot}guide/topics/manifest/permission-element.html"><permission></a></code> -<br/><code><a href="{@docRoot}guide/topics/manifest/permission-group-element.html"><permission-group></a></code> -<br/><code><a href="{@docRoot}guide/topics/manifest/permission-tree-element.html"><permission-tree></a></code> -<br/><code><a href="{@docRoot}guide/topics/manifest/provider-element.html"><provider></a></code> -<br/><code><a href="{@docRoot}guide/topics/manifest/receiver-element.html"><receiver></a></code> -<br/><code><a href="{@docRoot}guide/topics/manifest/service-element.html"><service></a></code> -<br/><code><a href="{@docRoot}guide/topics/manifest/supports-screens-element.html"><supports-screens></a></code> <!-- ##api level 4## --> -<br/><code><a href="{@docRoot}guide/topics/manifest/uses-configuration-element.html"><uses-configuration></a></code> <!-- ##api level 3## --> -<br/><code><a href="{@docRoot}guide/topics/manifest/uses-feature-element.html"><uses-feature></a></code> <!-- ##api level 4## --> -<br/><code><a href="{@docRoot}guide/topics/manifest/uses-library-element.html"><uses-library></a></code> -<br/><code><a href="{@docRoot}guide/topics/manifest/uses-permission-element.html"><uses-permission></a></code> -<br/><code><a href="{@docRoot}guide/topics/manifest/uses-sdk-element.html"><uses-sdk></a></code> -</p> - - +<ul> + <li><code><a href="{@docRoot}guide/topics/manifest/action-element.html"><action></a></code></li> + <li><code><a href="{@docRoot}guide/topics/manifest/activity-element.html"><activity></a></code></li> + <li><code><a href="{@docRoot}guide/topics/manifest/activity-alias-element.html"><activity-alias></a></code></li> + <li><code><a href="{@docRoot}guide/topics/manifest/application-element.html"><application></a></code></li> + <li><code><a href="{@docRoot}guide/topics/manifest/category-element.html"><category></a></code></li> + <li><code><a href="{@docRoot}guide/topics/manifest/data-element.html"><data></a></code></li> + <li><code><a href="{@docRoot}guide/topics/manifest/grant-uri-permission-element.html"><grant-uri-permission></a></code></li> + <li><code><a href="{@docRoot}guide/topics/manifest/instrumentation-element.html"><instrumentation></a></code></li> + <li><code><a href="{@docRoot}guide/topics/manifest/intent-filter-element.html"><intent-filter></a></code></li> + <li><code><a href="{@docRoot}guide/topics/manifest/manifest-element.html"><manifest></a></code></li> + <li><code><a href="{@docRoot}guide/topics/manifest/meta-data-element.html"><meta-data></a></code></li> + <li><code><a href="{@docRoot}guide/topics/manifest/permission-element.html"><permission></a></code></li> + <li><code><a href="{@docRoot}guide/topics/manifest/permission-group-element.html"><permission-group></a></code></li> + <li><code><a href="{@docRoot}guide/topics/manifest/permission-tree-element.html"><permission-tree></a></code></li> + <li><code><a href="{@docRoot}guide/topics/manifest/provider-element.html"><provider></a></code></li> + <li><code><a href="{@docRoot}guide/topics/manifest/receiver-element.html"><receiver></a></code></li> + <li><code><a href="{@docRoot}guide/topics/manifest/service-element.html"><service></a></code></li> + <li><code><a href="{@docRoot}guide/topics/manifest/supports-screens-element.html"><supports-screens></a></code> <!-- ##api level 4## --></li> + <li><code><a href="{@docRoot}guide/topics/manifest/uses-configuration-element.html"><uses-configuration></a></code> <!-- ##api level 3## --></li> + <li><code><a href="{@docRoot}guide/topics/manifest/uses-feature-element.html"><uses-feature></a></code> <!-- ##api level 4## --></li> + <li><code><a href="{@docRoot}guide/topics/manifest/uses-library-element.html"><uses-library></a></code></li> + <li><code><a href="{@docRoot}guide/topics/manifest/uses-permission-element.html"><uses-permission></a></code></li> + <li><code><a href="{@docRoot}guide/topics/manifest/uses-sdk-element.html"><uses-sdk></a></code></li> +</ul> +<p class="note"><strong>Note</strong>: These are the only legal elements – you cannot +add your own elements or attributes. +</p> -<h2 id="filec">File Conventions</h2> +<h2 id="filec">File conventions</h2> <p> -Some conventions and rules apply generally to all elements and attributes -in the manifest: +This section describes the conventions and rules that apply generally to all of the elements and +attributes in the manifest file. </p> <dl> @@ -172,29 +186,28 @@ in the manifest: <dd>Only the <code><a href="{@docRoot}guide/topics/manifest/manifest-element.html"><manifest></a></code> and <code><a href="{@docRoot}guide/topics/manifest/application-element.html"><application></a></code> -elements are required, they each must be present and can occur only once. -Most of the others can occur many times or not at all — although at -least some of them must be present for the manifest to accomplish anything -meaningful. +elements are required. They each must be present and can occur only once. +Most of the other elements can occur many times or not at all. However, at +least some of them must be present before the manifest file becomes useful. <p> If an element contains anything at all, it contains other elements. -All values are set through attributes, not as character data within an element. +All of the values are set through attributes, not as character data within an element. </p> <p> -Elements at the same level are generally not ordered. For example, +Elements at the same level are generally not ordered. For example, the <code><a href="{@docRoot}guide/topics/manifest/activity-element.html"><activity></a></code>, <code><a href="{@docRoot}guide/topics/manifest/provider-element.html"><provider></a></code>, and <code><a href="{@docRoot}guide/topics/manifest/service-element.html"><service></a></code> elements can be intermixed in any sequence. There are two key exceptions to this -rule, however: +rule: <ul> <li> An <code><a href="{@docRoot}guide/topics/manifest/activity-alias-element.html"><activity-alias></a></code> element must follow the <code><a href="{@docRoot}guide/topics/manifest/activity-element.html"><activity></a></code> - it is an alias for. + for which it is an alias. </li> <li> The <code><a href="{@docRoot}guide/topics/manifest/application-element.html"><application></a></code> @@ -207,15 +220,15 @@ rule, however: </p></dd> <dt><b>Attributes</b></dt> -<dd>In a formal sense, all attributes are optional. However, there are some -that must be specified for an element to accomplish its purpose. Use the -documentation as a guide. For truly optional attributes, it mentions a default +<dd>In a formal sense, all attributes are optional. However, there are some attributes +that must be specified so that an element can accomplish its purpose. Use the +documentation as a guide. For truly optional attributes, it mentions a default value or states what happens in the absence of a specification. <p>Except for some attributes of the root <code><a href="{@docRoot}guide/topics/manifest/manifest-element.html"><manifest></a></code> -element, all attribute names begin with an {@code android:} prefix — -for example, {@code android:alwaysRetainTaskState}. Because the prefix is +element, all attribute names begin with an {@code android:} prefix. +For example, {@code android:alwaysRetainTaskState}. Because the prefix is universal, the documentation generally omits it when referring to attributes by name.</p></dd> @@ -223,7 +236,7 @@ by name.</p></dd> <dd>Many elements correspond to Java objects, including elements for the application itself (the <code><a href="{@docRoot}guide/topics/manifest/application-element.html"><application></a></code> -element) and its principal components — activities +element) and its principal components: activities (<code><a href="{@docRoot}guide/topics/manifest/activity-element.html"><activity></a></code>), services (<code><a href="{@docRoot}guide/topics/manifest/service-element.html"><service></a></code>), @@ -238,7 +251,7 @@ If you define a subclass, as you almost always would for the component classes {@link android.content.BroadcastReceiver}, and {@link android.content.ContentProvider}), the subclass is declared through a {@code name} attribute. The name must include the full package designation. -For example, an {@link android.app.Service} subclass might be declared as follows: +For example, a {@link android.app.Service} subclass might be declared as follows: </p> <pre><manifest . . . > @@ -251,12 +264,12 @@ For example, an {@link android.app.Service} subclass might be declared as follow </manifest></pre> <p> -However, as a shorthand, if the first character of the string is a period, the -string is appended to the application's package name (as specified by the +However, if the first character of the string is a period, the +application's package name (as specified by the <code><a href="{@docRoot}guide/topics/manifest/manifest-element.html"><manifest></a></code> element's <code><a href="{@docRoot}guide/topics/manifest/manifest-element.html#package">package</a></code> -attribute). The following assignment is the same as the one above: +attribute) is appended to the string. The following assignment is the same as that shown above: </p> <pre><manifest package="com.example.project" . . . > @@ -269,13 +282,13 @@ attribute). The following assignment is the same as the one above: </manifest></pre> <p> -When starting a component, Android creates an instance of the named subclass. +When starting a component, the Android system creates an instance of the named subclass. If a subclass isn't specified, it creates an instance of the base class. </p></dd> <dt><b>Multiple values</b></dt> <dd>If more than one value can be specified, the element is almost always -repeated, rather than listing multiple values within a single element. +repeated, rather than multiple values being listed within a single element. For example, an intent filter can list several actions: <pre><intent-filter . . . > @@ -286,108 +299,105 @@ For example, an intent filter can list several actions: </intent-filter></pre></dd> <dt><b>Resource values</b></dt> -<dd>Some attributes have values that can be displayed to users — for -example, a label and an icon for an activity. The values of these attributes -should be localized and therefore set from a resource or theme. Resource -values are expressed in the following format,</p> +<dd>Some attributes have values that can be displayed to users, such as +a label and an icon for an activity. The values of these attributes +should be localized and set from a resource or theme. Resource +values are expressed in the following format:</p> <p style="margin-left: 2em">{@code @[<i>package</i>:]<i>type</i>/<i>name</i>}</p> <p> -where the <i>package</i> name can be omitted if the resource is in the same package -as the application, <i>type</i> is a type of resource — such as "string" or -"drawable" — and <i>name</i> is the name that identifies the specific resource. -For example: +You can ommit the <i>package</i> name if the resource is in the same package +as the application. The <i>type</i> is a type of resource, such as <em>string</em> or +<em>drawable</em>, and the <i>name</i> is the name that identifies the specific resource. +Here is an example: </p> <pre><activity android:icon="@drawable/smallPic" . . . ></pre> <p> -Values from a theme are expressed in a similar manner, but with an initial '{@code ?}' -rather than '{@code @}': +The values from a theme are expressed similarly, but with an initial {@code ?} +instead of {@code @}: </p> <p style="margin-left: 2em">{@code ?[<i>package</i>:]<i>type</i>/<i>name</i>} </p></dd> <dt><b>String values</b></dt> -<dd>Where an attribute value is a string, double backslashes ('{@code \\}') -must be used to escape characters — for example, '{@code \\n}' for -a newline or '{@code \\uxxxx}' for a Unicode character.</dd> +<dd>Where an attribute value is a string, you must use double backslashes ({@code \\}) +to escape characters, such as {@code \\n} for +a newline or {@code \\uxxxx} for a Unicode character.</dd> </dl> - -<h2 id="filef">File Features</h2> +<h2 id="filef">File features</h2> <p> -The following sections describe how some Android features are reflected +The following sections describe the way that some Android features are reflected in the manifest file. </p> -<h3 id="ifs">Intent Filters</h3> +<h3 id="ifs">Intent filters</h3> <p> -The core components of an application (its activities, services, and broadcast -receivers) are activated by <i>intents</i>. An intent is a +The core components of an application, such as its activities, services, and broadcast +receivers, are activated by <i>intents</i>. An intent is a bundle of information (an {@link android.content.Intent} object) describing a -desired action — including the data to be acted upon, the category of +desired action, including the data to be acted upon, the category of component that should perform the action, and other pertinent instructions. -Android locates an appropriate component to respond to the intent, launches +The Android system locates an appropriate component that can respond to the intent, launches a new instance of the component if one is needed, and passes it the -Intent object. +{@link android.content.Intent} object. </p> <p> -Components advertise their capabilities — the kinds of intents they can -respond to — through <i>intent filters</i>. Since the Android system -must learn which intents a component can handle before it launches the component, +The components advertise the types of intents that they can +respond to through <i>intent filters</i>. Since the Android system +must learn the intents that a component can handle before it launches the component, intent filters are specified in the manifest as <code><a href="{@docRoot}guide/topics/manifest/intent-filter-element.html"><intent-filter></a></code> -elements. A component may have any number of filters, each one describing +elements. A component can have any number of filters, each one describing a different capability. </p> <p> -An intent that explicitly names a target component will activate that component; -the filter doesn't play a role. But an intent that doesn't specify a target by +An intent that explicitly names a target component activates that component, so +the filter doesn't play a role. An intent that doesn't specify a target by name can activate a component only if it can pass through one of the component's filters. </p> <p> -For information on how Intent objects are tested against intent filters, -see a separate document, -<a href="{@docRoot}guide/components/intents-filters.html">Intents -and Intent Filters</a>. +For information about how {@link android.content.Intent} objects are tested against intent filters, +see the <a href="{@docRoot}guide/components/intents-filters.html">Intents +and Intent Filters</a> document. </p> - -<h3 id="iconlabel">Icons and Labels</h3> +<h3 id="iconlabel">Icons and labels</h3> <p> A number of elements have {@code icon} and {@code label} attributes for a -small icon and a text label that can be displayed to users. Some also have a -{@code description} attribute for longer explanatory text that can also be -shown on-screen. For example, the +small icon and a text label that can be displayed to users. Some also have a +{@code description} attribute for longer, explanatory text that can also be +shown on-screen. For example, the <code><a href="{@docRoot}guide/topics/manifest/permission-element.html"><permission></a></code> -element has all three of these attributes, so that when the user is asked whether +element has all three of these attributes so that when the user is asked whether to grant the permission to an application that has requested it, an icon representing the permission, the name of the permission, and a description of what it -entails can all be presented to the user. +entails are all presented to the user. </p> <p> -In every case, the icon and label set in a containing element become the default +In every case, the icon and label that are set in a containing element become the default {@code icon} and {@code label} settings for all of the container's subelements. -Thus, the icon and label set in the +Thus, the icon and label that are set in the <code><a href="{@docRoot}guide/topics/manifest/application-element.html"><application></a></code> element are the default icon and label for each of the application's components. -Similarly, the icon and label set for a component — for example, an +Similarly, the icon and label that are set for a component, such as an <code><a href="{@docRoot}guide/topics/manifest/activity-element.html"><activity></a></code> -element — are the default settings for each of the component's +element, are the default settings for each of the component's <code><a href="{@docRoot}guide/topics/manifest/intent-filter-element.html"><intent-filter></a></code> -elements. If an +elements. If an <code><a href="{@docRoot}guide/topics/manifest/application-element.html"><application></a></code> element sets a label, but an activity and its intent filter do not, the application label is treated as the label for both the activity and @@ -395,62 +405,62 @@ the intent filter. </p> <p> -The icon and label set for an intent filter are used to represent a component -whenever the component is presented to the user as fulfilling the function -advertised by the filter. For example, a filter with -"{@code android.intent.action.MAIN}" and -"{@code android.intent.category.LAUNCHER}" settings advertises an activity -as one that initiates an application — that is, as -one that should be displayed in the application launcher. The icon and label -set in the filter are therefore the ones displayed in the launcher. +The icon and label that are set for an intent filter represent a component +whenever the component is presented to the user and fulfills the function +that is advertised by the filter. For example, a filter with +{@code android.intent.action.MAIN} and +{@code android.intent.category.LAUNCHER} settings advertises an activity +as one that initiates an application. That is, as +one that should be displayed in the application launcher. The icon and label +that are set in the filter are displayed in the launcher. </p> - <h3 id="perms">Permissions</h3> <p> -A <i>permission</i> is a restriction limiting access to a part of the code -or to data on the device. The limitation is imposed to protect critical +A <i>permission</i> is a restriction that limits access to a part of the code +or to data on the device. The limitation is imposed to protect critical data and code that could be misused to distort or damage the user experience. </p> <p> -Each permission is identified by a unique label. Often the label indicates -the action that's restricted. For example, here are some permissions defined +Each permission is identified by a unique label. Often the label indicates +the action that's restricted. Here are some permissions that are defined by Android: </p> -<p style="margin-left: 2em">{@code android.permission.CALL_EMERGENCY_NUMBERS} -<br/>{@code android.permission.READ_OWNER_DATA} -<br/>{@code android.permission.SET_WALLPAPER} -<br/>{@code android.permission.DEVICE_POWER}</p> +<ul> + <li>{@code android.permission.CALL_EMERGENCY_NUMBERS}</li> + <li>{@code android.permission.READ_OWNER_DATA}</li> + <li>{@code android.permission.SET_WALLPAPER}</li> + <li>{@code android.permission.DEVICE_POWER}</li> +</ul> <p> -A feature can be protected by at most one permission. +A feature can be protected by only one permission. </p> <p> -If an application needs access to a feature protected by a permission, -it must declare that it requires that permission with a +If an application needs access to a feature that is protected by a permission, +it must declare that it requires the permission with a <code><a href="{@docRoot}guide/topics/manifest/uses-permission-element.html"><uses-permission></a></code> -element in the manifest. Then, when the application is installed on -the device, the installer determines whether or not to grant the requested +element in the manifest. When the application is installed on +the device, the installer determines whether to grant the requested permission by checking the authorities that signed the application's certificates and, in some cases, asking the user. If the permission is granted, the application is able to use the protected -features. If not, its attempts to access those features will simply fail +features. If not, its attempts to access those features fail without any notification to the user. </p> <p> -An application can also protect its own components (activities, services, -broadcast receivers, and content providers) with permissions. It can employ -any of the permissions defined by Android (listed in -{@link android.Manifest.permission android.Manifest.permission}) or declared -by other applications. Or it can define its own. A new permission is declared +An application can also protect its own components with permissions. It can employ +any of the permissions that are defined by Android, as listed in +{@link android.Manifest.permission android.Manifest.permission}, or declared +by other applications. It can also define its own. A new permission is declared with the <code><a href="{@docRoot}guide/topics/manifest/permission-element.html"><permission></a></code> -element. For example, an activity could be protected as follows: +element. For example, an activity could be protected as follows: </p> <pre> @@ -474,34 +484,34 @@ declared with the <code><a href="{@docRoot}guide/topics/manifest/permission-element.html"><permission></a></code> element, its use is also requested with the <code><a href="{@docRoot}guide/topics/manifest/uses-permission-element.html"><uses-permission></a></code> -element. Its use must be requested in order for other components of the +element. You must request its use in order for other components of the application to launch the protected activity, even though the protection is imposed by the application itself. </p> <p> -If, in the same example, the {@code permission} attribute was set to a -permission declared elsewhere -(such as {@code android.permission.CALL_EMERGENCY_NUMBERS}, it would not -have been necessary to declare it again with a +If, in the same example shown above, the {@code permission} attribute was set to a +permission that is declared elsewhere, +such as {@code android.permission.CALL_EMERGENCY_NUMBERS}, it would not +be necessary to declare it again with a <code><a href="{@docRoot}guide/topics/manifest/permission-element.html"><permission></a></code> -element. However, it would still have been necessary to request its use with +element. However, it would still be necessary to request its use with <code><a href="{@docRoot}guide/topics/manifest/uses-permission-element.html"><uses-permission></a></code>. </p> <p> The <code><a href="{@docRoot}guide/topics/manifest/permission-tree-element.html"><permission-tree></a></code> -element declares a namespace for a group of permissions that will be defined in -code. And +element declares a namespace for a group of permissions that are defined in +code, and the <code><a href="{@docRoot}guide/topics/manifest/permission-group-element.html"><permission-group></a></code> -defines a label for a set of permissions (both those declared in the manifest with +defines a label for a set of permissions, both those declared in the manifest with <code><a href="{@docRoot}guide/topics/manifest/permission-element.html"><permission></a></code> -elements and those declared elsewhere). It affects only how the permissions are -grouped when presented to the user. The +elements and those declared elsewhere. This affects only how the permissions are +grouped when presented to the user. The <code><a href="{@docRoot}guide/topics/manifest/permission-group-element.html"><permission-group></a></code> -element does not specify which permissions belong to the group; -it just gives the group a name. A permission is placed in the group +element does not specify the permissions that belong to the group, but +it gives the group a name. You can place a permission in the group by assigning the group name to the <code><a href="{@docRoot}guide/topics/manifest/permission-element.html"><permission></a></code> element's @@ -515,15 +525,14 @@ attribute. <p> Every application is linked against the default Android library, which includes the basic packages for building applications (with common classes -such as Activity, Service, Intent, View, Button, Application, ContentProvider, -and so on). +such as Activity, Service, Intent, View, Button, Application, and ContentProvider). </p> <p> -However, some packages reside in their own libraries. If your application -uses code from any of these packages, it must explicitly asked to be linked -against them. The manifest must contain a separate +However, some packages reside in their own libraries. If your application +uses code from any of these packages, it must explicitly ask to be linked +against them. The manifest must contain a separate <code><a href="{@docRoot}guide/topics/manifest/uses-library-element.html"><uses-library></a></code> -element to name each of the libraries. (The library name can be found in the -documentation for the package.) +element to name each of the libraries. You can find the library name in the +documentation for the package. </p> diff --git a/docs/html/guide/topics/manifest/uses-feature-element.jd b/docs/html/guide/topics/manifest/uses-feature-element.jd index 10841d675834..9b32244b736f 100755 --- a/docs/html/guide/topics/manifest/uses-feature-element.jd +++ b/docs/html/guide/topics/manifest/uses-feature-element.jd @@ -1230,7 +1230,7 @@ densities: '160' </p> <p> - When declared as required, this feature indicates that the app is + By default, your app requires this feature. This feature indicates that the app is compatible with a device only if that device emulates a touchscreen ("fake touch" interface) or has an actual touchscreen. </p> @@ -1240,19 +1240,12 @@ densities: '160' that emulates a subset of a touchscreen's capabilities. For example, a mouse or remote control could drive an on-screen cursor. If your app requires basic point and click interaction (in other words, it won't work - with only a d-pad controller), you should declare this feature. Because + with only a d-pad controller), you should declare this feature or simply + avoid declaring any {@code android.hardware.touchscreen.*} features. Because this is the minimum level of touch interaction, you can also use an app that declares this feature on devices that offer more complex touch interfaces. </p> - - <p class="note"> - <strong>Note:</strong> Apps require the {@code android.hardware.touchscreen} - feature by default. If you want your app to be available to devices that - provide a fake touch interface, you must also explicitly declare that a - touchscreen is not required as follows: - </p> - <pre><uses-feature android:name="android.hardware.touchscreen" <strong>android:required="false"</strong> /></pre> </dd> <dt> @@ -1327,21 +1320,9 @@ densities: '160' </p> <p> - By default, your app requires this feature. As such, your app is not - available to devices that provide only an emulated touch interface ("fake - touch") by default. If you want to make your app available on devices - that provide a fake touch interface (or even on devices that provide only - a d-pad controller), you must explicitly declare that a touchscreen is - not required by declaring {@code android.hardware.touchscreen} with - {@code android:required="false"}. You should add this declaration if your - app uses—but does not require—a real touchscreen interface. - </p> - - <p> If your app in fact requires a touch interface (to perform more advanced - touch gestures such as fling), then you don't need to declare any touch - interface features because they're required by default. However, it's - best if you explicitly declare all features that your app uses. + touch gestures such as fling), then you must explicitly declare this feature + or any advanced touchscreen features. </p> <p> diff --git a/docs/html/guide/topics/ui/layout/grid.jd b/docs/html/guide/topics/ui/layout/grid.jd index 31f9b9ca4ead..cc536517ea09 100644 --- a/docs/html/guide/topics/ui/layout/grid.jd +++ b/docs/html/guide/topics/ui/layout/grid.jd @@ -23,17 +23,32 @@ displays child {@link android.view.View} elements in rows and columns.</p> <img src="{@docRoot}images/ui/gridlayout.png" alt="" /> -<p>{@link android.widget.TableLayout} positions its children into rows - and columns. TableLayout containers do not display border lines for their rows, columns, - or cells. The table will have as many columns as the row with the most cells. A table can leave -cells empty, but cells cannot span columns, as they can in HTML.</p> -<p>{@link android.widget.TableRow} objects are the child views of a TableLayout -(each TableRow defines a single row in the table). -Each row has zero or more cells, each of which is defined by any kind of other View. So, the cells of a row may be -composed of a variety of View objects, like ImageView or TextView objects. -A cell may also be a ViewGroup object (for example, you can nest another TableLayout as a cell).</p> -<p>The following sample layout has two rows and two cells in each. The accompanying screenshot shows the -result, with cell borders displayed as dotted lines (added for visual effect). </p> +<p> + {@link android.widget.TableLayout} positions its children into rows and + columns. TableLayout containers do not display border lines for their rows, + columns, or cells. The table will have as many columns as the row with the + most cells. A table can leave cells empty. Cells can span multiple columns, + as they can in HTML. You can span columns by using the <code>span</code> + field in the {@link android.widget.TableRow.LayoutParams} class. +</p> + +<p class="note"> + <strong>Note:</strong> Cells cannot span multiple rows. +</p> + +<p> + {@link android.widget.TableRow} objects are the child views of a TableLayout + (each TableRow defines a single row in the table). Each row has zero or more + cells, each of which is defined by any kind of other View. So, the cells of + a row may be composed of a variety of View objects, like ImageView or + TextView objects. A cell may also be a ViewGroup object (for example, you + can nest another TableLayout as a cell). +</p> +<p> + The following sample layout has two rows and two cells in each. The + accompanying screenshot shows the result, with cell borders displayed as + dotted lines (added for visual effect). +</p> <table class="columns"> <tr> diff --git a/docs/html/images/topic/arc/sideload_figure_1.jpg b/docs/html/images/topic/arc/sideload_figure_1.jpg Binary files differnew file mode 100644 index 000000000000..8eb508504185 --- /dev/null +++ b/docs/html/images/topic/arc/sideload_figure_1.jpg diff --git a/docs/html/topic/arc/_book.yaml b/docs/html/topic/arc/_book.yaml new file mode 100644 index 000000000000..42287a7c8587 --- /dev/null +++ b/docs/html/topic/arc/_book.yaml @@ -0,0 +1,9 @@ +toc: +- title: Optimizing Apps for Chromebooks + path: /topic/arc/index.html +- title: App Manifest Compatibility for Chromebooks + path: /topic/arc/manifest.html +- title: Loading Apps on Chromebooks + path: /topic/arc/sideload.html +- title: Chrome OS Device Support for Apps + path: /topic/arc/device-support.html diff --git a/docs/html/topic/arc/device-support.jd b/docs/html/topic/arc/device-support.jd new file mode 100644 index 000000000000..fc471acb05a5 --- /dev/null +++ b/docs/html/topic/arc/device-support.jd @@ -0,0 +1,153 @@ +page.title=Chrome OS Device Support for Apps +@jd:body + +<div id="qv-wrapper"> + <div id="qv"> + <h2>On this page</h2> + + <ol> + <li><a href="#overview">Overview</a></li> + <li><a href="#support">Supported Platforms</a></li> + </ol> + </div> + </div> + +<p> +You can use the Google Play Store to install Android apps on several Google +Chromebooks. This document describes the Chromebooks, Chromeboxes, and +Chromebases that can install Android apps, both currently and in upcoming +releases of Chrome OS. +</p> + +<h2 id="overview">Overview</h2> + +<p> +The same Android apps that run on phones and tablets can run on Chromebooks +without compromising their speed, simplicity, or security. To develop the best +experience for Android apps across Chromebooks, you should test your app on a +suite of devices that consists of the following categories: +</p> + +<ul> + <li> + ARM architecture. + </li> + <li> + Intel x86 architecture. + </li> + <li> + Touch. + </li> + <li> + Non-touch (uses fake-touch). + </li> + <li> + Convertible. + </li> +</ul> + +<p>To learn more about Google Play Store support on Chromebooks, see the +following <a class="external-link" +href="https://chrome.googleblog.com/2016/05/the-google-play-store-coming-to.html"> +Google Chrome blog post</a>. +</p> + +<p class="note"><strong>Note: </strong>You may elect to exclude your app from +being available to certain Android devices, such as Chromebooks. For more +information, visit <a class="external-link" +href="https://support.google.com/googleplay/android-developer/answer/1286017"> +View & restrict your app's compatible devices</a>. +</p> + +<p> +The following section lists the Chromebooks that work with Android apps and the +categories that each device satisfies. +</p> + +<h2 id="support">Supported Platforms</h2> + +<p> +Android apps are not available on every Chromebook, but Google continues to +evaluate more devices based on a range of factors, such as processor type, GPU, +and drivers. The following table shows the platforms that currently support +Android apps: +</p> + +<p class="table-caption" id="Objects-and-interfaces"> + <strong>Table 1.</strong> Chromebooks that currently support Android apps.</p> +<table> + <tr> + <th scope="col">Manufacturer</th> + <th scope="col">Model</th> + <th scope="col">Architecture</th> + <th scope="col">Touchscreen support</th> + <th scope="col">Convertible</th> + </tr> + <tr> + <td>Acer</td> + <td>Chromebook R11 / C738T</td> + <td>Intel x86</td> + <td>Yes</td> + <td>Yes</td> + </tr> + <tr> + <td>Asus</td> + <td>Chromebook Flip</td> + <td>ARM</td> + <td>Yes</td> + <td>Yes</td> + </tr> + <tr> + <td>Google</td> + <td>Chromebook Pixel (2015)</td> + <td>Intel x86</td> + <td>Yes</td> + <td>No</td> + </tr> +</table> + +<p> +The following list shows the platforms that will support Android apps in an +upcoming release of Chrome OS: +</p> + +<ul> + <li><strong>Acer: </strong>Chromebook 11 C740, Chromebook 11 CB3-111 / C730 / + C730E / CB3-131, Chromebook 14 CB3-431, Chromebook 14 for Work, Chromebook + 15 CB5-571 / C910, Chromebook 15 CB3-531, Chromebox CXI2, Chromebase 24 + </li> + <li><strong>Asus: </strong>Chromebook C200, Chromebook C201, + Chromebook C202SA, Chromebook C300SA, Chromebook C300, Chromebox CN62, + Chromebit CS10</li> + <li><strong>AOpen: </strong>Chromebox Commercial, + Chromebase Commercial 22"</li> + <li><strong>Bobicus: </strong>Chromebook 11</li> + <li><strong>CDI: </strong>eduGear Chromebook K Series, + eduGear Chromebook M Series, eduGear Chromebook R Series</li> + <li><strong>CTL: </strong>Chromebook J2 / J4, N6 Education Chromebook, + J5 Convertible Chromebook</li> + <li><strong>Dell: </strong>Chromebook 11 3120, Chromebook 13 7310</li> + <li><strong>Edxis: </strong>Chromebook, Education Chromebook</li> + <li><strong>Haier: </strong>Chromebook 11, Chromebook 11e, Chromebook 11 G2 + </li> + <li><strong>Hexa: </strong>Chromebook Pi</li> + <li><strong>HiSense: </strong>Chromebook 11</li> + <li><strong>Lava: </strong>Xolo Chromebook</li> + <li><strong>HP: </strong>Chromebook 11 G3 / G4 / G4 EE, Chromebook 14 G4, + Chromebook 13</li> + <li><strong>Lenovo: </strong>100S Chromebook, N20 / N20P Chromebook, + N21 Chromebook, ThinkCentre Chromebox, ThinkPad 11e Chromebook, + N22 Chromebook, Thinkpad 13 Chromebook, Thinkpad 11e Chromebook Gen 3</li> + <li><strong>Medion: </strong>Akoya S2013, Chromebook S2015</li> + <li><strong>M&A: </strong>Chromebook</li> + <li><strong>NComputing: </strong>Chromebook CX100</li> + <li><strong>Nexian: </strong>Chromebook 11.6"</li> + <li><strong>PCMerge: </strong>Chromebook PCM-116E</li> + <li><strong>Poin2: </strong>Chromebook 11</li> + <li><strong>Samsung: </strong>Chromebook 2 11" - XE500C12, Chromebook 3</li> + <li><strong>Sector 5: </strong>E1 Rugged Chromebook</li> + <li><strong>Senkatel: </strong>C1101 Chromebook</li> + <li><strong>Toshiba: </strong>Chromebook 2, Chromebook 2 (2015)</li> + <li><strong>True IDC: </strong>Chromebook 11</li> + <li><strong>Viglen: </strong>Chromebook 11</li> +</ul> diff --git a/docs/html/topic/arc/index.jd b/docs/html/topic/arc/index.jd new file mode 100644 index 000000000000..d46fbc89ac59 --- /dev/null +++ b/docs/html/topic/arc/index.jd @@ -0,0 +1,398 @@ +page.title=Optimizing Apps for Chromebooks +@jd:body + +<div id="qv-wrapper"> + <div id="qv"> + <h2>On this page</h2> + + <ol> + <li><a href="#update-manifest">Update Your App's Manifest File</a></li> + <li><a href="#leverage">Leverage Support for Multi-Window Mode</li> + <li><a href="#keyboard">Support the Keyboard, Trackpad, and Mouse</a></li> + <li><a href="#backup">Use Backup and Restore Effectively</a></li> + <li><a href="#update-ndk">Update the NDK Libraries</a></li> + <li><a href="#support-new-features">Plan Support for New Android Features</a></li> + <li><a href="#testing">Test Your App</a></li> + <li><a href="#setup">Set Up ADB</a></li> + <li><a href="#learning-materials">Additional Learning Materials</a></li> + </ol> + </div> + </div> + +<p> +Google Chromebooks now support the Google Play Store and Android apps. This +document describes some ways that you can optimize your Android apps for +Chromebooks. +</p> + +<h2 id="update-manifest">Update Your App's Manifest File</h2> + +<p> +To begin optimizing your Android app for Chromebooks, update your manifest file +(<code>AndroidManifest.xml</code>) to account for some key hardware and software +differences between Chromebooks and other devices running Android. +</p> + +<p> +As of Chrome OS version M53, all Android apps that don't explicitly require the +<a +href="{@docRoot}guide/topics/manifest/uses-feature-element.html#touchscreen-hw-features"><code>android.hardware.touchscreen</code></a> +feature will also work on Chrome OS devices that support the +<code>android.hardware.faketouch</code> feature. However, if you want your app +to work on all Chromebooks in the best possible way, go to your manifest file +and adjust the settings so that the <code>android.hardware.touchscreen</code> +feature is not required, as shown in the following example. You should also +review your mouse and keyboard interactions. +</p> + +<pre> +<manifest xmlns:android="http://schemas.android.com/apk/res/android" + ... > + <!-- Some Chromebooks don't support touch. Although not essential, + it's a good idea to explicitly include this declaration. --> + <uses-feature android:name="android.hardware.touchscreen" + required="false" /> +</manifest> +</pre> + +<p> +Different devices often have different sensors available in them. See the <a +href="https://developer.android.com/guide/topics/sensors/sensors_overview.html">Sensors +Overview</a> document for an overview of all sensors that the Android platform +supports. Although Android handheld devices may have GPS and accelerometers, +sensors are not guaranteed to be available in every Chromebook. However, there +are cases where the functionality of a sensor is provided in another way. For +example, Chromebooks may not have GPS sensors, but they still provide location +data based on Wi-Fi connections. If you want your app to run on Chromebooks, +regardless of sensor support, you should update your manifest file so that none +of the sensors are required. +</p> + +<p class="note"><strong>Note</strong>: If you don't require a particular sensor +for your app but still use measurements from the sensor when it's available, +make sure you dynamically check for the sensor's availability before trying to +gather information from it in your app. +</p> + +<p> +Some software features are unsupported on Chromebooks. For example, apps that +provide custom IMEs, app widgets, live wallpapers, and app launchers aren't +supported and won't be available for installation on Chromebooks. For a complete +list of software features that aren't currently supported on Chromebooks, see <a +href="{@docRoot}topic/arc/manifest.html#incompat-software-features">incompatible +software features</a>. +</p> + +<h2 id="leverage">Leverage Support for Multi-Window Mode</h2> + +<p> +The implementation of Android apps on Chrome OS includes basic multi-window +support. Instead of automatically drawing over the full screen, Android renders +apps on Chrome OS into layouts that are appropriate for this form factor. Google +provides support for the most common window layouts: + +<ul> + <li> + <strong>Portrait</strong> – Similar to Nexus 5. + </li> + <li> + <strong>Landscape</strong> – Similar to Nexus 7. + </li> + <li> + <strong>Maximized</strong> – Uses all available screen pixels. + </li> +</ul> + +<p> +In addition, end users are presented with window controls to toggle among all +available layouts. By choosing the correct orientation option, you can ensure +that the user has the correct layout upon launching the app. If an app is +available in portrait and landscape, it defaults to landscape if possible. After +this option is set, it is remembered on a per-app basis. Google recommends that +you test your app to ensure that it handles changes in window size +appropriately. +</p> + +<h2 id="keyboard">Support the Keyboard, Trackpad, and Mouse</h2> + +<p> +All Chromebooks have a physical keyboard and a trackpad, and some Chromebooks +have a touchscreen as well. Some devices can even convert from a laptop to a +tablet. +</p> + +<p> +Many existing apps already support mouse and trackpad interactions with no extra +work required. However, it's always best to adjust your app's behavior +appropriately when users interact with it using a trackpad instead of a +touchscreen, and you should support and distinguish between both interfaces +properly. Given the support for physical keyboards, you can now provide hotkeys +to enable your app's users to be more productive. For example, if your app +supports printing, you can use <strong>Ctrl+P</strong> to open a print dialog. +</p> + +<h2 id="backup">Use Backup and Restore Effectively</h2> + +<p> +One of the strongest features of Chromebooks is that users can easily migrate +from one device to another. That is, if someone stops using one Chromebook and +starts using another, they simply have to sign in, and all of their apps appear. +</p> + +<p class="note"><strong>Tip: </strong> Although it's not mandatory, backing up +your app's data to the cloud is a good idea. +</p> + +<p> +Chromebooks can also be shared among a large number of people, such as in +schools. Since local storage is not infinite, entire accounts—together +with their storage—can be removed from the device at any point. For +educational settings, it's a good idea to keep this scenario in mind. +</p> + +<h2 id="update-ndk">Update the NDK Libraries</h2> + +<p> +If your app uses the Android NDK libraries, and its target SDK version is 23 or +higher, ensure that text relocations are removed from both the ARM and x86 +versions of your NDK libraries, as they're not compatible in Android 6.0 (API +level 23) and higher. By leaving text relocations in your NDK libraries, you may +also cause incompatibility errors with Chromebooks, especially when running on +a device that uses an x86 architecture. +</p> + +<p class="note"><strong>Note: </strong>To view more details on updating NDK +libraries properly, see the <a +href="https://developer.android.com/about/versions/marshmallow/android-6.0-changes.html#behavior-runtime"> +Runtime</a> section of the Android 6.0 Changes document. +</p> + +<h2 id="support-new-features">Plan Support for New Android Features</h2> + +<p> +Android apps on Chromebooks initially ship with APIs for Android 6.0 (API level +23). By following the best practices outlined above, your app is likely to be +compatible with the multi-window improvements introduced in Android 7.0 (API +level 24). It's good to plan support for the APIs and behaviors available as of +Android 7.0, which feature several improvements. For example, multi-window +support is better integrated, and you're able to resize activities arbitrarily, +making them feel more natural. You can also access APIs for drag-and-drop +operations across apps and mouse cursor control. +</p> + +<h2 id="testing">Test Your App</h2> + +<p> +To <a href="{@docRoot}topic/arc/sideload.html">load</a> your app onto your +Chromebook for testing, you must enter <em>Developer</em> mode on your Chrome OS +device and enable <em>unknown sources</em>. See the <a class="external-link" +href="https://www.chromium.org/chromium-os/poking-around-your-chrome-os-device#TOC-Putting-your-Chrome-OS-Device-into-Developer-Mode"> +Putting your Chrome OS Device into Developer Mode</a> document for detailed +instructions about moving your device into Developer mode. After your device is +in Developer mode, you can go to your Chrome settings and select <strong>Enable +Unknown Sources</strong> under the <em>security in app</em> settings. +</p> + +<p> +After enabling Developer mode, you can load an Android app onto your Chrome OS +device using one of several methods. For more details, see the <a +href="{@docRoot}topic/arc/sideload.html#load-app">Load Your App</a> section of +the Loading Apps on Chromebooks page. +</p> + +<p class="note"><strong>Note: </strong>To ensure that your Android app works +well on a variety of Chromebook devices and available form factors, Google +recommends that you test your app on an ARM-based Chromebook, an x86-based +Chromebook, a device with a touchscreen and one without one, and on a +convertible device (one that can change between a laptop and a tablet). To view +the full list of supported devices, see the <a +href="{@docRoot}topic/arc/device-support.html">Chrome OS Device Support for +Apps</a> page.</p> + +<h2 id="setup">Set Up ADB</h2> + +<p> +Before attempting to set up an ADB connection, you must start your Chrome OS in +<a class="external-link" +href="https://www.chromium.org/chromium-os/poking-around-your-chrome-os-device"> +Developer Mode</a> so that you have the ability to install Android apps on the +Chromebook. +</p> + +<p class="caution"><strong>Caution: </strong>After switching your Chrome OS +device to Developer mode, it restarts and clears all existing data on the +device. +</p> + +<p> +To set up ADB, complete the following steps: +</p> + +<ol> + <li> + Press <strong>Ctrl+D</strong> to start your device. + </li> + <li> + Finish the setup process. + </li> + <li> + Log into your test account. + </li> + <li> + Accept the Google Play Store terms and service conditions. + </li> +</ol> + +<h3>Configure the firewall</h3> + +<p> +To configure the Chrome OS firewall to allow incoming ADB connections, complete +the following steps: +</p> + +<ol> + <li> + Press <strong>Ctrl+Alt+T</strong> to start the Chrome OS terminal. + </li> + <li> + Type <strong>shell</strong> to get to the bash command shell: +<pre class="no-pretty-print"> +crosh> shell +chronos@localhost / $ +</pre> + </li> + <li> + Type the following commands to set up developer features and enable + disk-write access for the firewall settings changes: +<pre class="no-pretty-print"> +chronos@localhost / $ sudo /usr/libexec/debugd/helpers/dev_features_rootfs_verification +chronos@localhost / $ sudo reboot +</pre> + The <em>sudo reboot</em> command restarts your Chromebook. +<p class="note"><strong>Note</strong>: You can press the <strong>Tab</strong> +key to enable autocompletion of file names.</p> + </li> + <li> + After your device restarts, log in to your test account and type the + following command to enable the <em>secure shell</em> and configure the + firewall properly: +<pre class="no-pretty-print"> +chronos@localhost / $ sudo /usr/libexec/debugd/helpers/dev_features_ssh +</pre> + You can now exit out of the shell. + </li> +</ol> + +<p class="note"><strong>Note</strong>: You must complete this procedure only +once on your Chromebook.</p> + +<h3>Check the IP address of your Chromebook</h3> + +<p> +To verify the IP address of your Chromebook, complete the following steps: +</p> + +<ol> + <li> + Click the clock icon in the bottom-right area of the screen. + </li> + <li> + Click <strong>Settings</strong>. + </li> + <li> + The <em>Internet Connection</em> section in the Settings area lists all of + the available networks. Select the one that you want to use for ADB. + </li> + <li> + Take note of the IP address that appears. + </li> +</ol> + +<h3>Enable ADB debugging</h3> + +<p> +To enable ADB debugging, complete the following steps: +</p> + +<ol> + <li> + Click the clock icon in the bottom-right area of the screen. + </li> + <li> + Click <strong>Settings</strong>. + </li> + <li> + In the <em>Android Apps</em> section, click the <strong>Settings</strong> + link in the line that reads <em>Manage your Android apps in Settings</em>. + This brings up the Android apps settings. + </li> + <li> + Click <strong>About device</strong>. + </li> + <li> + Click <strong>Build number</strong> seven times to move into Developer mode. + </li> + <li> + Click the arrow in the top-left area of the window to go back to the main + Settings screen. + </li> + <li> + Click the new <strong>Developer options</strong> item, activate <strong>ADB + debugging</strong>, and then click <strong>OK</strong> to allow ADB + debugging. + </li> + <li> + Return to your development machine and use ADB to connect to your + Chromebook's using its IP address and port 22. + </li> + <li> + On your Chromebook, click <strong>Allow</strong> when prompted whether you + want to allow the debugger. Your ADB session is established. + </li> +</ol> + +<h4>Troubleshooting ADB debugging</h4> + +<p> +Sometimes the ADB device shows that it's offline when everything is connected +properly. In this case, complete the following steps to troubleshoot the issue: +</p> + +<ol> + <li> + Deactivate <strong>ADB debugging</strong> in <em>Developer options</em>. + </li> + <li> + In a terminal window, run <code>adb kill-server</code>. + </li> + <li> + Re-activate the <strong>ADB debugging</strong> option. + </li> + <li> + In a terminal window, attempt to run <code>adb connect</code>. + </li> + <li> + Click <strong>Allow</strong> when prompted whether you want to allow + debugging. Your ADB session is established. + </li> +</ol> + +<h2 id="learning-materials">Additional Learning Materials</h2> + +<p> +To learn more about optimizing your Android apps for Chromebooks, consult the +following resources: +</p> + +<ul> + <li> + Review the + <a class="external-link" href="http://android-developers.blogspot.com/2016/05/bring-your-android-app-to-chromebooks.html"> + Bring your Android App to Chromebooks</a> I/O session. + </li> + <li> + Post a question on the <a class="external-link" + href="https://plus.sandbox.google.com/+AndroidDevelopers">Android developer + community</a> with hashtag <em>#AndroidAppsOnChromeOS</em>. + </li> +</ul> diff --git a/docs/html/topic/arc/manifest.jd b/docs/html/topic/arc/manifest.jd new file mode 100644 index 000000000000..7d1866591ab3 --- /dev/null +++ b/docs/html/topic/arc/manifest.jd @@ -0,0 +1,341 @@ +page.title=App Manifest Compatibility for Chromebooks +@jd:body + +<div id="qv-wrapper"> + <div id="qv"> + <h2>On this page</h2> + + <ol> + <li><a href="#incompat-entries">Incompatible Manifest Entries</a></li> + <li> + <a href="#implied-features">Permissions That Imply Feature + Requirements</a> + </li> + </ol> + </div> + </div> + +<p> +As you prepare your Android app to run on Chromebooks, you should consider the +device features that your app uses. Chromebooks don't support all of the +hardware and software features that are available on other devices running +Android. If your app requires specific features that aren't supported on +Chromebooks, it won't be available for installation on Chromebooks. +</p> + +<p> +You declare your app's requirements for hardware features and certain software +features in the <a +href="{@docRoot}guide/topics/manifest/manifest-intro.html">manifest file</a>. +This document describes the app manifest feature declarations that aren't +compatible with Chromebooks. +</p> + +<h2 id="incompat-entries">Incompatible Manifest Entries</h2> + +<p> +The manifest entries listed in this section aren't currently compatible with +Chromebooks. If your app uses any of these entries, consider removing them or +including the <code>required="false"</code> attribute value with them so that +your app can be installed on Chromebooks. For more information about declaring +feature use without requiring that the feature be available on the device, see +the guide for the <a +href="{@docRoot}guide/topics/manifest/uses-feature-element.html#market-feature-filtering"> +<code><uses-feature></code></a> manifest element. +</p> + +<p class="note"><strong>Note</strong>: See the <a +href="{@docRoot}guide/topics/manifest/uses-feature-element.html#features-reference"> +Features Reference</a> for a complete list of app manifest features and +descriptions. +</p> + +<h3 id="incompat-hardware-features">Hardware features</h3> + +<p> +Support for hardware features varies on Chromebooks. Some features aren't +supported on any Chromebooks while others are supported on some Chromebooks. +</p> + +<h4>Unsupported hardware features</h4> + +<p> +The following list includes the hardware features that aren't currently +supported on Chromebooks: +</p> + +<ul> + <li> + <code>android.hardware.camera</code> – Back-facing camera + </li> + <li> + <code>android.hardware.camera.autofocus</code> – Camera that uses + autofocus + </li> + <li> + <code>android.hardware.camera.capability.manual_post_processing</code> + – Camera that uses the <code>MANUAL_POST_PROCESSING</code> feature, + including functionality for overriding auto white balance + </li> + <li> + <code>android.hardware.camera.capability.manual_sensor</code> – Camera + that uses the <code>MANUAL_SENSOR</code> feature, including auto-exposure + locking support + </li> + <li> + <code>android.hardware.camera.capability.raw</code> – Camera that uses + the <code>RAW</code> feature, including the ability to save DNG (raw) files + and provide DNG-related metadata + </li> + <li> + <code>android.hardware.camera.flash</code> – Camera that uses flash + </li> + <li> + <code>android.hardware.camera.level.full</code> – Camera that uses + <code>FULL</code>-level image-capturing support + </li> + <li> + <code>android.hardware.consumerir</code> – Infrared (IR) + </li> + <li> + <code>android.hardware.location.gps</code> – GPS + </li> + <li> + <code>android.hardware.nfc</code> – Near-Field Communication (NFC) + </li> + <li> + <code>android.hardware.nfc.hce</code> – NFC card emulation + (<em>deprecated</em>) + </li> + <li> + <code>android.hardware.sensor.barometer</code> – Barometer (air + pressure) + </li> + <li> + <code>android.hardware.telephony</code> – Telephony, including radio + with data communication services + </li> + <li> + <code>android.hardware.telephony.cdma</code> – Telephony Code Division + Multiple Access (CDMA) network support + </li> + <li> + <code>android.hardware.telephony.gsm</code> – Telephony Global System + for Mobile Communications (GSM) network support + </li> + <li> + <code>android.hardware.type.automotive</code> – Android Auto user + interface + </li> + <li> + <code>android.hardware.type.television</code> – Television + (<em>deprecated</em>) + <li> + <code>android.hardware.usb.accessory</code> – USB accessory mode + </li> + <li> + <code>android.hardware.usb.host</code> – USB host mode + </li> +</ul> + +<h4>Partially-supported hardware features</h4> + +<p> +The following list includes the hardware features that may be available on some +Chromebooks: +</p> + +<ul> + <li> + <code>android.hardware.sensor.accelerometer</code> – Accelerometer + (device orientation) + </li> + <li> + <code>android.hardware.sensor.compass</code> – Compass + </li> + <li> + <code>android.hardware.sensor.gyroscope</code> – Gyroscope (device + rotation and twist) + </li> + <li> + <code>android.hardware.sensor.light</code> – Light + </li> + <li> + <code>android.hardware.sensor.proximity</code> – Proximity (to user) + </li> + <li> + <code>android.hardware.sensor.stepcounter</code> – Step counter + </li> + <li> + <code>android.hardware.sensor.stepdetector</code> – Step detector + </li> +</ul> + +<h4>Touchscreen hardware support</h4> + +<p> +As of Chrome OS version M53, all Android apps that don't explicitly require the +<a href="{@docRoot}guide/topics/manifest/uses-feature-element.html#touchscreen-hw-features"> +<code>android.hardware.touchscreen</code></a> feature will also work on Chrome +OS devices that support the <a +href="{@docRoot}guide/topics/manifest/uses-feature-element.html#touchscreen-hw-features"> +<code>android.hardware.faketouch</code></a> feature. Devices that have fake +touch interfaces provide a user input system that emulates basic touch events. +For example, the user could interact with a mouse or remote control to move an +on-screen cursor, scroll through a list, and drag elements from one part of the +screen to another. +</p> + +<p> +If you don't want your app to be installed on devices that have fake touch +interfaces but not touchscreens, you can complete one of the following actions: +</p> + +<ul> + <li>Exclude specific devices in the <a class="external-link" + href="https://play.google.com/apps/publish">Google Play Developer Console.</a> + </li> + <li>Filter devices with no touchscreen hardware by explicitly declaring <a + href="{@docRoot}guide/topics/manifest/uses-feature-element.html#touchscreen-hw-features"> + <code>android.hardware.touchscreen</code></a> as being required in order to + install your app.</li> +</ul> + +<h3 id="incompat-software-features">Software features</h3> + +<p> +The following list includes the software features that aren't currently +supported on Chromebooks: +</p> + +<ul> + <li> + <code>android.software.app_widgets</code> – App Widgets on the Home + screen + </li> + <li> + <code>android.software.device_admin</code> – Device policy + administration + </li> + <li> + <code>android.software.home_screen</code> – Replaces device's Home + screen + </li> + <li> + <code>android.software.input_methods</code> – Custom input methods + (instances of <a href="{@docRoot}reference/android/inputmethodservice/InputMethodService.html"> + <code>InputMethodService</code></a>) + </li> + <li> + <code>android.software.leanback</code> – UI designed for large-screen + viewing + </li> + <li> + <code>android.software.live_wallpaper</code> – Animated wallpapers + </li> + <li> + <code>android.software.live_tv</code> – Streaming live TV programs + </li> + <li> + <code>android.software.managed_users</code> – Secondary users and + managed profiles + </li> + <li> + <code>android.software.midi</code> – Musical Instrument Digital + Interface (MIDI) protocol, which supports connecting to musical instruments + and providing sound + </li> + <li> + <code>android.software.sip</code> – Session Initiation Protocol (SIP) + service, which supports video conferencing and instant messaging + </li> + <li> + <code>android.software.sip.voip</code> – Voice Over Internet Protocol + (VoIP) service based on SIP, which supports two-way video conferencing + </li> +</ul> + +<h2 id="implied-features">Permissions That Imply Feature Requirements</h2> + +<p> +Some permissions that you request in your manifest files can create implied +requests for hardware and software features. By requesting these permissions, +you'll prevent your app from being installed on Chromebooks. +</p> + +<p> +For details about how to prevent permission requests from making your app +unavailable on Chromebooks, see the <a href="#incompat-entries">Incompatible +Manifest Entries</a> section of this page. +</p> + +<p> +The following table shows the permissions that imply certain feature +requirements which make an app incompatible with Chromebooks: +</p> + +<p class="table-caption"> +<strong>Table 1. </strong>Device permissions that imply hardware features which +are incompatible with Chromebooks. +</p> + +<table> + <tr> + <th scope="col">Category</th> + <th scope="col">This Permission...</th> + <th scope="col">...Implies This Feature Requirement</th> + </tr> + <tr> + <td>Camera</td> + <td><code>CAMERA</code></td> + <td> + <code>android.hardware.camera</code> and<br> + <code>android.hardware.camera.autofocus</code> + </td> + </tr> + <tr> + <td rowspan="11">Telephony</td> + <td><code>CALL_PHONE</code></td> + <td><code>android.hardware.telephony</code></td> + </tr> + <tr> + <td><code>CALL_PRIVILEGED</code></td> + <td><code>android.hardware.telephony</code></td> + </tr> + <tr> + <td><code>MODIFY_PHONE_STATE</code></td> + <td><code>android.hardware.telephony</code></td> + </tr> + <tr> + <td><code>PROCESS_OUTGOING_CALLS</code></td> + <td><code>android.hardware.telephony</code></td> + </tr> + <tr> + <td><code>READ_SMSREAD_SMS</code></td> + <td><code>android.hardware.telephony</code></td> + </tr> + <tr> + <td><code>RECEIVE_SMS</code></td> + <td><code>android.hardware.telephony</code></td> + </tr> + <tr> + <td><code>RECEIVE_MMS</code></td> + <td><code>android.hardware.telephony</code></td> + </tr> + <tr> + <td><code>RECEIVE_WAP_PUSH</code></td> + <td><code>android.hardware.telephony</code></td> + </tr> + <tr> + <td><code>SEND_SMS</code></td> + <td><code>android.hardware.telephony</code></td> + </tr> + <tr> + <td><code>WRITE_APN_SETTINGS</code></td> + <td><code>android.hardware.telephony</code></td> + </tr> + <tr> + <td><code>WRITE_SMS</code></td> + <td><code>android.hardware.telephony</code></td> + </tr> +</table> diff --git a/docs/html/topic/arc/sideload.jd b/docs/html/topic/arc/sideload.jd new file mode 100644 index 000000000000..dca84ffc65ca --- /dev/null +++ b/docs/html/topic/arc/sideload.jd @@ -0,0 +1,125 @@ +page.title=Loading Apps on Chromebooks +@jd:body + +<div id="qv-wrapper"> + <div id="qv"> + <h2>On this page</h2> + + <ol> + <li><a href="#enter-dev">Enter Developer Mode</a></li> + <li><a href="#enable-unknown">Enable Unknown Sources</a></li> + <li><a href="#load-app">Load Your App</a></li> + </ol> + </div> + </div> + +<p> +This document describes how to enter <em>Developer</em> mode and enable +<em>unknown resources</em> so that you can load Android apps on your Google +Chromebook. +</p> + +<h2 id="enter-dev">Enter Developer Mode</h2> + +<p> +To load Android apps, you must enable unknown sources. Enabling unknown sources +is available only when your device is in Developer mode. +</p> + +<p class="caution"><strong>Caution: </strong>Modifications that you make to the +system are not supported by Google and may void your warranty. Additionally, +modifications may cause hardware, software, or security issues. +</p> + +<p class="note"><strong>Note: </strong>On most devices, both the +<em>recovery</em> button and the <em>dev-switch</em> button are virtualized. If +these instructions don't work for you, see the <a class="external-link" +href="https://www.chromium.org/chromium-os/developer-information-for-chrome-os-devices"> +specific instructions for your device</a>. +</p> + +<p> +To enter Developer mode, complete these steps: +</p> + +<ol> + <li> + Invoke <em>Recovery</em> mode by pressing and holding the + <strong>Esc</strong> and <strong>Refresh (F3)</strong> keys, then pressing + the <strong>Power</strong> button. + </li> + <li> + When the <em>Recovery</em> screen appears, press <strong>Ctrl+D</strong>. + There's no prompt for this action, so you must simply complete it. + Afterwards, you are prompted to confirm and reboot into Developer mode. + </li> +</ol> + +<p> +If you see one of the following screens when you turn on your device, you've +successfully entered Developer mode: +</p> + +<img src="{@docRoot}images/topic/arc/sideload_figure_1.jpg" /> + +<p class="img-caption"><strong>Figure 1. </strong>Developer mode confirmation +screens.</p> + +<p class="note"><strong>Note</strong>: To skip the OS loading screen, either +wait 30 seconds or press <strong>Ctrl+D</strong>, and your Chromebook continues +starting. +</p> + +<h2 id="enable-unknown">Enable Unknown Sources</h2> + +<p> +To enable unknown sources, navigate to <strong>Chrome Settings > App Settings > +Security</strong>, then enable <strong>Unknown sources</strong> by moving the +slider to the right. +</p> + +<p class="note"><strong>Note:</strong>You can enable unknown sources only when +your device is in <a +href="{@docRoot}topic/arc/sideload.html#enter-dev">Developer mode</a>. +</p> + +<h2 id="load-app">Load Your App</h2> + +<p> +After enabling unknown sources, you can load apps by copying an app's APK file +to the <em>Downloads</em> folder and opening it with Android's File Manager app. + +</p> + +<p> +You can copy the APK file to your Chromebook using one of the following methods: +</p> + +<ul> + <li> + <strong>Using a cloud app</strong> – Upload your APK file to Google + Drive or send it to yourself via email. Open it with the Android app + equivalent (Drive and Gmail, respectively). + </li> + <li> + <strong>Using an external storage device</strong> – Transfer the APK + file to the Downloads folder of your Chromebook using a thumb drive, SD + card, or an external hard drive. Afterwards, open the Android File Manager + app by navigating to <strong>Chrome Settings > App Settings > Device & + USB > Explore</strong>. + </li> + <li> + <strong>Using ADB</strong> – After <a + href="{@docRoot}topic/arc/index.html#setup"> setting up ADB</a> on your + Chromebook, enter the following command into a terminal window on your + development workstation: +<pre class="no-pretty-print"> +adb install <var>app-name</var>.apk +</pre> + <p>This command pushes the app to your connected Chromebook and installs the + app. For more information about copying and installing apps from a + development computer, see <a + href="{@docRoot}studio/command-line/adb.html#move">Installing an + Application</a>.</p> + </li> +</ul> diff --git a/docs/html/training/_book.yaml b/docs/html/training/_book.yaml index 0523ec9e12b0..891574fbc6ca 100644 --- a/docs/html/training/_book.yaml +++ b/docs/html/training/_book.yaml @@ -1384,6 +1384,11 @@ toc: path_attributes: - name: description value: How to use the SafetyNet service to analyze a device where your app is running and get information about its compatibility with your app. + - title: Checking URLs with the Safe Browsing API + path: /training/safebrowsing/index.html + path_attributes: + - name: description + value: How to use the SafetyNet service to determine if a URL is designated as a known threat. - title: Verifying Hardware-backed Key Pairs with Key Attestation path: /training/articles/security-key-attestation.html path_attributes: diff --git a/docs/html/training/safebrowsing/index.jd b/docs/html/training/safebrowsing/index.jd new file mode 100644 index 000000000000..c6c72bfd1460 --- /dev/null +++ b/docs/html/training/safebrowsing/index.jd @@ -0,0 +1,315 @@ +page.title=Checking URLs with the Safe Browsing API + +@jd:body + + +<div id="tb-wrapper"> + <div id="tb"> + <h2> + In this document + </h2> + + <ol> + <li> + <a href="#tos">Terms of Service</a> + </li> + + <li> + <a href="#api-key">Requesting and Registering an Android API Key</a> + <ol> + <li> + <a href="#manifest">Adding the Android API to your + AndroidManifest.xml</a> + </li> + </ol> + </li> + + <li> + <a href="#connect-google-play">Connect to Google Play Services</a> + </li> + + <li> + <a href="#url-check">Requesting a URL Check</a> + <ol> + <li> + <a href="#threat-types">Specifying threat types of interest</a> + </li> + + <li> + <a href="#url-check-request">Send the URL check request</a> + </li> + + <li> + <a href="#url-check-response">Read the URL check response</a> + </li> + </ol> + </li> + + <li> + <a href="#warning-lang">Suggested Warning Language</a> + </li> + </ol> + </div> +</div> + +<p> + SafetyNet provides services for determining whether a URL has been marked as + a known threat by Google. +</p> + +<p> + The service provides an API your app can use to determine whether a + particular URL has been classified by Google as a known threat. Internally, + SafetyNet implements a client for the Safe Browsing Network Protocol v4 + developed by Google. Both the client code and the v4 network protocol were + designed to preserve users' privacy, as well as keep battery and bandwidth + consumption to a minimum. This API allows you to take full advantage of + Google's Safe Browsing service on Android in the most resource-optimized way, + and without having to implement its network protocol. +</p> + +<p> + This document shows you how to use SafetyNet for checking a URL for threat + types of interest. +</p> + +<h2 id="tos"> + Terms of Service +</h2> + +<p> + By using the Safe Browsing API, you consent to be bound by the <a href= + "https://developers.google.com/safe-browsing/terms">Terms of Service</a>. + Please read and understand all applicable terms and policies before accessing + the Safe Browsing API. +</p> + +<h2 id="api-key"> + Requesting and Registering an Android API Key +</h2> + +<p> + To create an API key, complete the following steps: +</p> + +<ol> + <li>Go to the <a href="https://console.developers.google.com/project" + class="external-link">Google Developers Console</a>. + </li> + + <li>On the upper toolbar, choose <strong>Select a project > + <em>your-project-name</em></strong>. + </li> + + <li>In the search box, enter <em>Safe Browsing APIs</em>; when the Safe + Browsing API name appears in the table, select it. + </li> + + <li>After the page redisplays, select <strong>Enable</strong> then select + <strong>Go to Credentials</strong>. + </li> + + <li>When the <em>Add credentials to your project</em> window appears, choose + your parameters then select <strong>What credentials do I need?</strong>. + </li> + + <li>Enter a name for your API key then select <strong>Create API + key</strong>. + </li> + + <li> + <p> + Your new API key appears; copy and paste this key for future use. + </p> + + <p class="note"> + <strong>Note:</strong> Your API key allows you to perform a URL check + 10,000 times each day. The key, in this instance, should just be a + hexadecimal string, not part of a URL. + </p> + </li> + + <li>Select <strong>Done</strong> to complete the process. + </li> +</ol> + +<p> + If you need more help, check out the <a href= + "https://developers.google.com/console/help/new/">Google Developers Console + Help Center</a>. +</p> + +<h3 id="manifest"> + Adding the Android API key to your AndroidManifest.xml +</h3> + +<p> + Once your key has been whitelisted, you need to add the key to the + <code>AndroidManifest.xml</code> file for your app: +</p> + +<pre> +<application> + + ... + + <!-- SafetyNet API metadata --> + <meta-data android:name="com.google.android.safetynet.API_KEY" + android:value="<var>your-API-key</var>" /> + + ... + +</application> +</pre> +<h2 id="connect-google-play"> + Connect to Google Play Services +</h2> + +<p> + The SafetyNet API is part of Google Play services. To connect to the API, you + need to create an instance of the Google Play services API client. For + details about using the client in your app, see <a href= + "https://developers.google.com/android/guides/api-client#Starting">Accessing + Google APIs</a>. Once you have established a connection to Google Play + services, you can use the Google API client classes to connect to the + SafetyNet API. +</p> + +<p> + To connect to the API, in your activity's <code><a href= + "{@docRoot}reference/android/app/Activity.html#onCreate(android.os.Bundle)">onCreate()</a></code> + method, create an instance of Google API Client using <code><a href= + "https://developers.google.com/android/reference/com/google/android/gms/common/api/GoogleApiClient.Builder"> + GoogleApiClient.Builder</a></code>. Use the builder to add the SafetyNet API, + as shown in the following code example: +</p> + +<pre> +protected synchronized void buildGoogleApiClient() { + mGoogleApiClient = new GoogleApiClient.Builder(this) + .addApi(SafetyNet.API) + .addConnectionCallbacks(myMainActivity.this) + .build(); +} +</pre> +<p class="note"> + <strong>Note:</strong> You can only call these methods after your app has + established a connection to Google Play services by receiving the <code> + <a href="https://developers.google.com/android/reference/com/google/android/gms/common/api/GoogleApiClient.ConnectionCallbacks#public-methods"> + onConnected()</a></code> callback. For details about listening for a completed + client connection, see <a href= + "https://developers.google.com/android/guides/api-client#Starting">Accessing + Google APIs</a>. +</p> + +<h2 id="url-check"> + Requesting a URL Check +</h2> + +<p> + A URL check allows your app to determine if a URL has been marked as a threat + of interest. Some threat types may not be of interest to your particular + app, and the API allows you to choose which threat types are important for + your needs. You can specify multiple threat types of interest. +</p> + +<h3 id="threat-types"> + Specifying threat types of interest +</h3> + +<p> + The constants in the {@code SafeBrowsingThreat} class contain the + currently-supported threat types: +</p> + +<pre> +package com.google.android.gms.safetynet; + +public class SafeBrowsingThreat { + + /** + * This threat type identifies URLs of pages that are flagged as containing potentially + * harmful applications. + */ + public static final int TYPE_POTENTIALLY_HARMFUL_APPLICATION = 4; + + /** + * This threat type identifies URLs of pages that are flagged as containing social + * engineering threats. + */ + public static final int TYPE_SOCIAL_ENGINEERING = 5; +} +</pre> +<p> + When using the API, you must use constants that are not marked as deprecated. + You add threat type constants as arguments to the API. You may add as many + threat type constants as is required for your app. +</p> + +<h3 id="url-check-request"> + Send the URL check request +</h3> + +<p> + The API is agnostic to the scheme used, so you can pass the URL with or + without a scheme. For example, either +</p> + +<pre> +String url = "https://www.google.com"; +</pre> +<p> + or +</p> + +<pre> +String url = "www.google.com"; +</pre> +<p> + is valid. +</p> + +<pre> +SafetyNet.SafetyNetApi.lookupUri(mGoogleApiClient, url, + SafeBrowsingThreat.TYPE_POTENTIALLY_HARMFUL_APPLICATION, + SafeBrowsingThreat.TYPE_SOCIAL_ENGINEERING) + .setResultCallback( + new ResultCallback<SafetyNetApi.SafeBrowsingResult>() { + + @Override + public void onResult(SafetyNetApi.SafeBrowsingResult result) { + Status status = result.getStatus(); + if ((status != null) && status.isSuccess()) { + // Indicates communication with the service was successful. + // Identify any detected threats. + if (result.getDetectedThreats().isEmpty()) { + + } + } else { + // An error occurred. Let the user proceed without warning. + } + } +}); +</pre> +<h3 id="url-check-response"> + Read the URL check response +</h3> + +<p> + The result is provided as a list of {@code SafeBrowsingThreat} objects by + calling the {@code SafetyNetApi.SafeBrowsingResult.getDetectedThreats()} + method of the returned {@code SafetyNetApi.SafeBrowsingResult} object. If the + list is empty, no threats were detected; otherwise, calling {@code + SafeBrowsingThreat.getThreatType()} on each element in the list enumerates + the threats that were detected. +</p> + +<h2 id="warning-lang"> + Suggested Warning Language +</h2> + +<p> + Please see the Safe Browsing API Developer's Guide for <a href= + "https://developers.google.com/safe-browsing/v4/usage-limits#suggested--warning-language"> + suggested warning language</a>. +</p>
\ No newline at end of file diff --git a/docs/html/wear/preview/api-overview.jd b/docs/html/wear/preview/api-overview.jd index 42336244e4e6..0b3ac6bf4b2d 100644 --- a/docs/html/wear/preview/api-overview.jd +++ b/docs/html/wear/preview/api-overview.jd @@ -45,19 +45,19 @@ page.image=images/cards/card-n-apis_2x.png <p> The Android Wear Preview API is still in active development, but you can try it now as part of the Wear 2.0 Developer Preview. The sections below - highlight some of the new features for Wear developers. + highlight some of the new features for Android Wear developers. </p> <h2 id="ui">User Interface Improvements</h2> -<p>The preview introduces powerful additions to the user interface, opening up -exciting possibilities to developers. -A complication is any feature in a watch face that displays more than hours and -minutes. With the Complications API, - watch faces can display extra information and separate apps can expose complication - data. -The navigation and action drawers provide users with new ways to interact with apps. +<p> + The preview introduces powerful additions to the user interface, opening up + exciting possibilities to developers. A complication + is any feature in a watch face that displays more than hours and + minutes. With the Complications API, watch faces can display extra information + and separate apps can expose complication data. The navigation and action + drawers provide users with new ways to interact with apps. </p> @@ -69,8 +69,8 @@ The navigation and action drawers provide users with new ways to interact with a A <a href= "https://en.wikipedia.org/wiki/Complication_(horology)">complication</a> is a feature of a watch face that displays more than hours and minutes, such as a - battery indicator or a step counter. The Complications API helps watch face - developers create these features visual features and data connections they + battery indicator or a step counter. The Complications API thus helps watch face + developers create visual features and the data connections they require. </p> diff --git a/graphics/java/android/graphics/Bitmap.java b/graphics/java/android/graphics/Bitmap.java index 1fdc1f575bd4..49721cf42666 100644 --- a/graphics/java/android/graphics/Bitmap.java +++ b/graphics/java/android/graphics/Bitmap.java @@ -1667,10 +1667,10 @@ public final class Bitmap implements Parcelable { * and therefore is harmless. */ public void prepareToDraw() { - // TODO: Consider having this start an async upload? - // With inPurgeable no-op'd there's currently no use for this - // method, but it could have interesting future uses. checkRecycled("Can't prepareToDraw on a recycled bitmap!"); + // Kick off an update/upload of the bitmap outside of the normal + // draw path. + nativePrepareToDraw(mNativePtr); } /** @@ -1741,4 +1741,5 @@ public final class Bitmap implements Parcelable { private static native void nativeSetHasMipMap(long nativeBitmap, boolean hasMipMap); private static native boolean nativeSameAs(long nativeBitmap0, long nativeBitmap1); private static native long nativeRefPixelRef(long nativeBitmap); + private static native void nativePrepareToDraw(long nativeBitmap); } diff --git a/libs/hwui/AnimationContext.h b/libs/hwui/AnimationContext.h index 801fd8719a14..11d305c3c8d0 100644 --- a/libs/hwui/AnimationContext.h +++ b/libs/hwui/AnimationContext.h @@ -100,7 +100,7 @@ public: ANDROID_API virtual void destroy(); - ANDROID_API virtual void detachAnimators() {} + ANDROID_API virtual void pauseAnimators() {} private: friend class AnimationHandle; diff --git a/libs/hwui/AnimatorManager.cpp b/libs/hwui/AnimatorManager.cpp index f170e9cda8af..8d5f1a83e211 100644 --- a/libs/hwui/AnimatorManager.cpp +++ b/libs/hwui/AnimatorManager.cpp @@ -83,8 +83,11 @@ void AnimatorManager::pushStaging() { } mNewAnimators.clear(); } - for (auto& animator : mAnimators) { - animator->pushStaging(mAnimationHandle->context()); + if (mAnimators.size()) { + for (auto& animator : mAnimators) { + animator->pushStaging(mAnimationHandle->context()); + } + mParent.mProperties.updateMatrix(); } } diff --git a/libs/hwui/FrameInfo.cpp b/libs/hwui/FrameInfo.cpp index 09b3945c7f55..826f0bba294c 100644 --- a/libs/hwui/FrameInfo.cpp +++ b/libs/hwui/FrameInfo.cpp @@ -43,6 +43,9 @@ static_assert((sizeof(FrameInfoNames)/sizeof(FrameInfoNames[0])) == static_cast<int>(FrameInfoIndex::NumIndexes), "size mismatch: FrameInfoNames doesn't match the enum!"); +static_assert(static_cast<int>(FrameInfoIndex::NumIndexes) == 16, + "Must update value in FrameMetrics.java#FRAME_STATS_COUNT (and here)"); + void FrameInfo::importUiThreadInfo(int64_t* info) { memcpy(mFrameInfo, info, UI_THREAD_FRAME_INFO_SIZE * sizeof(int64_t)); } diff --git a/libs/hwui/FrameInfo.h b/libs/hwui/FrameInfo.h index 1fe54591cf7e..45b57de0b504 100644 --- a/libs/hwui/FrameInfo.h +++ b/libs/hwui/FrameInfo.h @@ -52,6 +52,7 @@ enum class FrameInfoIndex { QueueBufferDuration, // Must be the last value! + // Also must be kept in sync with FrameMetrics.java#FRAME_STATS_COUNT NumIndexes }; diff --git a/libs/hwui/RenderNode.cpp b/libs/hwui/RenderNode.cpp index 6facf20b025c..bdcad798f05e 100644 --- a/libs/hwui/RenderNode.cpp +++ b/libs/hwui/RenderNode.cpp @@ -422,7 +422,6 @@ void RenderNode::prepareTreeImpl(TreeInfo& info, bool functorsNeedLayer) { pushStagingDisplayListChanges(info); } prepareSubTree(info, childFunctorsNeedLayer, mDisplayList); - pushLayerUpdate(info); if (mDisplayList) { for (auto& vectorDrawable : mDisplayList->getVectorDrawables()) { @@ -433,6 +432,7 @@ void RenderNode::prepareTreeImpl(TreeInfo& info, bool functorsNeedLayer) { vectorDrawable->setPropertyChangeWillBeConsumed(true); } } + pushLayerUpdate(info); info.damageAccumulator->popTransform(); } diff --git a/libs/hwui/TextureCache.cpp b/libs/hwui/TextureCache.cpp index ade8600ab78b..523924af5ef1 100644 --- a/libs/hwui/TextureCache.cpp +++ b/libs/hwui/TextureCache.cpp @@ -167,6 +167,10 @@ bool TextureCache::prefetchAndMarkInUse(void* ownerToken, const SkBitmap* bitmap return texture; } +bool TextureCache::prefetch(const SkBitmap* bitmap) { + return getCachedTexture(bitmap, AtlasUsageType::Use); +} + Texture* TextureCache::get(const SkBitmap* bitmap, AtlasUsageType atlasUsageType) { Texture* texture = getCachedTexture(bitmap, atlasUsageType); diff --git a/libs/hwui/TextureCache.h b/libs/hwui/TextureCache.h index a4317cee73fd..0a61b6b1a522 100644 --- a/libs/hwui/TextureCache.h +++ b/libs/hwui/TextureCache.h @@ -78,6 +78,13 @@ public: bool prefetchAndMarkInUse(void* ownerToken, const SkBitmap* bitmap); /** + * Attempts to precache the SkBitmap. Returns true if a Texture was successfully + * acquired for the bitmap, false otherwise. Does not mark the Texture + * as in use and won't update currently in-use Textures. + */ + bool prefetch(const SkBitmap* bitmap); + + /** * Returns the texture associated with the specified bitmap from either within the cache, or * the AssetAtlas. If the texture cannot be found in the cache, a new texture is generated. */ diff --git a/libs/hwui/renderthread/CanvasContext.cpp b/libs/hwui/renderthread/CanvasContext.cpp index d68f0e383152..dafe1d11bbc9 100644 --- a/libs/hwui/renderthread/CanvasContext.cpp +++ b/libs/hwui/renderthread/CanvasContext.cpp @@ -326,7 +326,7 @@ void CanvasContext::prepareTree(TreeInfo& info, int64_t* uiFrameInfo, void CanvasContext::stopDrawing() { mRenderThread.removeFrameCallback(this); - mAnimationContext->detachAnimators(); + mAnimationContext->pauseAnimators(); } void CanvasContext::notifyFramePending() { @@ -562,11 +562,16 @@ void CanvasContext::draw() { swap.damage = screenDirty; swap.swapCompletedTime = systemTime(CLOCK_MONOTONIC); swap.vsyncTime = mRenderThread.timeLord().latestVsync(); - int durationUs; - mNativeSurface->query(NATIVE_WINDOW_LAST_DEQUEUE_DURATION, &durationUs); - swap.dequeueDuration = us2ns(durationUs); - mNativeSurface->query(NATIVE_WINDOW_LAST_QUEUE_DURATION, &durationUs); - swap.queueDuration = us2ns(durationUs); + if (mNativeSurface.get()) { + int durationUs; + mNativeSurface->query(NATIVE_WINDOW_LAST_DEQUEUE_DURATION, &durationUs); + swap.dequeueDuration = us2ns(durationUs); + mNativeSurface->query(NATIVE_WINDOW_LAST_QUEUE_DURATION, &durationUs); + swap.queueDuration = us2ns(durationUs); + } else { + swap.dequeueDuration = 0; + swap.queueDuration = 0; + } mCurrentFrameInfo->set(FrameInfoIndex::DequeueBufferDuration) = swap.dequeueDuration; mCurrentFrameInfo->set(FrameInfoIndex::QueueBufferDuration) diff --git a/libs/hwui/renderthread/RenderProxy.cpp b/libs/hwui/renderthread/RenderProxy.cpp index 06a24b248bf6..fb1c8962328b 100644 --- a/libs/hwui/renderthread/RenderProxy.cpp +++ b/libs/hwui/renderthread/RenderProxy.cpp @@ -22,9 +22,11 @@ #include "Readback.h" #include "Rect.h" #include "renderthread/CanvasContext.h" +#include "renderthread/EglManager.h" #include "renderthread/RenderTask.h" #include "renderthread/RenderThread.h" #include "utils/Macros.h" +#include "utils/TimeUtils.h" namespace android { namespace uirenderer { @@ -44,6 +46,8 @@ namespace renderthread { typedef struct { \ a1; a2; a3; a4; a5; a6; a7; a8; \ } ARGS(name); \ + static_assert(std::is_trivially_destructible<ARGS(name)>::value, \ + "Error, ARGS must be trivially destructible!"); \ static void* Bridge_ ## name(ARGS(name)* args) #define SETUP_TASK(method) \ @@ -636,6 +640,41 @@ int RenderProxy::copySurfaceInto(sp<Surface>& surface, SkBitmap* bitmap) { reinterpret_cast<intptr_t>( staticPostAndWait(task) )); } +CREATE_BRIDGE2(prepareToDraw, RenderThread* thread, SkBitmap* bitmap) { + if (Caches::hasInstance() && args->thread->eglManager().hasEglContext()) { + ATRACE_NAME("Bitmap#prepareToDraw task"); + Caches::getInstance().textureCache.prefetch(args->bitmap); + } + delete args->bitmap; + args->bitmap = nullptr; + return nullptr; +} + +void RenderProxy::prepareToDraw(const SkBitmap& bitmap) { + // If we haven't spun up a hardware accelerated window yet, there's no + // point in precaching these bitmaps as it can't impact jank. + // We also don't know if we even will spin up a hardware-accelerated + // window or not. + if (!RenderThread::hasInstance()) return; + RenderThread* renderThread = &RenderThread::getInstance(); + SETUP_TASK(prepareToDraw); + args->thread = renderThread; + args->bitmap = new SkBitmap(bitmap); + nsecs_t lastVsync = renderThread->timeLord().latestVsync(); + nsecs_t estimatedNextVsync = lastVsync + renderThread->timeLord().frameIntervalNanos(); + nsecs_t timeToNextVsync = estimatedNextVsync - systemTime(CLOCK_MONOTONIC); + // We expect the UI thread to take 4ms and for RT to be active from VSYNC+4ms to + // VSYNC+12ms or so, so aim for the gap during which RT is expected to + // be idle + // TODO: Make this concept a first-class supported thing? RT could use + // knowledge of pending draws to better schedule this task + if (timeToNextVsync > -6_ms && timeToNextVsync < 1_ms) { + renderThread->queueAt(task, estimatedNextVsync + 8_ms); + } else { + renderThread->queue(task); + } +} + void RenderProxy::post(RenderTask* task) { mRenderThread.queue(task); } diff --git a/libs/hwui/renderthread/RenderProxy.h b/libs/hwui/renderthread/RenderProxy.h index e31062c83734..bb111bd0de25 100644 --- a/libs/hwui/renderthread/RenderProxy.h +++ b/libs/hwui/renderthread/RenderProxy.h @@ -129,6 +129,7 @@ public: ANDROID_API long getDroppedFrameReportCount(); ANDROID_API static int copySurfaceInto(sp<Surface>& surface, SkBitmap* bitmap); + ANDROID_API static void prepareToDraw(const SkBitmap& bitmap); private: RenderThread& mRenderThread; diff --git a/packages/CaptivePortalLogin/res/values-bn-rBD/strings.xml b/packages/CaptivePortalLogin/res/values-bn-rBD/strings.xml index 20173b0dc3bf..24cbfbd6430e 100644 --- a/packages/CaptivePortalLogin/res/values-bn-rBD/strings.xml +++ b/packages/CaptivePortalLogin/res/values-bn-rBD/strings.xml @@ -4,7 +4,7 @@ <string name="app_name" msgid="5934709770924185752">"CaptivePortalLogin"</string> <string name="action_use_network" msgid="6076184727448466030">"যেভাবে আছে সেভাবেই এই নেটওয়ার্ক ব্যবহার করুন"</string> <string name="action_do_not_use_network" msgid="4577366536956516683">"এই নেটওয়ার্ক ব্যবহার করবেন না"</string> - <string name="action_bar_label" msgid="917235635415966620">"নেটওয়ার্কে প্রবেশ করুন করুন"</string> + <string name="action_bar_label" msgid="917235635415966620">"নেটওয়ার্কে প্রবেশ করুন"</string> <string name="ssl_error_warning" msgid="6653188881418638872">"আপনি যে নেটওয়ার্কে যোগ দেওয়ার চেষ্টা করছেন তাতে নিরাপত্তার সমস্যা আছে।"</string> <string name="ssl_error_example" msgid="647898534624078900">"উদাহরণস্বরূপ, লগইন পৃষ্ঠাটি প্রদর্শিত প্রতিষ্ঠানের অন্তর্গত নাও হতে পারে৷"</string> <string name="ssl_error_continue" msgid="6492718244923937110">"যাই হোক না কেন ব্রাউজারের মাধ্যমে অবিরত রাখুন"</string> diff --git a/packages/DocumentsUI/res/values-ja/strings.xml b/packages/DocumentsUI/res/values-ja/strings.xml index 121a896d3bee..e1b2c50438d6 100644 --- a/packages/DocumentsUI/res/values-ja/strings.xml +++ b/packages/DocumentsUI/res/values-ja/strings.xml @@ -110,9 +110,9 @@ <string name="menu_rename" msgid="7678802479104285353">"名前を変更"</string> <string name="rename_error" msgid="4203041674883412606">"ドキュメントの名前を変更できませんでした"</string> <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"一部のファイルが変換されました"</string> - <string name="open_external_dialog_request" msgid="5789329484285817629">"「<xliff:g id="STORAGE"><i>^3</i></xliff:g>」の「<xliff:g id="DIRECTORY"><i>^2</i></xliff:g>」ディレクトリに「<xliff:g id="APPNAME"><b>^1</b></xliff:g>」へのアクセスを許可しますか？"</string> - <string name="open_external_dialog_request_primary_volume" msgid="6635562535713428688">"「<xliff:g id="APPNAME"><b>^1</b></xliff:g>」アプリに「<xliff:g id="DIRECTORY"><i>^2</i></xliff:g>」ディレクトリへのアクセスを許可しますか？"</string> - <string name="open_external_dialog_root_request" msgid="8899108702926347720">"<xliff:g id="STORAGE"><i>^2</i></xliff:g>の写真や動画などのデータへのアクセスを「<xliff:g id="APPNAME"><b>^1</b></xliff:g>」に許可しますか？"</string> + <string name="open_external_dialog_request" msgid="5789329484285817629">"<xliff:g id="STORAGE"><i>^3</i></xliff:g> の <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> ディレクトリに <xliff:g id="APPNAME"><b>^1</b></xliff:g> へのアクセスを許可しますか？"</string> + <string name="open_external_dialog_request_primary_volume" msgid="6635562535713428688">"<xliff:g id="APPNAME"><b>^1</b></xliff:g> アプリに <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> ディレクトリへのアクセスを許可しますか？"</string> + <string name="open_external_dialog_root_request" msgid="8899108702926347720">"<xliff:g id="STORAGE"><i>^2</i></xliff:g>の写真や動画などのデータへのアクセスを <xliff:g id="APPNAME"><b>^1</b></xliff:g> に許可しますか？"</string> <string name="never_ask_again" msgid="4295278542972859268">"今後表示しない"</string> <string name="allow" msgid="7225948811296386551">"許可"</string> <string name="deny" msgid="2081879885755434506">"拒否"</string> diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardPinBasedInputView.java b/packages/Keyguard/src/com/android/keyguard/KeyguardPinBasedInputView.java index 8d6e07e619ff..108b466e44af 100644 --- a/packages/Keyguard/src/com/android/keyguard/KeyguardPinBasedInputView.java +++ b/packages/Keyguard/src/com/android/keyguard/KeyguardPinBasedInputView.java @@ -20,13 +20,14 @@ import android.content.Context; import android.graphics.Rect; import android.util.AttributeSet; import android.view.KeyEvent; +import android.view.MotionEvent; import android.view.View; /** * A Pin based Keyguard input view */ public abstract class KeyguardPinBasedInputView extends KeyguardAbsKeyInputView - implements View.OnKeyListener { + implements View.OnKeyListener, View.OnTouchListener { protected PasswordTextView mPasswordEntry; private View mOkButton; @@ -185,10 +186,10 @@ public abstract class KeyguardPinBasedInputView extends KeyguardAbsKeyInputView mOkButton = findViewById(R.id.key_enter); if (mOkButton != null) { + mOkButton.setOnTouchListener(this); mOkButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - doHapticKeyClick(); if (mPasswordEntry.isEnabled()) { verifyPasswordAndUnlock(); } @@ -199,6 +200,7 @@ public abstract class KeyguardPinBasedInputView extends KeyguardAbsKeyInputView mDeleteButton = findViewById(R.id.delete_button); mDeleteButton.setVisibility(View.VISIBLE); + mDeleteButton.setOnTouchListener(this); mDeleteButton.setOnClickListener(new OnClickListener() { @Override public void onClick(View v) { @@ -206,7 +208,6 @@ public abstract class KeyguardPinBasedInputView extends KeyguardAbsKeyInputView if (mPasswordEntry.isEnabled()) { mPasswordEntry.deleteLastChar(); } - doHapticKeyClick(); } }); mDeleteButton.setOnLongClickListener(new View.OnLongClickListener() { @@ -237,6 +238,14 @@ public abstract class KeyguardPinBasedInputView extends KeyguardAbsKeyInputView } @Override + public boolean onTouch(View v, MotionEvent event) { + if (event.getActionMasked() == MotionEvent.ACTION_DOWN) { + doHapticKeyClick(); + } + return false; + } + + @Override public boolean onKey(View v, int keyCode, KeyEvent event) { if (event.getAction() == KeyEvent.ACTION_DOWN) { return onKeyDown(keyCode, event); diff --git a/packages/SettingsProvider/res/values/defaults.xml b/packages/SettingsProvider/res/values/defaults.xml index f7e9541b0d33..fad102f6e6f8 100644 --- a/packages/SettingsProvider/res/values/defaults.xml +++ b/packages/SettingsProvider/res/values/defaults.xml @@ -155,6 +155,9 @@ <!-- Default for Settings.Secure.LONG_PRESS_TIMEOUT_MILLIS --> <integer name="def_long_press_timeout_millis">400</integer> + <!-- Default for Settings.Secure.MULTI_PRESS_TIMEOUT --> + <integer name="def_multi_press_timeout_millis">300</integer> + <!-- Default for Settings.Secure.SHOW_IME_WITH_HARD_KEYBOARD --> <bool name="def_show_ime_with_hard_keyboard">false</bool> diff --git a/packages/SettingsProvider/src/com/android/providers/settings/EventLogTags.logtags b/packages/SettingsProvider/src/com/android/providers/settings/EventLogTags.logtags index 298d7768d01f..7eff16b0def4 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/EventLogTags.logtags +++ b/packages/SettingsProvider/src/com/android/providers/settings/EventLogTags.logtags @@ -1,5 +1,6 @@ -# See system/core/logcat/e for a description of the format of this file. +# See system/core/logcat/event.logtags for a description of the format of this file. option java_package com.android.providers.settings; 52100 unsupported_settings_query (uri|3),(selection|3),(whereArgs|3) +52101 persist_setting_error (message|3) diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java index d27f1f830c32..0f3a7fbe9daa 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java @@ -544,7 +544,7 @@ public class SettingsProvider extends ContentProvider { final int userCount = users.size(); for (int i = 0; i < userCount; i++) { UserInfo user = users.get(i); - dumpForUser(user.id, pw); + dumpForUserLocked(user.id, pw); } } finally { Binder.restoreCallingIdentity(identity); @@ -552,12 +552,16 @@ public class SettingsProvider extends ContentProvider { } } - private void dumpForUser(int userId, PrintWriter pw) { + private void dumpForUserLocked(int userId, PrintWriter pw) { if (userId == UserHandle.USER_SYSTEM) { pw.println("GLOBAL SETTINGS (user " + userId + ")"); Cursor globalCursor = getAllGlobalSettings(ALL_COLUMNS); dumpSettings(globalCursor, pw); pw.println(); + + SettingsState globalSettings = mSettingsRegistry.getSettingsLocked( + SETTINGS_TYPE_GLOBAL, UserHandle.USER_SYSTEM); + globalSettings.dumpHistoricalOperations(pw); } pw.println("SECURE SETTINGS (user " + userId + ")"); @@ -565,10 +569,18 @@ public class SettingsProvider extends ContentProvider { dumpSettings(secureCursor, pw); pw.println(); + SettingsState secureSettings = mSettingsRegistry.getSettingsLocked( + SETTINGS_TYPE_SECURE, userId); + secureSettings.dumpHistoricalOperations(pw); + pw.println("SYSTEM SETTINGS (user " + userId + ")"); Cursor systemCursor = getAllSystemSettings(userId, ALL_COLUMNS); dumpSettings(systemCursor, pw); pw.println(); + + SettingsState systemSettings = mSettingsRegistry.getSettingsLocked( + SETTINGS_TYPE_SYSTEM, userId); + systemSettings.dumpHistoricalOperations(pw); } private void dumpSettings(Cursor cursor, PrintWriter pw) { @@ -2090,7 +2102,7 @@ public class SettingsProvider extends ContentProvider { } private final class UpgradeController { - private static final int SETTINGS_VERSION = 130; + private static final int SETTINGS_VERSION = 131; private final int mUserId; @@ -2398,6 +2410,22 @@ public class SettingsProvider extends ContentProvider { currentVersion = 130; } + if (currentVersion == 130) { + // Initialize new multi-press timeout to default value + final SettingsState systemSecureSettings = getSecureSettingsLocked(userId); + final String oldValue = systemSecureSettings.getSettingLocked( + Settings.Secure.MULTI_PRESS_TIMEOUT).getValue(); + if (TextUtils.equals(null, oldValue)) { + systemSecureSettings.insertSettingLocked( + Settings.Secure.MULTI_PRESS_TIMEOUT, + String.valueOf(getContext().getResources().getInteger( + R.integer.def_multi_press_timeout_millis)), + SettingsState.SYSTEM_PACKAGE_NAME); + } + + currentVersion = 131; + } + if (currentVersion != newVersion) { Slog.w("SettingsProvider", "warning: upgrading settings database to version " + newVersion + " left it at " diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsState.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsState.java index 4710d5adf3ac..bc91545ef13f 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsState.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsState.java @@ -16,6 +16,7 @@ package com.android.providers.settings; +import android.os.Build; import android.os.Handler; import android.os.Looper; import android.os.Message; @@ -26,6 +27,7 @@ import android.util.ArrayMap; import android.util.AtomicFile; import android.util.Base64; import android.util.Slog; +import android.util.TimeUtils; import android.util.Xml; import com.android.internal.annotations.GuardedBy; import libcore.io.IoUtils; @@ -39,6 +41,7 @@ import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; +import java.io.PrintWriter; import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.List; @@ -60,7 +63,7 @@ final class SettingsState { private static final String LOG_TAG = "SettingsState"; - static final int SETTINGS_VERSOIN_NEW_ENCODING = 121; + static final int SETTINGS_VERSION_NEW_ENCODING = 121; private static final long WRITE_SETTINGS_DELAY_MILLIS = 200; private static final long MAX_WRITE_SETTINGS_DELAY_MILLIS = 2000; @@ -93,6 +96,12 @@ final class SettingsState { // This was used in version 120 and before. private static final String NULL_VALUE_OLD_STYLE = "null"; + private static final int HISTORICAL_OPERATION_COUNT = 20; + private static final String HISTORICAL_OPERATION_UPDATE = "update"; + private static final String HISTORICAL_OPERATION_DELETE = "delete"; + private static final String HISTORICAL_OPERATION_PERSIST = "persist"; + private static final String HISTORICAL_OPERATION_INITIALIZE = "initialize"; + private final Object mLock; private final Handler mHandler; @@ -117,6 +126,9 @@ final class SettingsState { }; @GuardedBy("mLock") + private final List<HistoricalOperation> mHistoricalOperations; + + @GuardedBy("mLock") public final int mKey; @GuardedBy("mLock") @@ -134,6 +146,9 @@ final class SettingsState { @GuardedBy("mLock") private long mNextId; + @GuardedBy("mLock") + private int mNextHistoricalOpIdx; + public SettingsState(Object lock, File file, int key, int maxBytesPerAppPackage, Looper looper) { // It is important that we use the same lock as the settings provider @@ -150,6 +165,10 @@ final class SettingsState { mMaxBytesPerAppPackage = maxBytesPerAppPackage; mPackageToMemoryUsage = null; } + + mHistoricalOperations = Build.IS_DEBUGGABLE + ? new ArrayList<>(HISTORICAL_OPERATION_COUNT) : null; + synchronized (mLock) { readStateSyncLocked(); } @@ -238,16 +257,20 @@ final class SettingsState { Setting oldState = mSettings.get(name); String oldValue = (oldState != null) ? oldState.value : null; + Setting newState; if (oldState != null) { if (!oldState.update(value, packageName)) { return false; } + newState = oldState; } else { - Setting state = new Setting(name, value, packageName); - mSettings.put(name, state); + newState = new Setting(name, value, packageName); + mSettings.put(name, newState); } + addHistoricalOperationLocked(HISTORICAL_OPERATION_UPDATE, newState); + updateMemoryUsagePerPackageLocked(packageName, oldValue, value); scheduleWriteIfNeededLocked(); @@ -271,6 +294,8 @@ final class SettingsState { updateMemoryUsagePerPackageLocked(oldState.packageName, oldState.value, null); + addHistoricalOperationLocked(HISTORICAL_OPERATION_DELETE, oldState); + scheduleWriteIfNeededLocked(); return true; @@ -290,6 +315,51 @@ final class SettingsState { } } + private void addHistoricalOperationLocked(String type, Setting setting) { + if (mHistoricalOperations == null) { + return; + } + HistoricalOperation operation = new HistoricalOperation( + SystemClock.elapsedRealtime(), type, + setting != null ? new Setting(setting) : null); + if (mNextHistoricalOpIdx >= mHistoricalOperations.size()) { + mHistoricalOperations.add(operation); + } else { + mHistoricalOperations.set(mNextHistoricalOpIdx, operation); + } + mNextHistoricalOpIdx++; + if (mNextHistoricalOpIdx >= HISTORICAL_OPERATION_COUNT) { + mNextHistoricalOpIdx = 0; + } + } + + public void dumpHistoricalOperations(PrintWriter pw) { + synchronized (mLock) { + if (mHistoricalOperations == null) { + return; + } + pw.println("Historical operations"); + final int operationCount = mHistoricalOperations.size(); + for (int i = 0; i < operationCount; i++) { + int index = mNextHistoricalOpIdx - 1 - i; + if (index < 0) { + index = operationCount + index; + } + HistoricalOperation operation = mHistoricalOperations.get(index); + pw.print(TimeUtils.formatForLogging(operation.mTimestamp)); + pw.print(" "); + pw.print(operation.mOperation); + if (operation.mSetting != null) { + pw.print(" "); + pw.print(operation.mSetting); + } + pw.println(); + } + pw.println(); + pw.println(); + } + } + private void updateMemoryUsagePerPackageLocked(String packageName, String oldValue, String newValue) { if (mMaxBytesPerAppPackage == MAX_BYTES_PER_APP_PACKAGE_UNLIMITED) { @@ -407,6 +477,10 @@ final class SettingsState { serializer.endDocument(); destination.finishWrite(out); + synchronized (mLock) { + addHistoricalOperationLocked(HISTORICAL_OPERATION_PERSIST, null); + } + if (DEBUG_PERSISTENCE) { Slog.i(LOG_TAG, "[PERSIST END]"); } @@ -435,7 +509,7 @@ final class SettingsState { static void setValueAttribute(int version, XmlSerializer serializer, String value) throws IOException { - if (version >= SETTINGS_VERSOIN_NEW_ENCODING) { + if (version >= SETTINGS_VERSION_NEW_ENCODING) { if (value == null) { // Null value -> No ATTR_VALUE nor ATTR_VALUE_BASE64. } else if (isBinary(value)) { @@ -454,7 +528,7 @@ final class SettingsState { } private String getValueAttribute(XmlPullParser parser) { - if (mVersion >= SETTINGS_VERSOIN_NEW_ENCODING) { + if (mVersion >= SETTINGS_VERSION_NEW_ENCODING) { final String value = parser.getAttributeValue(null, ATTR_VALUE); if (value != null) { return value; @@ -479,22 +553,26 @@ final class SettingsState { private void readStateSyncLocked() { FileInputStream in; if (!mStatePersistFile.exists()) { + Slog.i(LOG_TAG, "No settings state " + mStatePersistFile); + addHistoricalOperationLocked(HISTORICAL_OPERATION_INITIALIZE, null); return; } try { in = new AtomicFile(mStatePersistFile).openRead(); } catch (FileNotFoundException fnfe) { - Slog.i(LOG_TAG, "No settings state"); + String message = "No settings state " + mStatePersistFile; + Slog.wtf(LOG_TAG, message); + Slog.i(LOG_TAG, message); return; } try { XmlPullParser parser = Xml.newPullParser(); parser.setInput(in, StandardCharsets.UTF_8.name()); parseStateLocked(parser); - } catch (XmlPullParserException | IOException e) { - throw new IllegalStateException("Failed parsing settings file: " - + mStatePersistFile , e); + String message = "Failed parsing settings file: " + mStatePersistFile; + Slog.wtf(LOG_TAG, message); + throw new IllegalStateException(message , e); } finally { IoUtils.closeQuietly(in); } @@ -567,6 +645,19 @@ final class SettingsState { } } + private class HistoricalOperation { + final long mTimestamp; + final String mOperation; + final Setting mSetting; + + public HistoricalOperation(long timestamp, + String operation, Setting setting) { + mTimestamp = timestamp; + mOperation = operation; + mSetting = setting; + } + } + class Setting { private String name; private String value; @@ -629,6 +720,10 @@ final class SettingsState { this.id = String.valueOf(mNextId++); return true; } + + public String toString() { + return "Setting{name=" + value + " from " + packageName + "}"; + } } /** diff --git a/packages/SettingsProvider/test/src/com/android/providers/settings/SettingsStateTest.java b/packages/SettingsProvider/test/src/com/android/providers/settings/SettingsStateTest.java index b5bd8ad3073d..9964467fb5ec 100644 --- a/packages/SettingsProvider/test/src/com/android/providers/settings/SettingsStateTest.java +++ b/packages/SettingsProvider/test/src/com/android/providers/settings/SettingsStateTest.java @@ -15,7 +15,6 @@ */ package com.android.providers.settings; -import android.os.Handler; import android.os.Looper; import android.test.AndroidTestCase; import android.util.Xml; @@ -99,10 +98,10 @@ public class SettingsStateTest extends AndroidTestCase { checkWriteSingleSetting(serializer, null, null); checkWriteSingleSetting(serializer, CRAZY_STRING, null); SettingsState.writeSingleSetting( - SettingsState.SETTINGS_VERSOIN_NEW_ENCODING, + SettingsState.SETTINGS_VERSION_NEW_ENCODING, serializer, null, "k", "v", "package"); SettingsState.writeSingleSetting( - SettingsState.SETTINGS_VERSOIN_NEW_ENCODING, + SettingsState.SETTINGS_VERSION_NEW_ENCODING, serializer, "1", "k", "v", null); } @@ -115,7 +114,7 @@ public class SettingsStateTest extends AndroidTestCase { String key, String value) throws Exception { // Make sure the XML serializer won't crash. SettingsState.writeSingleSetting( - SettingsState.SETTINGS_VERSOIN_NEW_ENCODING, + SettingsState.SETTINGS_VERSION_NEW_ENCODING, serializer, "1", key, value, "package"); } @@ -129,7 +128,7 @@ public class SettingsStateTest extends AndroidTestCase { final SettingsState ssWriter = new SettingsState(lock, file, 1, SettingsState.MAX_BYTES_PER_APP_PACKAGE_UNLIMITED, Looper.getMainLooper()); - ssWriter.setVersionLocked(SettingsState.SETTINGS_VERSOIN_NEW_ENCODING); + ssWriter.setVersionLocked(SettingsState.SETTINGS_VERSION_NEW_ENCODING); ssWriter.insertSettingLocked("k1", "\u0000", "package"); ssWriter.insertSettingLocked("k2", "abc", "p2"); diff --git a/packages/Shell/res/values-pl/strings.xml b/packages/Shell/res/values-pl/strings.xml index 73cd181bc632..9734b2ecfc2b 100644 --- a/packages/Shell/res/values-pl/strings.xml +++ b/packages/Shell/res/values-pl/strings.xml @@ -21,7 +21,7 @@ <string name="bugreport_finished_title" msgid="4429132808670114081">"Raport o błędzie <xliff:g id="ID">#%d</xliff:g> został zapisany"</string> <string name="bugreport_updating_title" msgid="4423539949559634214">"Dodaję szczegóły do raportu o błędzie"</string> <string name="bugreport_updating_wait" msgid="3322151947853929470">"Czekaj..."</string> - <string name="bugreport_finished_text" product="watch" msgid="1223616207145252689">"Raport o błędzie będzie się pojawiał na telefonie przez chwilę"</string> + <string name="bugreport_finished_text" product="watch" msgid="1223616207145252689">"Raport o błędzie będzie pojawiał się na telefonie przez chwilę"</string> <string name="bugreport_finished_text" product="default" msgid="8353769438382138847">"Kliknij, by udostępnić raport o błędzie"</string> <string name="bugreport_finished_pending_screenshot_text" product="watch" msgid="1474435374470177193">"Kliknij, by udostępnić raport o błędzie bez zrzutu ekranu, lub poczekaj, aż zostanie on wygenerowany"</string> <string name="bugreport_finished_pending_screenshot_text" product="default" msgid="1474435374470177193">"Kliknij, by udostępnić raport o błędzie bez zrzutu ekranu, lub poczekaj, aż zostanie on wygenerowany"</string> diff --git a/packages/Shell/src/com/android/shell/BugreportProgressService.java b/packages/Shell/src/com/android/shell/BugreportProgressService.java index f04df4b64f84..5a75f40c4036 100644 --- a/packages/Shell/src/com/android/shell/BugreportProgressService.java +++ b/packages/Shell/src/com/android/shell/BugreportProgressService.java @@ -60,6 +60,8 @@ import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.content.res.Configuration; +import android.graphics.Bitmap; +import android.hardware.display.DisplayManagerGlobal; import android.net.Uri; import android.os.AsyncTask; import android.os.Bundle; @@ -78,6 +80,8 @@ import android.text.format.DateUtils; import android.util.Log; import android.util.Patterns; import android.util.SparseArray; +import android.view.Display; +import android.view.KeyEvent; import android.view.View; import android.view.WindowManager; import android.view.View.OnFocusChangeListener; @@ -771,7 +775,6 @@ public class BugreportProgressService extends Service { } msg = mContext.getString(R.string.bugreport_screenshot_taken); } else { - // TODO: try again using Framework APIs instead of relying on screencap. msg = mContext.getString(R.string.bugreport_screenshot_failed); Toast.makeText(mContext, msg, Toast.LENGTH_SHORT).show(); } @@ -1350,22 +1353,24 @@ public class BugreportProgressService extends Service { /** * Takes a screenshot and save it to the given location. */ - private static boolean takeScreenshot(Context context, String screenshotFile) { - final ProcessBuilder screencap = new ProcessBuilder() - .command("/system/bin/screencap", "-p", screenshotFile); - Log.d(TAG, "Taking screenshot using " + screencap.command()); - try { - final int exitValue = screencap.start().waitFor(); - if (exitValue == 0) { + private static boolean takeScreenshot(Context context, String path) { + final Bitmap bitmap = Screenshooter.takeScreenshot(); + if (bitmap == null) { + return false; + } + boolean status; + try (final FileOutputStream fos = new FileOutputStream(path)) { + if (bitmap.compress(Bitmap.CompressFormat.PNG, 100, fos)) { ((Vibrator) context.getSystemService(Context.VIBRATOR_SERVICE)).vibrate(150); return true; + } else { + Log.e(TAG, "Failed to save screenshot on " + path); } - Log.e(TAG, "screencap (" + screencap.command() + ") failed: " + exitValue); - } catch (IOException e) { - Log.e(TAG, "screencap (" + screencap.command() + ") failed", e); - } catch (InterruptedException e) { - Log.w(TAG, "Thread interrupted while screencap still running"); - Thread.currentThread().interrupt(); + } catch (IOException e ) { + Log.e(TAG, "Failed to save screenshot on " + path, e); + return false; + } finally { + bitmap.recycle(); } return false; } diff --git a/packages/Shell/src/com/android/shell/Screenshooter.java b/packages/Shell/src/com/android/shell/Screenshooter.java new file mode 100644 index 000000000000..ce0fbbc82395 --- /dev/null +++ b/packages/Shell/src/com/android/shell/Screenshooter.java @@ -0,0 +1,139 @@ +/* + * Copyright (C) 2016 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.shell; + +import android.graphics.Bitmap; +import android.graphics.Canvas; +import android.graphics.Point; +import android.hardware.display.DisplayManagerGlobal; +import android.os.Binder; +import android.os.RemoteException; +import android.util.Log; +import android.view.Display; +import android.view.Surface; +import android.view.SurfaceControl; + +/** + * Helper class used to take screenshots. + * + * TODO: logic below was copied and pasted from UiAutomation; it should be refactored into a common + * component that could be used by both (Shell and UiAutomation). + */ +final class Screenshooter { + + private static final String TAG = "Screenshooter"; + + /** Rotation constant: Freeze rotation to 0 degrees (natural orientation) */ + public static final int ROTATION_FREEZE_0 = Surface.ROTATION_0; + + /** Rotation constant: Freeze rotation to 90 degrees . */ + public static final int ROTATION_FREEZE_90 = Surface.ROTATION_90; + + /** Rotation constant: Freeze rotation to 180 degrees . */ + public static final int ROTATION_FREEZE_180 = Surface.ROTATION_180; + + /** Rotation constant: Freeze rotation to 270 degrees . */ + public static final int ROTATION_FREEZE_270 = Surface.ROTATION_270; + + /** + * Takes a screenshot. + * + * @return The screenshot bitmap on success, null otherwise. + */ + static Bitmap takeScreenshot() { + Display display = DisplayManagerGlobal.getInstance() + .getRealDisplay(Display.DEFAULT_DISPLAY); + Point displaySize = new Point(); + display.getRealSize(displaySize); + final int displayWidth = displaySize.x; + final int displayHeight = displaySize.y; + + final float screenshotWidth; + final float screenshotHeight; + + final int rotation = display.getRotation(); + switch (rotation) { + case ROTATION_FREEZE_0: { + screenshotWidth = displayWidth; + screenshotHeight = displayHeight; + } break; + case ROTATION_FREEZE_90: { + screenshotWidth = displayHeight; + screenshotHeight = displayWidth; + } break; + case ROTATION_FREEZE_180: { + screenshotWidth = displayWidth; + screenshotHeight = displayHeight; + } break; + case ROTATION_FREEZE_270: { + screenshotWidth = displayHeight; + screenshotHeight = displayWidth; + } break; + default: { + throw new IllegalArgumentException("Invalid rotation: " + + rotation); + } + } + + Log.d(TAG, "Taking screenshot of dimensions " + displayWidth + " x " + displayHeight); + // Take the screenshot + Bitmap screenShot = + SurfaceControl.screenshot((int) screenshotWidth, (int) screenshotHeight); + if (screenShot == null) { + Log.e(TAG, "Failed to take screenshot of dimensions " + screenshotWidth + " x " + + screenshotHeight); + return null; + } + + // Rotate the screenshot to the current orientation + if (rotation != ROTATION_FREEZE_0) { + Bitmap unrotatedScreenShot = Bitmap.createBitmap(displayWidth, displayHeight, + Bitmap.Config.ARGB_8888); + Canvas canvas = new Canvas(unrotatedScreenShot); + canvas.translate(unrotatedScreenShot.getWidth() / 2, + unrotatedScreenShot.getHeight() / 2); + canvas.rotate(getDegreesForRotation(rotation)); + canvas.translate(- screenshotWidth / 2, - screenshotHeight / 2); + canvas.drawBitmap(screenShot, 0, 0, null); + canvas.setBitmap(null); + screenShot.recycle(); + screenShot = unrotatedScreenShot; + } + + // Optimization + screenShot.setHasAlpha(false); + + return screenShot; + } + + private static float getDegreesForRotation(int value) { + switch (value) { + case Surface.ROTATION_90: { + return 360f - 90f; + } + case Surface.ROTATION_180: { + return 360f - 180f; + } + case Surface.ROTATION_270: { + return 360f - 270f; + } default: { + return 0; + } + } + } + +} diff --git a/packages/SystemUI/res/drawable/lockscreen_fingerprint_error_state_to_fp.xml b/packages/SystemUI/res/drawable/lockscreen_fingerprint_error_state_to_fp.xml index 67e6a01640b1..e207cb3808c0 100644 --- a/packages/SystemUI/res/drawable/lockscreen_fingerprint_error_state_to_fp.xml +++ b/packages/SystemUI/res/drawable/lockscreen_fingerprint_error_state_to_fp.xml @@ -98,11 +98,11 @@ <path android:name="path_2" android:pathData="M 1.35900878906,6.76104736328 c 0.0,0.0 -2.69998168945,0.0 -2.69998168945,0.0 c 0.0,0.0 0.0,-2.69995117188 0.0,-2.69995117188 c 0.0,0.0 2.69998168945,0.0 2.69998168945,0.0 c 0.0,0.0 0.0,2.69995117188 0.0,2.69995117188 Z" - android:fillColor="#FFF2501D" /> + android:fillColor="@*android:color/system_error" /> <path android:name="path_1" android:pathData="M 1.35363769531,1.36633300781 c 0.0,0.0 -2.69998168945,0.0 -2.69998168945,0.0 c 0.0,0.0 0.0,-8.09997558594 0.0,-8.09997558594 c 0.0,0.0 2.69998168945,0.0 2.69998168945,0.0 c 0.0,0.0 0.0,8.09997558594 0.0,8.09997558594 Z" - android:fillColor="#FFF2501D" /> + android:fillColor="@*android:color/system_error" /> </group> </group> <group @@ -117,7 +117,7 @@ <path android:name="path_3" android:pathData="M 0.0101470947266,10.8087768555 c -5.96701049805,0.0 -10.8000183105,-4.8330078125 -10.8000183105,-10.8000488281 c 0.0,-5.96691894531 4.8330078125,-10.7999267578 10.8000183105,-10.7999267578 c 5.96697998047,0.0 10.799987793,4.8330078125 10.799987793,10.7999267578 c 0.0,5.96704101562 -4.8330078125,10.8000488281 -10.799987793,10.8000488281 Z" - android:strokeColor="#FFF2501D" + android:strokeColor="@*android:color/system_error" android:strokeWidth="2" android:trimPathStart="0" android:trimPathEnd="1" /> diff --git a/packages/SystemUI/res/drawable/lockscreen_fingerprint_fp_to_error_state.xml b/packages/SystemUI/res/drawable/lockscreen_fingerprint_fp_to_error_state.xml index bbadec197dfd..2b4babce277b 100644 --- a/packages/SystemUI/res/drawable/lockscreen_fingerprint_fp_to_error_state.xml +++ b/packages/SystemUI/res/drawable/lockscreen_fingerprint_fp_to_error_state.xml @@ -96,7 +96,7 @@ <path android:name="ridge_5_path_0" android:pathData="M -25.3591003418,-24.4138946533 c -0.569000244141,0.106399536133 -1.12660217285,0.140594482422 -1.45460510254,0.140594482422 c -1.29689025879,0.0 -2.53239440918,-0.343307495117 -3.62019348145,-1.12400817871 c -1.67700195312,-1.20349121094 -2.76950073242,-3.17008972168 -2.76950073242,-5.39189147949" - android:strokeColor="#FFF2501D" + android:strokeColor="@*android:color/system_error" android:strokeWidth="1.45" android:strokeLineCap="round" android:trimPathEnd="0" /> @@ -106,7 +106,7 @@ <path android:name="ridge_7_path_0" android:pathData="M -36.1409912109,-21.7843475342 c -1.00540161133,-1.19300842285 -1.57499694824,-1.9181060791 -2.36520385742,-3.50170898438 c -0.827560424805,-1.65869140625 -1.31352233887,-3.49159240723 -1.31352233887,-5.48489379883 c 0.0,-3.66279602051 2.96932983398,-6.63220214844 6.63221740723,-6.63220214844 c 3.6628112793,0.0 6.63220214844,2.96940612793 6.63220214844,6.63220214844" - android:strokeColor="#FFF2501D" + android:strokeColor="@*android:color/system_error" android:strokeWidth="1.45" android:strokeLineCap="round" android:trimPathEnd="0" /> @@ -116,7 +116,7 @@ <path android:name="ridge_6_path_0" android:pathData="M -42.1907958984,-25.6756896973 c -0.758117675781,-2.14370727539 -0.896545410156,-3.86891174316 -0.896545410156,-5.12921142578 c 0.0,-1.46069335938 0.249176025391,-2.84799194336 0.814682006836,-4.09748840332 c 1.56153869629,-3.45030212402 5.03434753418,-5.85076904297 9.0679473877,-5.85076904297 c 5.49430847168,0.0 9.94830322266,4.4539642334 9.94830322266,9.94825744629 c 0.0,1.83151245117 -1.48460388184,3.31610107422 -3.31610107422,3.31610107422 c -1.83149719238,0.0 -3.31610107422,-1.48469543457 -3.31610107422,-3.31610107422 c 0.0,-1.83139038086 -1.48458862305,-3.31610107422 -3.31610107422,-3.31610107422 c -1.83149719238,0.0 -3.31610107422,1.48471069336 -3.31610107422,3.31610107422 c 0.0,2.57020568848 0.989517211914,4.88710021973 2.60510253906,6.5865020752 c 1.22210693359,1.28550720215 2.43139648438,2.09950256348 4.47590637207,2.69030761719" - android:strokeColor="#FFF2501D" + android:strokeColor="@*android:color/system_error" android:strokeWidth="1.45" android:strokeLineCap="round" android:trimPathEnd="0" /> @@ -126,7 +126,7 @@ <path android:name="ridge_2_path_0" android:pathData="M -44.0646514893,-38.1672973633 c 1.19026184082,-1.77430725098 2.67503356934,-3.24531555176 4.55902099609,-4.27278137207 c 1.88395690918,-1.0274810791 4.04466247559,-1.61137390137 6.34175109863,-1.61137390137 c 2.28761291504,0.0 4.43991088867,0.579071044922 6.31831359863,1.59861755371 c 1.8784942627,1.01954650879 3.36059570312,2.4796295166 4.55279541016,4.24153137207" - android:strokeColor="#FFF2501D" + android:strokeColor="@*android:color/system_error" android:strokeWidth="1.45" android:strokeLineCap="round" android:trimPathStart="1" /> @@ -138,7 +138,7 @@ <path android:name="ridge_1_path_0" android:pathData="M 71.7812347412,97.0507202148 c -2.27149963379,-1.31344604492 -4.71360778809,-2.07006835938 -7.56221008301,-2.07006835938 c -2.84869384766,0.0 -5.23320007324,0.779556274414 -7.34411621094,2.07006835938" - android:strokeColor="#FFF2501D" + android:strokeColor="@*android:color/system_error" android:strokeWidth="1.45" android:strokeLineCap="round" android:trimPathEnd="0" /> @@ -157,11 +157,11 @@ <path android:name="path_2" android:pathData="M -1.3705291748,4.06730651855 c 0.0,0.0 0.036376953125,-0.0102386474609 0.036376953125,-0.0102386474609 c 0.0,0.0 -0.00682067871094,0.0040283203125 -0.00682067871093,0.0040283203125 c 0.0,0.0 -0.0161437988281,0.00479125976562 -0.0161437988281,0.00479125976563 c 0.0,0.0 -0.0134124755859,0.00141906738281 -0.0134124755859,0.00141906738281 Z" - android:fillColor="#FFF2501D" /> + android:fillColor="@*android:color/system_error" /> <path android:name="path_1" android:pathData="M -1.3737487793,-6.77532958984 c 0.0,0.0 0.00604248046875,0.0166625976562 0.00604248046876,0.0166625976562 c 0.0,0.0 0.0213623046875,0.0250244140625 0.0213623046875,0.0250244140625 c 0.0,0.0 -0.00604248046875,-0.0166625976562 -0.00604248046876,-0.0166625976562 c 0.0,0.0 -0.0213623046875,-0.0250244140625 -0.0213623046875,-0.0250244140625 Z" - android:fillColor="#FFF2501D" /> + android:fillColor="@*android:color/system_error" /> </group> </group> <group @@ -176,7 +176,7 @@ <path android:name="path_3" android:pathData="M 0.0101470947266,10.8087768555 c -5.96701049805,0.0 -10.8000183105,-4.8330078125 -10.8000183105,-10.8000488281 c 0.0,-5.96691894531 4.8330078125,-10.7999267578 10.8000183105,-10.7999267578 c 5.96697998047,0.0 10.799987793,4.8330078125 10.799987793,10.7999267578 c 0.0,5.96704101562 -4.8330078125,10.8000488281 -10.799987793,10.8000488281 Z" - android:strokeColor="#FFF2501D" + android:strokeColor="@*android:color/system_error" android:strokeWidth="2" android:trimPathStart="1" /> </group> diff --git a/packages/SystemUI/res/layout/status_bar_expanded.xml b/packages/SystemUI/res/layout/status_bar_expanded.xml index 2c8a55955b4b..3d70969e336d 100644 --- a/packages/SystemUI/res/layout/status_bar_expanded.xml +++ b/packages/SystemUI/res/layout/status_bar_expanded.xml @@ -65,6 +65,14 @@ layout="@layout/keyguard_status_bar" android:visibility="invisible" /> + <Button + android:id="@+id/report_rejected_touch" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/status_bar_header_height_keyguard" + android:text="@string/report_rejected_touch" + android:visibility="gone" /> + </com.android.systemui.statusbar.phone.NotificationsQuickSettingsContainer> <include diff --git a/packages/SystemUI/res/values-af/strings.xml b/packages/SystemUI/res/values-af/strings.xml index 847bdb14ee53..546698cfb28a 100644 --- a/packages/SystemUI/res/values-af/strings.xml +++ b/packages/SystemUI/res/values-af/strings.xml @@ -335,6 +335,8 @@ <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Verdeel horisontaal"</string> <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Verdeel vertikaal"</string> <string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Verdeel gepasmaak"</string> + <string-array name="recents_blacklist_array"> + </string-array> <string name="expanded_header_battery_charged" msgid="5945855970267657951">"Gelaai"</string> <string name="expanded_header_battery_charging" msgid="205623198487189724">"Laai tans"</string> <string name="expanded_header_battery_charging_with_time" msgid="457559884275395376">"<xliff:g id="CHARGING_TIME">%s</xliff:g> tot vol"</string> diff --git a/packages/SystemUI/res/values-am/strings.xml b/packages/SystemUI/res/values-am/strings.xml index 1d7b2238a797..bd4afe177b3e 100644 --- a/packages/SystemUI/res/values-am/strings.xml +++ b/packages/SystemUI/res/values-am/strings.xml @@ -335,6 +335,8 @@ <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"አግድም ክፈል"</string> <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"ቁልቁል ክፈል"</string> <string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"በብጁ ክፈል"</string> + <string-array name="recents_blacklist_array"> + </string-array> <string name="expanded_header_battery_charged" msgid="5945855970267657951">"ባትሪ ሞልቷል"</string> <string name="expanded_header_battery_charging" msgid="205623198487189724">"ኃይል በመሙላት ላይ"</string> <string name="expanded_header_battery_charging_with_time" msgid="457559884275395376">"<xliff:g id="CHARGING_TIME">%s</xliff:g> እስኪሞላ ድረስ"</string> diff --git a/packages/SystemUI/res/values-ar/strings.xml b/packages/SystemUI/res/values-ar/strings.xml index 3090efe181c7..eca668e2e22d 100644 --- a/packages/SystemUI/res/values-ar/strings.xml +++ b/packages/SystemUI/res/values-ar/strings.xml @@ -343,6 +343,8 @@ <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"تقسيم أفقي"</string> <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"تقسيم رأسي"</string> <string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"تقسيم مخصص"</string> + <string-array name="recents_blacklist_array"> + </string-array> <string name="expanded_header_battery_charged" msgid="5945855970267657951">"تم الشحن"</string> <string name="expanded_header_battery_charging" msgid="205623198487189724">"جارٍ الشحن"</string> <string name="expanded_header_battery_charging_with_time" msgid="457559884275395376">"<xliff:g id="CHARGING_TIME">%s</xliff:g> حتى الاكتمال"</string> diff --git a/packages/SystemUI/res/values-az-rAZ/strings.xml b/packages/SystemUI/res/values-az-rAZ/strings.xml index f54af11ca8d4..3d9cc4ab307d 100644 --- a/packages/SystemUI/res/values-az-rAZ/strings.xml +++ b/packages/SystemUI/res/values-az-rAZ/strings.xml @@ -335,6 +335,8 @@ <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Üfüqi Böl"</string> <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Şaquli Böl"</string> <string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Fərdi Böl"</string> + <string-array name="recents_blacklist_array"> + </string-array> <string name="expanded_header_battery_charged" msgid="5945855970267657951">"Dolub"</string> <string name="expanded_header_battery_charging" msgid="205623198487189724">"Enerji doldurulur"</string> <string name="expanded_header_battery_charging_with_time" msgid="457559884275395376">"<xliff:g id="CHARGING_TIME">%s</xliff:g> dolana kimi"</string> diff --git a/packages/SystemUI/res/values-b+sr+Latn/strings.xml b/packages/SystemUI/res/values-b+sr+Latn/strings.xml index dbe4d51df5b8..f95045c0021c 100644 --- a/packages/SystemUI/res/values-b+sr+Latn/strings.xml +++ b/packages/SystemUI/res/values-b+sr+Latn/strings.xml @@ -337,6 +337,8 @@ <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Podeli horizontalno"</string> <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Podeli vertikalno"</string> <string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Prilagođeno deljenje"</string> + <string-array name="recents_blacklist_array"> + </string-array> <string name="expanded_header_battery_charged" msgid="5945855970267657951">"Napunjena je"</string> <string name="expanded_header_battery_charging" msgid="205623198487189724">"Punjenje"</string> <string name="expanded_header_battery_charging_with_time" msgid="457559884275395376">"<xliff:g id="CHARGING_TIME">%s</xliff:g> dok se ne napuni"</string> diff --git a/packages/SystemUI/res/values-be-rBY/strings.xml b/packages/SystemUI/res/values-be-rBY/strings.xml index 8ed3d8d320b8..325d70652cd3 100644 --- a/packages/SystemUI/res/values-be-rBY/strings.xml +++ b/packages/SystemUI/res/values-be-rBY/strings.xml @@ -341,6 +341,8 @@ <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Падзяліць гарызантальна"</string> <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Падзяліць вертыкальна"</string> <string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Падзяліць іншым чынам"</string> + <string-array name="recents_blacklist_array"> + </string-array> <string name="expanded_header_battery_charged" msgid="5945855970267657951">"Зараджаны"</string> <string name="expanded_header_battery_charging" msgid="205623198487189724">"Зарадка"</string> <string name="expanded_header_battery_charging_with_time" msgid="457559884275395376">"<xliff:g id="CHARGING_TIME">%s</xliff:g> да поўнай зарадкі"</string> diff --git a/packages/SystemUI/res/values-bg/strings.xml b/packages/SystemUI/res/values-bg/strings.xml index 0e97138cb23c..c5817eeeeadc 100644 --- a/packages/SystemUI/res/values-bg/strings.xml +++ b/packages/SystemUI/res/values-bg/strings.xml @@ -335,6 +335,8 @@ <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Хоризонтално разделяне"</string> <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Вертикално разделяне"</string> <string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Персонализирано разделяне"</string> + <string-array name="recents_blacklist_array"> + </string-array> <string name="expanded_header_battery_charged" msgid="5945855970267657951">"Заредена"</string> <string name="expanded_header_battery_charging" msgid="205623198487189724">"Зарежда се"</string> <string name="expanded_header_battery_charging_with_time" msgid="457559884275395376">"<xliff:g id="CHARGING_TIME">%s</xliff:g> до пълно зареждане"</string> diff --git a/packages/SystemUI/res/values-bn-rBD/strings.xml b/packages/SystemUI/res/values-bn-rBD/strings.xml index 000119ae232d..40076e6d2c3f 100644 --- a/packages/SystemUI/res/values-bn-rBD/strings.xml +++ b/packages/SystemUI/res/values-bn-rBD/strings.xml @@ -335,6 +335,8 @@ <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"অনুভূমিক স্প্লিট"</string> <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"উল্লম্ব স্প্লিট"</string> <string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"কাস্টম স্প্লিট করুন"</string> + <string-array name="recents_blacklist_array"> + </string-array> <string name="expanded_header_battery_charged" msgid="5945855970267657951">"চার্জ হয়েছে"</string> <string name="expanded_header_battery_charging" msgid="205623198487189724">"চার্জ হচ্ছে"</string> <string name="expanded_header_battery_charging_with_time" msgid="457559884275395376">"পূর্ণ হতে <xliff:g id="CHARGING_TIME">%s</xliff:g> সময় লাগবে"</string> diff --git a/packages/SystemUI/res/values-bs-rBA/strings.xml b/packages/SystemUI/res/values-bs-rBA/strings.xml index fd8fad6f2e06..30ba65499d5f 100644 --- a/packages/SystemUI/res/values-bs-rBA/strings.xml +++ b/packages/SystemUI/res/values-bs-rBA/strings.xml @@ -259,7 +259,7 @@ <string name="accessibility_rotation_lock_on_landscape" msgid="6731197337665366273">"Ekran je zaključan u vodoravnom prikazu."</string> <string name="accessibility_rotation_lock_on_portrait" msgid="5809367521644012115">"Ekran je zaključan u uspravnom prikazu."</string> <string name="accessibility_rotation_lock_off_changed" msgid="8134601071026305153">"Ekran će se sada automatski rotirati."</string> - <string name="accessibility_rotation_lock_on_landscape_changed" msgid="3135965553707519743">"Ekran je sada zaključan u vodoravnom položaju."</string> + <string name="accessibility_rotation_lock_on_landscape_changed" msgid="3135965553707519743">"Ekran je sada zaključan u vodoravnom prikazu."</string> <string name="accessibility_rotation_lock_on_portrait_changed" msgid="8922481981834012126">"Ekran je sada zaključan u uspravnom položaju."</string> <string name="dessert_case" msgid="1295161776223959221">"Slika sa desertima"</string> <string name="start_dreams" msgid="5640361424498338327">"Čuvar ekrana"</string> @@ -337,6 +337,8 @@ <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Podjela po horizontali"</string> <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Podjela po vertikali"</string> <string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Prilagođena podjela"</string> + <string-array name="recents_blacklist_array"> + </string-array> <string name="expanded_header_battery_charged" msgid="5945855970267657951">"Napunjeno"</string> <string name="expanded_header_battery_charging" msgid="205623198487189724">"Punjenje"</string> <string name="expanded_header_battery_charging_with_time" msgid="457559884275395376">"Do kraja punjenja preostalo <xliff:g id="CHARGING_TIME">%s</xliff:g>"</string> @@ -543,7 +545,7 @@ <string name="keyboard_key_backspace" msgid="1559580097512385854">"Tipka za brisanje"</string> <string name="keyboard_key_media_play_pause" msgid="3861975717393887428">"Pokreni/pauziraj"</string> <string name="keyboard_key_media_stop" msgid="2859963958595908962">"Zaustavi"</string> - <string name="keyboard_key_media_next" msgid="1894394911630345607">"Sljedeće"</string> + <string name="keyboard_key_media_next" msgid="1894394911630345607">"Naprijed"</string> <string name="keyboard_key_media_previous" msgid="4256072387192967261">"Prethodno"</string> <string name="keyboard_key_media_rewind" msgid="2654808213360820186">"Premotaj"</string> <string name="keyboard_key_media_fast_forward" msgid="3849417047738200605">"Ubrzaj"</string> diff --git a/packages/SystemUI/res/values-ca/strings.xml b/packages/SystemUI/res/values-ca/strings.xml index 66d37358b4bf..3354f92638b0 100644 --- a/packages/SystemUI/res/values-ca/strings.xml +++ b/packages/SystemUI/res/values-ca/strings.xml @@ -335,6 +335,8 @@ <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Divisió horitzontal"</string> <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Divisió vertical"</string> <string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Divisió personalitzada"</string> + <string-array name="recents_blacklist_array"> + </string-array> <string name="expanded_header_battery_charged" msgid="5945855970267657951">"Carregada"</string> <string name="expanded_header_battery_charging" msgid="205623198487189724">"S\'està carregant"</string> <string name="expanded_header_battery_charging_with_time" msgid="457559884275395376">"<xliff:g id="CHARGING_TIME">%s</xliff:g> per completar la càrrega"</string> @@ -602,7 +604,7 @@ <string name="select_keycode" msgid="7413765103381924584">"Selecciona un botó de teclat"</string> <string name="preview" msgid="9077832302472282938">"Previsualització"</string> <string name="drag_to_add_tiles" msgid="7058945779098711293">"Arrossega per afegir funcions"</string> - <string name="drag_to_remove_tiles" msgid="3361212377437088062">"Arrossega\'ls aquí per suprimir-los"</string> + <string name="drag_to_remove_tiles" msgid="3361212377437088062">"Arrossega aquí per suprimir una funció"</string> <string name="qs_edit" msgid="2232596095725105230">"Edita"</string> <string name="tuner_time" msgid="6572217313285536011">"Hora"</string> <string-array name="clock_options"> diff --git a/packages/SystemUI/res/values-cs/strings.xml b/packages/SystemUI/res/values-cs/strings.xml index f905f145565f..d64e5d9eb806 100644 --- a/packages/SystemUI/res/values-cs/strings.xml +++ b/packages/SystemUI/res/values-cs/strings.xml @@ -341,6 +341,8 @@ <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Vodorovné rozdělení"</string> <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Vertikální rozdělení"</string> <string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Vlastní rozdělení"</string> + <string-array name="recents_blacklist_array"> + </string-array> <string name="expanded_header_battery_charged" msgid="5945855970267657951">"Nabito"</string> <string name="expanded_header_battery_charging" msgid="205623198487189724">"Nabíjení"</string> <string name="expanded_header_battery_charging_with_time" msgid="457559884275395376">"<xliff:g id="CHARGING_TIME">%s</xliff:g> do plného nabití"</string> diff --git a/packages/SystemUI/res/values-da/strings.xml b/packages/SystemUI/res/values-da/strings.xml index 399dd497aa03..da8daa4da468 100644 --- a/packages/SystemUI/res/values-da/strings.xml +++ b/packages/SystemUI/res/values-da/strings.xml @@ -335,6 +335,8 @@ <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Opdel vandret"</string> <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Opdel lodret"</string> <string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Opdel brugerdefineret"</string> + <string-array name="recents_blacklist_array"> + </string-array> <string name="expanded_header_battery_charged" msgid="5945855970267657951">"Opladet"</string> <string name="expanded_header_battery_charging" msgid="205623198487189724">"Oplader"</string> <string name="expanded_header_battery_charging_with_time" msgid="457559884275395376">"<xliff:g id="CHARGING_TIME">%s</xliff:g> indtil fuld opladet"</string> diff --git a/packages/SystemUI/res/values-de/strings.xml b/packages/SystemUI/res/values-de/strings.xml index be919a6402cf..46078d9c2516 100644 --- a/packages/SystemUI/res/values-de/strings.xml +++ b/packages/SystemUI/res/values-de/strings.xml @@ -337,6 +337,8 @@ <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Geteilte Schaltfläche – horizontal"</string> <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Geteilte Schaltfläche – vertikal"</string> <string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Geteilte Schaltfläche – benutzerdefiniert"</string> + <string-array name="recents_blacklist_array"> + </string-array> <string name="expanded_header_battery_charged" msgid="5945855970267657951">"Aufgeladen"</string> <string name="expanded_header_battery_charging" msgid="205623198487189724">"Wird aufgeladen"</string> <string name="expanded_header_battery_charging_with_time" msgid="457559884275395376">"Voll in <xliff:g id="CHARGING_TIME">%s</xliff:g>"</string> diff --git a/packages/SystemUI/res/values-el/strings.xml b/packages/SystemUI/res/values-el/strings.xml index 81c56c2a4360..0a327ab24910 100644 --- a/packages/SystemUI/res/values-el/strings.xml +++ b/packages/SystemUI/res/values-el/strings.xml @@ -335,6 +335,8 @@ <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Οριζόντιος διαχωρισμός"</string> <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Κάθετος διαχωρισμός"</string> <string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Προσαρμοσμένος διαχωρισμός"</string> + <string-array name="recents_blacklist_array"> + </string-array> <string name="expanded_header_battery_charged" msgid="5945855970267657951">"Φορτίστηκε"</string> <string name="expanded_header_battery_charging" msgid="205623198487189724">"Φόρτιση"</string> <string name="expanded_header_battery_charging_with_time" msgid="457559884275395376">"<xliff:g id="CHARGING_TIME">%s</xliff:g> για πλήρη φόρτιση"</string> diff --git a/packages/SystemUI/res/values-en-rAU/strings.xml b/packages/SystemUI/res/values-en-rAU/strings.xml index a89afb626b2b..9443ad90c342 100644 --- a/packages/SystemUI/res/values-en-rAU/strings.xml +++ b/packages/SystemUI/res/values-en-rAU/strings.xml @@ -335,6 +335,8 @@ <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Split Horizontal"</string> <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Split Vertical"</string> <string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Split Customised"</string> + <string-array name="recents_blacklist_array"> + </string-array> <string name="expanded_header_battery_charged" msgid="5945855970267657951">"Charged"</string> <string name="expanded_header_battery_charging" msgid="205623198487189724">"Charging"</string> <string name="expanded_header_battery_charging_with_time" msgid="457559884275395376">"<xliff:g id="CHARGING_TIME">%s</xliff:g> until full"</string> diff --git a/packages/SystemUI/res/values-en-rGB/strings.xml b/packages/SystemUI/res/values-en-rGB/strings.xml index a89afb626b2b..9443ad90c342 100644 --- a/packages/SystemUI/res/values-en-rGB/strings.xml +++ b/packages/SystemUI/res/values-en-rGB/strings.xml @@ -335,6 +335,8 @@ <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Split Horizontal"</string> <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Split Vertical"</string> <string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Split Customised"</string> + <string-array name="recents_blacklist_array"> + </string-array> <string name="expanded_header_battery_charged" msgid="5945855970267657951">"Charged"</string> <string name="expanded_header_battery_charging" msgid="205623198487189724">"Charging"</string> <string name="expanded_header_battery_charging_with_time" msgid="457559884275395376">"<xliff:g id="CHARGING_TIME">%s</xliff:g> until full"</string> diff --git a/packages/SystemUI/res/values-en-rIN/strings.xml b/packages/SystemUI/res/values-en-rIN/strings.xml index a89afb626b2b..9443ad90c342 100644 --- a/packages/SystemUI/res/values-en-rIN/strings.xml +++ b/packages/SystemUI/res/values-en-rIN/strings.xml @@ -335,6 +335,8 @@ <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Split Horizontal"</string> <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Split Vertical"</string> <string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Split Customised"</string> + <string-array name="recents_blacklist_array"> + </string-array> <string name="expanded_header_battery_charged" msgid="5945855970267657951">"Charged"</string> <string name="expanded_header_battery_charging" msgid="205623198487189724">"Charging"</string> <string name="expanded_header_battery_charging_with_time" msgid="457559884275395376">"<xliff:g id="CHARGING_TIME">%s</xliff:g> until full"</string> diff --git a/packages/SystemUI/res/values-es-rUS/strings.xml b/packages/SystemUI/res/values-es-rUS/strings.xml index 85f2cbdb53dc..602d6b2dfd71 100644 --- a/packages/SystemUI/res/values-es-rUS/strings.xml +++ b/packages/SystemUI/res/values-es-rUS/strings.xml @@ -337,6 +337,8 @@ <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"División horizontal"</string> <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"División vertical"</string> <string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"División personalizada"</string> + <string-array name="recents_blacklist_array"> + </string-array> <string name="expanded_header_battery_charged" msgid="5945855970267657951">"Cargada"</string> <string name="expanded_header_battery_charging" msgid="205623198487189724">"Cargando"</string> <string name="expanded_header_battery_charging_with_time" msgid="457559884275395376">"<xliff:g id="CHARGING_TIME">%s</xliff:g> para completarse"</string> diff --git a/packages/SystemUI/res/values-es/strings.xml b/packages/SystemUI/res/values-es/strings.xml index 2016d250dc1e..ba11d6fb9e5d 100644 --- a/packages/SystemUI/res/values-es/strings.xml +++ b/packages/SystemUI/res/values-es/strings.xml @@ -337,6 +337,8 @@ <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"División horizontal"</string> <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"División vertical"</string> <string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"División personalizada"</string> + <string-array name="recents_blacklist_array"> + </string-array> <string name="expanded_header_battery_charged" msgid="5945855970267657951">"Cargada"</string> <string name="expanded_header_battery_charging" msgid="205623198487189724">"Cargando"</string> <string name="expanded_header_battery_charging_with_time" msgid="457559884275395376">"<xliff:g id="CHARGING_TIME">%s</xliff:g> para completarse"</string> diff --git a/packages/SystemUI/res/values-et-rEE/strings.xml b/packages/SystemUI/res/values-et-rEE/strings.xml index 604167392dd0..bfc55e9724d1 100644 --- a/packages/SystemUI/res/values-et-rEE/strings.xml +++ b/packages/SystemUI/res/values-et-rEE/strings.xml @@ -337,6 +337,8 @@ <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Horisontaalne poolitamine"</string> <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Vertikaalne poolitamine"</string> <string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Kohandatud poolitamine"</string> + <string-array name="recents_blacklist_array"> + </string-array> <string name="expanded_header_battery_charged" msgid="5945855970267657951">"Laetud"</string> <string name="expanded_header_battery_charging" msgid="205623198487189724">"Laadimine"</string> <string name="expanded_header_battery_charging_with_time" msgid="457559884275395376">"Täislaadimiseks kulub <xliff:g id="CHARGING_TIME">%s</xliff:g>"</string> diff --git a/packages/SystemUI/res/values-eu-rES/strings.xml b/packages/SystemUI/res/values-eu-rES/strings.xml index 509fd43c239d..a340b3d3f90f 100644 --- a/packages/SystemUI/res/values-eu-rES/strings.xml +++ b/packages/SystemUI/res/values-eu-rES/strings.xml @@ -337,6 +337,8 @@ <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Zatitze horizontala"</string> <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Zatitze bertikala"</string> <string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Zatitze pertsonalizatua"</string> + <string-array name="recents_blacklist_array"> + </string-array> <string name="expanded_header_battery_charged" msgid="5945855970267657951">"Kargatuta"</string> <string name="expanded_header_battery_charging" msgid="205623198487189724">"Kargatzen"</string> <string name="expanded_header_battery_charging_with_time" msgid="457559884275395376">"<xliff:g id="CHARGING_TIME">%s</xliff:g> falta zaizkio guztiz kargatzeko"</string> diff --git a/packages/SystemUI/res/values-fa/strings.xml b/packages/SystemUI/res/values-fa/strings.xml index 7ce3fce5b6f2..58a5d936a68f 100644 --- a/packages/SystemUI/res/values-fa/strings.xml +++ b/packages/SystemUI/res/values-fa/strings.xml @@ -335,6 +335,8 @@ <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"تقسیم افقی"</string> <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"تقسیم عمودی"</string> <string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"سفارشی کردن تقسیم"</string> + <string-array name="recents_blacklist_array"> + </string-array> <string name="expanded_header_battery_charged" msgid="5945855970267657951">"شارژ کامل شد"</string> <string name="expanded_header_battery_charging" msgid="205623198487189724">"در حال شارژ شدن"</string> <string name="expanded_header_battery_charging_with_time" msgid="457559884275395376">"<xliff:g id="CHARGING_TIME">%s</xliff:g> مانده تا شارژ کامل شود"</string> diff --git a/packages/SystemUI/res/values-fi/strings.xml b/packages/SystemUI/res/values-fi/strings.xml index e588a26ba8c1..f292c2b454f0 100644 --- a/packages/SystemUI/res/values-fi/strings.xml +++ b/packages/SystemUI/res/values-fi/strings.xml @@ -335,6 +335,8 @@ <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Vaakasuuntainen jako"</string> <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Pystysuuntainen jako"</string> <string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Muokattu jako"</string> + <string-array name="recents_blacklist_array"> + </string-array> <string name="expanded_header_battery_charged" msgid="5945855970267657951">"Ladattu"</string> <string name="expanded_header_battery_charging" msgid="205623198487189724">"Ladataan"</string> <string name="expanded_header_battery_charging_with_time" msgid="457559884275395376">"<xliff:g id="CHARGING_TIME">%s</xliff:g> kunnes täynnä"</string> diff --git a/packages/SystemUI/res/values-fr-rCA/strings.xml b/packages/SystemUI/res/values-fr-rCA/strings.xml index c20c2b6f3bbc..7d50feef5cd8 100644 --- a/packages/SystemUI/res/values-fr-rCA/strings.xml +++ b/packages/SystemUI/res/values-fr-rCA/strings.xml @@ -337,6 +337,8 @@ <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Séparation horizontale"</string> <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Séparation verticale"</string> <string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Séparation personnalisée"</string> + <string-array name="recents_blacklist_array"> + </string-array> <string name="expanded_header_battery_charged" msgid="5945855970267657951">"Chargée"</string> <string name="expanded_header_battery_charging" msgid="205623198487189724">"Charge en cours..."</string> <string name="expanded_header_battery_charging_with_time" msgid="457559884275395376">"Chargée dans <xliff:g id="CHARGING_TIME">%s</xliff:g>"</string> diff --git a/packages/SystemUI/res/values-fr/strings.xml b/packages/SystemUI/res/values-fr/strings.xml index cedc1ed8ed2d..d89e1c17afea 100644 --- a/packages/SystemUI/res/values-fr/strings.xml +++ b/packages/SystemUI/res/values-fr/strings.xml @@ -337,6 +337,8 @@ <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Séparation horizontale"</string> <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Séparation verticale"</string> <string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Séparation personnalisée"</string> + <string-array name="recents_blacklist_array"> + </string-array> <string name="expanded_header_battery_charged" msgid="5945855970267657951">"Chargé"</string> <string name="expanded_header_battery_charging" msgid="205623198487189724">"En charge"</string> <string name="expanded_header_battery_charging_with_time" msgid="457559884275395376">"Chargé dans <xliff:g id="CHARGING_TIME">%s</xliff:g>"</string> diff --git a/packages/SystemUI/res/values-gl-rES/strings.xml b/packages/SystemUI/res/values-gl-rES/strings.xml index 4d90e9123ba3..6d0e366332a0 100644 --- a/packages/SystemUI/res/values-gl-rES/strings.xml +++ b/packages/SystemUI/res/values-gl-rES/strings.xml @@ -337,6 +337,8 @@ <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Dividir en horizontal"</string> <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Dividir en vertical"</string> <string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Dividir de xeito personalizado"</string> + <string-array name="recents_blacklist_array"> + </string-array> <string name="expanded_header_battery_charged" msgid="5945855970267657951">"Cargada"</string> <string name="expanded_header_battery_charging" msgid="205623198487189724">"Cargando"</string> <string name="expanded_header_battery_charging_with_time" msgid="457559884275395376">"<xliff:g id="CHARGING_TIME">%s</xliff:g> para completar a carga"</string> diff --git a/packages/SystemUI/res/values-gu-rIN/strings.xml b/packages/SystemUI/res/values-gu-rIN/strings.xml index d425f3a7a0ea..0663b41af0dd 100644 --- a/packages/SystemUI/res/values-gu-rIN/strings.xml +++ b/packages/SystemUI/res/values-gu-rIN/strings.xml @@ -335,6 +335,8 @@ <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"આડું વિભક્ત કરો"</string> <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"ઊભું વિભક્ત કરો"</string> <string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"કસ્ટમ વિભક્ત કરો"</string> + <string-array name="recents_blacklist_array"> + </string-array> <string name="expanded_header_battery_charged" msgid="5945855970267657951">"ચાર્જ થઈ ગયું"</string> <string name="expanded_header_battery_charging" msgid="205623198487189724">"ચાર્જ થઈ રહ્યું છે"</string> <string name="expanded_header_battery_charging_with_time" msgid="457559884275395376">"પૂર્ણ થવામાં <xliff:g id="CHARGING_TIME">%s</xliff:g> બાકી"</string> diff --git a/packages/SystemUI/res/values-hi/strings.xml b/packages/SystemUI/res/values-hi/strings.xml index c74da952ceba..292455688081 100644 --- a/packages/SystemUI/res/values-hi/strings.xml +++ b/packages/SystemUI/res/values-hi/strings.xml @@ -335,6 +335,8 @@ <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"क्षैतिज रूप से विभाजित करें"</string> <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"लम्बवत रूप से विभाजित करें"</string> <string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"कस्टम रूप से विभाजित करें"</string> + <string-array name="recents_blacklist_array"> + </string-array> <string name="expanded_header_battery_charged" msgid="5945855970267657951">"चार्ज हो गई है"</string> <string name="expanded_header_battery_charging" msgid="205623198487189724">"चार्ज हो रही है"</string> <string name="expanded_header_battery_charging_with_time" msgid="457559884275395376">"पूर्ण होने में <xliff:g id="CHARGING_TIME">%s</xliff:g> शेष"</string> diff --git a/packages/SystemUI/res/values-hr/strings.xml b/packages/SystemUI/res/values-hr/strings.xml index de3b3a6a98c6..02466d610b9e 100644 --- a/packages/SystemUI/res/values-hr/strings.xml +++ b/packages/SystemUI/res/values-hr/strings.xml @@ -337,6 +337,8 @@ <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Podijeli vodoravno"</string> <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Podijeli okomito"</string> <string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Podijeli prilagođeno"</string> + <string-array name="recents_blacklist_array"> + </string-array> <string name="expanded_header_battery_charged" msgid="5945855970267657951">"Napunjeno"</string> <string name="expanded_header_battery_charging" msgid="205623198487189724">"Punjenje"</string> <string name="expanded_header_battery_charging_with_time" msgid="457559884275395376">"<xliff:g id="CHARGING_TIME">%s</xliff:g> do napunjenosti"</string> diff --git a/packages/SystemUI/res/values-hu/strings.xml b/packages/SystemUI/res/values-hu/strings.xml index 03943245cf31..b89b1069922b 100644 --- a/packages/SystemUI/res/values-hu/strings.xml +++ b/packages/SystemUI/res/values-hu/strings.xml @@ -335,6 +335,8 @@ <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Osztott vízszintes"</string> <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Osztott függőleges"</string> <string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Osztott egyéni"</string> + <string-array name="recents_blacklist_array"> + </string-array> <string name="expanded_header_battery_charged" msgid="5945855970267657951">"Feltöltve"</string> <string name="expanded_header_battery_charging" msgid="205623198487189724">"Töltés"</string> <string name="expanded_header_battery_charging_with_time" msgid="457559884275395376">"<xliff:g id="CHARGING_TIME">%s</xliff:g> a teljes töltöttségig"</string> diff --git a/packages/SystemUI/res/values-hy-rAM/strings.xml b/packages/SystemUI/res/values-hy-rAM/strings.xml index f37858ccc2fc..d0d6c506f72d 100644 --- a/packages/SystemUI/res/values-hy-rAM/strings.xml +++ b/packages/SystemUI/res/values-hy-rAM/strings.xml @@ -335,6 +335,8 @@ <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Հորիզոնական տրոհում"</string> <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Ուղղահայաց տրոհում"</string> <string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Հատուկ տրոհում"</string> + <string-array name="recents_blacklist_array"> + </string-array> <string name="expanded_header_battery_charged" msgid="5945855970267657951">"Լիցքավորված է"</string> <string name="expanded_header_battery_charging" msgid="205623198487189724">"Լիցքավորվում է"</string> <string name="expanded_header_battery_charging_with_time" msgid="457559884275395376">"Լրիվ լիցքավորմանը մնաց <xliff:g id="CHARGING_TIME">%s</xliff:g>"</string> diff --git a/packages/SystemUI/res/values-in/strings.xml b/packages/SystemUI/res/values-in/strings.xml index 5b80343bfbbe..ad24d6a2954f 100644 --- a/packages/SystemUI/res/values-in/strings.xml +++ b/packages/SystemUI/res/values-in/strings.xml @@ -335,6 +335,8 @@ <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Pisahkan Horizontal"</string> <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Pisahkan Vertikal"</string> <string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Pisahkan Khusus"</string> + <string-array name="recents_blacklist_array"> + </string-array> <string name="expanded_header_battery_charged" msgid="5945855970267657951">"Terisi"</string> <string name="expanded_header_battery_charging" msgid="205623198487189724">"Mengisi daya"</string> <string name="expanded_header_battery_charging_with_time" msgid="457559884275395376">"<xliff:g id="CHARGING_TIME">%s</xliff:g> sampai penuh"</string> diff --git a/packages/SystemUI/res/values-is-rIS/strings.xml b/packages/SystemUI/res/values-is-rIS/strings.xml index 5d9989c50563..a95e28b2d55e 100644 --- a/packages/SystemUI/res/values-is-rIS/strings.xml +++ b/packages/SystemUI/res/values-is-rIS/strings.xml @@ -335,6 +335,8 @@ <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Lárétt skipting"</string> <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Lóðrétt skipting"</string> <string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Sérsniðin skipting"</string> + <string-array name="recents_blacklist_array"> + </string-array> <string name="expanded_header_battery_charged" msgid="5945855970267657951">"Fullhlaðin"</string> <string name="expanded_header_battery_charging" msgid="205623198487189724">"Í hleðslu"</string> <string name="expanded_header_battery_charging_with_time" msgid="457559884275395376">"<xliff:g id="CHARGING_TIME">%s</xliff:g> þar til fullri hleðslu er náð"</string> diff --git a/packages/SystemUI/res/values-it/strings.xml b/packages/SystemUI/res/values-it/strings.xml index 209f3efb87c2..d370b6588bcb 100644 --- a/packages/SystemUI/res/values-it/strings.xml +++ b/packages/SystemUI/res/values-it/strings.xml @@ -337,6 +337,8 @@ <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Divisione in orizzontale"</string> <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Divisione in verticale"</string> <string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Divisione personalizzata"</string> + <string-array name="recents_blacklist_array"> + </string-array> <string name="expanded_header_battery_charged" msgid="5945855970267657951">"Carica"</string> <string name="expanded_header_battery_charging" msgid="205623198487189724">"In carica"</string> <string name="expanded_header_battery_charging_with_time" msgid="457559884275395376">"<xliff:g id="CHARGING_TIME">%s</xliff:g> al termine della carica"</string> diff --git a/packages/SystemUI/res/values-iw/strings.xml b/packages/SystemUI/res/values-iw/strings.xml index 4afad7f01518..4cf48c2c73e6 100644 --- a/packages/SystemUI/res/values-iw/strings.xml +++ b/packages/SystemUI/res/values-iw/strings.xml @@ -339,6 +339,8 @@ <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"פיצול אופקי"</string> <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"פיצול אנכי"</string> <string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"פיצול מותאם אישית"</string> + <string-array name="recents_blacklist_array"> + </string-array> <string name="expanded_header_battery_charged" msgid="5945855970267657951">"טעון"</string> <string name="expanded_header_battery_charging" msgid="205623198487189724">"טוען"</string> <string name="expanded_header_battery_charging_with_time" msgid="457559884275395376">"<xliff:g id="CHARGING_TIME">%s</xliff:g> עד למילוי"</string> diff --git a/packages/SystemUI/res/values-ja/strings.xml b/packages/SystemUI/res/values-ja/strings.xml index f9940f1c7495..c42e34652ae3 100644 --- a/packages/SystemUI/res/values-ja/strings.xml +++ b/packages/SystemUI/res/values-ja/strings.xml @@ -337,6 +337,8 @@ <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"横に分割"</string> <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"縦に分割"</string> <string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"分割（カスタム）"</string> + <string-array name="recents_blacklist_array"> + </string-array> <string name="expanded_header_battery_charged" msgid="5945855970267657951">"充電が完了しました"</string> <string name="expanded_header_battery_charging" msgid="205623198487189724">"充電しています"</string> <string name="expanded_header_battery_charging_with_time" msgid="457559884275395376">"充電完了まで<xliff:g id="CHARGING_TIME">%s</xliff:g>"</string> diff --git a/packages/SystemUI/res/values-ka-rGE/strings.xml b/packages/SystemUI/res/values-ka-rGE/strings.xml index 1715d7bb2bd7..6ddcde8ee767 100644 --- a/packages/SystemUI/res/values-ka-rGE/strings.xml +++ b/packages/SystemUI/res/values-ka-rGE/strings.xml @@ -335,6 +335,8 @@ <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"ჰორიზონტალური გაყოფა"</string> <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"ვერტიკალური გაყოფა"</string> <string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"ინდივიდუალური გაყობა"</string> + <string-array name="recents_blacklist_array"> + </string-array> <string name="expanded_header_battery_charged" msgid="5945855970267657951">"დატენილია"</string> <string name="expanded_header_battery_charging" msgid="205623198487189724">"მიმდინარეობს დატენვა"</string> <string name="expanded_header_battery_charging_with_time" msgid="457559884275395376">"<xliff:g id="CHARGING_TIME">%s</xliff:g> სრულად დატენვამდე"</string> diff --git a/packages/SystemUI/res/values-kk-rKZ/strings.xml b/packages/SystemUI/res/values-kk-rKZ/strings.xml index 6715fefcdd26..2c444e46f5ed 100644 --- a/packages/SystemUI/res/values-kk-rKZ/strings.xml +++ b/packages/SystemUI/res/values-kk-rKZ/strings.xml @@ -335,6 +335,8 @@ <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Бөлінген көлденең"</string> <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Бөлінген тік"</string> <string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Бөлінген теңшелетін"</string> + <string-array name="recents_blacklist_array"> + </string-array> <string name="expanded_header_battery_charged" msgid="5945855970267657951">"Зарядталды"</string> <string name="expanded_header_battery_charging" msgid="205623198487189724">"Зарядталуда"</string> <string name="expanded_header_battery_charging_with_time" msgid="457559884275395376">"Толғанға дейін <xliff:g id="CHARGING_TIME">%s</xliff:g>"</string> diff --git a/packages/SystemUI/res/values-km-rKH/strings.xml b/packages/SystemUI/res/values-km-rKH/strings.xml index f9d36aafed00..0db7abc73b64 100644 --- a/packages/SystemUI/res/values-km-rKH/strings.xml +++ b/packages/SystemUI/res/values-km-rKH/strings.xml @@ -335,6 +335,8 @@ <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"បំបែកផ្តេក"</string> <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"បំបែកបញ្ឈរ"</string> <string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"បំបែកផ្ទាល់ខ្លួន"</string> + <string-array name="recents_blacklist_array"> + </string-array> <string name="expanded_header_battery_charged" msgid="5945855970267657951">"បានបញ្ចូលថ្ម"</string> <string name="expanded_header_battery_charging" msgid="205623198487189724">"កំពុងបញ្ចូលថ្ម"</string> <string name="expanded_header_battery_charging_with_time" msgid="457559884275395376">"<xliff:g id="CHARGING_TIME">%s</xliff:g> រហូតដល់ពេញ"</string> diff --git a/packages/SystemUI/res/values-kn-rIN/strings.xml b/packages/SystemUI/res/values-kn-rIN/strings.xml index 548adbe32633..c62a8db9cb45 100644 --- a/packages/SystemUI/res/values-kn-rIN/strings.xml +++ b/packages/SystemUI/res/values-kn-rIN/strings.xml @@ -335,6 +335,8 @@ <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"ಅಡ್ಡಲಾಗಿ ವಿಭಜಿಸಿದ"</string> <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"ಲಂಬವಾಗಿ ವಿಭಜಿಸಿದ"</string> <string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"ಕಸ್ಟಮ್ ವಿಭಜಿಸಿದ"</string> + <string-array name="recents_blacklist_array"> + </string-array> <string name="expanded_header_battery_charged" msgid="5945855970267657951">"ಚಾರ್ಜ್ ಆಗಿದೆ"</string> <string name="expanded_header_battery_charging" msgid="205623198487189724">"ಚಾರ್ಜ್ ಆಗುತ್ತಿದೆ"</string> <string name="expanded_header_battery_charging_with_time" msgid="457559884275395376">"<xliff:g id="CHARGING_TIME">%s</xliff:g> ಪೂರ್ಣಗೊಳ್ಳುವವರೆಗೆ"</string> @@ -603,7 +605,7 @@ <string name="preview" msgid="9077832302472282938">"ಪೂರ್ವವೀಕ್ಷಣೆ"</string> <string name="drag_to_add_tiles" msgid="7058945779098711293">"ಟೈಲ್ಗಳನ್ನು ಸೇರಿಸಲು ಡ್ರ್ಯಾಗ್ ಮಾಡಿ"</string> <string name="drag_to_remove_tiles" msgid="3361212377437088062">"ತೆಗೆದುಹಾಕಲು ಇಲ್ಲಿ ಡ್ರ್ಯಾಗ್ ಮಾಡಿ"</string> - <string name="qs_edit" msgid="2232596095725105230">"ಸಂಪಾದಿಸು"</string> + <string name="qs_edit" msgid="2232596095725105230">"ಎಡಿಟ್"</string> <string name="tuner_time" msgid="6572217313285536011">"ಸಮಯ"</string> <string-array name="clock_options"> <item msgid="5965318737560463480">"ಗಂಟೆಗಳು, ನಿಮಿಷಗಳು, ಸೆಕೆಂಡುಗಳನ್ನು ತೋರಿಸು"</item> @@ -627,7 +629,7 @@ <string name="accessibility_action_divider_top_50" msgid="6385859741925078668">"50% ಮೇಲಕ್ಕೆ"</string> <string name="accessibility_action_divider_top_30" msgid="6201455163864841205">"30% ಮೇಲಕ್ಕೆ"</string> <string name="accessibility_action_divider_bottom_full" msgid="301433196679548001">"ಕೆಳಗಿನ ಪೂರ್ಣ ಪರದೆ"</string> - <string name="accessibility_qs_edit_tile_label" msgid="8374924053307764245">"ಸ್ಥಾನ <xliff:g id="POSITION">%1$d</xliff:g>, <xliff:g id="TILE_NAME">%2$s</xliff:g>. ಸಂಪಾದಿಸಲು ಡಬಲ್ ಟ್ಯಾಪ್ ಮಾಡಿ."</string> + <string name="accessibility_qs_edit_tile_label" msgid="8374924053307764245">"ಸ್ಥಾನ <xliff:g id="POSITION">%1$d</xliff:g>, <xliff:g id="TILE_NAME">%2$s</xliff:g>. ಎಡಿಟ್ ಮಾಡಲು ಡಬಲ್ ಟ್ಯಾಪ್ ಮಾಡಿ."</string> <string name="accessibility_qs_edit_add_tile_label" msgid="8133209638023882667">"<xliff:g id="TILE_NAME">%1$s</xliff:g>. ಸೇರಿಸಲು ಡಬಲ್ ಟ್ಯಾಪ್ ಮಾಡಿ."</string> <string name="accessibility_qs_edit_position_label" msgid="5055306305919289819">"ಸ್ಥಾನ <xliff:g id="POSITION">%1$d</xliff:g>. ಆಯ್ಕೆಮಾಡಲು ಡಬಲ್ ಟ್ಯಾಪ್ ಮಾಡಿ."</string> <string name="accessibility_qs_edit_move_tile" msgid="2461819993780159542">"<xliff:g id="TILE_NAME">%1$s</xliff:g> ಸರಿಸಿ"</string> @@ -635,7 +637,7 @@ <string name="accessibility_qs_edit_tile_added" msgid="8050200862063548309">"<xliff:g id="POSITION">%2$d</xliff:g> ಸ್ಥಾನಕ್ಕೆ <xliff:g id="TILE_NAME">%1$s</xliff:g> ಸೇರಿಸಲಾಗಿದೆ"</string> <string name="accessibility_qs_edit_tile_removed" msgid="8584304916627913440">"<xliff:g id="TILE_NAME">%1$s</xliff:g> ತೆಗೆದುಹಾಕಲಾಗಿದೆ"</string> <string name="accessibility_qs_edit_tile_moved" msgid="4343693412689365038">"<xliff:g id="POSITION">%2$d</xliff:g> ಸ್ಥಾನಕ್ಕೆ <xliff:g id="TILE_NAME">%1$s</xliff:g> ಸೇರಿಸಲಾಗಿದೆ"</string> - <string name="accessibility_desc_quick_settings_edit" msgid="8073587401747016103">"ತ್ವರಿತ ಸೆಟ್ಟಿಂಗ್ಗಳ ಸಂಪಾದಕ."</string> + <string name="accessibility_desc_quick_settings_edit" msgid="8073587401747016103">"ತ್ವರಿತ ಸೆಟ್ಟಿಂಗ್ಗಳ ಎಡಿಟರ್."</string> <string name="accessibility_desc_notification_icon" msgid="8352414185263916335">"<xliff:g id="ID_1">%1$s</xliff:g> ಅಧಿಸೂಚನೆ: <xliff:g id="ID_2">%2$s</xliff:g>"</string> <string name="dock_forced_resizable" msgid="5914261505436217520">"ವಿಭಜಿಸಿದ ಪರದೆಯಲ್ಲಿ ಅಪ್ಲಿಕೇಶನ್ ಕೆಲಸ ಮಾಡದೇ ಇರಬಹುದು."</string> <string name="dock_non_resizeble_failed_to_dock_text" msgid="3871617304250207291">"ಅಪ್ಲಿಕೇಶನ್ ಸ್ಪ್ಲಿಟ್ ಸ್ಕ್ರೀನ್ ಅನ್ನು ಬೆಂಬಲಿಸುವುದಿಲ್ಲ."</string> @@ -647,6 +649,6 @@ <string name="accessibility_quick_settings_no_internet" msgid="31890692343084075">"ಇಂಟರ್ನೆಟ್ ಇಲ್ಲ."</string> <string name="accessibility_quick_settings_open_details" msgid="4230931801728005194">"ವಿವರಗಳನ್ನು ತೆರೆಯಿರಿ."</string> <string name="accessibility_quick_settings_open_settings" msgid="7806613775728380737">"<xliff:g id="ID_1">%s</xliff:g> ಸೆಟ್ಟಿಂಗ್ಗಳನ್ನು ತೆರೆಯಿರಿ."</string> - <string name="accessibility_quick_settings_edit" msgid="7839992848995240393">"ಸೆಟ್ಟಿಂಗ್ಗಳ ಕ್ರಮವನ್ನು ಸಂಪಾದಿಸು."</string> + <string name="accessibility_quick_settings_edit" msgid="7839992848995240393">"ಸೆಟ್ಟಿಂಗ್ಗಳ ಕ್ರಮವನ್ನು ಎಡಿಟ್ ಮಾಡಿ."</string> <string name="accessibility_quick_settings_page" msgid="5032979051755200721">"<xliff:g id="ID_2">%2$d</xliff:g> ರಲ್ಲಿ <xliff:g id="ID_1">%1$d</xliff:g> ಪುಟ"</string> </resources> diff --git a/packages/SystemUI/res/values-ko/strings.xml b/packages/SystemUI/res/values-ko/strings.xml index 241f80322d47..3c08e923c7ff 100644 --- a/packages/SystemUI/res/values-ko/strings.xml +++ b/packages/SystemUI/res/values-ko/strings.xml @@ -337,6 +337,8 @@ <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"수평 분할"</string> <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"수직 분할"</string> <string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"맞춤 분할"</string> + <string-array name="recents_blacklist_array"> + </string-array> <string name="expanded_header_battery_charged" msgid="5945855970267657951">"충전됨"</string> <string name="expanded_header_battery_charging" msgid="205623198487189724">"충전 중"</string> <string name="expanded_header_battery_charging_with_time" msgid="457559884275395376">"완충까지 <xliff:g id="CHARGING_TIME">%s</xliff:g> 남음"</string> diff --git a/packages/SystemUI/res/values-ky-rKG/strings.xml b/packages/SystemUI/res/values-ky-rKG/strings.xml index e392b97c15c4..7645b93795af 100644 --- a/packages/SystemUI/res/values-ky-rKG/strings.xml +++ b/packages/SystemUI/res/values-ky-rKG/strings.xml @@ -335,6 +335,8 @@ <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Туурасынан бөлүү"</string> <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Тигинен бөлүү"</string> <string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Ыңгайлаштырылган бөлүү"</string> + <string-array name="recents_blacklist_array"> + </string-array> <string name="expanded_header_battery_charged" msgid="5945855970267657951">"Кубатталды"</string> <string name="expanded_header_battery_charging" msgid="205623198487189724">"Кубатталууда"</string> <string name="expanded_header_battery_charging_with_time" msgid="457559884275395376">"<xliff:g id="CHARGING_TIME">%s</xliff:g> толгонго чейин"</string> diff --git a/packages/SystemUI/res/values-lo-rLA/strings.xml b/packages/SystemUI/res/values-lo-rLA/strings.xml index 66fb010b617c..6b1fca8d493b 100644 --- a/packages/SystemUI/res/values-lo-rLA/strings.xml +++ b/packages/SystemUI/res/values-lo-rLA/strings.xml @@ -335,6 +335,8 @@ <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"ການແຍກລວງຂວາງ"</string> <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"ການແຍກລວງຕັ້ງ"</string> <string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"ການແຍກກຳນົດເອງ"</string> + <string-array name="recents_blacklist_array"> + </string-array> <string name="expanded_header_battery_charged" msgid="5945855970267657951">"ສາກເຕັມແລ້ວ."</string> <string name="expanded_header_battery_charging" msgid="205623198487189724">"ກຳລັງສາກໄຟ"</string> <string name="expanded_header_battery_charging_with_time" msgid="457559884275395376">"<xliff:g id="CHARGING_TIME">%s</xliff:g> ຈຶ່ງຈະເຕັມ"</string> diff --git a/packages/SystemUI/res/values-lt/strings.xml b/packages/SystemUI/res/values-lt/strings.xml index c120a7e21ecb..46e50fbc3461 100644 --- a/packages/SystemUI/res/values-lt/strings.xml +++ b/packages/SystemUI/res/values-lt/strings.xml @@ -339,6 +339,8 @@ <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Horizontalus skaidymas"</string> <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Vertikalus skaidymas"</string> <string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Tinkintas skaidymas"</string> + <string-array name="recents_blacklist_array"> + </string-array> <string name="expanded_header_battery_charged" msgid="5945855970267657951">"Įkrautas"</string> <string name="expanded_header_battery_charging" msgid="205623198487189724">"Kraunamas"</string> <string name="expanded_header_battery_charging_with_time" msgid="457559884275395376">"<xliff:g id="CHARGING_TIME">%s</xliff:g> iki visiško įkrovimo"</string> diff --git a/packages/SystemUI/res/values-lv/strings.xml b/packages/SystemUI/res/values-lv/strings.xml index 3dcd7a2dbdc6..9efad2e94127 100644 --- a/packages/SystemUI/res/values-lv/strings.xml +++ b/packages/SystemUI/res/values-lv/strings.xml @@ -337,6 +337,8 @@ <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Horizontāls dalījums"</string> <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Vertikāls dalījums"</string> <string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Pielāgots dalījums"</string> + <string-array name="recents_blacklist_array"> + </string-array> <string name="expanded_header_battery_charged" msgid="5945855970267657951">"Akumulators uzlādēts"</string> <string name="expanded_header_battery_charging" msgid="205623198487189724">"Notiek uzlāde"</string> <string name="expanded_header_battery_charging_with_time" msgid="457559884275395376">"<xliff:g id="CHARGING_TIME">%s</xliff:g> līdz pilnam akumulatoram"</string> diff --git a/packages/SystemUI/res/values-mk-rMK/strings.xml b/packages/SystemUI/res/values-mk-rMK/strings.xml index 14940e600a15..549543db03a7 100644 --- a/packages/SystemUI/res/values-mk-rMK/strings.xml +++ b/packages/SystemUI/res/values-mk-rMK/strings.xml @@ -85,7 +85,7 @@ <string name="accessibility_menu" msgid="316839303324695949">"Мени"</string> <string name="accessibility_recent" msgid="5208608566793607626">"Краток преглед"</string> <string name="accessibility_search_light" msgid="1103867596330271848">"Пребарај"</string> - <string name="accessibility_camera_button" msgid="8064671582820358152">"Фотоапарат"</string> + <string name="accessibility_camera_button" msgid="8064671582820358152">"Камера"</string> <string name="accessibility_phone_button" msgid="6738112589538563574">"Телефон"</string> <string name="accessibility_voice_assist_button" msgid="487611083884852965">"Гласовна помош"</string> <string name="accessibility_unlock_button" msgid="128158454631118828">"Отклучување"</string> @@ -335,6 +335,8 @@ <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Раздели хоризонтално"</string> <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Раздели вертикално"</string> <string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Раздели прилагодено"</string> + <string-array name="recents_blacklist_array"> + </string-array> <string name="expanded_header_battery_charged" msgid="5945855970267657951">"Наполнета"</string> <string name="expanded_header_battery_charging" msgid="205623198487189724">"Се полни"</string> <string name="expanded_header_battery_charging_with_time" msgid="457559884275395376">"<xliff:g id="CHARGING_TIME">%s</xliff:g> додека не се наполни"</string> diff --git a/packages/SystemUI/res/values-ml-rIN/strings.xml b/packages/SystemUI/res/values-ml-rIN/strings.xml index c3e231b2c250..9f596b8175bb 100644 --- a/packages/SystemUI/res/values-ml-rIN/strings.xml +++ b/packages/SystemUI/res/values-ml-rIN/strings.xml @@ -335,6 +335,8 @@ <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"തിരശ്ചീനമായി വേർതിരിക്കുക"</string> <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"ലംബമായി വേർതിരിക്കുക"</string> <string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"ഇഷ്ടാനുസൃതമായി വേർതിരിക്കുക"</string> + <string-array name="recents_blacklist_array"> + </string-array> <string name="expanded_header_battery_charged" msgid="5945855970267657951">"ചാർജായി"</string> <string name="expanded_header_battery_charging" msgid="205623198487189724">"ചാർജ്ജുചെയ്യുന്നു"</string> <string name="expanded_header_battery_charging_with_time" msgid="457559884275395376">"പൂർണ്ണമായും ചാർജ്ജാകുന്നതിന്, <xliff:g id="CHARGING_TIME">%s</xliff:g>"</string> diff --git a/packages/SystemUI/res/values-mn-rMN/strings.xml b/packages/SystemUI/res/values-mn-rMN/strings.xml index 859ad57d9292..f3a2f0827f59 100644 --- a/packages/SystemUI/res/values-mn-rMN/strings.xml +++ b/packages/SystemUI/res/values-mn-rMN/strings.xml @@ -333,6 +333,8 @@ <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Хэвтээ чиглэлд хуваах"</string> <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Босоо чиглэлд хуваах"</string> <string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Хүссэн хэлбэрээр хуваах"</string> + <string-array name="recents_blacklist_array"> + </string-array> <string name="expanded_header_battery_charged" msgid="5945855970267657951">"Цэнэглэгдсэн"</string> <string name="expanded_header_battery_charging" msgid="205623198487189724">"Цэнэглэж байна"</string> <string name="expanded_header_battery_charging_with_time" msgid="457559884275395376">"дүүргэхэд <xliff:g id="CHARGING_TIME">%s</xliff:g>"</string> diff --git a/packages/SystemUI/res/values-mr-rIN/strings.xml b/packages/SystemUI/res/values-mr-rIN/strings.xml index a088bd4eddc6..fb7a17f1d8b1 100644 --- a/packages/SystemUI/res/values-mr-rIN/strings.xml +++ b/packages/SystemUI/res/values-mr-rIN/strings.xml @@ -335,6 +335,8 @@ <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"क्षैतिज विभाजित करा"</string> <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"अनुलंब विभाजित करा"</string> <string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"सानुकूल विभाजित करा"</string> + <string-array name="recents_blacklist_array"> + </string-array> <string name="expanded_header_battery_charged" msgid="5945855970267657951">"चार्ज झाली"</string> <string name="expanded_header_battery_charging" msgid="205623198487189724">"चार्ज होत आहे"</string> <string name="expanded_header_battery_charging_with_time" msgid="457559884275395376">"<xliff:g id="CHARGING_TIME">%s</xliff:g> पूर्ण होईपर्यंत"</string> diff --git a/packages/SystemUI/res/values-ms-rMY/strings.xml b/packages/SystemUI/res/values-ms-rMY/strings.xml index a9a1ad0ba3c5..7c543a6daab0 100644 --- a/packages/SystemUI/res/values-ms-rMY/strings.xml +++ b/packages/SystemUI/res/values-ms-rMY/strings.xml @@ -335,6 +335,8 @@ <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Mendatar Terpisah"</string> <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Menegak Terpisah"</string> <string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Tersuai Terpisah"</string> + <string-array name="recents_blacklist_array"> + </string-array> <string name="expanded_header_battery_charged" msgid="5945855970267657951">"Sudah dicas"</string> <string name="expanded_header_battery_charging" msgid="205623198487189724">"Mengecas"</string> <string name="expanded_header_battery_charging_with_time" msgid="457559884275395376">"Lagi <xliff:g id="CHARGING_TIME">%s</xliff:g> untuk penuh"</string> diff --git a/packages/SystemUI/res/values-my-rMM/strings.xml b/packages/SystemUI/res/values-my-rMM/strings.xml index 0577b51e2b36..56a72494d235 100644 --- a/packages/SystemUI/res/values-my-rMM/strings.xml +++ b/packages/SystemUI/res/values-my-rMM/strings.xml @@ -335,6 +335,8 @@ <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"ရေပြင်ညီ ပိုင်းမည်"</string> <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"ဒေါင်လိုက်ပိုင်းမည်"</string> <string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"စိတ်ကြိုက် ပိုင်းမည်"</string> + <string-array name="recents_blacklist_array"> + </string-array> <string name="expanded_header_battery_charged" msgid="5945855970267657951">"အားသွင်းပြီး"</string> <string name="expanded_header_battery_charging" msgid="205623198487189724">"အားသွင်းနေ"</string> <string name="expanded_header_battery_charging_with_time" msgid="457559884275395376">"<xliff:g id="CHARGING_TIME">%s</xliff:g> ပြည်သည့် အထိ"</string> diff --git a/packages/SystemUI/res/values-nb/strings.xml b/packages/SystemUI/res/values-nb/strings.xml index ff1cd2c4e19d..3efdd3e13254 100644 --- a/packages/SystemUI/res/values-nb/strings.xml +++ b/packages/SystemUI/res/values-nb/strings.xml @@ -335,6 +335,8 @@ <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Del horisontalt"</string> <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Del vertikalt"</string> <string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Del tilpasset"</string> + <string-array name="recents_blacklist_array"> + </string-array> <string name="expanded_header_battery_charged" msgid="5945855970267657951">"Oppladet"</string> <string name="expanded_header_battery_charging" msgid="205623198487189724">"Lader"</string> <string name="expanded_header_battery_charging_with_time" msgid="457559884275395376">"Fulladet om <xliff:g id="CHARGING_TIME">%s</xliff:g>"</string> diff --git a/packages/SystemUI/res/values-ne-rNP/strings.xml b/packages/SystemUI/res/values-ne-rNP/strings.xml index 76908d914f2a..07d0795bcf16 100644 --- a/packages/SystemUI/res/values-ne-rNP/strings.xml +++ b/packages/SystemUI/res/values-ne-rNP/strings.xml @@ -335,6 +335,8 @@ <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"तेर्सो रूपमा विभाजन गर्नुहोस्"</string> <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"ठाडो रूपमा विभाजन गर्नुहोस्"</string> <string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"अनुकूलन विभाजन गर्नुहोस्"</string> + <string-array name="recents_blacklist_array"> + </string-array> <string name="expanded_header_battery_charged" msgid="5945855970267657951">"चार्ज भयो"</string> <string name="expanded_header_battery_charging" msgid="205623198487189724">"चार्ज हुँदै"</string> <string name="expanded_header_battery_charging_with_time" msgid="457559884275395376">"<xliff:g id="CHARGING_TIME">%s</xliff:g> पूर्ण नभएसम्म"</string> diff --git a/packages/SystemUI/res/values-nl/strings.xml b/packages/SystemUI/res/values-nl/strings.xml index c26b6a5d66a0..95092290b825 100644 --- a/packages/SystemUI/res/values-nl/strings.xml +++ b/packages/SystemUI/res/values-nl/strings.xml @@ -335,6 +335,8 @@ <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Horizontaal splitsen"</string> <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Verticaal splitsen"</string> <string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Aangepast splitsen"</string> + <string-array name="recents_blacklist_array"> + </string-array> <string name="expanded_header_battery_charged" msgid="5945855970267657951">"Opgeladen"</string> <string name="expanded_header_battery_charging" msgid="205623198487189724">"Opladen"</string> <string name="expanded_header_battery_charging_with_time" msgid="457559884275395376">"<xliff:g id="CHARGING_TIME">%s</xliff:g> tot volledig opgeladen"</string> diff --git a/packages/SystemUI/res/values-pa-rIN/strings.xml b/packages/SystemUI/res/values-pa-rIN/strings.xml index fdd5ae096785..17c126163bad 100644 --- a/packages/SystemUI/res/values-pa-rIN/strings.xml +++ b/packages/SystemUI/res/values-pa-rIN/strings.xml @@ -335,6 +335,8 @@ <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"ਹੌਰੀਜ਼ੌਂਟਲ ਸਪਲਿਟ"</string> <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"ਵਰਟੀਕਲ ਸਪਲਿਟ"</string> <string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"ਕਸਟਮ ਸਪਲਿਟ"</string> + <string-array name="recents_blacklist_array"> + </string-array> <string name="expanded_header_battery_charged" msgid="5945855970267657951">"ਚਾਰਜ ਹੋਇਆ"</string> <string name="expanded_header_battery_charging" msgid="205623198487189724">"ਚਾਰਜ ਕਰ ਰਿਹਾ ਹੈ"</string> <string name="expanded_header_battery_charging_with_time" msgid="457559884275395376">"<xliff:g id="CHARGING_TIME">%s</xliff:g> ਪੂਰਾ ਹੋਣ ਤੱਕ"</string> diff --git a/packages/SystemUI/res/values-pl/strings.xml b/packages/SystemUI/res/values-pl/strings.xml index 9892e797a96a..c86d26c31770 100644 --- a/packages/SystemUI/res/values-pl/strings.xml +++ b/packages/SystemUI/res/values-pl/strings.xml @@ -339,6 +339,8 @@ <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Podziel poziomo"</string> <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Podziel pionowo"</string> <string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Podziel niestandardowo"</string> + <string-array name="recents_blacklist_array"> + </string-array> <string name="expanded_header_battery_charged" msgid="5945855970267657951">"Naładowana"</string> <string name="expanded_header_battery_charging" msgid="205623198487189724">"Ładowanie"</string> <string name="expanded_header_battery_charging_with_time" msgid="457559884275395376">"<xliff:g id="CHARGING_TIME">%s</xliff:g> do pełnego naładowania"</string> diff --git a/packages/SystemUI/res/values-pt-rBR/strings.xml b/packages/SystemUI/res/values-pt-rBR/strings.xml index 153f8af4da89..199dbad15371 100644 --- a/packages/SystemUI/res/values-pt-rBR/strings.xml +++ b/packages/SystemUI/res/values-pt-rBR/strings.xml @@ -337,6 +337,8 @@ <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Divisão horizontal"</string> <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Divisão vertical"</string> <string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Divisão personalizada"</string> + <string-array name="recents_blacklist_array"> + </string-array> <string name="expanded_header_battery_charged" msgid="5945855970267657951">"Carregada"</string> <string name="expanded_header_battery_charging" msgid="205623198487189724">"Carregando"</string> <string name="expanded_header_battery_charging_with_time" msgid="457559884275395376">"<xliff:g id="CHARGING_TIME">%s</xliff:g> até concluir"</string> diff --git a/packages/SystemUI/res/values-pt-rPT/strings.xml b/packages/SystemUI/res/values-pt-rPT/strings.xml index e515c6e56467..d3d7f24903b6 100644 --- a/packages/SystemUI/res/values-pt-rPT/strings.xml +++ b/packages/SystemUI/res/values-pt-rPT/strings.xml @@ -335,6 +335,8 @@ <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Divisão horizontal"</string> <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Divisão vertical"</string> <string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Divisão personalizada"</string> + <string-array name="recents_blacklist_array"> + </string-array> <string name="expanded_header_battery_charged" msgid="5945855970267657951">"Carregada"</string> <string name="expanded_header_battery_charging" msgid="205623198487189724">"A carregar"</string> <string name="expanded_header_battery_charging_with_time" msgid="457559884275395376">"<xliff:g id="CHARGING_TIME">%s</xliff:g> até ficar completa"</string> diff --git a/packages/SystemUI/res/values-pt/strings.xml b/packages/SystemUI/res/values-pt/strings.xml index 153f8af4da89..199dbad15371 100644 --- a/packages/SystemUI/res/values-pt/strings.xml +++ b/packages/SystemUI/res/values-pt/strings.xml @@ -337,6 +337,8 @@ <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Divisão horizontal"</string> <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Divisão vertical"</string> <string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Divisão personalizada"</string> + <string-array name="recents_blacklist_array"> + </string-array> <string name="expanded_header_battery_charged" msgid="5945855970267657951">"Carregada"</string> <string name="expanded_header_battery_charging" msgid="205623198487189724">"Carregando"</string> <string name="expanded_header_battery_charging_with_time" msgid="457559884275395376">"<xliff:g id="CHARGING_TIME">%s</xliff:g> até concluir"</string> diff --git a/packages/SystemUI/res/values-ro/strings.xml b/packages/SystemUI/res/values-ro/strings.xml index e8157a4c22e6..f59721a8ed33 100644 --- a/packages/SystemUI/res/values-ro/strings.xml +++ b/packages/SystemUI/res/values-ro/strings.xml @@ -339,6 +339,8 @@ <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Divizare pe orizontală"</string> <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Divizare pe verticală"</string> <string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Divizare personalizată"</string> + <string-array name="recents_blacklist_array"> + </string-array> <string name="expanded_header_battery_charged" msgid="5945855970267657951">"Încărcată"</string> <string name="expanded_header_battery_charging" msgid="205623198487189724">"Se încarcă"</string> <string name="expanded_header_battery_charging_with_time" msgid="457559884275395376">"<xliff:g id="CHARGING_TIME">%s</xliff:g> până la încărcare completă"</string> diff --git a/packages/SystemUI/res/values-ru/strings.xml b/packages/SystemUI/res/values-ru/strings.xml index 89c11a37f5a2..bee7eedcfbf3 100644 --- a/packages/SystemUI/res/values-ru/strings.xml +++ b/packages/SystemUI/res/values-ru/strings.xml @@ -341,6 +341,8 @@ <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Разделить по горизонтали"</string> <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Разделить по вертикали"</string> <string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Разделить по-другому"</string> + <string-array name="recents_blacklist_array"> + </string-array> <string name="expanded_header_battery_charged" msgid="5945855970267657951">"Батарея заряжена"</string> <string name="expanded_header_battery_charging" msgid="205623198487189724">"Зарядка батареи"</string> <string name="expanded_header_battery_charging_with_time" msgid="457559884275395376">"<xliff:g id="CHARGING_TIME">%s</xliff:g> до полной зарядки"</string> diff --git a/packages/SystemUI/res/values-si-rLK/strings.xml b/packages/SystemUI/res/values-si-rLK/strings.xml index 256803f1f681..0811f5e77adb 100644 --- a/packages/SystemUI/res/values-si-rLK/strings.xml +++ b/packages/SystemUI/res/values-si-rLK/strings.xml @@ -335,6 +335,8 @@ <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"තිරස්ව වෙන් කරන්න"</string> <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"සිරස්ව වෙන් කරන්න"</string> <string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"අභිමත ලෙස වෙන් කරන්න"</string> + <string-array name="recents_blacklist_array"> + </string-array> <string name="expanded_header_battery_charged" msgid="5945855970267657951">"අරෝපිතයි"</string> <string name="expanded_header_battery_charging" msgid="205623198487189724">"ආරෝපණය වෙමින්"</string> <string name="expanded_header_battery_charging_with_time" msgid="457559884275395376">"<xliff:g id="CHARGING_TIME">%s</xliff:g> සම්පූර්ණ වන තෙක්"</string> diff --git a/packages/SystemUI/res/values-sk/strings.xml b/packages/SystemUI/res/values-sk/strings.xml index 5ef132d09344..304c9a06eb35 100644 --- a/packages/SystemUI/res/values-sk/strings.xml +++ b/packages/SystemUI/res/values-sk/strings.xml @@ -341,6 +341,8 @@ <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Rozdeliť vodorovné"</string> <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Rozdeliť zvislé"</string> <string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Rozdeliť vlastné"</string> + <string-array name="recents_blacklist_array"> + </string-array> <string name="expanded_header_battery_charged" msgid="5945855970267657951">"Nabitá"</string> <string name="expanded_header_battery_charging" msgid="205623198487189724">"Nabíja sa"</string> <string name="expanded_header_battery_charging_with_time" msgid="457559884275395376">"Úplné nabitie o <xliff:g id="CHARGING_TIME">%s</xliff:g>"</string> diff --git a/packages/SystemUI/res/values-sl/strings.xml b/packages/SystemUI/res/values-sl/strings.xml index 4f874324465d..a8bc3d1a5dc2 100644 --- a/packages/SystemUI/res/values-sl/strings.xml +++ b/packages/SystemUI/res/values-sl/strings.xml @@ -341,6 +341,8 @@ <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Razdeli vodoravno"</string> <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Razdeli navpično"</string> <string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Razdeli po meri"</string> + <string-array name="recents_blacklist_array"> + </string-array> <string name="expanded_header_battery_charged" msgid="5945855970267657951">"Akumulator napolnjen"</string> <string name="expanded_header_battery_charging" msgid="205623198487189724">"Polnjenje"</string> <string name="expanded_header_battery_charging_with_time" msgid="457559884275395376">"<xliff:g id="CHARGING_TIME">%s</xliff:g> do napolnjenosti"</string> diff --git a/packages/SystemUI/res/values-sq-rAL/strings.xml b/packages/SystemUI/res/values-sq-rAL/strings.xml index bf620ec74933..4bc29aa610dd 100644 --- a/packages/SystemUI/res/values-sq-rAL/strings.xml +++ b/packages/SystemUI/res/values-sq-rAL/strings.xml @@ -335,6 +335,8 @@ <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Ndaje horizontalisht"</string> <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Ndaj vertikalisht"</string> <string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Ndaj të personalizuarën"</string> + <string-array name="recents_blacklist_array"> + </string-array> <string name="expanded_header_battery_charged" msgid="5945855970267657951">"I ngarkuar"</string> <string name="expanded_header_battery_charging" msgid="205623198487189724">"Po ngarkohet"</string> <string name="expanded_header_battery_charging_with_time" msgid="457559884275395376">"<xliff:g id="CHARGING_TIME">%s</xliff:g> deri sa të mbushet"</string> diff --git a/packages/SystemUI/res/values-sr/strings.xml b/packages/SystemUI/res/values-sr/strings.xml index 2f7781122ba6..16ae7e2ec3aa 100644 --- a/packages/SystemUI/res/values-sr/strings.xml +++ b/packages/SystemUI/res/values-sr/strings.xml @@ -337,6 +337,8 @@ <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Подели хоризонтално"</string> <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Подели вертикално"</string> <string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Прилагођено дељење"</string> + <string-array name="recents_blacklist_array"> + </string-array> <string name="expanded_header_battery_charged" msgid="5945855970267657951">"Напуњена је"</string> <string name="expanded_header_battery_charging" msgid="205623198487189724">"Пуњење"</string> <string name="expanded_header_battery_charging_with_time" msgid="457559884275395376">"<xliff:g id="CHARGING_TIME">%s</xliff:g> док се не напуни"</string> diff --git a/packages/SystemUI/res/values-sv/strings.xml b/packages/SystemUI/res/values-sv/strings.xml index dfa02a423c1e..e6988d702137 100644 --- a/packages/SystemUI/res/values-sv/strings.xml +++ b/packages/SystemUI/res/values-sv/strings.xml @@ -335,6 +335,8 @@ <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Dela horisontellt"</string> <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Dela vertikalt"</string> <string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Dela anpassad"</string> + <string-array name="recents_blacklist_array"> + </string-array> <string name="expanded_header_battery_charged" msgid="5945855970267657951">"Laddat"</string> <string name="expanded_header_battery_charging" msgid="205623198487189724">"Laddar"</string> <string name="expanded_header_battery_charging_with_time" msgid="457559884275395376">"<xliff:g id="CHARGING_TIME">%s</xliff:g> tills batteriet är fulladdat"</string> diff --git a/packages/SystemUI/res/values-sw/strings.xml b/packages/SystemUI/res/values-sw/strings.xml index 2df876781ec0..50c668532adc 100644 --- a/packages/SystemUI/res/values-sw/strings.xml +++ b/packages/SystemUI/res/values-sw/strings.xml @@ -335,6 +335,8 @@ <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Gawanya Mlalo"</string> <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Gawanya Wima"</string> <string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Maalum Iliyogawanywa"</string> + <string-array name="recents_blacklist_array"> + </string-array> <string name="expanded_header_battery_charged" msgid="5945855970267657951">"Betri imejaa"</string> <string name="expanded_header_battery_charging" msgid="205623198487189724">"Inachaji"</string> <string name="expanded_header_battery_charging_with_time" msgid="457559884275395376">"Imebakisha <xliff:g id="CHARGING_TIME">%s</xliff:g> ijae"</string> diff --git a/packages/SystemUI/res/values-ta-rIN/strings.xml b/packages/SystemUI/res/values-ta-rIN/strings.xml index a9660a3d971b..f0cb53044a9f 100644 --- a/packages/SystemUI/res/values-ta-rIN/strings.xml +++ b/packages/SystemUI/res/values-ta-rIN/strings.xml @@ -335,6 +335,8 @@ <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"கிடைமட்டமாகப் பிரி"</string> <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"செங்குத்தாகப் பிரி"</string> <string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"தனிவிருப்பத்தில் பிரி"</string> + <string-array name="recents_blacklist_array"> + </string-array> <string name="expanded_header_battery_charged" msgid="5945855970267657951">"சார்ஜ் செய்யப்பட்டது"</string> <string name="expanded_header_battery_charging" msgid="205623198487189724">"சார்ஜாகிறது"</string> <string name="expanded_header_battery_charging_with_time" msgid="457559884275395376">"முழுவதும் சார்ஜாக <xliff:g id="CHARGING_TIME">%s</xliff:g> ஆகும்"</string> diff --git a/packages/SystemUI/res/values-te-rIN/strings.xml b/packages/SystemUI/res/values-te-rIN/strings.xml index 4c069e162f59..e50d47a1bf9d 100644 --- a/packages/SystemUI/res/values-te-rIN/strings.xml +++ b/packages/SystemUI/res/values-te-rIN/strings.xml @@ -335,6 +335,8 @@ <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"సమతలంగా విభజించు"</string> <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"లంబంగా విభజించు"</string> <string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"అనుకూలంగా విభజించు"</string> + <string-array name="recents_blacklist_array"> + </string-array> <string name="expanded_header_battery_charged" msgid="5945855970267657951">"ఛార్జ్ చేయబడింది"</string> <string name="expanded_header_battery_charging" msgid="205623198487189724">"ఛార్జ్ అవుతోంది"</string> <string name="expanded_header_battery_charging_with_time" msgid="457559884275395376">"పూర్తిగా నిండటానికి <xliff:g id="CHARGING_TIME">%s</xliff:g>"</string> diff --git a/packages/SystemUI/res/values-th/strings.xml b/packages/SystemUI/res/values-th/strings.xml index c9631caf4b63..a60371b49197 100644 --- a/packages/SystemUI/res/values-th/strings.xml +++ b/packages/SystemUI/res/values-th/strings.xml @@ -335,6 +335,8 @@ <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"แยกในแนวนอน"</string> <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"แยกในแนวตั้ง"</string> <string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"แยกแบบกำหนดเอง"</string> + <string-array name="recents_blacklist_array"> + </string-array> <string name="expanded_header_battery_charged" msgid="5945855970267657951">"ชาร์จแล้ว"</string> <string name="expanded_header_battery_charging" msgid="205623198487189724">"กำลังชาร์จ"</string> <string name="expanded_header_battery_charging_with_time" msgid="457559884275395376">"อีก <xliff:g id="CHARGING_TIME">%s</xliff:g> จึงจะเต็ม"</string> diff --git a/packages/SystemUI/res/values-tl/strings.xml b/packages/SystemUI/res/values-tl/strings.xml index 66d1d449679e..ed6830e87b87 100644 --- a/packages/SystemUI/res/values-tl/strings.xml +++ b/packages/SystemUI/res/values-tl/strings.xml @@ -335,6 +335,8 @@ <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Split Horizontal"</string> <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Split Vertical"</string> <string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Split Custom"</string> + <string-array name="recents_blacklist_array"> + </string-array> <string name="expanded_header_battery_charged" msgid="5945855970267657951">"Nasingil na"</string> <string name="expanded_header_battery_charging" msgid="205623198487189724">"Nagcha-charge"</string> <string name="expanded_header_battery_charging_with_time" msgid="457559884275395376">"<xliff:g id="CHARGING_TIME">%s</xliff:g> hanggang mapuno"</string> diff --git a/packages/SystemUI/res/values-tr/strings.xml b/packages/SystemUI/res/values-tr/strings.xml index 13fd288a90fe..8fae7975e51a 100644 --- a/packages/SystemUI/res/values-tr/strings.xml +++ b/packages/SystemUI/res/values-tr/strings.xml @@ -335,6 +335,8 @@ <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Yatay Ayırma"</string> <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Dikey Ayırma"</string> <string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Özel Ayırma"</string> + <string-array name="recents_blacklist_array"> + </string-array> <string name="expanded_header_battery_charged" msgid="5945855970267657951">"Ödeme alındı"</string> <string name="expanded_header_battery_charging" msgid="205623198487189724">"Şarj oluyor"</string> <string name="expanded_header_battery_charging_with_time" msgid="457559884275395376">"Tam şarj olmasına <xliff:g id="CHARGING_TIME">%s</xliff:g> kaldı"</string> diff --git a/packages/SystemUI/res/values-uk/strings.xml b/packages/SystemUI/res/values-uk/strings.xml index fc327631d58f..7eaf0dbad8c8 100644 --- a/packages/SystemUI/res/values-uk/strings.xml +++ b/packages/SystemUI/res/values-uk/strings.xml @@ -341,6 +341,8 @@ <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Розділити горизонтально"</string> <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Розділити вертикально"</string> <string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Розділити (власний варіант)"</string> + <string-array name="recents_blacklist_array"> + </string-array> <string name="expanded_header_battery_charged" msgid="5945855970267657951">"Заряджено"</string> <string name="expanded_header_battery_charging" msgid="205623198487189724">"Заряджається"</string> <string name="expanded_header_battery_charging_with_time" msgid="457559884275395376">"До повного зарядження <xliff:g id="CHARGING_TIME">%s</xliff:g>"</string> diff --git a/packages/SystemUI/res/values-ur-rPK/strings.xml b/packages/SystemUI/res/values-ur-rPK/strings.xml index abe67753e638..5c0ed1860a5f 100644 --- a/packages/SystemUI/res/values-ur-rPK/strings.xml +++ b/packages/SystemUI/res/values-ur-rPK/strings.xml @@ -335,6 +335,8 @@ <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"بلحاظ افقی الگ کریں"</string> <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"بلحاظ عمودی الگ کریں"</string> <string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"بلحاظ حسب ضرورت الگ کریں"</string> + <string-array name="recents_blacklist_array"> + </string-array> <string name="expanded_header_battery_charged" msgid="5945855970267657951">"چارج ہوگئی"</string> <string name="expanded_header_battery_charging" msgid="205623198487189724">"چارج ہو رہی ہے"</string> <string name="expanded_header_battery_charging_with_time" msgid="457559884275395376">"<xliff:g id="CHARGING_TIME">%s</xliff:g> مکمل ہونے تک"</string> diff --git a/packages/SystemUI/res/values-uz-rUZ/strings.xml b/packages/SystemUI/res/values-uz-rUZ/strings.xml index 50fa1ee28a9a..ac6194fecb0d 100644 --- a/packages/SystemUI/res/values-uz-rUZ/strings.xml +++ b/packages/SystemUI/res/values-uz-rUZ/strings.xml @@ -337,6 +337,8 @@ <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Gorizontal yo‘nalishda bo‘lish"</string> <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Vertikal yo‘nalishda bo‘lish"</string> <string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Boshqa usulda bo‘lish"</string> + <string-array name="recents_blacklist_array"> + </string-array> <string name="expanded_header_battery_charged" msgid="5945855970267657951">"Batareya quvvati to‘ldi"</string> <string name="expanded_header_battery_charging" msgid="205623198487189724">"Quvvat olmoqda"</string> <string name="expanded_header_battery_charging_with_time" msgid="457559884275395376">"<xliff:g id="CHARGING_TIME">%s</xliff:g>da to‘ladi"</string> diff --git a/packages/SystemUI/res/values-vi/strings.xml b/packages/SystemUI/res/values-vi/strings.xml index 2dfc7bbf672e..1eaa9a3f7bff 100644 --- a/packages/SystemUI/res/values-vi/strings.xml +++ b/packages/SystemUI/res/values-vi/strings.xml @@ -335,6 +335,8 @@ <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Phân tách ngang"</string> <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Phân tách dọc"</string> <string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Tùy chỉnh phân tách"</string> + <string-array name="recents_blacklist_array"> + </string-array> <string name="expanded_header_battery_charged" msgid="5945855970267657951">"Đã sạc đầy"</string> <string name="expanded_header_battery_charging" msgid="205623198487189724">"Đang sạc"</string> <string name="expanded_header_battery_charging_with_time" msgid="457559884275395376">"<xliff:g id="CHARGING_TIME">%s</xliff:g> cho đến khi đầy"</string> diff --git a/packages/SystemUI/res/values-zh-rCN/strings.xml b/packages/SystemUI/res/values-zh-rCN/strings.xml index 07e8264a71ea..2548c4b2f4ee 100644 --- a/packages/SystemUI/res/values-zh-rCN/strings.xml +++ b/packages/SystemUI/res/values-zh-rCN/strings.xml @@ -335,6 +335,8 @@ <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"水平分割"</string> <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"垂直分割"</string> <string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"自定义分割"</string> + <string-array name="recents_blacklist_array"> + </string-array> <string name="expanded_header_battery_charged" msgid="5945855970267657951">"已充满"</string> <string name="expanded_header_battery_charging" msgid="205623198487189724">"正在充电"</string> <string name="expanded_header_battery_charging_with_time" msgid="457559884275395376">"还需<xliff:g id="CHARGING_TIME">%s</xliff:g>充满"</string> diff --git a/packages/SystemUI/res/values-zh-rHK/strings.xml b/packages/SystemUI/res/values-zh-rHK/strings.xml index 08f723f4a9c8..c0172b1cf7ff 100644 --- a/packages/SystemUI/res/values-zh-rHK/strings.xml +++ b/packages/SystemUI/res/values-zh-rHK/strings.xml @@ -337,6 +337,8 @@ <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"水平分割"</string> <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"垂直分割"</string> <string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"自訂分割"</string> + <string-array name="recents_blacklist_array"> + </string-array> <string name="expanded_header_battery_charged" msgid="5945855970267657951">"已完成充電"</string> <string name="expanded_header_battery_charging" msgid="205623198487189724">"充電中"</string> <string name="expanded_header_battery_charging_with_time" msgid="457559884275395376">"<xliff:g id="CHARGING_TIME">%s</xliff:g>後完成充電"</string> diff --git a/packages/SystemUI/res/values-zh-rTW/strings.xml b/packages/SystemUI/res/values-zh-rTW/strings.xml index 9cb846eaef65..66c126404d21 100644 --- a/packages/SystemUI/res/values-zh-rTW/strings.xml +++ b/packages/SystemUI/res/values-zh-rTW/strings.xml @@ -335,6 +335,8 @@ <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"水平分割"</string> <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"垂直分割"</string> <string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"自訂分割"</string> + <string-array name="recents_blacklist_array"> + </string-array> <string name="expanded_header_battery_charged" msgid="5945855970267657951">"已充飽"</string> <string name="expanded_header_battery_charging" msgid="205623198487189724">"充電中"</string> <string name="expanded_header_battery_charging_with_time" msgid="457559884275395376">"<xliff:g id="CHARGING_TIME">%s</xliff:g>後充飽"</string> diff --git a/packages/SystemUI/res/values-zu/strings.xml b/packages/SystemUI/res/values-zu/strings.xml index 4892c1d16b72..49bf0bd0d502 100644 --- a/packages/SystemUI/res/values-zu/strings.xml +++ b/packages/SystemUI/res/values-zu/strings.xml @@ -335,6 +335,8 @@ <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Hlukanisa okuvundlile"</string> <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Hlukanisa okumile"</string> <string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Hlukanisa kwezifiso"</string> + <string-array name="recents_blacklist_array"> + </string-array> <string name="expanded_header_battery_charged" msgid="5945855970267657951">"Kushajiwe"</string> <string name="expanded_header_battery_charging" msgid="205623198487189724">"Iyashaja"</string> <string name="expanded_header_battery_charging_with_time" msgid="457559884275395376">"<xliff:g id="CHARGING_TIME">%s</xliff:g> ize igcwale"</string> diff --git a/packages/SystemUI/res/values/config.xml b/packages/SystemUI/res/values/config.xml index f48039ee7fe8..c2897cd77761 100644 --- a/packages/SystemUI/res/values/config.xml +++ b/packages/SystemUI/res/values/config.xml @@ -250,7 +250,7 @@ <integer name="doze_pulse_duration_in">900</integer> <!-- Doze: pulse parameter - how long does it take to fade in after a pickup? --> - <integer name="doze_pulse_duration_in_pickup">300</integer> + <integer name="doze_pulse_duration_in_pickup">130</integer> <!-- Doze: pulse parameter - once faded in, how long does it stay visible? --> <integer name="doze_pulse_duration_visible">3000</integer> diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml index a0cb61ab301e..6c48b25a93da 100644 --- a/packages/SystemUI/res/values/strings.xml +++ b/packages/SystemUI/res/values/strings.xml @@ -790,6 +790,10 @@ <!-- Recents: MultiStack add stack split custom radio button. [CHAR LIMIT=NONE] --> <string name="recents_multistack_add_stack_dialog_split_custom">Split Custom</string> + <!-- Fully qualified activity class names to be blacklisted in Recents, add package names into overlay as needed --> + <string-array name="recents_blacklist_array"> + </string-array> + <!-- Expanded Status Bar Header: Battery Charged [CHAR LIMIT=40] --> <string name="expanded_header_battery_charged">Charged</string> @@ -1625,6 +1629,9 @@ <!-- Accessibility label for the notification icons in the collapsed status bar. Not shown on screen [CHAR LIMIT=NONE] --> <string name="accessibility_desc_notification_icon"><xliff:g name="app_name" example="Gmail">%1$s</xliff:g> notification: <xliff:g name="notification_text" example="5 new messages">%2$s</xliff:g></string> + <!-- Label for button that reports a touch that was wrongly rejected by the lockscreen. For debugging only. [CHAR LIMIT=NONE] --> + <string name="report_rejected_touch" translatable="false">Report rejected touch</string> + <!-- Multi-Window strings --> <!-- Text that gets shown on top of current activity to inform the user that the system force-resized the current activity and that things might crash/not work properly [CHAR LIMIT=NONE] --> <string name="dock_forced_resizable">App may not work with split-screen.</string> diff --git a/packages/SystemUI/src/com/android/systemui/analytics/DataCollector.java b/packages/SystemUI/src/com/android/systemui/analytics/DataCollector.java index 91f652056326..b1f454e5e3d0 100644 --- a/packages/SystemUI/src/com/android/systemui/analytics/DataCollector.java +++ b/packages/SystemUI/src/com/android/systemui/analytics/DataCollector.java @@ -21,6 +21,7 @@ import android.database.ContentObserver; import android.hardware.Sensor; import android.hardware.SensorEvent; import android.hardware.SensorEventListener; +import android.net.Uri; import android.os.AsyncTask; import android.os.Build; import android.os.Handler; @@ -28,6 +29,7 @@ import android.os.UserHandle; import android.provider.Settings; import android.util.Log; import android.view.MotionEvent; +import android.widget.Toast; import java.io.File; import java.io.FileOutputStream; @@ -48,6 +50,8 @@ public class DataCollector implements SensorEventListener { private static final String TAG = "DataCollector"; private static final String COLLECTOR_ENABLE = "data_collector_enable"; private static final String COLLECT_BAD_TOUCHES = "data_collector_collect_bad_touches"; + private static final String ALLOW_REJECTED_TOUCH_REPORTS = + "data_collector_allow_rejected_touch_reports"; private static final long TIMEOUT_MILLIS = 11000; // 11 seconds. public static final boolean DEBUG = false; @@ -64,6 +68,7 @@ public class DataCollector implements SensorEventListener { private boolean mCollectBadTouches = false; private boolean mCornerSwiping = false; private boolean mTrackingStarted = false; + private boolean mAllowReportRejectedTouch = false; private static DataCollector sInstance = null; @@ -87,6 +92,11 @@ public class DataCollector implements SensorEventListener { mSettingsObserver, UserHandle.USER_ALL); + mContext.getContentResolver().registerContentObserver( + Settings.Secure.getUriFor(ALLOW_REJECTED_TOUCH_REPORTS), false, + mSettingsObserver, + UserHandle.USER_ALL); + updateConfiguration(); } @@ -104,10 +114,13 @@ public class DataCollector implements SensorEventListener { mCollectBadTouches = mEnableCollector && 0 != Settings.Secure.getInt( mContext.getContentResolver(), COLLECT_BAD_TOUCHES, 0); + mAllowReportRejectedTouch = Build.IS_DEBUGGABLE && 0 != Settings.Secure.getInt( + mContext.getContentResolver(), + ALLOW_REJECTED_TOUCH_REPORTS, 0); } private boolean sessionEntrypoint() { - if (mEnableCollector && mCurrentSession == null) { + if (isEnabled() && mCurrentSession == null) { onSessionStart(); return true; } @@ -115,7 +128,7 @@ public class DataCollector implements SensorEventListener { } private void sessionExitpoint(int result) { - if (mEnableCollector && mCurrentSession != null) { + if (mCurrentSession != null) { onSessionEnd(result); } } @@ -130,8 +143,36 @@ public class DataCollector implements SensorEventListener { SensorLoggerSession session = mCurrentSession; mCurrentSession = null; - session.end(System.currentTimeMillis(), result); - queueSession(session); + if (mEnableCollector) { + session.end(System.currentTimeMillis(), result); + queueSession(session); + } + } + + public Uri reportRejectedTouch() { + if (mCurrentSession == null) { + Toast.makeText(mContext, "Generating rejected touch report failed: session timed out.", + Toast.LENGTH_LONG).show(); + return null; + } + SensorLoggerSession currentSession = mCurrentSession; + + currentSession.setType(Session.REJECTED_TOUCH_REPORT); + currentSession.end(System.currentTimeMillis(), Session.SUCCESS); + Session proto = currentSession.toProto(); + + byte[] b = Session.toByteArray(proto); + File dir = new File(mContext.getExternalCacheDir(), "rejected_touch_reports"); + dir.mkdir(); + File touch = new File(dir, "rejected_touch_report_" + System.currentTimeMillis()); + + try { + new FileOutputStream(touch).write(b); + } catch (IOException e) { + throw new RuntimeException(e); + } + + return Uri.fromFile(touch); } private void queueSession(final SensorLoggerSession currentSession) { @@ -164,7 +205,7 @@ public class DataCollector implements SensorEventListener { @Override public synchronized void onSensorChanged(SensorEvent event) { - if (mEnableCollector && mCurrentSession != null) { + if (isEnabled() && mCurrentSession != null) { mCurrentSession.addSensorEvent(event, System.nanoTime()); enforceTimeout(); } @@ -186,7 +227,19 @@ public class DataCollector implements SensorEventListener { public void onAccuracyChanged(Sensor sensor, int accuracy) { } + /** + * @return true if data is being collected - either for data gathering or creating a + * rejected touch report. + */ public boolean isEnabled() { + return mEnableCollector || mAllowReportRejectedTouch; + } + + /** + * @return true if the full data set for data gathering should be collected - including + * extensive sensor data, which is is not normally included with rejected touch reports. + */ + public boolean isEnabledFull() { return mEnableCollector; } @@ -401,8 +454,12 @@ public class DataCollector implements SensorEventListener { } private void addEvent(int eventType) { - if (mEnableCollector && mCurrentSession != null) { + if (isEnabled() && mCurrentSession != null) { mCurrentSession.addPhoneEvent(eventType, System.nanoTime()); } } + + public boolean isReportingEnabled() { + return mAllowReportRejectedTouch; + } } diff --git a/packages/SystemUI/src/com/android/systemui/analytics/SensorLoggerSession.java b/packages/SystemUI/src/com/android/systemui/analytics/SensorLoggerSession.java index faaad2bf03bd..b39803a01783 100644 --- a/packages/SystemUI/src/com/android/systemui/analytics/SensorLoggerSession.java +++ b/packages/SystemUI/src/com/android/systemui/analytics/SensorLoggerSession.java @@ -53,6 +53,10 @@ public class SensorLoggerSession { mType = Session.REAL; } + public void setType(int type) { + mType = type; + } + public void end(long endTimestampMillis, int result) { mResult = result; mEndTimestampMillis = endTimestampMillis; diff --git a/packages/SystemUI/src/com/android/systemui/classifier/FalsingManager.java b/packages/SystemUI/src/com/android/systemui/classifier/FalsingManager.java index 1ac59925a70a..664e88676d9a 100644 --- a/packages/SystemUI/src/com/android/systemui/classifier/FalsingManager.java +++ b/packages/SystemUI/src/com/android/systemui/classifier/FalsingManager.java @@ -22,6 +22,7 @@ import android.hardware.Sensor; import android.hardware.SensorEvent; import android.hardware.SensorEventListener; import android.hardware.SensorManager; +import android.net.Uri; import android.os.Handler; import android.os.PowerManager; import android.os.UserHandle; @@ -142,7 +143,7 @@ public class FalsingManager implements SensorEventListener { if (mHumanInteractionClassifier.isEnabled()) { registerSensors(CLASSIFIER_SENSORS); } - if (mDataCollector.isEnabled()) { + if (mDataCollector.isEnabledFull()) { registerSensors(COLLECTOR_SENSORS); } } @@ -400,4 +401,15 @@ public class FalsingManager implements SensorEventListener { pw.print("mScreenOn="); pw.println(mScreenOn ? 1 : 0); pw.println(); } + + public Uri reportRejectedTouch() { + if (mDataCollector.isEnabled()) { + return mDataCollector.reportRejectedTouch(); + } + return null; + } + + public boolean isReportingEnabled() { + return mDataCollector.isReportingEnabled(); + } } diff --git a/packages/SystemUI/src/com/android/systemui/doze/DozeLog.java b/packages/SystemUI/src/com/android/systemui/doze/DozeLog.java index 9eb768c51851..7c8d0f64c11c 100644 --- a/packages/SystemUI/src/com/android/systemui/doze/DozeLog.java +++ b/packages/SystemUI/src/com/android/systemui/doze/DozeLog.java @@ -57,8 +57,9 @@ public class DozeLog { private static SummaryStats sEmergencyCallStats; private static SummaryStats[][] sProxStats; // [reason][near/far] - public static void tracePickupPulse(boolean withinVibrationThreshold) { + public static void tracePickupPulse(Context context, boolean withinVibrationThreshold) { if (!ENABLED) return; + init(context); log("pickupPulse withinVibrationThreshold=" + withinVibrationThreshold); (withinVibrationThreshold ? sPickupPulseNearVibrationStats : sPickupPulseNotNearVibrationStats).append(); @@ -76,8 +77,9 @@ public class DozeLog { log("pulseFinish"); } - public static void traceNotificationPulse(long instance) { + public static void traceNotificationPulse(Context context, long instance) { if (!ENABLED) return; + init(context); log("notificationPulse instance=" + instance); sNotificationPulseStats.append(); } @@ -153,9 +155,9 @@ public class DozeLog { public static void traceProximityResult(Context context, boolean near, long millis, int pulseReason) { if (!ENABLED) return; + init(context); log("proximityResult reason=" + pulseReasonToString(pulseReason) + " near=" + near + " millis=" + millis); - init(context); sProxStats[pulseReason][near ? 0 : 1].append(); } diff --git a/packages/SystemUI/src/com/android/systemui/doze/DozeService.java b/packages/SystemUI/src/com/android/systemui/doze/DozeService.java index 661b347608ed..fc0d8bb376d0 100644 --- a/packages/SystemUI/src/com/android/systemui/doze/DozeService.java +++ b/packages/SystemUI/src/com/android/systemui/doze/DozeService.java @@ -373,7 +373,7 @@ public class DozeService extends DreamService { if (DEBUG) Log.d(mTag, "mScheduleResetsRemaining = " + mScheduleResetsRemaining); mNotificationPulseTime = notificationTimeMs; if (pulseImmediately) { - DozeLog.traceNotificationPulse(0); + DozeLog.traceNotificationPulse(mContext, 0); requestPulse(DozeLog.PULSE_REASON_NOTIFICATION); } // schedule the rest of the pulses @@ -442,7 +442,7 @@ public class DozeService extends DreamService { if (NOTIFICATION_PULSE_ACTION.equals(intent.getAction())) { final long instance = intent.getLongExtra(EXTRA_INSTANCE, -1); if (DEBUG) Log.d(mTag, "Received notification pulse intent instance=" + instance); - DozeLog.traceNotificationPulse(instance); + DozeLog.traceNotificationPulse(mContext, instance); requestPulse(DozeLog.PULSE_REASON_NOTIFICATION); rescheduleNotificationPulse(mNotificationLightOn); } @@ -576,7 +576,7 @@ public class DozeService extends DreamService { resetNotificationResets(); } if (mSensor.getType() == Sensor.TYPE_PICK_UP_GESTURE) { - DozeLog.tracePickupPulse(withinVibrationThreshold); + DozeLog.tracePickupPulse(mContext, withinVibrationThreshold); } } finally { mWakeLock.release(); diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardService.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardService.java index b354a4cd60d5..84901ee67e71 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardService.java +++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardService.java @@ -98,9 +98,9 @@ public class KeyguardService extends Service { } @Override // Binder interface - public void dismiss() { + public void dismiss(boolean allowWhileOccluded) { checkPermission(); - mKeyguardViewMediator.dismiss(); + mKeyguardViewMediator.dismiss(allowWhileOccluded); } @Override // Binder interface diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java index cfa4661d7a06..a39c194bbda2 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java +++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java @@ -363,7 +363,7 @@ public class KeyguardViewMediator extends SystemUI { UserInfo info = UserManager.get(mContext).getUserInfo(userId); if (info != null && (info.isGuest() || info.isDemo())) { // If we just switched to a guest, try to dismiss keyguard. - dismiss(); + dismiss(false /* allowWhileOccluded */); } } } @@ -500,6 +500,17 @@ public class KeyguardViewMediator extends SystemUI { userId); } } + + @Override + public void onTrustChanged(int userId) { + if (userId == KeyguardUpdateMonitor.getCurrentUser()) { + synchronized (KeyguardViewMediator.this) { + notifyTrustedChangedLocked(mUpdateMonitor.getUserHasTrust(userId)); + } + } + } + + }; ViewMediatorCallback mViewMediatorCallback = new ViewMediatorCallback() { @@ -1253,15 +1264,16 @@ public class KeyguardViewMediator extends SystemUI { /** * Dismiss the keyguard through the security layers. + * @param allowWhileOccluded if true, dismiss the keyguard even if it's currently occluded. */ - public void handleDismiss() { - if (mShowing && !mOccluded) { + public void handleDismiss(boolean allowWhileOccluded) { + if (mShowing && (allowWhileOccluded || !mOccluded)) { mStatusBarKeyguardViewManager.dismiss(); } } - public void dismiss() { - mHandler.sendEmptyMessage(DISMISS); + public void dismiss(boolean allowWhileOccluded) { + mHandler.obtainMessage(DISMISS, allowWhileOccluded ? 1 : 0, 0).sendToTarget(); } /** @@ -1355,6 +1367,9 @@ public class KeyguardViewMediator extends SystemUI { */ public void setCurrentUser(int newUserId) { KeyguardUpdateMonitor.setCurrentUser(newUserId); + synchronized (this) { + notifyTrustedChangedLocked(mUpdateMonitor.getUserHasTrust(newUserId)); + } } private final BroadcastReceiver mBroadcastReceiver = new BroadcastReceiver() { @@ -1386,6 +1401,7 @@ public class KeyguardViewMediator extends SystemUI { public void keyguardDone(boolean authenticated) { Trace.beginSection("KeyguardViewMediator#keyguardDone"); if (DEBUG) Log.d(TAG, "keyguardDone(" + authenticated +")"); + userActivity(); EventLog.writeEvent(70000, 2); Message msg = mHandler.obtainMessage(KEYGUARD_DONE, authenticated ? 1 : 0); mHandler.sendMessage(msg); @@ -1462,7 +1478,7 @@ public class KeyguardViewMediator extends SystemUI { } break; case DISMISS: - handleDismiss(); + handleDismiss(msg.arg1 == 1 ? true : false /* allowWhileOccluded */); break; case START_KEYGUARD_EXIT_ANIM: Trace.beginSection("KeyguardViewMediator#handleMessage START_KEYGUARD_EXIT_ANIM"); @@ -1643,6 +1659,7 @@ public class KeyguardViewMediator extends SystemUI { @Override public void run() { Trace.beginSection("KeyguardViewMediator.mKeyGuardGoingAwayRunnable"); + if (DEBUG) Log.d(TAG, "keyguardGoingAway"); try { mStatusBarKeyguardViewManager.keyguardGoingAway(); @@ -1714,6 +1731,8 @@ public class KeyguardViewMediator extends SystemUI { private void handleStartKeyguardExitAnimation(long startTime, long fadeoutDuration) { Trace.beginSection("KeyguardViewMediator#handleStartKeyguardExitAnimation"); + if (DEBUG) Log.d(TAG, "handleStartKeyguardExitAnimation startTime=" + startTime + + " fadeoutDuration=" + fadeoutDuration); synchronized (KeyguardViewMediator.this) { if (!mHiding) { @@ -1728,6 +1747,7 @@ public class KeyguardViewMediator extends SystemUI { // this to our ViewRootImpl. mStatusBarKeyguardViewManager.getViewRootImpl().setReportNextDraw(); notifyDrawn(mDrawnCallback); + mDrawnCallback = null; } // only play "unlock" noises if not on a call (since the incall UI @@ -1736,6 +1756,7 @@ public class KeyguardViewMediator extends SystemUI { playSounds(false); } + mWakeAndUnlocking = false; setShowingLocked(false); mStatusBarKeyguardViewManager.hide(startTime, fadeoutDuration); resetKeyguardDonePendingLocked(); @@ -1862,6 +1883,7 @@ public class KeyguardViewMediator extends SystemUI { synchronized (this) { if (DEBUG) Log.d(TAG, "handleNotifyScreenTurnedOff"); mStatusBarKeyguardViewManager.onScreenTurnedOff(); + mDrawnCallback = null; mWakeAndUnlocking = false; } } @@ -1982,6 +2004,20 @@ public class KeyguardViewMediator extends SystemUI { } } + private void notifyTrustedChangedLocked(boolean trusted) { + int size = mKeyguardStateCallbacks.size(); + for (int i = size - 1; i >= 0; i--) { + try { + mKeyguardStateCallbacks.get(i).onTrustedChanged(trusted); + } catch (RemoteException e) { + Slog.w(TAG, "Failed to call notifyTrustedChangedLocked", e); + if (e instanceof DeadObjectException) { + mKeyguardStateCallbacks.remove(i); + } + } + } + } + public void addStateMonitorCallback(IKeyguardStateCallback callback) { synchronized (this) { mKeyguardStateCallbacks.add(callback); @@ -1989,8 +2025,10 @@ public class KeyguardViewMediator extends SystemUI { callback.onSimSecureStateChanged(mUpdateMonitor.isSimPinSecure()); callback.onShowingStateChanged(mShowing); callback.onInputRestrictedStateChanged(mInputRestricted); + callback.onTrustedChanged(mUpdateMonitor.getUserHasTrust( + KeyguardUpdateMonitor.getCurrentUser())); } catch (RemoteException e) { - Slog.w(TAG, "Failed to call onShowingStateChanged or onSimSecureStateChanged or onInputRestrictedStateChanged", e); + Slog.w(TAG, "Failed to call to IKeyguardStateCallback", e); } } } diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSPanel.java b/packages/SystemUI/src/com/android/systemui/qs/QSPanel.java index ad5c9c038f2f..385b8350cb45 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSPanel.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSPanel.java @@ -182,6 +182,7 @@ public class QSPanel extends LinearLayout implements Tunable, Callback { if (mCustomizePanel != null) { mCustomizePanel.setHost(mHost); } + mBrightnessController.setBackgroundLooper(host.getLooper()); } public QSTileHost getHost() { diff --git a/packages/SystemUI/src/com/android/systemui/qs/customize/TileAdapter.java b/packages/SystemUI/src/com/android/systemui/qs/customize/TileAdapter.java index 3a693cff7cc9..8d7f6ee72850 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/customize/TileAdapter.java +++ b/packages/SystemUI/src/com/android/systemui/qs/customize/TileAdapter.java @@ -297,6 +297,9 @@ public class TileAdapter extends RecyclerView.Adapter<Holder> implements TileSta mAccessibilityMoving = false; mTiles.remove(mEditIndex--); notifyItemRemoved(mEditIndex - 1); + // Don't remove items when the last position is selected. + if (position == mEditIndex) position--; + move(mAccessibilityFromIndex, position, v); notifyDataSetChanged(); } diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/NightDisplayTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/NightDisplayTile.java index 2d1f753898b7..9415b27f7570 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/NightDisplayTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/NightDisplayTile.java @@ -16,6 +16,7 @@ package com.android.systemui.qs.tiles; +import android.app.ActivityManager; import android.content.Intent; import android.provider.Settings; import android.widget.Switch; @@ -29,11 +30,12 @@ import com.android.systemui.qs.QSTile; public class NightDisplayTile extends QSTile<QSTile.BooleanState> implements NightDisplayController.Callback { - private final NightDisplayController mController; + private NightDisplayController mController; + private boolean mIsListening; public NightDisplayTile(Host host) { super(host); - mController = new NightDisplayController(mContext); + mController = new NightDisplayController(mContext, ActivityManager.getCurrentUser()); } @Override @@ -54,6 +56,22 @@ public class NightDisplayTile extends QSTile<QSTile.BooleanState> } @Override + protected void handleUserSwitch(int newUserId) { + // Stop listening to the old controller. + if (mIsListening) { + mController.setListener(null); + } + + // Make a new controller for the new user. + mController = new NightDisplayController(mContext, newUserId); + if (mIsListening) { + mController.setListener(this); + } + + super.handleUserSwitch(newUserId); + } + + @Override protected void handleUpdateState(BooleanState state, Object arg) { final boolean isActivated = mController.isActivated(); state.value = isActivated; @@ -79,6 +97,7 @@ public class NightDisplayTile extends QSTile<QSTile.BooleanState> @Override protected void setListening(boolean listening) { + mIsListening = listening; if (listening) { mController.setListener(this); refreshState(); diff --git a/packages/SystemUI/src/com/android/systemui/recents/RecentsActivityLaunchState.java b/packages/SystemUI/src/com/android/systemui/recents/RecentsActivityLaunchState.java index 71610534f1e6..914035bc525c 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/RecentsActivityLaunchState.java +++ b/packages/SystemUI/src/com/android/systemui/recents/RecentsActivityLaunchState.java @@ -29,6 +29,7 @@ public class RecentsActivityLaunchState { public boolean launchedWithAltTab; public boolean launchedFromApp; + public boolean launchedFromBlacklistedApp; public boolean launchedFromHome; public boolean launchedViaDragGesture; public boolean launchedViaDockGesture; @@ -39,6 +40,7 @@ public class RecentsActivityLaunchState { public void reset() { launchedFromHome = false; launchedFromApp = false; + launchedFromBlacklistedApp = false; launchedToTaskId = -1; launchedWithAltTab = false; launchedViaDragGesture = false; @@ -53,8 +55,14 @@ public class RecentsActivityLaunchState { RecentsActivityLaunchState launchState = Recents.getConfiguration().getLaunchState(); if (launchedFromApp) { if (!launchState.launchedWithAltTab && debugFlags.isFastToggleRecentsEnabled()) { - // If fast toggling, focus the front most task so that the next tap will focus the - // N-1 task + // If fast toggling, focus the front most task so that the next tap will launch the + // task + return numTasks - 1; + } + + if (launchState.launchedFromBlacklistedApp) { + // If we are launching from a blacklisted app, focus the front most task so that the + // next tap will launch the task return numTasks - 1; } @@ -67,7 +75,7 @@ public class RecentsActivityLaunchState { return -1; } - // If coming from home, focus the first task + // If coming from home, focus the front most task return numTasks - 1; } } diff --git a/packages/SystemUI/src/com/android/systemui/recents/RecentsImpl.java b/packages/SystemUI/src/com/android/systemui/recents/RecentsImpl.java index f9e59e7ccf99..2757fc4f5cc7 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/RecentsImpl.java +++ b/packages/SystemUI/src/com/android/systemui/recents/RecentsImpl.java @@ -807,15 +807,19 @@ public class RecentsImpl implements ActivityOptions.OnAnimationFinishedListener boolean isHomeStackVisible, boolean animate, int growTarget) { RecentsTaskLoader loader = Recents.getTaskLoader(); RecentsActivityLaunchState launchState = Recents.getConfiguration().getLaunchState(); + SystemServicesProxy ssp = Recents.getSystemServices(); + boolean isBlacklisted = (runningTask != null) + ? ssp.isBlackListedActivity(runningTask.baseActivity.getClassName()) + : false; - int runningTaskId = !mLaunchedWhileDocking && (runningTask != null) + int runningTaskId = !mLaunchedWhileDocking && !isBlacklisted && (runningTask != null) ? runningTask.id : -1; // In the case where alt-tab is triggered, we never get a preloadRecents() call, so we // should always preload the tasks now. If we are dragging in recents, reload them as // the stacks might have changed. - if (mLaunchedWhileDocking || mTriggeredFromAltTab ||sInstanceLoadPlan == null) { + if (mLaunchedWhileDocking || mTriggeredFromAltTab || sInstanceLoadPlan == null) { // Create a new load plan if preloadRecents() was never triggered sInstanceLoadPlan = loader.createLoadPlan(mContext); } @@ -825,11 +829,13 @@ public class RecentsImpl implements ActivityOptions.OnAnimationFinishedListener TaskStack stack = sInstanceLoadPlan.getTaskStack(); boolean hasRecentTasks = stack.getTaskCount() > 0; - boolean useThumbnailTransition = (runningTask != null) && !isHomeStackVisible && hasRecentTasks; + boolean useThumbnailTransition = (runningTask != null) && !isHomeStackVisible && + hasRecentTasks; // Update the launch state that we need in updateHeaderBarLayout() launchState.launchedFromHome = !useThumbnailTransition && !mLaunchedWhileDocking; launchState.launchedFromApp = useThumbnailTransition || mLaunchedWhileDocking; + launchState.launchedFromBlacklistedApp = launchState.launchedFromApp && isBlacklisted; launchState.launchedViaDockGesture = mLaunchedWhileDocking; launchState.launchedViaDragGesture = mDraggingInRecents; launchState.launchedToTaskId = runningTaskId; @@ -857,7 +863,9 @@ public class RecentsImpl implements ActivityOptions.OnAnimationFinishedListener } ActivityOptions opts; - if (useThumbnailTransition) { + if (isBlacklisted) { + opts = getUnknownTransitionActivityOptions(); + } else if (useThumbnailTransition) { // Try starting with a thumbnail transition opts = getThumbnailTransitionActivityOptions(runningTask, mDummyStackView, windowOverrideRect); diff --git a/packages/SystemUI/src/com/android/systemui/recents/misc/SystemServicesProxy.java b/packages/SystemUI/src/com/android/systemui/recents/misc/SystemServicesProxy.java index 37a4948ae8b0..b896f8a4d815 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/misc/SystemServicesProxy.java +++ b/packages/SystemUI/src/com/android/systemui/recents/misc/SystemServicesProxy.java @@ -243,6 +243,9 @@ public class SystemServicesProxy { if (uiModeManager.getCurrentModeType() == Configuration.UI_MODE_TYPE_TELEVISION) { Collections.addAll(sRecentsBlacklist, res.getStringArray(R.array.recents_tv_blacklist_array)); + } else { + Collections.addAll(sRecentsBlacklist, + res.getStringArray(R.array.recents_blacklist_array)); } } @@ -261,6 +264,13 @@ public class SystemServicesProxy { } /** + * @return whether the provided {@param className} is blacklisted + */ + public boolean isBlackListedActivity(String className) { + return sRecentsBlacklist.contains(className); + } + + /** * Returns a list of the recents tasks. * * @param includeFrontMostExcludedTask if set, will ensure that the front most excluded task diff --git a/packages/SystemUI/src/com/android/systemui/recents/model/RecentsTaskLoader.java b/packages/SystemUI/src/com/android/systemui/recents/model/RecentsTaskLoader.java index ca59831786b4..ba31e3e835c0 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/model/RecentsTaskLoader.java +++ b/packages/SystemUI/src/com/android/systemui/recents/model/RecentsTaskLoader.java @@ -200,6 +200,10 @@ class BackgroundTaskLoader implements Runnable { if (cachedThumbnailData.thumbnail == null) { cachedThumbnailData.thumbnail = mDefaultThumbnail; + } else { + // Kick off an early upload of the bitmap to GL so + // that this won't jank the first frame it's drawn in. + cachedThumbnailData.thumbnail.prepareToDraw(); } // When svelte, we trim the memory to just the visible thumbnails when 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 43d0cf6db854..41622083c792 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/views/RecentsView.java +++ b/packages/SystemUI/src/com/android/systemui/recents/views/RecentsView.java @@ -223,6 +223,13 @@ public class RecentsView extends FrameLayout { } /** + * Returns whether the nav bar is on the right. + */ + public boolean isNavBarOnRight() { + return mSystemInsets.right > 0; + } + + /** * Returns whether the last task launched was in the freeform stack or not. */ public boolean isLastTaskLaunchedFreeform() { diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/RecentsViewTouchHandler.java b/packages/SystemUI/src/com/android/systemui/recents/views/RecentsViewTouchHandler.java index c692a16ba2a5..55d9964f55c1 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/views/RecentsViewTouchHandler.java +++ b/packages/SystemUI/src/com/android/systemui/recents/views/RecentsViewTouchHandler.java @@ -45,10 +45,14 @@ import java.util.ArrayList; * Represents the dock regions for each orientation. */ class DockRegion { - public static TaskStack.DockState[] PHONE_LANDSCAPE = { - // We only allow docking to the left for now on small devices + // The phone landscape dock states correspond to the opposite end of the screen that the nav bar + // appears + public static TaskStack.DockState[] PHONE_LANDSCAPE_LEFT = { TaskStack.DockState.LEFT }; + public static TaskStack.DockState[] PHONE_LANDSCAPE_RIGHT = { + TaskStack.DockState.RIGHT + }; public static TaskStack.DockState[] PHONE_PORTRAIT = { // We only allow docking to the top for now on small devices TaskStack.DockState.TOP @@ -113,10 +117,17 @@ public class RecentsViewTouchHandler { boolean isLandscape = mRv.getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE; RecentsConfiguration config = Recents.getConfiguration(); - TaskStack.DockState[] dockStates = isLandscape ? - (config.isLargeScreen ? DockRegion.TABLET_LANDSCAPE : DockRegion.PHONE_LANDSCAPE) : - (config.isLargeScreen ? DockRegion.TABLET_PORTRAIT : DockRegion.PHONE_PORTRAIT); - return dockStates; + if (config.isLargeScreen) { + return isLandscape ? DockRegion.TABLET_LANDSCAPE : DockRegion.TABLET_PORTRAIT; + } else { + if (isLandscape) { + return mRv.isNavBarOnRight() + ? DockRegion.PHONE_LANDSCAPE_LEFT + : DockRegion.PHONE_LANDSCAPE_RIGHT; + } else { + return DockRegion.PHONE_PORTRAIT; + } + } } /** 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 89789bce6cf4..702b076d5aec 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackLayoutAlgorithm.java +++ b/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackLayoutAlgorithm.java @@ -556,7 +556,9 @@ public class TaskStackLayoutAlgorithm { Math.max(0, mUnfocusedRange.getAbsoluteX(maxBottomNormX))); boolean scrollToFront = launchState.launchedFromHome || launchState.launchedViaDockGesture; - if (launchState.launchedWithAltTab) { + if (launchState.launchedFromBlacklistedApp) { + mInitialScrollP = mMaxScrollP; + } else if (launchState.launchedWithAltTab) { mInitialScrollP = Utilities.clamp(launchTaskIndex, mMinScrollP, mMaxScrollP); } else if (scrollToFront) { mInitialScrollP = Utilities.clamp(launchTaskIndex, mMinScrollP, mMaxScrollP); @@ -579,6 +581,7 @@ public class TaskStackLayoutAlgorithm { mTaskIndexOverrideMap.clear(); boolean scrollToFront = launchState.launchedFromHome || + launchState.launchedFromBlacklistedApp || launchState.launchedViaDockGesture; if (getInitialFocusState() == STATE_UNFOCUSED && mNumStackTasks > 1) { if (ignoreScrollToFront || (!launchState.launchedWithAltTab && !scrollToFront)) { diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/TaskViewThumbnail.java b/packages/SystemUI/src/com/android/systemui/recents/views/TaskViewThumbnail.java index 319375950916..c46adf15861f 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/views/TaskViewThumbnail.java +++ b/packages/SystemUI/src/com/android/systemui/recents/views/TaskViewThumbnail.java @@ -164,6 +164,7 @@ public class TaskViewThumbnail extends View { /** Sets the thumbnail to a given bitmap. */ void setThumbnail(Bitmap bm, ActivityManager.TaskThumbnailInfo thumbnailInfo) { if (bm != null) { + bm.prepareToDraw(); mBitmapShader = new BitmapShader(bm, Shader.TileMode.CLAMP, Shader.TileMode.CLAMP); mDrawPaint.setShader(mBitmapShader); mThumbnailRect.set(0, 0, bm.getWidth(), bm.getHeight()); diff --git a/packages/SystemUI/src/com/android/systemui/settings/BrightnessController.java b/packages/SystemUI/src/com/android/systemui/settings/BrightnessController.java index d5131beb0153..1c6fffb6dde7 100644 --- a/packages/SystemUI/src/com/android/systemui/settings/BrightnessController.java +++ b/packages/SystemUI/src/com/android/systemui/settings/BrightnessController.java @@ -23,6 +23,8 @@ import android.net.Uri; import android.os.AsyncTask; import android.os.Handler; import android.os.IPowerManager; +import android.os.Looper; +import android.os.Message; import android.os.PowerManager; import android.os.RemoteException; import android.os.ServiceManager; @@ -45,6 +47,12 @@ public class BrightnessController implements ToggleSlider.Listener { */ private static final float BRIGHTNESS_ADJ_RESOLUTION = 2048; + private static final int MSG_UPDATE_ICON = 0; + private static final int MSG_UPDATE_SLIDER = 1; + private static final int MSG_SET_CHECKED = 2; + private static final int MSG_ATTACH_LISTENER = 3; + private static final int MSG_DETACH_LISTENER = 4; + private final int mMinimumBacklight; private final int mMaximumBacklight; @@ -54,13 +62,14 @@ public class BrightnessController implements ToggleSlider.Listener { private final boolean mAutomaticAvailable; private final IPowerManager mPower; private final CurrentUserTracker mUserTracker; - private final Handler mHandler; + + private Handler mBackgroundHandler; private final BrightnessObserver mBrightnessObserver; private ArrayList<BrightnessStateChangeCallback> mChangeCallbacks = new ArrayList<BrightnessStateChangeCallback>(); - private boolean mAutomatic; + private volatile boolean mAutomatic; private boolean mListening; private boolean mExternalChange; @@ -90,24 +99,20 @@ public class BrightnessController implements ToggleSlider.Listener { @Override public void onChange(boolean selfChange, Uri uri) { if (selfChange) return; - try { - mExternalChange = true; - if (BRIGHTNESS_MODE_URI.equals(uri)) { - updateMode(); - updateSlider(); - } else if (BRIGHTNESS_URI.equals(uri) && !mAutomatic) { - updateSlider(); - } else if (BRIGHTNESS_ADJ_URI.equals(uri) && mAutomatic) { - updateSlider(); - } else { - updateMode(); - updateSlider(); - } - for (BrightnessStateChangeCallback cb : mChangeCallbacks) { - cb.onBrightnessLevelChanged(); - } - } finally { - mExternalChange = false; + + if (BRIGHTNESS_MODE_URI.equals(uri)) { + mBackgroundHandler.post(mUpdateModeRunnable); + mBackgroundHandler.post(mUpdateSliderRunnable); + } else if (BRIGHTNESS_URI.equals(uri) && !mAutomatic) { + mBackgroundHandler.post(mUpdateSliderRunnable); + } else if (BRIGHTNESS_ADJ_URI.equals(uri) && mAutomatic) { + mBackgroundHandler.post(mUpdateSliderRunnable); + } else { + mBackgroundHandler.post(mUpdateModeRunnable); + mBackgroundHandler.post(mUpdateSliderRunnable); + } + for (BrightnessStateChangeCallback cb : mChangeCallbacks) { + cb.onBrightnessLevelChanged(); } } @@ -132,16 +137,117 @@ public class BrightnessController implements ToggleSlider.Listener { } + private final Runnable mStartListeningRunnable = new Runnable() { + @Override + public void run() { + mBrightnessObserver.startObserving(); + mUserTracker.startTracking(); + + // Update the slider and mode before attaching the listener so we don't + // receive the onChanged notifications for the initial values. + mUpdateModeRunnable.run(); + mUpdateSliderRunnable.run(); + + mHandler.sendEmptyMessage(MSG_ATTACH_LISTENER); + } + }; + + private final Runnable mStopListeningRunnable = new Runnable() { + @Override + public void run() { + mBrightnessObserver.stopObserving(); + mUserTracker.stopTracking(); + + mHandler.sendEmptyMessage(MSG_DETACH_LISTENER); + } + }; + + /** + * Fetch the brightness mode from the system settings and update the icon. Should be called from + * background thread. + */ + private final Runnable mUpdateModeRunnable = new Runnable() { + @Override + public void run() { + if (mAutomaticAvailable) { + int automatic; + automatic = Settings.System.getIntForUser(mContext.getContentResolver(), + Settings.System.SCREEN_BRIGHTNESS_MODE, + Settings.System.SCREEN_BRIGHTNESS_MODE_MANUAL, + UserHandle.USER_CURRENT); + mAutomatic = automatic != Settings.System.SCREEN_BRIGHTNESS_MODE_MANUAL; + mHandler.obtainMessage(MSG_UPDATE_ICON, mAutomatic ? 1 : 0).sendToTarget(); + } else { + mHandler.obtainMessage(MSG_SET_CHECKED, 0).sendToTarget(); + mHandler.obtainMessage(MSG_UPDATE_ICON, 0 /* automatic */).sendToTarget(); + } + } + }; + + /** + * Fetch the brightness from the system settings and update the slider. Should be called from + * background thread. + */ + private final Runnable mUpdateSliderRunnable = new Runnable() { + @Override + public void run() { + if (mAutomatic) { + float value = Settings.System.getFloatForUser(mContext.getContentResolver(), + Settings.System.SCREEN_AUTO_BRIGHTNESS_ADJ, 0, + UserHandle.USER_CURRENT); + mHandler.obtainMessage(MSG_UPDATE_SLIDER, (int) BRIGHTNESS_ADJ_RESOLUTION, + (int) ((value + 1) * BRIGHTNESS_ADJ_RESOLUTION / 2f)).sendToTarget(); + } else { + int value; + value = Settings.System.getIntForUser(mContext.getContentResolver(), + Settings.System.SCREEN_BRIGHTNESS, mMaximumBacklight, + UserHandle.USER_CURRENT); + mHandler.obtainMessage(MSG_UPDATE_SLIDER, mMaximumBacklight - mMinimumBacklight, + value - mMinimumBacklight).sendToTarget(); + } + } + }; + + private final Handler mHandler = new Handler() { + @Override + public void handleMessage(Message msg) { + mExternalChange = true; + try { + switch (msg.what) { + case MSG_UPDATE_ICON: + updateIcon(msg.arg1 != 0); + break; + case MSG_UPDATE_SLIDER: + mControl.setMax(msg.arg1); + mControl.setValue(msg.arg2); + break; + case MSG_SET_CHECKED: + mControl.setChecked(msg.arg1 != 0); + break; + case MSG_ATTACH_LISTENER: + mControl.setOnChangedListener(BrightnessController.this); + break; + case MSG_DETACH_LISTENER: + mControl.setOnChangedListener(null); + default: + super.handleMessage(msg); + } + } finally { + mExternalChange = false; + } + } + }; + public BrightnessController(Context context, ImageView icon, ToggleSlider control) { mContext = context; mIcon = icon; mControl = control; - mHandler = new Handler(); + mBackgroundHandler = new Handler(Looper.getMainLooper()); mUserTracker = new CurrentUserTracker(mContext) { @Override public void onUserSwitched(int newUserId) { - updateMode(); - updateSlider(); + mBackgroundHandler.post(mUpdateModeRunnable); + mBackgroundHandler.post(mUpdateSliderRunnable); } }; mBrightnessObserver = new BrightnessObserver(mHandler); @@ -155,6 +261,10 @@ public class BrightnessController implements ToggleSlider.Listener { mPower = IPowerManager.Stub.asInterface(ServiceManager.getService("power")); } + public void setBackgroundLooper(Looper backgroundLooper) { + mBackgroundHandler = new Handler(backgroundLooper); + } + public void addStateChangedCallback(BrightnessStateChangeCallback cb) { mChangeCallbacks.add(cb); } @@ -173,15 +283,7 @@ public class BrightnessController implements ToggleSlider.Listener { return; } - mBrightnessObserver.startObserving(); - mUserTracker.startTracking(); - - // Update the slider and mode before attaching the listener so we don't - // receive the onChanged notifications for the initial values. - updateMode(); - updateSlider(); - - mControl.setOnChangedListener(this); + mBackgroundHandler.post(mStartListeningRunnable); mListening = true; } @@ -191,9 +293,7 @@ public class BrightnessController implements ToggleSlider.Listener { return; } - mBrightnessObserver.stopObserving(); - mUserTracker.stopTracking(); - mControl.setOnChangedListener(null); + mBackgroundHandler.post(mStopListeningRunnable); mListening = false; } @@ -267,39 +367,4 @@ public class BrightnessController implements ToggleSlider.Listener { com.android.systemui.R.drawable.ic_qs_brightness_auto_off); } } - - /** Fetch the brightness mode from the system settings and update the icon */ - private void updateMode() { - if (mAutomaticAvailable) { - int automatic; - automatic = Settings.System.getIntForUser(mContext.getContentResolver(), - Settings.System.SCREEN_BRIGHTNESS_MODE, - Settings.System.SCREEN_BRIGHTNESS_MODE_MANUAL, - UserHandle.USER_CURRENT); - mAutomatic = automatic != Settings.System.SCREEN_BRIGHTNESS_MODE_MANUAL; - updateIcon(mAutomatic); - } else { - mControl.setChecked(false); - updateIcon(false /*automatic*/); - } - } - - /** Fetch the brightness from the system settings and update the slider */ - private void updateSlider() { - if (mAutomatic) { - float value = Settings.System.getFloatForUser(mContext.getContentResolver(), - Settings.System.SCREEN_AUTO_BRIGHTNESS_ADJ, 0, - UserHandle.USER_CURRENT); - mControl.setMax((int) BRIGHTNESS_ADJ_RESOLUTION); - mControl.setValue((int) ((value + 1) * BRIGHTNESS_ADJ_RESOLUTION / 2f)); - } else { - int value; - value = Settings.System.getIntForUser(mContext.getContentResolver(), - Settings.System.SCREEN_BRIGHTNESS, mMaximumBacklight, - UserHandle.USER_CURRENT); - mControl.setMax(mMaximumBacklight - mMinimumBacklight); - mControl.setValue(value - mMinimumBacklight); - } - } - } diff --git a/packages/SystemUI/src/com/android/systemui/stackdivider/DividerView.java b/packages/SystemUI/src/com/android/systemui/stackdivider/DividerView.java index 998f50f205d7..cb77d7b29c9f 100644 --- a/packages/SystemUI/src/com/android/systemui/stackdivider/DividerView.java +++ b/packages/SystemUI/src/com/android/systemui/stackdivider/DividerView.java @@ -31,6 +31,7 @@ import android.graphics.Region.Op; import android.hardware.display.DisplayManager; import android.os.Bundle; import android.os.Handler; +import android.os.Message; import android.util.AttributeSet; import android.view.Display; import android.view.DisplayInfo; @@ -106,6 +107,11 @@ public class DividerView extends FrameLayout implements OnTouchListener, private static final Interpolator IME_ADJUST_INTERPOLATOR = new PathInterpolator(0.2f, 0f, 0.1f, 1f); + private static final long ONE_MS_IN_NS = 1000000; + private static final long ONE_S_IN_NS = ONE_MS_IN_NS * 1000; + + private static final int MSG_RESIZE_STACK = 0; + private DividerHandleView mHandle; private View mBackground; private MinimizedDockShadow mMinimizedShadow; @@ -150,7 +156,25 @@ public class DividerView extends FrameLayout implements OnTouchListener, private boolean mDockedStackMinimized; private boolean mAdjustedForIme; private DividerState mState; - private final Handler mHandler = new Handler(); + + /** + * The offset between vsync-app and vsync-surfaceflinger. See + * {@link #calculateAppSurfaceFlingerVsyncOffsetMs} why this is necessary. + */ + private long mSurfaceFlingerOffsetMs; + + private final Handler mHandler = new Handler() { + @Override + public void handleMessage(Message msg) { + switch (msg.what) { + case MSG_RESIZE_STACK: + resizeStack(msg.arg1, msg.arg2, (SnapTarget) msg.obj); + break; + default: + super.handleMessage(msg); + } + } + }; private final AccessibilityDelegate mHandleDelegate = new AccessibilityDelegate() { @Override @@ -290,6 +314,7 @@ public class DividerView extends FrameLayout implements OnTouchListener, protected void onAttachedToWindow() { super.onAttachedToWindow(); EventBus.getDefault().register(this); + mSurfaceFlingerOffsetMs = calculateAppSurfaceFlingerVsyncOffsetMs(); } @Override @@ -298,6 +323,25 @@ public class DividerView extends FrameLayout implements OnTouchListener, EventBus.getDefault().unregister(this); } + /** + * This method calculates the offset between vsync-surfaceflinger and vsync-app. If vsync-app + * is a couple of milliseconds before vsync-sf, a touch or animation event that causes the + * stacks to be resized are sometimes processed before the vsync-sf tick, and sometimes after, + * which leads to jank. Figure out this difference here and then post all the touch/animation + * events to start being processed at vsync-sf. + * + * @return The offset between vsync-app and vsync-sf, or 0 if vsync app happens after vsync-sf. + */ + private long calculateAppSurfaceFlingerVsyncOffsetMs() { + Display display = getDisplay(); + + // Calculate vsync offset from SurfaceFlinger. + // See frameworks/native/services/surfaceflinger/SurfaceFlinger.cpp:getDisplayConfigs + long vsyncPeriod = (long) (ONE_S_IN_NS / display.getRefreshRate()); + long sfVsyncOffset = vsyncPeriod - (display.getPresentationDeadlineNanos() - ONE_MS_IN_NS); + return Math.max(0, (sfVsyncOffset - display.getAppVsyncOffsetNanos()) / ONE_MS_IN_NS); + } + @Override public WindowInsets onApplyWindowInsets(WindowInsets insets) { if (mStableInsets.left != insets.getStableInsetLeft() @@ -453,7 +497,7 @@ public class DividerView extends FrameLayout implements OnTouchListener, if (mMoving && mDockSide != WindowManager.DOCKED_INVALID) { SnapTarget snapTarget = mSnapAlgorithm.calculateSnapTarget( mStartPosition, 0 /* velocity */, false /* hardDismiss */); - resizeStack(calculatePosition(x, y), mStartPosition, snapTarget); + resizeStackDelayed(calculatePosition(x, y), mStartPosition, snapTarget); } break; case MotionEvent.ACTION_UP: @@ -532,10 +576,11 @@ public class DividerView extends FrameLayout implements OnTouchListener, final long endDelay) { final boolean taskPositionSameAtEnd = snapTarget.flag == SnapTarget.FLAG_NONE; ValueAnimator anim = ValueAnimator.ofInt(position, snapTarget.position); - anim.addUpdateListener(animation -> resizeStack((Integer) animation.getAnimatedValue(), + anim.addUpdateListener(animation -> resizeStackDelayed((int) animation.getAnimatedValue(), taskPositionSameAtEnd && animation.getAnimatedFraction() == 1f ? TASK_POSITION_SAME - : snapTarget.taskPosition, snapTarget)); + : snapTarget.taskPosition, + snapTarget)); Runnable endAction = () -> { commitSnapFlags(snapTarget); mWindowManagerProxy.setResizing(false); @@ -551,15 +596,24 @@ public class DividerView extends FrameLayout implements OnTouchListener, @Override public void onAnimationCancel(Animator animation) { + mHandler.removeMessages(MSG_RESIZE_STACK); mCancelled = true; } @Override public void onAnimationEnd(Animator animation) { - if (endDelay == 0 || mCancelled) { + long delay = 0; + if (endDelay != 0) { + delay = endDelay; + } else if (mCancelled) { + delay = 0; + } else if (mSurfaceFlingerOffsetMs != 0) { + delay = mSurfaceFlingerOffsetMs; + } + if (delay == 0) { endAction.run(); } else { - mHandler.postDelayed(endAction, endDelay); + mHandler.postDelayed(endAction, delay); } } }); @@ -793,6 +847,17 @@ public class DividerView extends FrameLayout implements OnTouchListener, mDisplayHeight, mDividerSize); } + public void resizeStackDelayed(int position, int taskPosition, SnapTarget taskSnapTarget) { + if (mSurfaceFlingerOffsetMs != 0) { + Message message = mHandler.obtainMessage(MSG_RESIZE_STACK, position, taskPosition, + taskSnapTarget); + message.setAsynchronous(true); + mHandler.sendMessageDelayed(message, mSurfaceFlingerOffsetMs); + } else { + resizeStack(position, taskPosition, taskSnapTarget); + } + } + public void resizeStack(int position, int taskPosition, SnapTarget taskSnapTarget) { calculateBoundsForPosition(position, mDockSide, mDockedRect); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java index 628cfd52d210..c575417e873e 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java @@ -961,7 +961,6 @@ public abstract class BaseStatusBar extends SystemUI implements mNotificationGutsExposed = entry.row.getGuts(); bindGuts(entry.row); } - entry.cacheContentViews(mContext, null /* updatedNotification */); inflateViews(entry, mStackScroller); } } @@ -1585,7 +1584,12 @@ public abstract class BaseStatusBar extends SystemUI implements entry.notification.getUser().getIdentifier()); final StatusBarNotification sbn = entry.notification; - entry.cacheContentViews(mContext, null); + try { + entry.cacheContentViews(mContext, null); + } catch (RuntimeException e) { + Log.e(TAG, "Unable to get notification remote views", e); + return false; + } final RemoteViews contentView = entry.cachedContentView; final RemoteViews bigContentView = entry.cachedBigContentView; @@ -2354,7 +2358,13 @@ public abstract class BaseStatusBar extends SystemUI implements Notification n = notification.getNotification(); mNotificationData.updateRanking(ranking); - boolean applyInPlace = entry.cacheContentViews(mContext, notification.getNotification()); + boolean applyInPlace; + try { + applyInPlace = entry.cacheContentViews(mContext, notification.getNotification()); + } catch (RuntimeException e) { + Log.e(TAG, "Unable to get notification remote views", e); + applyInPlace = false; + } boolean shouldPeek = shouldPeek(entry, notification); boolean alertAgain = alertAgain(entry, n); if (DEBUG) { @@ -2406,7 +2416,10 @@ public abstract class BaseStatusBar extends SystemUI implements StatusBarIconView.contentDescForNotification(mContext, n)); entry.icon.setNotification(n); entry.icon.set(ic); - inflateViews(entry, mStackScroller); + if (!inflateViews(entry, mStackScroller)) { + handleNotificationError(notification, "Couldn't update remote views for: " + + notification); + } } updateHeadsUp(key, entry, shouldPeek, alertAgain); updateNotifications(); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationData.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationData.java index 6570221bc26a..05a9fc762595 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationData.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationData.java @@ -34,7 +34,6 @@ import java.io.PrintWriter; import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; -import java.util.Map; import java.util.Objects; /** @@ -343,7 +342,6 @@ public class NotificationData { entry.notification.setOverrideGroupKey(overrideGroupKey); mGroupManager.onEntryUpdated(entry, oldSbn); } - //mGroupManager.onEntryBundlingUpdated(entry, getOverrideGroupKey(entry.key)); } } } 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 a98601a33300..048c4bd4a770 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java @@ -16,6 +16,9 @@ package com.android.systemui.statusbar.phone; +import static android.view.accessibility.AccessibilityNodeInfo.ACTION_CLICK; +import static android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction; + import android.app.ActivityManager; import android.app.ActivityManagerNative; import android.app.ActivityOptions; @@ -65,9 +68,6 @@ import com.android.systemui.statusbar.policy.AccessibilityController; import com.android.systemui.statusbar.policy.FlashlightController; import com.android.systemui.statusbar.policy.PreviewInflater; -import static android.view.accessibility.AccessibilityNodeInfo.ACTION_CLICK; -import static android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction; - /** * Implementation for the bottom area of the Keyguard, including camera/phone affordance and status * text. @@ -403,7 +403,7 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL public void bindCameraPrewarmService() { Intent intent = getCameraIntent(); ActivityInfo targetInfo = PreviewInflater.getTargetActivityInfo(mContext, intent, - KeyguardUpdateMonitor.getCurrentUser()); + KeyguardUpdateMonitor.getCurrentUser(), true /* onlyDirectBootAware */); if (targetInfo != null && targetInfo.metaData != null) { String clazz = targetInfo.metaData.getString( MediaStore.META_DATA_STILL_IMAGE_CAMERA_PREWARM_SERVICE); @@ -590,10 +590,16 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL } private void inflateCameraPreview() { + View previewBefore = mCameraPreview; + boolean visibleBefore = false; + if (previewBefore != null) { + mPreviewContainer.removeView(previewBefore); + visibleBefore = previewBefore.getVisibility() == View.VISIBLE; + } mCameraPreview = mPreviewInflater.inflatePreview(getCameraIntent()); if (mCameraPreview != null) { mPreviewContainer.addView(mCameraPreview); - mCameraPreview.setVisibility(View.INVISIBLE); + mCameraPreview.setVisibility(visibleBefore ? View.VISIBLE : View.INVISIBLE); } } @@ -712,4 +718,9 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL updateLeftAffordanceIcon(); updateLeftPreview(); } + + public void onKeyguardShowingChanged() { + updateLeftAffordance(); + inflateCameraPreview(); + } } 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 0f4d9ed278c7..51ff29e10964 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java @@ -65,6 +65,7 @@ public class NavigationBarView extends LinearLayout { boolean mVertical; boolean mScreenOn; + private int mCurrentRotation = -1; boolean mShowMenu; int mDisabledFlags = 0; @@ -526,6 +527,10 @@ public class NavigationBarView extends LinearLayout { updateCurrentView(); } + public boolean needsReorient() { + return mCurrentRotation != mDisplay.getRotation(); + } + private void updateCurrentView() { final int rot = mDisplay.getRotation(); for (int i=0; i<4; i++) { @@ -538,6 +543,7 @@ public class NavigationBarView extends LinearLayout { mButtonDisatchers.valueAt(i).setCurrentView(mCurrentView); } updateLayoutTransitionsEnabled(); + mCurrentRotation = rot; } private void updateRecentsIcon() { @@ -620,11 +626,12 @@ public class NavigationBarView extends LinearLayout { if (mCarMode && uiMode != Configuration.UI_MODE_TYPE_CAR) { mCarMode = false; uiCarModeChanged = true; + getHomeButton().setCarMode(mCarMode); } else if (uiMode == Configuration.UI_MODE_TYPE_CAR) { mCarMode = true; uiCarModeChanged = true; + getHomeButton().setCarMode(mCarMode); } - getHomeButton().setCarMode(mCarMode); } return uiCarModeChanged; } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationGroupManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationGroupManager.java index 204ab7e3aa80..1755cc68bee2 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationGroupManager.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationGroupManager.java @@ -31,7 +31,6 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; import java.util.Map; -import java.util.Objects; /** * A class to handle notifications and their corresponding groups. @@ -43,6 +42,7 @@ public class NotificationGroupManager implements HeadsUpManager.OnHeadsUpChanged private int mBarState = -1; private HashMap<String, StatusBarNotification> mIsolatedEntries = new HashMap<>(); private HeadsUpManager mHeadsUpManager; + private boolean mUpdatingSuppressionBlocked; public void setOnGroupChangeListener(OnGroupChangeListener listener) { mListener = listener; @@ -140,17 +140,8 @@ public class NotificationGroupManager implements HeadsUpManager.OnHeadsUpChanged } } - public void onEntryBundlingUpdated(final NotificationData.Entry updated, - final String overrideGroupKey) { - final StatusBarNotification oldSbn = updated.notification.clone(); - if (!Objects.equals(oldSbn.getOverrideGroupKey(), overrideGroupKey)) { - updated.notification.setOverrideGroupKey(overrideGroupKey); - onEntryUpdated(updated, oldSbn); - } - } - private void updateSuppression(NotificationGroup group) { - if (group == null) { + if (group == null || mUpdatingSuppressionBlocked) { return; } boolean prevSuppressed = group.suppressed; @@ -192,19 +183,24 @@ public class NotificationGroupManager implements HeadsUpManager.OnHeadsUpChanged public void onEntryUpdated(NotificationData.Entry entry, StatusBarNotification oldNotification) { + String oldKey = oldNotification.getGroupKey(); + String newKey = entry.notification.getGroupKey(); + boolean groupKeysChanged = !oldKey.equals(newKey); + boolean wasGroupChild = isGroupChild(oldNotification); + boolean isGroupChild = isGroupChild(entry.notification); + mUpdatingSuppressionBlocked = !groupKeysChanged && wasGroupChild == isGroupChild; if (mGroupMap.get(getGroupKey(oldNotification)) != null) { onEntryRemovedInternal(entry, oldNotification); } onEntryAdded(entry); + mUpdatingSuppressionBlocked = false; if (isIsolated(entry.notification)) { mIsolatedEntries.put(entry.key, entry.notification); - String oldKey = oldNotification.getGroupKey(); - String newKey = entry.notification.getGroupKey(); - if (!oldKey.equals(newKey)) { + if (groupKeysChanged) { updateSuppression(mGroupMap.get(oldKey)); updateSuppression(mGroupMap.get(newKey)); } - } else if (!isGroupChild(oldNotification) && isGroupChild(entry.notification)) { + } else if (!wasGroupChild && isGroupChild) { onEntryBecomingChild(entry); } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java index 64f205d2d8f8..da3fcf7f2a7f 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java @@ -81,8 +81,8 @@ public class NotificationPanelView extends PanelView implements private static final float LOCK_ICON_ACTIVE_SCALE = 1.2f; - private static final String COUNTER_PANEL_OPEN = "panel_open"; - private static final String COUNTER_PANEL_OPEN_QS = "panel_open_qs"; + static final String COUNTER_PANEL_OPEN = "panel_open"; + static final String COUNTER_PANEL_OPEN_QS = "panel_open_qs"; private static final String COUNTER_PANEL_OPEN_PEEK = "panel_open_peek"; private static final Rect mDummyDirtyRect = new Rect(0, 0, 1, 1); @@ -1013,7 +1013,7 @@ public class NotificationPanelView extends PanelView implements mKeyguardStatusBar.setAlpha(1f); mKeyguardStatusBar.setVisibility(keyguardShowing ? View.VISIBLE : View.INVISIBLE); if (keyguardShowing && oldState != mStatusBarState) { - mKeyguardBottomArea.updateLeftAffordance(); + mKeyguardBottomArea.onKeyguardShowingChanged(); mAfforanceHelper.updatePreviews(); } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java index b623f19b5ccb..d836c057a838 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java @@ -73,6 +73,7 @@ import android.media.session.MediaController; import android.media.session.MediaSession; import android.media.session.MediaSessionManager; import android.media.session.PlaybackState; +import android.net.Uri; import android.os.AsyncTask; import android.os.Bundle; import android.os.Handler; @@ -85,6 +86,7 @@ import android.os.RemoteException; import android.os.ServiceManager; import android.os.SystemClock; import android.os.Trace; +import android.os.SystemProperties; import android.os.UserHandle; import android.os.UserManager; import android.os.Vibrator; @@ -195,6 +197,7 @@ import com.android.systemui.volume.VolumeComponent; import java.io.FileDescriptor; import java.io.PrintWriter; +import java.io.StringWriter; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -365,6 +368,8 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, private View mPendingRemoteInputView; private View mPendingWorkRemoteInputView; + private View mReportRejectedTouch; + int mMaxAllowedKeyguardNotifications; boolean mExpandedVisible; @@ -929,6 +934,36 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, mBatteryController); mKeyguardStatusBar.setBatteryController(mBatteryController); + mReportRejectedTouch = mStatusBarWindow.findViewById(R.id.report_rejected_touch); + if (mReportRejectedTouch != null) { + updateReportRejectedTouchVisibility(); + mReportRejectedTouch.setOnClickListener(v -> { + Uri session = mFalsingManager.reportRejectedTouch(); + if (session == null) { return; } + + StringWriter message = new StringWriter(); + message.write("Build info: "); + message.write(SystemProperties.get("ro.build.description")); + message.write("\nSerial number: "); + message.write(SystemProperties.get("ro.serialno")); + message.write("\n"); + + PrintWriter falsingPw = new PrintWriter(message); + FalsingLog.dump(falsingPw); + falsingPw.flush(); + + startActivityDismissingKeyguard(Intent.createChooser(new Intent(Intent.ACTION_SEND) + .setType("*/*") + .putExtra(Intent.EXTRA_SUBJECT, "Rejected touch report") + .putExtra(Intent.EXTRA_STREAM, session) + .putExtra(Intent.EXTRA_TEXT, message.toString()), + "Share rejected touch report") + .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK), + true /* onlyProvisioned */, true /* dismissShade */); + }); + } + + PowerManager pm = (PowerManager) mContext.getSystemService(Context.POWER_SERVICE); mBroadcastReceiver.onReceive(mContext, new Intent(pm.isScreenOn() ? Intent.ACTION_SCREEN_ON : Intent.ACTION_SCREEN_OFF)); @@ -2260,6 +2295,14 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, Trace.endSection(); } + private void updateReportRejectedTouchVisibility() { + if (mReportRejectedTouch == null) { + return; + } + mReportRejectedTouch.setVisibility(mState == StatusBarState.KEYGUARD + && mFalsingManager.isReportingEnabled() ? View.VISIBLE : View.INVISIBLE); + } + protected int adjustDisableFlags(int state) { if (!mLaunchTransitionFadingAway && !mKeyguardFadingAway && (mExpandedVisible || mBouncerShowing || mWaitingForKeyguardExit)) { @@ -2620,7 +2663,8 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, @Override public void handleSystemNavigationKey(int key) { if (SPEW) Log.d(TAG, "handleSystemNavigationKey: " + key); - if (!panelsEnabled() || !mKeyguardMonitor.isDeviceInteractive()) { + if (!panelsEnabled() || !mKeyguardMonitor.isDeviceInteractive() + || mKeyguardMonitor.isShowing()) { return; } @@ -2628,12 +2672,16 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, if (!mUserSetup) return; if (KeyEvent.KEYCODE_SYSTEM_NAVIGATION_UP == key) { + MetricsLogger.action(mContext, MetricsEvent.ACTION_SYSTEM_NAVIGATION_KEY_UP); mNotificationPanel.collapse(false /* delayed */, 1.0f /* speedUpFactor */); } else if (KeyEvent.KEYCODE_SYSTEM_NAVIGATION_DOWN == key) { + MetricsLogger.action(mContext, MetricsEvent.ACTION_SYSTEM_NAVIGATION_KEY_DOWN); if (mNotificationPanel.isFullyCollapsed()) { mNotificationPanel.expand(true /* animate */); + MetricsLogger.count(mContext, NotificationPanelView.COUNTER_PANEL_OPEN, 1); } else if (!mNotificationPanel.isInSettings() && !mNotificationPanel.isExpanding()){ mNotificationPanel.flingSettings(0 /* velocity */, true /* expand */); + MetricsLogger.count(mContext, NotificationPanelView.COUNTER_PANEL_OPEN_QS, 1); } } @@ -3548,7 +3596,8 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, @Override public void onDisplayChanged(int displayId) { - if (displayId == Display.DEFAULT_DISPLAY) { + if (displayId == Display.DEFAULT_DISPLAY + && mNavigationBarView != null && mNavigationBarView.needsReorient()) { repositionNavigationBar(); } } @@ -4388,6 +4437,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, mGroupManager.setStatusBarState(state); mFalsingManager.setStatusBarState(state); mStatusBarWindowManager.setStatusBarState(state); + updateReportRejectedTouchVisibility(); updateDozing(); } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QSTileHost.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QSTileHost.java index 405ccd601ff6..10facea1e8f8 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QSTileHost.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QSTileHost.java @@ -334,6 +334,9 @@ public class QSTileHost implements QSTile.Host, Tunable { || ((CustomTile) tile).getUser() == currentUser)) { if (DEBUG) Log.d(TAG, "Adding " + tile); tile.removeCallbacks(); + if (!(tile instanceof CustomTile) && mCurrentUser != currentUser) { + tile.userSwitch(currentUser); + } newTiles.put(tileSpec, tile); } else { if (DEBUG) Log.d(TAG, "Creating tile: " + tileSpec); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickStatusBarHeader.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickStatusBarHeader.java index a9c47834238f..7a2ae22ed466 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickStatusBarHeader.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickStatusBarHeader.java @@ -197,6 +197,7 @@ public class QuickStatusBarHeader extends BaseStatusBarHeader implements @Override public void setExpanded(boolean expanded) { + if (mExpanded == expanded) return; mExpanded = expanded; mHeaderQsPanel.setExpanded(expanded); updateEverything(); @@ -255,8 +256,10 @@ public class QuickStatusBarHeader extends BaseStatusBarHeader implements @Override public void updateEverything() { - updateVisibilities(); - setClickable(false); + post(() -> { + updateVisibilities(); + setClickable(false); + }); } protected void updateVisibilities() { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/touch_analytics.proto b/packages/SystemUI/src/com/android/systemui/statusbar/phone/touch_analytics.proto index afc8f77f6896..50fd52ae0070 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/touch_analytics.proto +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/touch_analytics.proto @@ -120,6 +120,7 @@ message Session { RESERVED_2 = 1; RANDOM_WAKEUP = 2; REAL = 3; + REJECTED_TOUCH_REPORT = 4; } optional uint64 startTimestampMillis = 1; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/PreviewInflater.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/PreviewInflater.java index 93d0ec362ade..687b83a4bf63 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/PreviewInflater.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/PreviewInflater.java @@ -119,13 +119,16 @@ public class PreviewInflater { private WidgetInfo getWidgetInfo(Intent intent) { PackageManager packageManager = mContext.getPackageManager(); + int flags = PackageManager.MATCH_DEFAULT_ONLY + | PackageManager.MATCH_DIRECT_BOOT_AWARE + | PackageManager.MATCH_DIRECT_BOOT_UNAWARE; final List<ResolveInfo> appList = packageManager.queryIntentActivitiesAsUser( - intent, PackageManager.MATCH_DEFAULT_ONLY, KeyguardUpdateMonitor.getCurrentUser()); + intent, flags, KeyguardUpdateMonitor.getCurrentUser()); if (appList.size() == 0) { return null; } ResolveInfo resolved = packageManager.resolveActivityAsUser(intent, - PackageManager.MATCH_DEFAULT_ONLY | PackageManager.GET_META_DATA, + flags | PackageManager.GET_META_DATA, KeyguardUpdateMonitor.getCurrentUser()); if (wouldLaunchResolverActivity(resolved, appList)) { return null; @@ -139,23 +142,32 @@ public class PreviewInflater { public static boolean wouldLaunchResolverActivity(Context ctx, Intent intent, int currentUserId) { - return getTargetActivityInfo(ctx, intent, currentUserId) == null; + return getTargetActivityInfo(ctx, intent, currentUserId, false /* onlyDirectBootAware */) + == null; } /** + * @param onlyDirectBootAware a boolean indicating whether the matched activity packages must + * be direct boot aware when in direct boot mode if false, all + * packages are considered a match even if they are not aware. * @return the target activity info of the intent it resolves to a specific package or * {@code null} if it resolved to the resolver activity */ public static ActivityInfo getTargetActivityInfo(Context ctx, Intent intent, - int currentUserId) { + int currentUserId, boolean onlyDirectBootAware) { PackageManager packageManager = ctx.getPackageManager(); + int flags = PackageManager.MATCH_DEFAULT_ONLY; + if (!onlyDirectBootAware) { + flags |= PackageManager.MATCH_DIRECT_BOOT_AWARE + | PackageManager.MATCH_DIRECT_BOOT_UNAWARE; + } final List<ResolveInfo> appList = packageManager.queryIntentActivitiesAsUser( - intent, PackageManager.MATCH_DEFAULT_ONLY, currentUserId); + intent, flags, currentUserId); if (appList.size() == 0) { return null; } ResolveInfo resolved = packageManager.resolveActivityAsUser(intent, - PackageManager.MATCH_DEFAULT_ONLY | PackageManager.GET_META_DATA, currentUserId); + flags | PackageManager.GET_META_DATA, currentUserId); if (resolved == null || wouldLaunchResolverActivity(resolved, appList)) { return null; } else { diff --git a/proto/src/metrics_constants.proto b/proto/src/metrics_constants.proto index 0106f7f03023..5099db775d60 100644 --- a/proto/src/metrics_constants.proto +++ b/proto/src/metrics_constants.proto @@ -2197,6 +2197,16 @@ message MetricsEvent { // Night Light on SETTINGS_CONDITION_NIGHT_DISPLAY = 492; + // System navigation key up. + ACTION_SYSTEM_NAVIGATION_KEY_UP = 493; + + // System navigation key down. + ACTION_SYSTEM_NAVIGATION_KEY_DOWN = 494; + + // OPEN: Settings > Display -> Ambient Display + // CATEGORY: SETTINGS + ACTION_AMBIENT_DISPLAY = 495; + // ---- End N-MR1 Constants, all N-MR1 constants go above this line ---- // Add new aosp constants above this line. // END OF AOSP CONSTANTS diff --git a/services/accessibility/java/com/android/server/accessibility/AccessibilityInputFilter.java b/services/accessibility/java/com/android/server/accessibility/AccessibilityInputFilter.java index 2a7d945c1311..fd93865ea97e 100644 --- a/services/accessibility/java/com/android/server/accessibility/AccessibilityInputFilter.java +++ b/services/accessibility/java/com/android/server/accessibility/AccessibilityInputFilter.java @@ -77,6 +77,9 @@ class AccessibilityInputFilter extends InputFilter implements EventStreamTransfo */ static final int FLAG_FEATURE_INJECT_MOTION_EVENTS = 0x00000010; + static final int FEATURES_AFFECTING_MOTION_EVENTS = FLAG_FEATURE_INJECT_MOTION_EVENTS + | FLAG_FEATURE_AUTOCLICK | FLAG_FEATURE_TOUCH_EXPLORATION + | FLAG_FEATURE_SCREEN_MAGNIFIER; /** * Flag for enabling the feature to control the screen magnifier. If * {@link #FLAG_FEATURE_SCREEN_MAGNIFIER} is set this flag is ignored @@ -203,8 +206,13 @@ class AccessibilityInputFilter extends InputFilter implements EventStreamTransfo } if (event instanceof MotionEvent) { - MotionEvent motionEvent = (MotionEvent) event; - processMotionEvent(state, motionEvent, policyFlags); + if ((mEnabledFeatures & FEATURES_AFFECTING_MOTION_EVENTS) != 0) { + MotionEvent motionEvent = (MotionEvent) event; + processMotionEvent(state, motionEvent, policyFlags); + return; + } else { + super.onInputEvent(event, policyFlags); + } } else if (event instanceof KeyEvent) { KeyEvent keyEvent = (KeyEvent) event; processKeyEvent(state, keyEvent, policyFlags); diff --git a/services/core/java/com/android/server/AlarmManagerService.java b/services/core/java/com/android/server/AlarmManagerService.java index 4dd88b20fb7f..57c25a2d9a8c 100644 --- a/services/core/java/com/android/server/AlarmManagerService.java +++ b/services/core/java/com/android/server/AlarmManagerService.java @@ -1732,9 +1732,10 @@ class AlarmManagerService extends SystemService { Alarm a = alarms.get(j); if (a.alarmClock != null) { final int userId = UserHandle.getUserId(a.uid); + AlarmManager.AlarmClockInfo current = mNextAlarmClockForUser.get(userId); if (DEBUG_ALARM_CLOCK) { - Log.v(TAG, "Found AlarmClockInfo at " + + Log.v(TAG, "Found AlarmClockInfo " + a.alarmClock + " at " + formatNextAlarm(getContext(), a.alarmClock, userId) + " for user " + userId); } @@ -1742,6 +1743,10 @@ class AlarmManagerService extends SystemService { // Alarms and batches are sorted by time, no need to compare times here. if (nextForUser.get(userId) == null) { nextForUser.put(userId, a.alarmClock); + } else if (a.alarmClock.equals(current) + && current.getTriggerTime() <= nextForUser.get(userId).getTriggerTime()) { + // same/earlier time and it's the one we cited before, so stick with it + nextForUser.put(userId, current); } } } diff --git a/services/core/java/com/android/server/LocationManagerService.java b/services/core/java/com/android/server/LocationManagerService.java index 36ec2eb9a192..64ca2e3eb3de 100644 --- a/services/core/java/com/android/server/LocationManagerService.java +++ b/services/core/java/com/android/server/LocationManagerService.java @@ -150,7 +150,7 @@ public class LocationManagerService extends ILocationManager.Stub { // used internally for synchronization private final Object mLock = new Object(); - // --- fields below are final after systemReady() --- + // --- fields below are final after systemRunning() --- private LocationFudger mLocationFudger; private GeofenceManager mGeofenceManager; private PackageManager mPackageManager; @@ -168,6 +168,7 @@ public class LocationManagerService extends ILocationManager.Stub { // --- fields below are protected by mLock --- // Set of providers that are explicitly enabled + // Only used by passive, fused & test. Network & GPS are controlled separately, and not listed. private final Set<String> mEnabledProviders = new HashSet<String>(); // Set of providers that are explicitly disabled @@ -236,12 +237,12 @@ public class LocationManagerService extends ILocationManager.Stub { if (D) Log.d(TAG, "Constructed"); - // most startup is deferred until systemReady() + // most startup is deferred until systemRunning() } public void systemRunning() { synchronized (mLock) { - if (D) Log.d(TAG, "systemReady()"); + if (D) Log.d(TAG, "systemRunning()"); // fetch package manager mPackageManager = mContext.getPackageManager(); @@ -321,7 +322,11 @@ public class LocationManagerService extends ILocationManager.Stub { || Intent.ACTION_MANAGED_PROFILE_REMOVED.equals(action)) { updateUserProfiles(mCurrentUserId); } else if (Intent.ACTION_SHUTDOWN.equals(action)) { - shutdownComponents(); + // shutdown only if UserId indicates whole system, not just one user + if(D) Log.d(TAG, "Shutdown received with UserId: " + getSendingUserId()); + if (getSendingUserId() == UserHandle.USER_ALL) { + shutdownComponents(); + } } } }, UserHandle.ALL, intentFilter, null, mLocationHandler); diff --git a/services/core/java/com/android/server/PinnerService.java b/services/core/java/com/android/server/PinnerService.java index 7ea8f1f4924d..356ccb3596a9 100644 --- a/services/core/java/com/android/server/PinnerService.java +++ b/services/core/java/com/android/server/PinnerService.java @@ -17,26 +17,23 @@ package com.android.server; import android.content.Context; +import android.content.Intent; import android.content.pm.ActivityInfo; import android.content.pm.ApplicationInfo; -import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; -import android.content.res.Resources; -import android.content.Intent; -import android.util.EventLog; -import android.util.Slog; import android.os.Binder; import android.os.Build; import android.os.Handler; import android.os.Looper; import android.os.Message; -import android.os.Process; +import android.os.UserHandle; import android.provider.MediaStore; import android.system.ErrnoException; import android.system.Os; import android.system.OsConstants; import android.system.StructStat; +import android.util.Slog; import com.android.internal.app.ResolverActivity; import com.android.internal.os.BackgroundThread; @@ -44,12 +41,10 @@ import com.android.internal.os.BackgroundThread; import dalvik.system.DexFile; import dalvik.system.VMRuntime; -import java.util.ArrayList; -import java.util.List; import java.io.FileDescriptor; -import java.io.FileOutputStream; import java.io.IOException; import java.io.PrintWriter; +import java.util.ArrayList; /** * <p>PinnerService pins important files for key processes in memory.</p> @@ -89,20 +84,10 @@ public final class PinnerService extends SystemService { } mBinderService = new BinderService(); publishBinderService("pinner", mBinderService); - mPinnerHandler.sendMessage( - mPinnerHandler.obtainMessage(PinnerHandler.PIN_ONSTART_MSG)); - } - /** - * Pin camera on unlock. - * We have to wait for unlock because the user's - * preference for camera is not available from PackageManager until after - * unlock - */ - @Override - public void onUnlockUser(int userHandle) { - mPinnerHandler.sendMessage( - mPinnerHandler.obtainMessage(PinnerHandler.PIN_CAMERA_MSG, userHandle, 0)); + mPinnerHandler.obtainMessage(PinnerHandler.PIN_ONSTART_MSG).sendToTarget(); + mPinnerHandler.obtainMessage(PinnerHandler.PIN_CAMERA_MSG, UserHandle.USER_SYSTEM, 0) + .sendToTarget(); } /** @@ -113,8 +98,7 @@ public final class PinnerService extends SystemService { */ @Override public void onSwitchUser(int userHandle) { - mPinnerHandler.sendMessage( - mPinnerHandler.obtainMessage(PinnerHandler.PIN_CAMERA_MSG, userHandle, 0)); + mPinnerHandler.obtainMessage(PinnerHandler.PIN_CAMERA_MSG, userHandle, 0).sendToTarget(); } /** @@ -194,8 +178,10 @@ public final class PinnerService extends SystemService { // device without a fbe enabled, the _SECURE intent will never get set. Intent cameraIntent = new Intent(MediaStore.INTENT_ACTION_STILL_IMAGE_CAMERA); PackageManager pm = mContext.getPackageManager(); - ResolveInfo cameraResolveInfo = pm.resolveActivityAsUser( - cameraIntent, PackageManager.MATCH_DEFAULT_ONLY, userHandle); + ResolveInfo cameraResolveInfo = pm.resolveActivityAsUser(cameraIntent, + PackageManager.MATCH_DEFAULT_ONLY | PackageManager.MATCH_DIRECT_BOOT_AWARE + | PackageManager.MATCH_DIRECT_BOOT_UNAWARE, + userHandle); if (cameraResolveInfo == null ) { //this is not necessarily an error if (DEBUG) { diff --git a/services/core/java/com/android/server/am/ActiveServices.java b/services/core/java/com/android/server/am/ActiveServices.java index ee2fa51c8666..1bcff1a7b2e6 100755 --- a/services/core/java/com/android/server/am/ActiveServices.java +++ b/services/core/java/com/android/server/am/ActiveServices.java @@ -699,7 +699,7 @@ public final class ActiveServices { throw new IllegalArgumentException("null notification"); } if (r.foregroundId != id) { - r.cancelNotification(); + cancelForegroudNotificationLocked(r); r.foregroundId = id; } notification.flags |= Notification.FLAG_FOREGROUND_SERVICE; @@ -721,7 +721,7 @@ public final class ActiveServices { } } if ((flags & Service.STOP_FOREGROUND_REMOVE) != 0) { - r.cancelNotification(); + cancelForegroudNotificationLocked(r); r.foregroundId = 0; r.foregroundNoti = null; } else if (r.appInfo.targetSdkVersion >= Build.VERSION_CODES.LOLLIPOP) { @@ -738,6 +738,27 @@ public final class ActiveServices { } } + private void cancelForegroudNotificationLocked(ServiceRecord r) { + if (r.foregroundId != 0) { + // First check to see if this app has any other active foreground services + // with the same notification ID. If so, we shouldn't actually cancel it, + // because that would wipe away the notification that still needs to be shown + // due the other service. + ServiceMap sm = getServiceMap(r.userId); + if (sm != null) { + for (int i = sm.mServicesByName.size()-1; i >= 0; i--) { + ServiceRecord other = sm.mServicesByName.valueAt(i); + if (other != r && other.foregroundId == r.foregroundId + && other.packageName.equals(r.packageName)) { + // Found one! Abort the cancel. + return; + } + } + } + r.cancelNotification(); + } + } + private void updateServiceForegroundLocked(ProcessRecord proc, boolean oomAdj) { boolean anyForeground = false; for (int i=proc.services.size()-1; i>=0; i--) { @@ -1560,7 +1581,7 @@ public final class ActiveServices { r.makeRestarting(mAm.mProcessStats.getMemFactorLocked(), now); } - r.cancelNotification(); + cancelForegroudNotificationLocked(r); mAm.mHandler.removeCallbacks(r.restarter); mAm.mHandler.postAtTime(r.restarter, r.nextRestartTime); @@ -2022,7 +2043,7 @@ public final class ActiveServices { } } - r.cancelNotification(); + cancelForegroudNotificationLocked(r); r.isForeground = false; r.foregroundId = 0; r.foregroundNoti = null; diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index 90e2a5bde5b1..e336ed5e34ab 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -2328,12 +2328,17 @@ public final class ActivityManagerService extends ActivityManagerNative ProcessRecord proc = r.app; if (proc.vrThreadTid > 0) { if (proc.curSchedGroup == ProcessList.SCHED_GROUP_TOP_APP) { - if (mInVrMode == true) { - Process.setThreadScheduler(proc.vrThreadTid, - Process.SCHED_FIFO | Process.SCHED_RESET_ON_FORK, 1); - } else { - Process.setThreadScheduler(proc.vrThreadTid, - Process.SCHED_OTHER, 0); + try { + if (mInVrMode == true) { + Process.setThreadScheduler(proc.vrThreadTid, + Process.SCHED_FIFO | Process.SCHED_RESET_ON_FORK, 1); + } else { + Process.setThreadScheduler(proc.vrThreadTid, + Process.SCHED_OTHER, 0); + } + } catch (IllegalArgumentException e) { + Slog.e(TAG, "Failed to set scheduling policy, thread does" + + " not exist:\n" + e); } } } @@ -17728,6 +17733,70 @@ public final class ActivityManagerService extends ActivityManagerNative return INTENT_REMOTE_BUGREPORT_FINISHED.equals(intent.getAction()); } + private void checkBroadcastFromSystem(Intent intent, ProcessRecord callerApp, + String callerPackage, int callingUid, boolean isProtectedBroadcast, List receivers) { + final String action = intent.getAction(); + if (isProtectedBroadcast + || Intent.ACTION_CLOSE_SYSTEM_DIALOGS.equals(action) + || Intent.ACTION_DISMISS_KEYBOARD_SHORTCUTS.equals(action) + || Intent.ACTION_MEDIA_BUTTON.equals(action) + || Intent.ACTION_MEDIA_SCANNER_SCAN_FILE.equals(action) + || Intent.ACTION_SHOW_KEYBOARD_SHORTCUTS.equals(action) + || AppWidgetManager.ACTION_APPWIDGET_CONFIGURE.equals(action) + || AppWidgetManager.ACTION_APPWIDGET_UPDATE.equals(action) + || LocationManager.HIGH_POWER_REQUEST_CHANGE_ACTION.equals(action) + || TelephonyIntents.ACTION_REQUEST_OMADM_CONFIGURATION_UPDATE.equals(action) + || SuggestionSpan.ACTION_SUGGESTION_PICKED.equals(action)) { + // Broadcast is either protected, or it's a public action that + // we've relaxed, so it's fine for system internals to send. + return; + } + + // This broadcast may be a problem... but there are often system components that + // want to send an internal broadcast to themselves, which is annoying to have to + // explicitly list each action as a protected broadcast, so we will check for that + // one safe case and allow it: an explicit broadcast, only being received by something + // that has protected itself. + if (receivers != null && receivers.size() > 0 + && (intent.getPackage() != null || intent.getComponent() != null)) { + boolean allProtected = true; + for (int i = receivers.size()-1; i >= 0; i--) { + Object target = receivers.get(i); + if (target instanceof ResolveInfo) { + ResolveInfo ri = (ResolveInfo)target; + if (ri.activityInfo.exported && ri.activityInfo.permission == null) { + allProtected = false; + break; + } + } else { + BroadcastFilter bf = (BroadcastFilter)target; + if (bf.requiredPermission == null) { + allProtected = false; + break; + } + } + } + if (allProtected) { + // All safe! + return; + } + } + + // The vast majority of broadcasts sent from system internals + // should be protected to avoid security holes, so yell loudly + // to ensure we examine these cases. + if (callerApp != null) { + Log.wtf(TAG, "Sending non-protected broadcast " + action + + " from system " + callerApp.toShortString() + " pkg " + callerPackage, + new Throwable()); + } else { + Log.wtf(TAG, "Sending non-protected broadcast " + action + + " from system uid " + UserHandle.formatUid(callingUid) + + " pkg " + callerPackage, + new Throwable()); + } + } + final int broadcastIntentLocked(ProcessRecord callerApp, String callerPackage, Intent intent, String resolvedType, IIntentReceiver resultTo, int resultCode, String resultData, @@ -17814,37 +17883,9 @@ public final class ActivityManagerService extends ActivityManagerNative break; } - if (isCallerSystem) { - if (isProtectedBroadcast - || Intent.ACTION_CLOSE_SYSTEM_DIALOGS.equals(action) - || Intent.ACTION_DISMISS_KEYBOARD_SHORTCUTS.equals(action) - || Intent.ACTION_MEDIA_BUTTON.equals(action) - || Intent.ACTION_MEDIA_SCANNER_SCAN_FILE.equals(action) - || Intent.ACTION_SHOW_KEYBOARD_SHORTCUTS.equals(action) - || AppWidgetManager.ACTION_APPWIDGET_CONFIGURE.equals(action) - || AppWidgetManager.ACTION_APPWIDGET_UPDATE.equals(action) - || LocationManager.HIGH_POWER_REQUEST_CHANGE_ACTION.equals(action) - || TelephonyIntents.ACTION_REQUEST_OMADM_CONFIGURATION_UPDATE.equals(action) - || SuggestionSpan.ACTION_SUGGESTION_PICKED.equals(action)) { - // Broadcast is either protected, or it's a public action that - // we've relaxed, so it's fine for system internals to send. - } else { - // The vast majority of broadcasts sent from system internals - // should be protected to avoid security holes, so yell loudly - // to ensure we examine these cases. - if (callerApp != null) { - Log.wtf(TAG, "Sending non-protected broadcast " + action - + " from system " + callerApp.toShortString() + " pkg " + callerPackage, - new Throwable()); - } else { - Log.wtf(TAG, "Sending non-protected broadcast " + action - + " from system uid " + UserHandle.formatUid(callingUid) - + " pkg " + callerPackage, - new Throwable()); - } - } - - } else { + // First line security check before anything else: stop non-system apps from + // sending protected broadcasts. + if (!isCallerSystem) { if (isProtectedBroadcast) { String msg = "Permission Denial: not allowed to send broadcast " + action + " from pid=" @@ -18227,6 +18268,10 @@ public final class ActivityManagerService extends ActivityManagerNative // If we are not serializing this broadcast, then send the // registered receivers separately so they don't wait for the // components to be launched. + if (isCallerSystem) { + checkBroadcastFromSystem(intent, callerApp, callerPackage, callingUid, + isProtectedBroadcast, registeredReceivers); + } final BroadcastQueue queue = broadcastQueueForIntent(intent); BroadcastRecord r = new BroadcastRecord(queue, intent, callerApp, callerPackage, callingPid, callingUid, resolvedType, requiredPermissions, @@ -18314,6 +18359,11 @@ public final class ActivityManagerService extends ActivityManagerNative ir++; } + if (isCallerSystem) { + checkBroadcastFromSystem(intent, callerApp, callerPackage, callingUid, + isProtectedBroadcast, receivers); + } + if ((receivers != null && receivers.size() > 0) || resultTo != null) { BroadcastQueue queue = broadcastQueueForIntent(intent); @@ -21897,6 +21947,11 @@ public final class ActivityManagerService extends ActivityManagerNative /*resultTo*/ null, bOptions, userId); } } + + @Override + public int getUidProcessState(int uid) { + return getUidState(uid); + } } private final class SleepTokenImpl extends SleepToken { diff --git a/services/core/java/com/android/server/am/ActivityRecord.java b/services/core/java/com/android/server/am/ActivityRecord.java index 6e40cfff5411..00fda43f4ca4 100755 --- a/services/core/java/com/android/server/am/ActivityRecord.java +++ b/services/core/java/com/android/server/am/ActivityRecord.java @@ -221,7 +221,12 @@ final class ActivityRecord { boolean pendingVoiceInteractionStart; // Waiting for activity-invoked voice session IVoiceInteractionSession voiceSession; // Voice interaction session for this activity - int mRotationAnimationHint; + // A hint to override the window specified rotation animation, or -1 + // to use the window specified value. We use this so that + // we can select the right animation in the cases of starting + // windows, where the app hasn't had time to set a value + // on the window. + int mRotationAnimationHint = -1; private static String startingWindowStateToString(int state) { switch (state) { diff --git a/services/core/java/com/android/server/am/ActivityStack.java b/services/core/java/com/android/server/am/ActivityStack.java index 5a6614074002..5624260a2658 100644 --- a/services/core/java/com/android/server/am/ActivityStack.java +++ b/services/core/java/com/android/server/am/ActivityStack.java @@ -3559,19 +3559,22 @@ final class ActivityStack { final ActivityState prevState = r.state; if (DEBUG_STATES) Slog.v(TAG_STATES, "Moving to FINISHING: " + r); r.state = ActivityState.FINISHING; + final boolean finishingActivityInNonFocusedStack + = r.task.stack != mStackSupervisor.getFocusedStack() + && prevState == ActivityState.PAUSED && mode == FINISH_AFTER_VISIBLE; if (mode == FINISH_IMMEDIATELY || (prevState == ActivityState.PAUSED - && (mode == FINISH_AFTER_PAUSE || mode == FINISH_AFTER_VISIBLE - || mStackId == PINNED_STACK_ID)) + && (mode == FINISH_AFTER_PAUSE || mStackId == PINNED_STACK_ID)) + || finishingActivityInNonFocusedStack || prevState == ActivityState.STOPPED || prevState == ActivityState.INITIALIZING) { r.makeFinishingLocked(); boolean activityRemoved = destroyActivityLocked(r, true, "finish-imm"); - if (prevState == ActivityState.PAUSED && mode == FINISH_AFTER_VISIBLE) { - // Finishing activity that was in paused state - this can happen if it was in - // not currently focused stack. Need to make something visible in its place. + if (finishingActivityInNonFocusedStack) { + // Finishing activity that was in paused state and it was in not currently focused + // stack, need to make something visible in its place. mStackSupervisor.ensureActivitiesVisibleLocked(null, 0, !PRESERVE_WINDOWS); } if (activityRemoved) { diff --git a/services/core/java/com/android/server/am/ActivityStackSupervisor.java b/services/core/java/com/android/server/am/ActivityStackSupervisor.java index e31df57f56d4..ece1ee95f320 100644 --- a/services/core/java/com/android/server/am/ActivityStackSupervisor.java +++ b/services/core/java/com/android/server/am/ActivityStackSupervisor.java @@ -781,20 +781,25 @@ public final class ActivityStackSupervisor implements DisplayListener { } } + static int nextTaskIdForUser(int taskId, int userId) { + int nextTaskId = taskId + 1; + if (nextTaskId == (userId + 1) * MAX_TASK_IDS_PER_USER) { + // Wrap around as there will be smaller task ids that are available now. + nextTaskId -= MAX_TASK_IDS_PER_USER; + } + return nextTaskId; + } + int getNextTaskIdForUserLocked(int userId) { final int currentTaskId = mCurTaskIdForUser.get(userId, userId * MAX_TASK_IDS_PER_USER); // for a userId u, a taskId can only be in the range // [u*MAX_TASK_IDS_PER_USER, (u+1)*MAX_TASK_IDS_PER_USER-1], so if MAX_TASK_IDS_PER_USER // was 10, user 0 could only have taskIds 0 to 9, user 1: 10 to 19, user 2: 20 to 29, so on. - int candidateTaskId = currentTaskId; + int candidateTaskId = nextTaskIdForUser(currentTaskId, userId); while (mRecentTasks.taskIdTakenForUserLocked(candidateTaskId, userId) || anyTaskForIdLocked(candidateTaskId, !RESTORE_FROM_RECENTS, INVALID_STACK_ID) != null) { - candidateTaskId++; - if (candidateTaskId == (userId + 1) * MAX_TASK_IDS_PER_USER) { - // Wrap around as there will be smaller task ids that are available now. - candidateTaskId -= MAX_TASK_IDS_PER_USER; - } + candidateTaskId = nextTaskIdForUser(candidateTaskId, userId); if (candidateTaskId == currentTaskId) { // Something wrong! // All MAX_TASK_IDS_PER_USER task ids are taken up by running tasks for this user diff --git a/services/core/java/com/android/server/am/AppErrors.java b/services/core/java/com/android/server/am/AppErrors.java index 1f156dfd1985..7eff773543c8 100644 --- a/services/core/java/com/android/server/am/AppErrors.java +++ b/services/core/java/com/android/server/am/AppErrors.java @@ -638,7 +638,8 @@ class AppErrors { // Allow restarting for started or bound foreground services that are crashing the // first time. This includes wallpapers. - if (sr.crashCount <= 1 && (sr.isForeground || procIsBoundForeground)) { + if ((data != null) && (sr.crashCount <= 1) + && (sr.isForeground || procIsBoundForeground)) { data.isRestartableForService = true; } } diff --git a/services/core/java/com/android/server/am/BroadcastQueue.java b/services/core/java/com/android/server/am/BroadcastQueue.java index a279290a34be..4ef6a0fe17ab 100644 --- a/services/core/java/com/android/server/am/BroadcastQueue.java +++ b/services/core/java/com/android/server/am/BroadcastQueue.java @@ -226,11 +226,12 @@ public final class BroadcastQueue { } public final boolean replaceParallelBroadcastLocked(BroadcastRecord r) { + final Intent intent = r.intent; for (int i = mParallelBroadcasts.size() - 1; i >= 0; i--) { - if (r.intent.filterEquals(mParallelBroadcasts.get(i).intent)) { + if (intent.filterEquals(mParallelBroadcasts.get(i).intent)) { if (DEBUG_BROADCAST) Slog.v(TAG_BROADCAST, "***** DROPPING PARALLEL [" - + mQueueName + "]: " + r.intent); + + mQueueName + "]: " + intent); mParallelBroadcasts.set(i, r); return true; } @@ -239,11 +240,12 @@ public final class BroadcastQueue { } public final boolean replaceOrderedBroadcastLocked(BroadcastRecord r) { + final Intent intent = r.intent; for (int i = mOrderedBroadcasts.size() - 1; i > 0; i--) { - if (r.intent.filterEquals(mOrderedBroadcasts.get(i).intent)) { + if (intent.filterEquals(mOrderedBroadcasts.get(i).intent)) { if (DEBUG_BROADCAST) Slog.v(TAG_BROADCAST, "***** DROPPING ORDERED [" - + mQueueName + "]: " + r.intent); + + mQueueName + "]: " + intent); mOrderedBroadcasts.set(i, r); return true; } diff --git a/services/core/java/com/android/server/am/CoreSettingsObserver.java b/services/core/java/com/android/server/am/CoreSettingsObserver.java index 9dd07a9a9f90..73a17c613c4d 100644 --- a/services/core/java/com/android/server/am/CoreSettingsObserver.java +++ b/services/core/java/com/android/server/am/CoreSettingsObserver.java @@ -42,6 +42,7 @@ final class CoreSettingsObserver extends ContentObserver { String, Class<?>>(); static { sSecureSettingToTypeMap.put(Settings.Secure.LONG_PRESS_TIMEOUT, int.class); + sSecureSettingToTypeMap.put(Settings.Secure.MULTI_PRESS_TIMEOUT, int.class); // add other secure settings here... sSystemSettingToTypeMap.put(Settings.System.TIME_12_24, String.class); diff --git a/services/core/java/com/android/server/am/ServiceRecord.java b/services/core/java/com/android/server/am/ServiceRecord.java index 2bfc4021f887..71c7fd348fb3 100644 --- a/services/core/java/com/android/server/am/ServiceRecord.java +++ b/services/core/java/com/android/server/am/ServiceRecord.java @@ -543,27 +543,25 @@ final class ServiceRecord extends Binder { } public void cancelNotification() { - if (foregroundId != 0) { - // Do asynchronous communication with notification manager to - // avoid deadlocks. - final String localPackageName = packageName; - final int localForegroundId = foregroundId; - ams.mHandler.post(new Runnable() { - public void run() { - INotificationManager inm = NotificationManager.getService(); - if (inm == null) { - return; - } - try { - inm.cancelNotificationWithTag(localPackageName, null, - localForegroundId, userId); - } catch (RuntimeException e) { - Slog.w(TAG, "Error canceling notification for service", e); - } catch (RemoteException e) { - } + // Do asynchronous communication with notification manager to + // avoid deadlocks. + final String localPackageName = packageName; + final int localForegroundId = foregroundId; + ams.mHandler.post(new Runnable() { + public void run() { + INotificationManager inm = NotificationManager.getService(); + if (inm == null) { + return; } - }); - } + try { + inm.cancelNotificationWithTag(localPackageName, null, + localForegroundId, userId); + } catch (RuntimeException e) { + Slog.w(TAG, "Error canceling notification for service", e); + } catch (RemoteException e) { + } + } + }); } public void stripForegroundServiceFlagFromNotification() { diff --git a/services/core/java/com/android/server/am/UserController.java b/services/core/java/com/android/server/am/UserController.java index c9283b2283b9..4bc148bef290 100644 --- a/services/core/java/com/android/server/am/UserController.java +++ b/services/core/java/com/android/server/am/UserController.java @@ -279,6 +279,7 @@ final class UserController { */ private void finishUserUnlocking(final UserState uss) { final int userId = uss.mHandle.getIdentifier(); + boolean proceedWithUnlock = false; synchronized (mService) { // Bail if we ended up with a stale user if (mStartedUsers.get(uss.mHandle.getIdentifier()) != uss) return; @@ -288,20 +289,24 @@ final class UserController { if (uss.setState(STATE_RUNNING_LOCKED, STATE_RUNNING_UNLOCKING)) { getUserManagerInternal().setUserState(userId, uss.state); - uss.mUnlockProgress.start(); - - // Prepare app storage before we go any further - uss.mUnlockProgress.setProgress(5, - mService.mContext.getString(R.string.android_start_title)); - mUserManager.onBeforeUnlockUser(userId); - uss.mUnlockProgress.setProgress(20); - - // Dispatch unlocked to system services; when fully dispatched, - // that calls through to the next "unlocked" phase - mHandler.obtainMessage(SYSTEM_USER_UNLOCK_MSG, userId, 0, uss) - .sendToTarget(); + proceedWithUnlock = true; } } + + if (proceedWithUnlock) { + uss.mUnlockProgress.start(); + + // Prepare app storage before we go any further + uss.mUnlockProgress.setProgress(5, + mService.mContext.getString(R.string.android_start_title)); + mUserManager.onBeforeUnlockUser(userId); + uss.mUnlockProgress.setProgress(20); + + // Dispatch unlocked to system services; when fully dispatched, + // that calls through to the next "unlocked" phase + mHandler.obtainMessage(SYSTEM_USER_UNLOCK_MSG, userId, 0, uss) + .sendToTarget(); + } } /** @@ -962,6 +967,7 @@ final class UserController { boolean unlockUserCleared(final int userId, byte[] token, byte[] secret, IProgressListener listener) { + UserState uss; synchronized (mService) { // TODO Move this block outside of synchronized if it causes lock contention if (!StorageManager.isUserKeyUnlocked(userId)) { @@ -976,7 +982,7 @@ final class UserController { } // Bail if user isn't actually running, otherwise register the given // listener to watch for unlock progress - final UserState uss = mStartedUsers.get(userId); + uss = mStartedUsers.get(userId); if (uss == null) { notifyFinished(userId, listener); return false; @@ -984,8 +990,12 @@ final class UserController { uss.mUnlockProgress.addListener(listener); uss.tokenProvided = (token != null); } + } - finishUserUnlocking(uss); + finishUserUnlocking(uss); + + final ArraySet<Integer> childProfilesToUnlock = new ArraySet<>(); + synchronized (mService) { // We just unlocked a user, so let's now attempt to unlock any // managed profiles under that user. @@ -995,11 +1005,16 @@ final class UserController { if (parent != null && parent.id == userId && testUserId != userId) { Slog.d(TAG, "User " + testUserId + " (parent " + parent.id + "): attempting unlock because parent was just unlocked"); - maybeUnlockUser(testUserId); + childProfilesToUnlock.add(testUserId); } } } + final int size = childProfilesToUnlock.size(); + for (int i = 0; i < size; i++) { + maybeUnlockUser(childProfilesToUnlock.valueAt(i)); + } + return true; } diff --git a/services/core/java/com/android/server/connectivity/tethering/IPv6TetheringInterfaceServices.java b/services/core/java/com/android/server/connectivity/tethering/IPv6TetheringInterfaceServices.java index a58d24329083..b47e079395d8 100644 --- a/services/core/java/com/android/server/connectivity/tethering/IPv6TetheringInterfaceServices.java +++ b/services/core/java/com/android/server/connectivity/tethering/IPv6TetheringInterfaceServices.java @@ -176,9 +176,21 @@ class IPv6TetheringInterfaceServices { private void updateRaParams(RaParams params) { if (mRaDaemon != null) { + HashSet<IpPrefix> deprecated = null; + + if (mLastRaParams != null) { + deprecated = new HashSet<>(); + + for (IpPrefix ipp : mLastRaParams.prefixes) { + if (params == null || !params.prefixes.contains(ipp)) { + deprecated.add(ipp); + } + } + } + // Currently, we send spurious RAs (5) whenever there's any update. // TODO: Compare params with mLastParams to avoid spurious updates. - mRaDaemon.buildNewRa(params); + mRaDaemon.buildNewRa(params, deprecated); } mLastRaParams = params; diff --git a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java index b22a08484b8a..e3ec11ff1e8c 100644 --- a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java +++ b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java @@ -1035,7 +1035,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { */ private void notifyOverLimitNL(NetworkTemplate template) { if (!mOverLimitNotified.contains(template)) { - mContext.startActivity(buildNetworkOverLimitIntent(template)); + mContext.startActivity(buildNetworkOverLimitIntent(mContext.getResources(), template)); mOverLimitNotified.add(template); } } @@ -1079,7 +1079,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { builder.setDeleteIntent(PendingIntent.getBroadcast( mContext, 0, snoozeIntent, PendingIntent.FLAG_UPDATE_CURRENT)); - final Intent viewIntent = buildViewDataUsageIntent(policy.template); + final Intent viewIntent = buildViewDataUsageIntent(res, policy.template); builder.setContentIntent(PendingIntent.getActivity( mContext, 0, viewIntent, PendingIntent.FLAG_UPDATE_CURRENT)); @@ -1115,7 +1115,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { builder.setContentTitle(title); builder.setContentText(body); - final Intent intent = buildNetworkOverLimitIntent(policy.template); + final Intent intent = buildNetworkOverLimitIntent(res, policy.template); builder.setContentIntent(PendingIntent.getActivity( mContext, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT)); break; @@ -1150,7 +1150,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { builder.setContentTitle(title); builder.setContentText(body); - final Intent intent = buildViewDataUsageIntent(policy.template); + final Intent intent = buildViewDataUsageIntent(res, policy.template); builder.setContentIntent(PendingIntent.getActivity( mContext, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT)); break; @@ -2818,7 +2818,6 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { for (int j = mPowerSaveTempWhitelistAppIds.size() - 1; j >= 0; j--) { int appId = mPowerSaveTempWhitelistAppIds.keyAt(j); int uid = UserHandle.getUid(user.id, appId); - updateRulesForRestrictPowerUL(); // Update external firewall rules. updateRuleForAppIdleUL(uid); updateRuleForDeviceIdleUL(uid); @@ -3519,19 +3518,19 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { return intent; } - private static Intent buildNetworkOverLimitIntent(NetworkTemplate template) { + private static Intent buildNetworkOverLimitIntent(Resources res, NetworkTemplate template) { final Intent intent = new Intent(); - intent.setComponent(new ComponentName( - "com.android.systemui", "com.android.systemui.net.NetworkOverLimitActivity")); + intent.setComponent(ComponentName.unflattenFromString( + res.getString(R.string.config_networkOverLimitComponent))); intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); intent.putExtra(EXTRA_NETWORK_TEMPLATE, template); return intent; } - private static Intent buildViewDataUsageIntent(NetworkTemplate template) { + private static Intent buildViewDataUsageIntent(Resources res, NetworkTemplate template) { final Intent intent = new Intent(); - intent.setComponent(new ComponentName( - "com.android.settings", "com.android.settings.Settings$DataUsageSummaryActivity")); + intent.setComponent(ComponentName.unflattenFromString( + res.getString(R.string.config_dataUsageSummaryComponent))); intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); intent.putExtra(EXTRA_NETWORK_TEMPLATE, template); return intent; diff --git a/services/core/java/com/android/server/notification/NotificationManagerService.java b/services/core/java/com/android/server/notification/NotificationManagerService.java index 8b5942c85e4b..2dbbc88e0599 100644 --- a/services/core/java/com/android/server/notification/NotificationManagerService.java +++ b/services/core/java/com/android/server/notification/NotificationManagerService.java @@ -180,7 +180,7 @@ public class NotificationManagerService extends SystemService { = SystemProperties.getBoolean("debug.child_notifs", true); static final int MAX_PACKAGE_NOTIFICATIONS = 50; - static final float DEFAULT_MAX_NOTIFICATION_ENQUEUE_RATE = 50f; + static final float DEFAULT_MAX_NOTIFICATION_ENQUEUE_RATE = 10f; // message codes static final int MESSAGE_TIMEOUT = 2; @@ -2538,20 +2538,32 @@ public class NotificationManagerService extends SystemService { mUsageStats.registerEnqueuedByApp(pkg); + + if (pkg == null || notification == null) { + throw new IllegalArgumentException("null not allowed: pkg=" + pkg + + " id=" + id + " notification=" + notification); + } + final StatusBarNotification n = new StatusBarNotification( + pkg, opPkg, id, tag, callingUid, callingPid, 0, notification, + user); + // Limit the number of notifications that any given package except the android // package or a registered listener can enqueue. Prevents DOS attacks and deals with leaks. if (!isSystemNotification && !isNotificationFromListener) { synchronized (mNotificationList) { - final float appEnqueueRate = mUsageStats.getAppEnqueueRate(pkg); - if (appEnqueueRate > mMaxPackageEnqueueRate) { - mUsageStats.registerOverRateQuota(pkg); - final long now = SystemClock.elapsedRealtime(); - if ((now - mLastOverRateLogTime) > MIN_PACKAGE_OVERRATE_LOG_INTERVAL) { - Slog.e(TAG, "Package enqueue rate is " + appEnqueueRate - + ". Shedding events. package=" + pkg); - mLastOverRateLogTime = now; + if(mNotificationsByKey.get(n.getKey()) != null) { + // this is an update, rate limit updates only + final float appEnqueueRate = mUsageStats.getAppEnqueueRate(pkg); + if (appEnqueueRate > mMaxPackageEnqueueRate) { + mUsageStats.registerOverRateQuota(pkg); + final long now = SystemClock.elapsedRealtime(); + if ((now - mLastOverRateLogTime) > MIN_PACKAGE_OVERRATE_LOG_INTERVAL) { + Slog.e(TAG, "Package enqueue rate is " + appEnqueueRate + + ". Shedding events. package=" + pkg); + mLastOverRateLogTime = now; + } + return; } - return; } int count = 0; @@ -2574,11 +2586,6 @@ public class NotificationManagerService extends SystemService { } } - if (pkg == null || notification == null) { - throw new IllegalArgumentException("null not allowed: pkg=" + pkg - + " id=" + id + " notification=" + notification); - } - // Whitelist pending intents. if (notification.allPendingIntents != null) { final int intentCount = notification.allPendingIntents.size(); @@ -2601,9 +2608,6 @@ public class NotificationManagerService extends SystemService { Notification.PRIORITY_MAX); // setup local book-keeping - final StatusBarNotification n = new StatusBarNotification( - pkg, opPkg, id, tag, callingUid, callingPid, 0, notification, - user); final NotificationRecord r = new NotificationRecord(getContext(), n); mHandler.post(new EnqueueNotificationRunnable(userId, r)); diff --git a/services/core/java/com/android/server/pm/EphemeralResolverConnection.java b/services/core/java/com/android/server/pm/EphemeralResolverConnection.java index b25ef175c6a1..8d926f5d316f 100644 --- a/services/core/java/com/android/server/pm/EphemeralResolverConnection.java +++ b/services/core/java/com/android/server/pm/EphemeralResolverConnection.java @@ -16,6 +16,8 @@ package com.android.server.pm; +import android.app.EphemeralResolverService; +import android.app.IEphemeralResolver; import android.content.ComponentName; import android.content.Context; import android.content.Intent; @@ -30,9 +32,6 @@ import android.os.SystemClock; import android.os.UserHandle; import android.util.TimedRemoteCaller; -import com.android.internal.app.EphemeralResolverService; -import com.android.internal.app.IEphemeralResolver; - import java.io.FileDescriptor; import java.io.PrintWriter; import java.util.ArrayList; diff --git a/services/core/java/com/android/server/pm/LauncherAppsService.java b/services/core/java/com/android/server/pm/LauncherAppsService.java index cd5bcd41515d..53e328c7ee5f 100644 --- a/services/core/java/com/android/server/pm/LauncherAppsService.java +++ b/services/core/java/com/android/server/pm/LauncherAppsService.java @@ -768,41 +768,46 @@ public class LauncherAppsService extends SystemService { private void onShortcutChangedInner(@NonNull String packageName, @UserIdInt int userId) { - final UserHandle user = UserHandle.of(userId); - - final int n = mListeners.beginBroadcast(); - for (int i = 0; i < n; i++) { - IOnAppsChangedListener listener = mListeners.getBroadcastItem(i); - BroadcastCookie cookie = (BroadcastCookie) mListeners.getBroadcastCookie(i); - if (!isEnabledProfileOf(user, cookie.user, "onShortcutChanged")) continue; - - final int launcherUserId = cookie.user.getIdentifier(); - - // Make sure the caller has the permission. - if (!mShortcutServiceInternal.hasShortcutHostPermission( - launcherUserId, cookie.packageName)) { - continue; - } - // Each launcher has a different set of pinned shortcuts, so we need to do a - // query in here. - // (As of now, only one launcher has the permission at a time, so it's bit - // moot, but we may change the permission model eventually.) - final List<ShortcutInfo> list = - mShortcutServiceInternal.getShortcuts(launcherUserId, - cookie.packageName, - /* changedSince= */ 0, packageName, /* shortcutIds=*/ null, - /* component= */ null, - ShortcutQuery.FLAG_GET_KEY_FIELDS_ONLY - | ShortcutQuery.FLAG_GET_ALL_KINDS - , userId); - try { - listener.onShortcutChanged(user, packageName, - new ParceledListSlice<>(list)); - } catch (RemoteException re) { - Slog.d(TAG, "Callback failed ", re); + try { + final UserHandle user = UserHandle.of(userId); + + final int n = mListeners.beginBroadcast(); + for (int i = 0; i < n; i++) { + IOnAppsChangedListener listener = mListeners.getBroadcastItem(i); + BroadcastCookie cookie = (BroadcastCookie) mListeners.getBroadcastCookie(i); + if (!isEnabledProfileOf(user, cookie.user, "onShortcutChanged")) continue; + + final int launcherUserId = cookie.user.getIdentifier(); + + // Make sure the caller has the permission. + if (!mShortcutServiceInternal.hasShortcutHostPermission( + launcherUserId, cookie.packageName)) { + continue; + } + // Each launcher has a different set of pinned shortcuts, so we need to do a + // query in here. + // (As of now, only one launcher has the permission at a time, so it's bit + // moot, but we may change the permission model eventually.) + final List<ShortcutInfo> list = + mShortcutServiceInternal.getShortcuts(launcherUserId, + cookie.packageName, + /* changedSince= */ 0, packageName, /* shortcutIds=*/ null, + /* component= */ null, + ShortcutQuery.FLAG_GET_KEY_FIELDS_ONLY + | ShortcutQuery.FLAG_GET_ALL_KINDS + , userId); + try { + listener.onShortcutChanged(user, packageName, + new ParceledListSlice<>(list)); + } catch (RemoteException re) { + Slog.d(TAG, "Callback failed ", re); + } } + mListeners.finishBroadcast(); + } catch (RuntimeException e) { + // When the user is locked we get IllegalState, so just catch all. + Log.w(TAG, e.getMessage(), e); } - mListeners.finishBroadcast(); } } diff --git a/services/core/java/com/android/server/pm/OtaDexoptService.java b/services/core/java/com/android/server/pm/OtaDexoptService.java index c5f3cfd3bc7e..836b588c7621 100644 --- a/services/core/java/com/android/server/pm/OtaDexoptService.java +++ b/services/core/java/com/android/server/pm/OtaDexoptService.java @@ -50,6 +50,9 @@ public class OtaDexoptService extends IOtaDexopt.Stub { private final static String TAG = "OTADexopt"; private final static boolean DEBUG_DEXOPT = true; + // The synthetic library dependencies denoting "no checks." + private final static String[] NO_LIBRARIES = new String[] { "&" }; + private final Context mContext; private final PackageManagerService mPackageManagerService; @@ -202,7 +205,13 @@ public class OtaDexoptService extends IOtaDexopt.Stub { PackageDexOptimizer optimizer = new OTADexoptPackageDexOptimizer( collectingInstaller, mPackageManagerService.mInstallLock, mContext); - optimizer.performDexOpt(pkg, pkg.usesLibraryFiles, + String[] libraryDependencies = pkg.usesLibraryFiles; + if (pkg.isSystemApp()) { + // For system apps, we want to avoid classpaths checks. + libraryDependencies = NO_LIBRARIES; + } + + optimizer.performDexOpt(pkg, libraryDependencies, null /* ISAs */, false /* checkProfiles */, getCompilerFilterForReason(compilationReason), null /* CompilerStats.PackageStats */); diff --git a/services/core/java/com/android/server/pm/ShortcutService.java b/services/core/java/com/android/server/pm/ShortcutService.java index 02ad7c650e11..558467b2ef85 100644 --- a/services/core/java/com/android/server/pm/ShortcutService.java +++ b/services/core/java/com/android/server/pm/ShortcutService.java @@ -20,6 +20,7 @@ import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.UserIdInt; import android.app.ActivityManager; +import android.app.ActivityManagerInternal; import android.app.ActivityManagerNative; import android.app.AppGlobals; import android.app.IUidObserver; @@ -77,6 +78,7 @@ import android.util.KeyValueListParser; import android.util.Log; import android.util.Slog; import android.util.SparseArray; +import android.util.SparseBooleanArray; import android.util.SparseIntArray; import android.util.SparseLongArray; import android.util.TypedValue; @@ -85,7 +87,6 @@ import android.view.IWindowManager; import com.android.internal.annotations.GuardedBy; import com.android.internal.annotations.VisibleForTesting; -import com.android.internal.content.PackageMonitor; import com.android.internal.os.BackgroundThread; import com.android.internal.util.FastXmlSerializer; import com.android.internal.util.Preconditions; @@ -284,6 +285,7 @@ public class ShortcutService extends IShortcutService.Stub { private final PackageManagerInternal mPackageManagerInternal; private final UserManager mUserManager; private final UsageStatsManagerInternal mUsageStatsManagerInternal; + private final ActivityManagerInternal mActivityManagerInternal; @GuardedBy("mLock") final SparseIntArray mUidState = new SparseIntArray(); @@ -301,6 +303,9 @@ public class ShortcutService extends IShortcutService.Stub { | PackageManager.MATCH_DIRECT_BOOT_UNAWARE | PackageManager.MATCH_UNINSTALLED_PACKAGES; + @GuardedBy("mLock") + final SparseBooleanArray mUnlockedUsers = new SparseBooleanArray(); + // Stats @VisibleForTesting interface Stats { @@ -369,6 +374,8 @@ public class ShortcutService extends IShortcutService.Stub { mUserManager = Preconditions.checkNotNull(context.getSystemService(UserManager.class)); mUsageStatsManagerInternal = Preconditions.checkNotNull( LocalServices.getService(UsageStatsManagerInternal.class)); + mActivityManagerInternal = Preconditions.checkNotNull( + LocalServices.getService(ActivityManagerInternal.class)); if (onlyForPackageManagerApis) { return; // Don't do anything further. For unit tests only. @@ -453,7 +460,8 @@ public class ShortcutService extends IShortcutService.Stub { } private boolean isProcessStateForeground(int processState) { - return processState <= PROCESS_STATE_FOREGROUND_THRESHOLD; + return (processState != ActivityManager.PROCESS_STATE_NONEXISTENT) + && (processState <= PROCESS_STATE_FOREGROUND_THRESHOLD); } boolean isUidForegroundLocked(int uid) { @@ -462,7 +470,13 @@ public class ShortcutService extends IShortcutService.Stub { // so it's foreground anyway. return true; } - return isProcessStateForeground(mUidState.get(uid, ActivityManager.MAX_PROCESS_STATE)); + // First, check with the local cache. + if (isProcessStateForeground(mUidState.get(uid, ActivityManager.MAX_PROCESS_STATE))) { + return true; + } + // If the cache says background, reach out to AM. Since it'll internally need to hold + // the AM lock, we use it as a last resort. + return isProcessStateForeground(mActivityManagerInternal.getUidProcessState(uid)); } long getUidLastForegroundElapsedTimeLocked(int uid) { @@ -522,6 +536,8 @@ public class ShortcutService extends IShortcutService.Stub { Slog.d(TAG, "handleUnlockUser: user=" + userId); } synchronized (mLock) { + mUnlockedUsers.put(userId, true); + // Preload the user's shortcuts. // Also see if the locale has changed. // Note as of nyc, the locale is per-user, so the locale shouldn't change @@ -534,8 +550,13 @@ public class ShortcutService extends IShortcutService.Stub { /** lifecycle event */ void handleCleanupUser(int userId) { + if (DEBUG) { + Slog.d(TAG, "handleCleanupUser: user=" + userId); + } synchronized (mLock) { unloadUserLocked(userId); + + mUnlockedUsers.put(userId, false); } } @@ -978,16 +999,20 @@ public class ShortcutService extends IShortcutService.Stub { if (DEBUG) { Slog.d(TAG, "saveDirtyInfo"); } - synchronized (mLock) { - for (int i = mDirtyUserIds.size() - 1; i >= 0; i--) { - final int userId = mDirtyUserIds.get(i); - if (userId == UserHandle.USER_NULL) { // USER_NULL for base state. - saveBaseStateLocked(); - } else { - saveUserLocked(userId); + try { + synchronized (mLock) { + for (int i = mDirtyUserIds.size() - 1; i >= 0; i--) { + final int userId = mDirtyUserIds.get(i); + if (userId == UserHandle.USER_NULL) { // USER_NULL for base state. + saveBaseStateLocked(); + } else { + saveUserLocked(userId); + } } + mDirtyUserIds.clear(); } - mDirtyUserIds.clear(); + } catch (Exception e) { + wtf("Exception in saveDirtyInfo", e); } } @@ -1037,20 +1062,14 @@ public class ShortcutService extends IShortcutService.Stub { } } - private boolean isUserUnlocked(@UserIdInt int userId) { - final long token = injectClearCallingIdentity(); - try { - // Weird: when SystemService.onUnlockUser() is called, the user state is still - // unlocking, as opposed to unlocked. So we need to accept the "unlocking" state too. - // We know when the user is unlocking, the CE storage is already unlocked. - return mUserManager.isUserUnlockingOrUnlocked(userId); - } finally { - injectRestoreCallingIdentity(token); - } + // Requires mLock held, but "Locked" prefix would look weired so we jsut say "L". + protected boolean isUserUnlockedL(@UserIdInt int userId) { + return mUnlockedUsers.get(userId); } - void throwIfUserLocked(@UserIdInt int userId) { - if (!isUserUnlocked(userId)) { + // Requires mLock held, but "Locked" prefix would look weired so we jsut say "L". + void throwIfUserLockedL(@UserIdInt int userId) { + if (!isUserUnlockedL(userId)) { throw new IllegalStateException("User " + userId + " is locked or not running"); } } @@ -1065,9 +1084,8 @@ public class ShortcutService extends IShortcutService.Stub { @GuardedBy("mLock") @NonNull ShortcutUser getUserShortcutsLocked(@UserIdInt int userId) { - if (!isUserUnlocked(userId)) { + if (!isUserUnlockedL(userId)) { wtf("User still locked"); - return new ShortcutUser(this, userId); } ShortcutUser userPackages = mUsers.get(userId); @@ -1471,22 +1489,21 @@ public class ShortcutService extends IShortcutService.Stub { } private void notifyListeners(@NonNull String packageName, @UserIdInt int userId) { - final long token = injectClearCallingIdentity(); - try { - if (!mUserManager.isUserRunning(userId)) { - return; - } - } finally { - injectRestoreCallingIdentity(token); - } injectPostToHandler(() -> { - final ArrayList<ShortcutChangeListener> copy; - synchronized (mLock) { - copy = new ArrayList<>(mListeners); - } - // Note onShortcutChanged() needs to be called with the system service permissions. - for (int i = copy.size() - 1; i >= 0; i--) { - copy.get(i).onShortcutChanged(packageName, userId); + try { + final ArrayList<ShortcutChangeListener> copy; + synchronized (mLock) { + if (!isUserUnlockedL(userId)) { + return; + } + + copy = new ArrayList<>(mListeners); + } + // Note onShortcutChanged() needs to be called with the system service permissions. + for (int i = copy.size() - 1; i >= 0; i--) { + copy.get(i).onShortcutChanged(packageName, userId); + } + } catch (Exception ignore) { } }); } @@ -1558,12 +1575,13 @@ public class ShortcutService extends IShortcutService.Stub { public boolean setDynamicShortcuts(String packageName, ParceledListSlice shortcutInfoList, @UserIdInt int userId) { verifyCaller(packageName, userId); - throwIfUserLocked(userId); final List<ShortcutInfo> newShortcuts = (List<ShortcutInfo>) shortcutInfoList.getList(); final int size = newShortcuts.size(); synchronized (mLock) { + throwIfUserLockedL(userId); + final ShortcutPackage ps = getPackageShortcutsLocked(packageName, userId); ps.getUser().onCalledByPublisher(packageName); @@ -1609,12 +1627,13 @@ public class ShortcutService extends IShortcutService.Stub { public boolean updateShortcuts(String packageName, ParceledListSlice shortcutInfoList, @UserIdInt int userId) { verifyCaller(packageName, userId); - throwIfUserLocked(userId); final List<ShortcutInfo> newShortcuts = (List<ShortcutInfo>) shortcutInfoList.getList(); final int size = newShortcuts.size(); synchronized (mLock) { + throwIfUserLockedL(userId); + final ShortcutPackage ps = getPackageShortcutsLocked(packageName, userId); ps.getUser().onCalledByPublisher(packageName); @@ -1689,12 +1708,13 @@ public class ShortcutService extends IShortcutService.Stub { public boolean addDynamicShortcuts(String packageName, ParceledListSlice shortcutInfoList, @UserIdInt int userId) { verifyCaller(packageName, userId); - throwIfUserLocked(userId); final List<ShortcutInfo> newShortcuts = (List<ShortcutInfo>) shortcutInfoList.getList(); final int size = newShortcuts.size(); synchronized (mLock) { + throwIfUserLockedL(userId); + final ShortcutPackage ps = getPackageShortcutsLocked(packageName, userId); ps.getUser().onCalledByPublisher(packageName); @@ -1741,9 +1761,10 @@ public class ShortcutService extends IShortcutService.Stub { CharSequence disabledMessage, int disabledMessageResId, @UserIdInt int userId) { verifyCaller(packageName, userId); Preconditions.checkNotNull(shortcutIds, "shortcutIds must be provided"); - throwIfUserLocked(userId); synchronized (mLock) { + throwIfUserLockedL(userId); + final ShortcutPackage ps = getPackageShortcutsLocked(packageName, userId); ps.getUser().onCalledByPublisher(packageName); @@ -1770,9 +1791,10 @@ public class ShortcutService extends IShortcutService.Stub { public void enableShortcuts(String packageName, List shortcutIds, @UserIdInt int userId) { verifyCaller(packageName, userId); Preconditions.checkNotNull(shortcutIds, "shortcutIds must be provided"); - throwIfUserLocked(userId); synchronized (mLock) { + throwIfUserLockedL(userId); + final ShortcutPackage ps = getPackageShortcutsLocked(packageName, userId); ps.getUser().onCalledByPublisher(packageName); @@ -1792,9 +1814,10 @@ public class ShortcutService extends IShortcutService.Stub { @UserIdInt int userId) { verifyCaller(packageName, userId); Preconditions.checkNotNull(shortcutIds, "shortcutIds must be provided"); - throwIfUserLocked(userId); synchronized (mLock) { + throwIfUserLockedL(userId); + final ShortcutPackage ps = getPackageShortcutsLocked(packageName, userId); ps.getUser().onCalledByPublisher(packageName); @@ -1816,9 +1839,10 @@ public class ShortcutService extends IShortcutService.Stub { @Override public void removeAllDynamicShortcuts(String packageName, @UserIdInt int userId) { verifyCaller(packageName, userId); - throwIfUserLocked(userId); synchronized (mLock) { + throwIfUserLockedL(userId); + final ShortcutPackage ps = getPackageShortcutsLocked(packageName, userId); ps.getUser().onCalledByPublisher(packageName); ps.deleteAllDynamicShortcuts(); @@ -1832,9 +1856,10 @@ public class ShortcutService extends IShortcutService.Stub { public ParceledListSlice<ShortcutInfo> getDynamicShortcuts(String packageName, @UserIdInt int userId) { verifyCaller(packageName, userId); - throwIfUserLocked(userId); synchronized (mLock) { + throwIfUserLockedL(userId); + return getShortcutsWithQueryLocked( packageName, userId, ShortcutInfo.CLONE_REMOVE_FOR_CREATOR, ShortcutInfo::isDynamic); @@ -1845,9 +1870,10 @@ public class ShortcutService extends IShortcutService.Stub { public ParceledListSlice<ShortcutInfo> getManifestShortcuts(String packageName, @UserIdInt int userId) { verifyCaller(packageName, userId); - throwIfUserLocked(userId); synchronized (mLock) { + throwIfUserLockedL(userId); + return getShortcutsWithQueryLocked( packageName, userId, ShortcutInfo.CLONE_REMOVE_FOR_CREATOR, ShortcutInfo::isManifestShortcut); @@ -1858,9 +1884,10 @@ public class ShortcutService extends IShortcutService.Stub { public ParceledListSlice<ShortcutInfo> getPinnedShortcuts(String packageName, @UserIdInt int userId) { verifyCaller(packageName, userId); - throwIfUserLocked(userId); synchronized (mLock) { + throwIfUserLockedL(userId); + return getShortcutsWithQueryLocked( packageName, userId, ShortcutInfo.CLONE_REMOVE_FOR_CREATOR, ShortcutInfo::isPinned); @@ -1890,9 +1917,10 @@ public class ShortcutService extends IShortcutService.Stub { @Override public int getRemainingCallCount(String packageName, @UserIdInt int userId) { verifyCaller(packageName, userId); - throwIfUserLocked(userId); synchronized (mLock) { + throwIfUserLockedL(userId); + final ShortcutPackage ps = getPackageShortcutsLocked(packageName, userId); ps.getUser().onCalledByPublisher(packageName); return mMaxUpdatesPerInterval - ps.getApiCallCount(); @@ -1902,9 +1930,10 @@ public class ShortcutService extends IShortcutService.Stub { @Override public long getRateLimitResetTime(String packageName, @UserIdInt int userId) { verifyCaller(packageName, userId); - throwIfUserLocked(userId); synchronized (mLock) { + throwIfUserLockedL(userId); + return getNextResetTimeLocked(); } } @@ -1921,7 +1950,6 @@ public class ShortcutService extends IShortcutService.Stub { @Override public void reportShortcutUsed(String packageName, String shortcutId, int userId) { verifyCaller(packageName, userId); - throwIfUserLocked(userId); Preconditions.checkNotNull(shortcutId); @@ -1931,6 +1959,8 @@ public class ShortcutService extends IShortcutService.Stub { } synchronized (mLock) { + throwIfUserLockedL(userId); + final ShortcutPackage ps = getPackageShortcutsLocked(packageName, userId); ps.getUser().onCalledByPublisher(packageName); @@ -1962,6 +1992,11 @@ public class ShortcutService extends IShortcutService.Stub { void resetThrottlingInner(@UserIdInt int userId) { synchronized (mLock) { + if (!isUserUnlockedL(userId)) { + Log.w(TAG, "User " + userId + " is locked or not running"); + return; + } + getUserShortcutsLocked(userId).resetThrottling(); } scheduleSaveUser(userId); @@ -1976,25 +2011,23 @@ public class ShortcutService extends IShortcutService.Stub { Slog.i(TAG, "ShortcutManager: throttling counter reset for all users"); } - void resetPackageThrottling(String packageName, int userId) { - synchronized (mLock) { - getPackageShortcutsLocked(packageName, userId) - .resetRateLimitingForCommandLineNoSaving(); - saveUserLocked(userId); - } - } - @Override public void onApplicationActive(String packageName, int userId) { if (DEBUG) { Slog.d(TAG, "onApplicationActive: package=" + packageName + " userid=" + userId); } enforceResetThrottlingPermission(); - if (!isUserUnlocked(userId)) { - // This is called by system UI, so no need to throw. Just ignore. - return; + + synchronized (mLock) { + if (!isUserUnlockedL(userId)) { + // This is called by system UI, so no need to throw. Just ignore. + return; + } + + getPackageShortcutsLocked(packageName, userId) + .resetRateLimitingForCommandLineNoSaving(); + saveUserLocked(userId); } - resetPackageThrottling(packageName, userId); } // We override this method in unit tests to do a simpler check. @@ -2011,9 +2044,9 @@ public class ShortcutService extends IShortcutService.Stub { // even when hasShortcutPermission() is overridden. @VisibleForTesting boolean hasShortcutHostPermissionInner(@NonNull String callingPackage, int userId) { - throwIfUserLocked(userId); - synchronized (mLock) { + throwIfUserLockedL(userId); + final ShortcutUser user = getUserShortcutsLocked(userId); // Always trust the in-memory cache. @@ -2171,9 +2204,6 @@ public class ShortcutService extends IShortcutService.Stub { int queryFlags, int userId) { final ArrayList<ShortcutInfo> ret = new ArrayList<>(); - throwIfUserLocked(userId); - throwIfUserLocked(launcherUserId); - final boolean cloneKeyFieldOnly = ((queryFlags & ShortcutQuery.FLAG_GET_KEY_FIELDS_ONLY) != 0); final int cloneFlag = cloneKeyFieldOnly ? ShortcutInfo.CLONE_REMOVE_NON_KEY_INFO @@ -2183,6 +2213,9 @@ public class ShortcutService extends IShortcutService.Stub { } synchronized (mLock) { + throwIfUserLockedL(userId); + throwIfUserLockedL(launcherUserId); + getLauncherShortcutsLocked(callingPackage, userId, launcherUserId) .attemptToRestoreIfNeededAndSave(); @@ -2251,10 +2284,10 @@ public class ShortcutService extends IShortcutService.Stub { Preconditions.checkStringNotEmpty(packageName, "packageName"); Preconditions.checkStringNotEmpty(shortcutId, "shortcutId"); - throwIfUserLocked(userId); - throwIfUserLocked(launcherUserId); - synchronized (mLock) { + throwIfUserLockedL(userId); + throwIfUserLockedL(launcherUserId); + getLauncherShortcutsLocked(callingPackage, userId, launcherUserId) .attemptToRestoreIfNeededAndSave(); @@ -2270,8 +2303,8 @@ public class ShortcutService extends IShortcutService.Stub { Preconditions.checkStringNotEmpty(packageName, "packageName"); Preconditions.checkStringNotEmpty(shortcutId, "shortcutId"); - throwIfUserLocked(userId); - throwIfUserLocked(launcherUserId); + throwIfUserLockedL(userId); + throwIfUserLockedL(launcherUserId); final ShortcutPackage p = getUserShortcutsLocked(userId) .getPackageShortcutsIfExists(packageName); @@ -2294,10 +2327,10 @@ public class ShortcutService extends IShortcutService.Stub { Preconditions.checkStringNotEmpty(packageName, "packageName"); Preconditions.checkNotNull(shortcutIds, "shortcutIds"); - throwIfUserLocked(userId); - throwIfUserLocked(launcherUserId); - synchronized (mLock) { + throwIfUserLockedL(userId); + throwIfUserLockedL(launcherUserId); + final ShortcutLauncher launcher = getLauncherShortcutsLocked(callingPackage, userId, launcherUserId); launcher.attemptToRestoreIfNeededAndSave(); @@ -2317,10 +2350,10 @@ public class ShortcutService extends IShortcutService.Stub { Preconditions.checkStringNotEmpty(packageName, "packageName can't be empty"); Preconditions.checkStringNotEmpty(shortcutId, "shortcutId can't be empty"); - throwIfUserLocked(userId); - throwIfUserLocked(launcherUserId); - synchronized (mLock) { + throwIfUserLockedL(userId); + throwIfUserLockedL(launcherUserId); + getLauncherShortcutsLocked(callingPackage, userId, launcherUserId) .attemptToRestoreIfNeededAndSave(); @@ -2350,10 +2383,10 @@ public class ShortcutService extends IShortcutService.Stub { Preconditions.checkNotNull(packageName, "packageName"); Preconditions.checkNotNull(shortcutId, "shortcutId"); - throwIfUserLocked(userId); - throwIfUserLocked(launcherUserId); - synchronized (mLock) { + throwIfUserLockedL(userId); + throwIfUserLockedL(launcherUserId); + getLauncherShortcutsLocked(callingPackage, userId, launcherUserId) .attemptToRestoreIfNeededAndSave(); @@ -2377,10 +2410,10 @@ public class ShortcutService extends IShortcutService.Stub { Preconditions.checkNotNull(packageName, "packageName"); Preconditions.checkNotNull(shortcutId, "shortcutId"); - throwIfUserLocked(userId); - throwIfUserLocked(launcherUserId); - synchronized (mLock) { + throwIfUserLockedL(userId); + throwIfUserLockedL(launcherUserId); + getLauncherShortcutsLocked(callingPackage, userId, launcherUserId) .attemptToRestoreIfNeededAndSave(); @@ -2412,7 +2445,6 @@ public class ShortcutService extends IShortcutService.Stub { @Override public boolean hasShortcutHostPermission(int launcherUserId, @NonNull String callingPackage) { - throwIfUserLocked(launcherUserId); return ShortcutService.this.hasShortcutHostPermission(callingPackage, launcherUserId); } } @@ -2423,8 +2455,12 @@ public class ShortcutService extends IShortcutService.Stub { if (!mBootCompleted.get()) { return; // Boot not completed, ignore the broadcast. } - if (Intent.ACTION_LOCALE_CHANGED.equals(intent.getAction())) { - handleLocaleChanged(); + try { + if (Intent.ACTION_LOCALE_CHANGED.equals(intent.getAction())) { + handleLocaleChanged(); + } + } catch (Exception e) { + wtf("Exception in mReceiver.onReceive", e); } } }; @@ -2435,11 +2471,13 @@ public class ShortcutService extends IShortcutService.Stub { } scheduleSaveBaseState(); - final long token = injectClearCallingIdentity(); - try { - forEachLoadedUserLocked(user -> user.detectLocaleChange()); - } finally { - injectRestoreCallingIdentity(token); + synchronized (mLock) { + final long token = injectClearCallingIdentity(); + try { + forEachLoadedUserLocked(user -> user.detectLocaleChange()); + } finally { + injectRestoreCallingIdentity(token); + } } } @@ -2462,18 +2500,17 @@ public class ShortcutService extends IShortcutService.Stub { // but we still check it in unit tests. final long token = injectClearCallingIdentity(); try { - - if (!isUserUnlocked(userId)) { - if (DEBUG) { - Slog.d(TAG, "Ignoring package broadcast " + action - + " for locked/stopped user " + userId); + synchronized (mLock) { + if (!isUserUnlockedL(userId)) { + if (DEBUG) { + Slog.d(TAG, "Ignoring package broadcast " + action + + " for locked/stopped user " + userId); + } + return; } - return; - } - // Whenever we get one of those package broadcasts, or get - // ACTION_PREFERRED_ACTIVITY_CHANGED, we purge the default launcher cache. - synchronized (mLock) { + // Whenever we get one of those package broadcasts, or get + // ACTION_PREFERRED_ACTIVITY_CHANGED, we purge the default launcher cache. final ShortcutUser user = getUserShortcutsLocked(userId); user.clearLauncher(); } @@ -2513,6 +2550,8 @@ public class ShortcutService extends IShortcutService.Stub { handlePackageDataCleared(packageName, userId); break; } + } catch (Exception e) { + wtf("Exception in mPackageMonitor.onReceive", e); } finally { injectRestoreCallingIdentity(token); } @@ -3023,9 +3062,14 @@ public class ShortcutService extends IShortcutService.Stub { Slog.d(TAG, "Backing up user " + userId); } synchronized (mLock) { + if (!isUserUnlockedL(userId)) { + wtf("Can't backup: user " + userId + " is locked or not running"); + return null; + } + final ShortcutUser user = getUserShortcutsLocked(userId); if (user == null) { - Slog.w(TAG, "Can't backup: user not found: id=" + userId); + wtf("Can't backup: user not found: id=" + userId); return null; } @@ -3050,15 +3094,19 @@ public class ShortcutService extends IShortcutService.Stub { if (DEBUG) { Slog.d(TAG, "Restoring user " + userId); } - final ShortcutUser user; - final ByteArrayInputStream is = new ByteArrayInputStream(payload); - try { - user = loadUserInternal(userId, is, /* fromBackup */ true); - } catch (XmlPullParserException | IOException e) { - Slog.w(TAG, "Restoration failed.", e); - return; - } synchronized (mLock) { + if (!isUserUnlockedL(userId)) { + wtf("Can't restore: user " + userId + " is locked or not running"); + return; + } + final ShortcutUser user; + final ByteArrayInputStream is = new ByteArrayInputStream(payload); + try { + user = loadUserInternal(userId, is, /* fromBackup */ true); + } catch (XmlPullParserException | IOException e) { + Slog.w(TAG, "Restoration failed.", e); + return; + } mUsers.put(userId, user); // Then purge all the save images. @@ -3268,7 +3316,7 @@ public class ShortcutService extends IShortcutService.Stub { private int mUserId = UserHandle.USER_SYSTEM; - private void parseOptions(boolean takeUser) + private void parseOptionsLocked(boolean takeUser) throws CommandException { String opt; while ((opt = getNextOption()) != null) { @@ -3276,7 +3324,7 @@ public class ShortcutService extends IShortcutService.Stub { case "--user": if (takeUser) { mUserId = UserHandle.parseUserArg(getNextArgRequired()); - if (!isUserUnlocked(mUserId)) { + if (!isUserUnlockedL(mUserId)) { throw new CommandException( "User " + mUserId + " is not running or locked"); } @@ -3368,11 +3416,13 @@ public class ShortcutService extends IShortcutService.Stub { } private void handleResetThrottling() throws CommandException { - parseOptions(/* takeUser =*/ true); + synchronized (mLock) { + parseOptionsLocked(/* takeUser =*/ true); - Slog.i(TAG, "cmd: handleResetThrottling: user=" + mUserId); + Slog.i(TAG, "cmd: handleResetThrottling: user=" + mUserId); - resetThrottlingInner(mUserId); + resetThrottlingInner(mUserId); + } } private void handleResetAllThrottling() { @@ -3418,34 +3468,42 @@ public class ShortcutService extends IShortcutService.Stub { } private void handleClearDefaultLauncher() throws CommandException { - parseOptions(/* takeUser =*/ true); + synchronized (mLock) { + parseOptionsLocked(/* takeUser =*/ true); - clearLauncher(); + clearLauncher(); + } } private void handleGetDefaultLauncher() throws CommandException { - parseOptions(/* takeUser =*/ true); + synchronized (mLock) { + parseOptionsLocked(/* takeUser =*/ true); - clearLauncher(); - showLauncher(); + clearLauncher(); + showLauncher(); + } } private void handleUnloadUser() throws CommandException { - parseOptions(/* takeUser =*/ true); + synchronized (mLock) { + parseOptionsLocked(/* takeUser =*/ true); - Slog.i(TAG, "cmd: handleUnloadUser: user=" + mUserId); + Slog.i(TAG, "cmd: handleUnloadUser: user=" + mUserId); - ShortcutService.this.handleCleanupUser(mUserId); + ShortcutService.this.handleCleanupUser(mUserId); + } } private void handleClearShortcuts() throws CommandException { - parseOptions(/* takeUser =*/ true); - final String packageName = getNextArgRequired(); + synchronized (mLock) { + parseOptionsLocked(/* takeUser =*/ true); + final String packageName = getNextArgRequired(); - Slog.i(TAG, "cmd: handleClearShortcuts: user" + mUserId + ", " + packageName); + Slog.i(TAG, "cmd: handleClearShortcuts: user" + mUserId + ", " + packageName); - ShortcutService.this.cleanUpPackageForAllLoadedUsers(packageName, mUserId, - /* appStillExists = */ true); + ShortcutService.this.cleanUpPackageForAllLoadedUsers(packageName, mUserId, + /* appStillExists = */ true); + } } private void handleVerifyStates() throws CommandException { diff --git a/services/core/java/com/android/server/pm/ShortcutUser.java b/services/core/java/com/android/server/pm/ShortcutUser.java index 21e4165e6a67..ce3ed9c7deef 100644 --- a/services/core/java/com/android/server/pm/ShortcutUser.java +++ b/services/core/java/com/android/server/pm/ShortcutUser.java @@ -57,7 +57,9 @@ class ShortcutUser { private static final String ATTR_VALUE = "value"; private static final String ATTR_KNOWN_LOCALES = "locales"; - private static final String ATTR_LAST_APP_SCAN_TIME = "last-app-scan-time"; + + // Suffix "2" was added to force rescan all packages after the next OTA. + private static final String ATTR_LAST_APP_SCAN_TIME = "last-app-scan-time2"; private static final String KEY_USER_ID = "userId"; private static final String KEY_LAUNCHERS = "launchers"; private static final String KEY_PACKAGES = "packages"; diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java index e502764f33b2..85f3ddfeab91 100644 --- a/services/core/java/com/android/server/policy/PhoneWindowManager.java +++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java @@ -200,6 +200,11 @@ public class PhoneWindowManager implements WindowManagerPolicy { static final int MULTI_PRESS_POWER_THEATER_MODE = 1; static final int MULTI_PRESS_POWER_BRIGHTNESS_BOOST = 2; + // Number of presses needed before we induce panic press behavior on the back button + static final int PANIC_PRESS_BACK_COUNT = 4; + static final int PANIC_PRESS_BACK_NOTHING = 0; + static final int PANIC_PRESS_BACK_HOME = 1; + // These need to match the documentation/constant in // core/res/res/values/config.xml static final int LONG_PRESS_HOME_NOTHING = 0; @@ -406,6 +411,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { volatile boolean mBackKeyHandled; volatile boolean mBeganFromNonInteractive; volatile int mPowerKeyPressCounter; + volatile int mBackKeyPressCounter; volatile boolean mEndCallKeyHandled; volatile boolean mCameraGestureTriggeredDuringGoingToSleep; volatile boolean mGoingToSleep; @@ -464,6 +470,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { int mDoublePressOnPowerBehavior; int mTriplePressOnPowerBehavior; int mLongPressOnBackBehavior; + int mPanicPressOnBackBehavior; int mShortPressOnSleepBehavior; int mShortPressWindowBehavior; boolean mAwake; @@ -726,6 +733,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { private static final int MSG_SHOW_TV_PICTURE_IN_PICTURE_MENU = 17; private static final int MSG_BACK_LONG_PRESS = 18; private static final int MSG_DISPOSE_INPUT_CONSUMER = 19; + private static final int MSG_BACK_DELAYED_PRESS = 20; private static final int MSG_REQUEST_TRANSIENT_BARS_ARG_STATUS = 0; private static final int MSG_REQUEST_TRANSIENT_BARS_ARG_NAVIGATION = 1; @@ -792,10 +800,15 @@ public class PhoneWindowManager implements WindowManagerPolicy { break; case MSG_BACK_LONG_PRESS: backLongPress(); + finishBackKeyPress(); break; case MSG_DISPOSE_INPUT_CONSUMER: disposeInputConsumer((InputConsumer) msg.obj); break; + case MSG_BACK_DELAYED_PRESS: + backMultiPressAction((Long) msg.obj, msg.arg1); + finishBackKeyPress(); + break; } } } @@ -1010,6 +1023,52 @@ public class PhoneWindowManager implements WindowManagerPolicy { } } + private void interceptBackKeyDown() { + // Reset back key state for long press + mBackKeyHandled = false; + + // Cancel multi-press detection timeout. + if (hasPanicPressOnBackBehavior()) { + if (mBackKeyPressCounter != 0 + && mBackKeyPressCounter < PANIC_PRESS_BACK_COUNT) { + mHandler.removeMessages(MSG_BACK_DELAYED_PRESS); + } + } + + if (hasLongPressOnBackBehavior()) { + Message msg = mHandler.obtainMessage(MSG_BACK_LONG_PRESS); + msg.setAsynchronous(true); + mHandler.sendMessageDelayed(msg, + ViewConfiguration.get(mContext).getDeviceGlobalActionKeyTimeout()); + } + } + + // returns true if the key was handled and should not be passed to the user + private boolean interceptBackKeyUp(KeyEvent event) { + // Cache handled state + boolean handled = mBackKeyHandled; + + if (hasPanicPressOnBackBehavior()) { + // Check for back key panic press + ++mBackKeyPressCounter; + + final long eventTime = event.getDownTime(); + + if (mBackKeyPressCounter <= PANIC_PRESS_BACK_COUNT) { + // This could be a multi-press. Wait a little bit longer to confirm. + Message msg = mHandler.obtainMessage(MSG_BACK_DELAYED_PRESS, + mBackKeyPressCounter, 0, eventTime); + msg.setAsynchronous(true); + mHandler.sendMessageDelayed(msg, ViewConfiguration.getMultiPressTimeout()); + } + } + + // Reset back long press state + cancelPendingBackKeyAction(); + + return handled; + } + private void interceptPowerKeyDown(KeyEvent event, boolean interactive) { // Hold a wake lock until the power key is released. if (!mPowerKeyWakeLock.isHeld()) { @@ -1140,6 +1199,10 @@ public class PhoneWindowManager implements WindowManagerPolicy { } } + private void finishBackKeyPress() { + mBackKeyPressCounter = 0; + } + private void cancelPendingPowerKeyAction() { if (!mPowerKeyHandled) { mPowerKeyHandled = true; @@ -1154,6 +1217,18 @@ public class PhoneWindowManager implements WindowManagerPolicy { } } + private void backMultiPressAction(long eventTime, int count) { + if (count >= PANIC_PRESS_BACK_COUNT) { + switch (mPanicPressOnBackBehavior) { + case PANIC_PRESS_BACK_NOTHING: + break; + case PANIC_PRESS_BACK_HOME: + launchHomeFromHotKey(); + break; + } + } + } + private void powerPress(long eventTime, boolean interactive, int count) { if (mScreenOnEarly && !mScreenOnFully) { Slog.i(TAG, "Suppressed redundant power key press while " @@ -1312,6 +1387,10 @@ public class PhoneWindowManager implements WindowManagerPolicy { return mLongPressOnBackBehavior != LONG_PRESS_BACK_NOTHING; } + private boolean hasPanicPressOnBackBehavior() { + return mPanicPressOnBackBehavior != PANIC_PRESS_BACK_NOTHING; + } + private void interceptScreenshotChord() { if (mScreenshotChordEnabled && mScreenshotChordVolumeDownKeyTriggered && mScreenshotChordPowerKeyTriggered @@ -1639,6 +1718,8 @@ public class PhoneWindowManager implements WindowManagerPolicy { mLongPressOnBackBehavior = mContext.getResources().getInteger( com.android.internal.R.integer.config_longPressOnBackBehavior); + mPanicPressOnBackBehavior = mContext.getResources().getInteger( + com.android.internal.R.integer.config_backPanicBehavior); mShortPressOnPowerBehavior = mContext.getResources().getInteger( com.android.internal.R.integer.config_shortPressOnPowerBehavior); @@ -3560,6 +3641,14 @@ public class PhoneWindowManager implements WindowManagerPolicy { } } + @Override + public boolean canShowDismissingWindowWhileLockedLw() { + // If the keyguard is trusted, it will unlock without a challange. Therefore, windows with + // FLAG_DISMISS_KEYGUARD don't need to be force hidden, as they will unlock the phone right + // away anyways. + return mKeyguardDelegate != null && mKeyguardDelegate.isTrusted(); + } + private void launchAssistLongPressAction() { performHapticFeedbackLw(null, HapticFeedbackConstants.LONG_PRESS, false); sendCloseSystemWindows(SYSTEM_DIALOG_REASON_ASSIST); @@ -5256,7 +5345,10 @@ public class PhoneWindowManager implements WindowManagerPolicy { } } else if (mDismissKeyguard != DISMISS_KEYGUARD_NONE) { mKeyguardHidden = false; - if (setKeyguardOccludedLw(false)) { + final boolean trusted = mKeyguardDelegate.isTrusted(); + if (trusted) { + // No need to un-occlude keyguard - we'll dimiss it right away anyways. + } else if (setKeyguardOccludedLw(false)) { changes |= FINISH_LAYOUT_REDO_LAYOUT | FINISH_LAYOUT_REDO_CONFIG | FINISH_LAYOUT_REDO_WALLPAPER; @@ -5266,7 +5358,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { mHandler.post(new Runnable() { @Override public void run() { - mKeyguardDelegate.dismiss(); + mKeyguardDelegate.dismiss(trusted /* allowWhileOccluded */); } }); } @@ -5607,20 +5699,11 @@ public class PhoneWindowManager implements WindowManagerPolicy { switch (keyCode) { case KeyEvent.KEYCODE_BACK: { if (down) { - mBackKeyHandled = false; - if (hasLongPressOnBackBehavior()) { - Message msg = mHandler.obtainMessage(MSG_BACK_LONG_PRESS); - msg.setAsynchronous(true); - mHandler.sendMessageDelayed(msg, - ViewConfiguration.get(mContext).getDeviceGlobalActionKeyTimeout()); - } + interceptBackKeyDown(); } else { - boolean handled = mBackKeyHandled; - - // Reset back key state - cancelPendingBackKeyAction(); + boolean handled = interceptBackKeyUp(event); - // Don't pass back press to app if we've already handled it + // Don't pass back press to app if we've already handled it via long press if (handled) { result &= ~ACTION_PASS_TO_USER; } @@ -6511,7 +6594,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { @Override public void run() { // ask the keyguard to prompt the user to authenticate if necessary - mKeyguardDelegate.dismiss(); + mKeyguardDelegate.dismiss(false /* allowWhileOccluded */); } }); } diff --git a/services/core/java/com/android/server/policy/keyguard/KeyguardServiceDelegate.java b/services/core/java/com/android/server/policy/keyguard/KeyguardServiceDelegate.java index bcae481c583f..d3c592db4099 100644 --- a/services/core/java/com/android/server/policy/keyguard/KeyguardServiceDelegate.java +++ b/services/core/java/com/android/server/policy/keyguard/KeyguardServiceDelegate.java @@ -199,6 +199,13 @@ public class KeyguardServiceDelegate { return mKeyguardState.showing; } + public boolean isTrusted() { + if (mKeyguardService != null) { + return mKeyguardService.isTrusted(); + } + return false; + } + public boolean isInputRestricted() { if (mKeyguardService != null) { mKeyguardState.inputRestricted = mKeyguardService.isInputRestricted(); @@ -220,14 +227,15 @@ public class KeyguardServiceDelegate { public void setOccluded(boolean isOccluded) { if (mKeyguardService != null) { + if (DEBUG) Log.v(TAG, "setOccluded(" + isOccluded + ")"); mKeyguardService.setOccluded(isOccluded); } mKeyguardState.occluded = isOccluded; } - public void dismiss() { + public void dismiss(boolean allowWhileOccluded) { if (mKeyguardService != null) { - mKeyguardService.dismiss(); + mKeyguardService.dismiss(allowWhileOccluded); } } diff --git a/services/core/java/com/android/server/policy/keyguard/KeyguardServiceWrapper.java b/services/core/java/com/android/server/policy/keyguard/KeyguardServiceWrapper.java index 57e885797e4c..bea31673a58b 100644 --- a/services/core/java/com/android/server/policy/keyguard/KeyguardServiceWrapper.java +++ b/services/core/java/com/android/server/policy/keyguard/KeyguardServiceWrapper.java @@ -81,9 +81,9 @@ public class KeyguardServiceWrapper implements IKeyguardService { } @Override // Binder interface - public void dismiss() { + public void dismiss(boolean allowWhileOccluded) { try { - mService.dismiss(); + mService.dismiss(allowWhileOccluded); } catch (RemoteException e) { Slog.w(TAG , "Remote Exception", e); } @@ -234,6 +234,10 @@ public class KeyguardServiceWrapper implements IKeyguardService { return mKeyguardStateMonitor.isShowing(); } + public boolean isTrusted() { + return mKeyguardStateMonitor.isTrusted(); + } + public boolean isSecure(int userId) { return mKeyguardStateMonitor.isSecure(userId); } diff --git a/services/core/java/com/android/server/policy/keyguard/KeyguardStateMonitor.java b/services/core/java/com/android/server/policy/keyguard/KeyguardStateMonitor.java index 138f068f38ed..f3238c824104 100644 --- a/services/core/java/com/android/server/policy/keyguard/KeyguardStateMonitor.java +++ b/services/core/java/com/android/server/policy/keyguard/KeyguardStateMonitor.java @@ -43,6 +43,7 @@ public class KeyguardStateMonitor extends IKeyguardStateCallback.Stub { private volatile boolean mIsShowing = true; private volatile boolean mSimSecure = true; private volatile boolean mInputRestricted = true; + private volatile boolean mTrusted = false; private int mCurrentUserId; @@ -70,6 +71,10 @@ public class KeyguardStateMonitor extends IKeyguardStateCallback.Stub { return mInputRestricted; } + public boolean isTrusted() { + return mTrusted; + } + @Override // Binder interface public void onShowingStateChanged(boolean showing) { mIsShowing = showing; @@ -93,12 +98,18 @@ public class KeyguardStateMonitor extends IKeyguardStateCallback.Stub { mInputRestricted = inputRestricted; } + @Override // Binder interface + public void onTrustedChanged(boolean trusted) { + mTrusted = trusted; + } + public void dump(String prefix, PrintWriter pw) { pw.println(prefix + TAG); prefix += " "; pw.println(prefix + "mIsShowing=" + mIsShowing); pw.println(prefix + "mSimSecure=" + mSimSecure); pw.println(prefix + "mInputRestricted=" + mInputRestricted); + pw.println(prefix + "mTrusted=" + mTrusted); pw.println(prefix + "mCurrentUserId=" + mCurrentUserId); } }
\ No newline at end of file diff --git a/services/core/java/com/android/server/vr/VrManagerService.java b/services/core/java/com/android/server/vr/VrManagerService.java index 7d209318c086..fdadc8de717f 100644 --- a/services/core/java/com/android/server/vr/VrManagerService.java +++ b/services/core/java/com/android/server/vr/VrManagerService.java @@ -46,6 +46,7 @@ import android.service.vr.IVrListener; import android.service.vr.IVrManager; import android.service.vr.IVrStateCallbacks; import android.service.vr.VrListenerService; +import android.text.TextUtils; import android.util.ArrayMap; import android.util.ArraySet; import android.util.Slog; @@ -218,6 +219,7 @@ public class VrManagerService extends SystemService implements EnabledComponentC String packageName = mNotificationAccessPackageToUserId.keyAt(i); revokeNotificationListenerAccess(packageName, grantUserId); revokeNotificationPolicyAccess(packageName); + revokeCoarseLocationPermissionIfNeeded(packageName, grantUserId); mNotificationAccessPackageToUserId.removeAt(i); } } @@ -226,6 +228,7 @@ public class VrManagerService extends SystemService implements EnabledComponentC if (!packageNames.contains(pkg)) { revokeNotificationListenerAccess(pkg, currentUserId); revokeNotificationPolicyAccess(pkg); + revokeCoarseLocationPermissionIfNeeded(pkg, currentUserId); mNotificationAccessPackageToUserId.remove(pkg); } } @@ -233,6 +236,7 @@ public class VrManagerService extends SystemService implements EnabledComponentC if (!allowed.contains(pkg)) { grantNotificationPolicyAccess(pkg); grantNotificationListenerAccess(pkg, currentUserId); + grantCoarseLocationPermissionIfNeeded(pkg, currentUserId); mNotificationAccessPackageToUserId.put(pkg, currentUserId); } } @@ -643,7 +647,7 @@ public class VrManagerService extends SystemService implements EnabledComponentC for (String c : current) { ComponentName component = ComponentName.unflattenFromString(c); - if (component.getPackageName().equals(pkg)) { + if (component != null && component.getPackageName().equals(pkg)) { toRemove.add(c); } } @@ -656,6 +660,22 @@ public class VrManagerService extends SystemService implements EnabledComponentC flatSettings, userId); } + private void grantCoarseLocationPermissionIfNeeded(String pkg, int userId) { + // Don't clobber the user if permission set in current state explicitly + if (!isPermissionUserUpdated(Manifest.permission.ACCESS_COARSE_LOCATION, pkg, userId)) { + mContext.getPackageManager().grantRuntimePermission(pkg, + Manifest.permission.ACCESS_COARSE_LOCATION, new UserHandle(userId)); + } + } + + private void revokeCoarseLocationPermissionIfNeeded(String pkg, int userId) { + // Don't clobber the user if permission set in current state explicitly + if (!isPermissionUserUpdated(Manifest.permission.ACCESS_COARSE_LOCATION, pkg, userId)) { + mContext.getPackageManager().revokeRuntimePermission(pkg, + Manifest.permission.ACCESS_COARSE_LOCATION, new UserHandle(userId)); + } + } + private boolean isPermissionUserUpdated(String permission, String pkg, int userId) { final int flags = mContext.getPackageManager().getPermissionFlags( permission, pkg, new UserHandle(userId)); @@ -671,7 +691,9 @@ public class VrManagerService extends SystemService implements EnabledComponentC if (flat != null) { String[] allowed = flat.split(":"); for (String s : allowed) { - current.add(s); + if (!TextUtils.isEmpty(s)) { + current.add(s); + } } } return current; diff --git a/services/core/java/com/android/server/wm/DisplayContent.java b/services/core/java/com/android/server/wm/DisplayContent.java index fba439f8ca60..1d57872b2fbc 100644 --- a/services/core/java/com/android/server/wm/DisplayContent.java +++ b/services/core/java/com/android/server/wm/DisplayContent.java @@ -191,6 +191,16 @@ class DisplayContent { return mHomeStack; } + TaskStack getStackById(int stackId) { + for (int i = mStacks.size() - 1; i >= 0; --i) { + final TaskStack stack = mStacks.get(i); + if (stack.mStackId == stackId) { + return stack; + } + } + return null; + } + void updateDisplayInfo() { mDisplay.getDisplayInfo(mDisplayInfo); mDisplay.getMetrics(mDisplayMetrics); diff --git a/services/core/java/com/android/server/wm/WindowAnimator.java b/services/core/java/com/android/server/wm/WindowAnimator.java index be060d243404..e5eda0522f92 100644 --- a/services/core/java/com/android/server/wm/WindowAnimator.java +++ b/services/core/java/com/android/server/wm/WindowAnimator.java @@ -16,6 +16,7 @@ package com.android.server.wm; +import static android.view.WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD; import static android.view.WindowManager.LayoutParams.FLAG_SHOW_WALLPAPER; import static android.view.WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED; import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_KEYGUARD; @@ -233,6 +234,12 @@ public class WindowAnimator { || (win.mAttrs.privateFlags & PRIVATE_FLAG_SYSTEM_ERROR) != 0; } + // Allow showing a window that dismisses Keyguard if the policy allows it. This is used for + // when the policy knows that the Keyguard can be dismissed without user interaction to + // provide a smooth transition in that case. + allowWhenLocked |= (win.mAttrs.flags & FLAG_DISMISS_KEYGUARD) != 0 + && mPolicy.canShowDismissingWindowWhileLockedLw(); + // Only hide windows if the keyguard is active and not animating away. boolean keyguardOn = mPolicy.isKeyguardShowingOrOccluded() && mForceHiding != KEYGUARD_ANIMATING_OUT; diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java index 6451c7492fa8..c66f09cd792e 100644 --- a/services/core/java/com/android/server/wm/WindowManagerService.java +++ b/services/core/java/com/android/server/wm/WindowManagerService.java @@ -5047,18 +5047,32 @@ public class WindowManagerService extends IWindowManager.Stub try { synchronized (mWindowMap) { final DisplayContent displayContent = mDisplayContents.get(displayId); + boolean attachedToDisplay = false; if (displayContent != null) { TaskStack stack = mStackIdToStack.get(stackId); if (stack == null) { if (DEBUG_STACK) Slog.d(TAG_WM, "attachStack: stackId=" + stackId); - stack = new TaskStack(this, stackId); + + stack = displayContent.getStackById(stackId); + if (stack != null) { + // It's already attached to the display. Detach and re-attach + // because onTop might change, and be sure to clear mDeferDetach! + displayContent.detachStack(stack); + stack.mDeferDetach = false; + attachedToDisplay = true; + } else { + stack = new TaskStack(this, stackId); + } + mStackIdToStack.put(stackId, stack); if (stackId == DOCKED_STACK_ID) { getDefaultDisplayContentLocked().mDividerControllerLocked .notifyDockedStackExistsChanged(true); } } - stack.attachDisplayContent(displayContent); + if (!attachedToDisplay) { + stack.attachDisplayContent(displayContent); + } displayContent.attachStack(stack, onTop); if (stack.getRawFullscreen()) { return null; @@ -9454,10 +9468,17 @@ public class WindowManagerService extends IWindowManager.Stub } final boolean dragResizingChanged = w.isDragResizeChanged() && !w.isDragResizingChangeReported(); + if (localLOGV) Slog.v(TAG_WM, "Resizing " + w + ": configChanged=" + configChanged + " dragResizingChanged=" + dragResizingChanged + " last=" + w.mLastFrame + " frame=" + w.mFrame); + + // We update mLastFrame always rather than in the conditional with the + // last inset variables, because mFrameSizeChanged only tracks the + // width and height changing. + w.mLastFrame.set(w.mFrame); + if (w.mContentInsetsChanged || w.mVisibleInsetsChanged || winAnimator.mSurfaceResized @@ -9495,7 +9516,6 @@ public class WindowManagerService extends IWindowManager.Stub w.mLastVisibleInsets.set(w.mVisibleInsets); w.mLastStableInsets.set(w.mStableInsets); w.mLastOutsets.set(w.mOutsets); - w.mLastFrame.set(w.mFrame); makeWindowFreezingScreenIfNeededLocked(w); // If the orientation is changing, or we're starting or ending // a drag resizing action, then we need to hold off on unfreezing @@ -11445,8 +11465,9 @@ public class WindowManagerService extends IWindowManager.Stub for (int winNdx = windows.size() - 1; winNdx >= 0; --winNdx) { final WindowState win = windows.get(winNdx); final boolean isForceHiding = mPolicy.isForceHiding(win.mAttrs); + final boolean keyguard = mPolicy.isKeyguardHostWindow(win.mAttrs); if (win.isVisibleLw() - && (win.mAppToken != null || isForceHiding)) { + && (win.mAppToken != null || isForceHiding || keyguard)) { win.mWinAnimator.mDrawState = DRAW_PENDING; // Force add to mResizingWindows. win.mLastContentInsets.set(-1, -1, -1, -1); diff --git a/services/net/java/android/net/ip/RouterAdvertisementDaemon.java b/services/net/java/android/net/ip/RouterAdvertisementDaemon.java index 407d315f9973..1a9d2f23935e 100644 --- a/services/net/java/android/net/ip/RouterAdvertisementDaemon.java +++ b/services/net/java/android/net/ip/RouterAdvertisementDaemon.java @@ -45,7 +45,9 @@ import java.nio.BufferOverflowException; import java.nio.ByteBuffer; import java.nio.ByteOrder; import java.util.ArrayList; +import java.util.HashMap; import java.util.HashSet; +import java.util.Map; import java.util.Random; import java.util.Set; import java.util.concurrent.atomic.AtomicInteger; @@ -109,6 +111,11 @@ public class RouterAdvertisementDaemon { private final byte[] mRA = new byte[IPV6_MIN_MTU]; @GuardedBy("mLock") private int mRaLength; + @GuardedBy("mLock") + private final HashMap<IpPrefix, Integer> mDeprecatedPrefixes; + + @GuardedBy("mLock") + private RaParams mRaParams; private volatile FileDescriptor mSocket; private volatile MulticastTransmitter mMulticastTransmitter; @@ -141,45 +148,29 @@ public class RouterAdvertisementDaemon { mIfIndex = ifindex; mHwAddr = hwaddr; mAllNodes = new InetSocketAddress(getAllNodesForScopeId(mIfIndex), 0); + mDeprecatedPrefixes = new HashMap<>(); } - public void buildNewRa(RaParams params) { + public void buildNewRa(RaParams params, HashSet<IpPrefix> newlyDeprecated) { + if (newlyDeprecated != null) { + synchronized (mLock) { + for (IpPrefix ipp : newlyDeprecated) { + mDeprecatedPrefixes.put(ipp, MAX_URGENT_RTR_ADVERTISEMENTS); + } + } + } + + // TODO: Send MAX_URGENT_RTR_ADVERTISEMENTS zero router lifetime RAs, + // iff. we have already sent an RA. if (params == null || params.prefixes.isEmpty()) { // No RA to be served at this time. clearRa(); return; } - if (params.mtu < IPV6_MIN_MTU) { - params.mtu = IPV6_MIN_MTU; - } - - final ByteBuffer ra = ByteBuffer.wrap(mRA); - ra.order(ByteOrder.BIG_ENDIAN); - synchronized (mLock) { - try { - putHeader(ra, params.hasDefaultRoute); - putSlla(ra, mHwAddr); - // https://tools.ietf.org/html/rfc5175#section-4 says: - // - // "MUST NOT be added to a Router Advertisement message - // if no flags in the option are set." - // - // putExpandedFlagsOption(ra); - putMtu(ra, params.mtu); - for (IpPrefix ipp : params.prefixes) { - putPio(ra, ipp); - } - if (params.dnses.size() > 0) { - putRdnss(ra, params.dnses); - } - mRaLength = ra.position(); - } catch (BufferOverflowException e) { - Log.e(TAG, "Could not construct new RA: " + e); - mRaLength = 0; - return; - } + mRaParams = params; + assembleRa(); } maybeNotifyMulticastTransmitter(); @@ -216,6 +207,64 @@ public class RouterAdvertisementDaemon { } } + private void assembleRa() { + final ByteBuffer ra = ByteBuffer.wrap(mRA); + ra.order(ByteOrder.BIG_ENDIAN); + + synchronized (mLock) { + try { + putHeader(ra, mRaParams.hasDefaultRoute); + + putSlla(ra, mHwAddr); + + // https://tools.ietf.org/html/rfc5175#section-4 says: + // + // "MUST NOT be added to a Router Advertisement message + // if no flags in the option are set." + // + // putExpandedFlagsOption(ra); + + putMtu(ra, mRaParams.mtu); + + for (IpPrefix ipp : mRaParams.prefixes) { + putPio(ra, ipp, DEFAULT_LIFETIME, DEFAULT_LIFETIME); + mDeprecatedPrefixes.remove(ipp); + } + + for (IpPrefix ipp : mDeprecatedPrefixes.keySet()) { + putPio(ra, ipp, 0, 0); + } + + if (mRaParams.dnses.size() > 0) { + putRdnss(ra, mRaParams.dnses); + } + + mRaLength = ra.position(); + } catch (BufferOverflowException e) { + Log.e(TAG, "Could not construct new RA: " + e); + mRaLength = 0; + return; + } + } + } + + private int decrementDeprecatedPrefixes() { + int removed = 0; + + synchronized (mLock) { + for (Map.Entry<IpPrefix, Integer> kv : mDeprecatedPrefixes.entrySet()) { + if (kv.getValue() == 0) { + mDeprecatedPrefixes.remove(kv.getKey()); + removed++; + } else { + kv.setValue(kv.getValue() - 1); + } + } + } + + return removed; + } + private void maybeNotifyMulticastTransmitter() { final MulticastTransmitter m = mMulticastTransmitter; if (m != null) { @@ -325,10 +374,11 @@ public class RouterAdvertisementDaemon { ra.put(ND_OPTION_MTU) .put(MTU_NUM_8OCTETS) .putShort(asShort(0)) - .putInt(mtu); + .putInt((mtu < IPV6_MIN_MTU) ? IPV6_MIN_MTU : mtu); } - private static void putPio(ByteBuffer ra, IpPrefix ipp) { + private static void putPio(ByteBuffer ra, IpPrefix ipp, + int validTime, int preferredTime) { /** Prefix Information @@ -359,13 +409,17 @@ public class RouterAdvertisementDaemon { final byte ND_OPTION_PIO = 3; final byte PIO_NUM_8OCTETS = 4; + if (validTime < 0) validTime = 0; + if (preferredTime < 0) preferredTime = 0; + if (preferredTime > validTime) preferredTime = validTime; + final byte[] addr = ipp.getAddress().getAddress(); ra.put(ND_OPTION_PIO) .put(PIO_NUM_8OCTETS) .put(asByte(prefixLength)) - .put(asByte(0xc0)) // L&A set - .putInt(DEFAULT_LIFETIME) - .putInt(DEFAULT_LIFETIME) + .put(asByte(0xc0)) /* L & A set */ + .putInt(validTime) + .putInt(preferredTime) .putInt(0) .put(addr); } @@ -547,6 +601,11 @@ public class RouterAdvertisementDaemon { } maybeSendRA(mAllNodes); + if (decrementDeprecatedPrefixes() > 0) { + // At least one deprecated PIO has been removed; + // reassemble the RA. + assembleRa(); + } } } @@ -560,15 +619,17 @@ public class RouterAdvertisementDaemon { } private int getNextMulticastTransmitDelaySec() { + int countDeprecatedPrefixes = 0; synchronized (mLock) { if (mRaLength < MIN_RA_HEADER_SIZE) { // No actual RA to send; just sleep for 1 day. return DAY_IN_SECONDS; } + countDeprecatedPrefixes = mDeprecatedPrefixes.size(); } final int urgentPending = mUrgentAnnouncements.getAndDecrement(); - if (urgentPending > 0) { + if (urgentPending > 0 || countDeprecatedPrefixes > 0) { return MIN_DELAY_BETWEEN_RAS_SEC; } diff --git a/services/retaildemo/java/com/android/server/retaildemo/PreloadAppsInstaller.java b/services/retaildemo/java/com/android/server/retaildemo/PreloadAppsInstaller.java index 7a3b461a6ff7..daaa4f5c6848 100644 --- a/services/retaildemo/java/com/android/server/retaildemo/PreloadAppsInstaller.java +++ b/services/retaildemo/java/com/android/server/retaildemo/PreloadAppsInstaller.java @@ -67,10 +67,11 @@ class PreloadAppsInstaller { void installApps(int userId) { File[] files = preloadsAppsDirectory.listFiles(); + AppInstallCounter counter = new AppInstallCounter(mContext, userId); if (ArrayUtils.isEmpty(files)) { + counter.setExpectedAppsCount(0); return; } - AppInstallCounter counter = new AppInstallCounter(mContext, userId); int expectedCount = 0; for (File file : files) { String apkName = file.getName(); diff --git a/services/retaildemo/java/com/android/server/retaildemo/RetailDemoModeService.java b/services/retaildemo/java/com/android/server/retaildemo/RetailDemoModeService.java index 8d5971f1ca97..7525e87c0e12 100644 --- a/services/retaildemo/java/com/android/server/retaildemo/RetailDemoModeService.java +++ b/services/retaildemo/java/com/android/server/retaildemo/RetailDemoModeService.java @@ -340,9 +340,8 @@ public class RetailDemoModeService extends SystemService { UserHandle.SYSTEM); Settings.Secure.putIntForUser(getContext().getContentResolver(), Settings.Secure.SKIP_FIRST_USE_HINTS, 1, userInfo.id); - Settings.Secure.putIntForUser(getContext().getContentResolver(), - Settings.Global.PACKAGE_VERIFIER_ENABLE, 0, userInfo.id); - + Settings.Global.putInt(getContext().getContentResolver(), + Settings.Global.PACKAGE_VERIFIER_ENABLE, 0); grantRuntimePermissionToCamera(user); clearPrimaryCallLog(); } diff --git a/services/tests/servicestests/src/com/android/server/pm/BaseShortcutManagerTest.java b/services/tests/servicestests/src/com/android/server/pm/BaseShortcutManagerTest.java index 0515a9a10245..e7f33457bb5f 100644 --- a/services/tests/servicestests/src/com/android/server/pm/BaseShortcutManagerTest.java +++ b/services/tests/servicestests/src/com/android/server/pm/BaseShortcutManagerTest.java @@ -36,6 +36,7 @@ import static org.mockito.Mockito.when; import android.annotation.NonNull; import android.annotation.UserIdInt; import android.app.Activity; +import android.app.ActivityManager; import android.app.ActivityManagerInternal; import android.app.IUidObserver; import android.app.usage.UsageStatsManagerInternal; @@ -246,6 +247,20 @@ public abstract class BaseShortcutManagerTest extends InstrumentationTestCase { } @Override + protected boolean isUserUnlockedL(@UserIdInt int userId) { + // Note due to a late change, now ShortcutManager doesn't use + // UserManager.isUserUnlockingOrUnlocked(). But all unit tests are still using it, + // so we convert here. + + final long token = injectClearCallingIdentity(); + try { + return mMockUserManager.isUserUnlockingOrUnlocked(userId); + } finally { + injectRestoreCallingIdentity(token); + } + } + + @Override int injectDipToPixel(int dip) { return dip; } @@ -701,6 +716,9 @@ public abstract class BaseShortcutManagerTest extends InstrumentationTestCase { return b(mRunningUsers.get(userId)) && b(mUnlockedUsers.get(userId)); })); + when(mMockActivityManagerInternal.getUidProcessState(anyInt())).thenReturn( + ActivityManager.PROCESS_STATE_CACHED_EMPTY); + // User 0 and P0 are always running mRunningUsers.put(USER_0, true); mRunningUsers.put(USER_10, false); diff --git a/services/usb/java/com/android/server/usb/UsbDeviceManager.java b/services/usb/java/com/android/server/usb/UsbDeviceManager.java index df9242dc0aa1..8560651fa7ec 100644 --- a/services/usb/java/com/android/server/usb/UsbDeviceManager.java +++ b/services/usb/java/com/android/server/usb/UsbDeviceManager.java @@ -49,6 +49,7 @@ import android.util.Pair; import android.util.Slog; import com.android.internal.annotations.GuardedBy; +import com.android.internal.os.SomeArgs; import com.android.internal.util.IndentingPrintWriter; import com.android.server.FgThread; @@ -320,6 +321,7 @@ public class UsbDeviceManager { private boolean mConnected; private boolean mHostConnected; private boolean mSourcePower; + private boolean mSinkPower; private boolean mConfigured; private boolean mUsbDataUnlocked; private String mCurrentFunctions; @@ -401,7 +403,18 @@ public class UsbDeviceManager { public void updateHostState(UsbPort port, UsbPortStatus status) { boolean hostConnected = status.getCurrentDataRole() == UsbPort.DATA_ROLE_HOST; boolean sourcePower = status.getCurrentPowerRole() == UsbPort.POWER_ROLE_SOURCE; - obtainMessage(MSG_UPDATE_HOST_STATE, hostConnected ? 1 :0, sourcePower ? 1 :0).sendToTarget(); + boolean sinkPower = status.getCurrentPowerRole() == UsbPort.POWER_ROLE_SINK; + + if (DEBUG) { + Slog.i(TAG, "updateHostState " + port + " status=" + status); + } + + SomeArgs args = SomeArgs.obtain(); + args.argi1 = hostConnected ? 1 :0; + args.argi2 = sourcePower ? 1 :0; + args.argi3 = sinkPower ? 1 :0; + + obtainMessage(MSG_UPDATE_HOST_STATE, args).sendToTarget(); } private boolean waitForState(String state) { @@ -718,8 +731,11 @@ public class UsbDeviceManager { } break; case MSG_UPDATE_HOST_STATE: - mHostConnected = (msg.arg1 == 1); - mSourcePower = (msg.arg2 == 1); + SomeArgs args = (SomeArgs) msg.obj; + mHostConnected = (args.argi1 == 1); + mSourcePower = (args.argi2 == 1); + mSinkPower = (args.argi3 == 1); + args.recycle(); updateUsbNotification(); if (mBootCompleted) { updateUsbStateBroadcastIfNeeded(); @@ -809,6 +825,8 @@ public class UsbDeviceManager { } } else if (mSourcePower) { id = com.android.internal.R.string.usb_supplying_notification_title; + } else if (mHostConnected && mSinkPower) { + id = com.android.internal.R.string.usb_charging_notification_title; } if (id != mUsbNotificationId) { // clear notification if title needs changing @@ -908,6 +926,9 @@ public class UsbDeviceManager { pw.println(" mConfigured: " + mConfigured); pw.println(" mUsbDataUnlocked: " + mUsbDataUnlocked); pw.println(" mCurrentAccessory: " + mCurrentAccessory); + pw.println(" mHostConnected: " + mHostConnected); + pw.println(" mSourcePower: " + mSourcePower); + pw.println(" mSinkPower: " + mSinkPower); try { pw.println(" Kernel state: " + FileUtils.readTextFile(new File(STATE_PATH), 0, null).trim()); diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index bdaf0b74e734..f14474fdaddb 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -892,6 +892,14 @@ public class CarrierConfigManager { public static final String KEY_IMS_REASONINFO_MAPPING_STRING_ARRAY = "ims_reasoninfo_mapping_string_array"; + /** + * When {@code false}, use default title for Enhanced 4G LTE Mode settings. + * When {@code true}, use the variant. + * @hide + */ + public static final String KEY_ENHANCED_4G_LTE_TITLE_VARIANT_BOOL = + "enhanced_4g_lte_title_variant_bool"; + /** The default value for every variable. */ private final static PersistableBundle sDefaults; @@ -1056,6 +1064,7 @@ public class CarrierConfigManager { sDefaults.putBoolean(KEY_VIDEO_CALLS_CAN_BE_HD_AUDIO, true); sDefaults.putStringArray(KEY_IMS_REASONINFO_MAPPING_STRING_ARRAY, null); + sDefaults.putBoolean(KEY_ENHANCED_4G_LTE_TITLE_VARIANT_BOOL, false); } /** diff --git a/tests/AppLaunch/src/com/android/tests/applaunch/AppLaunch.java b/tests/AppLaunch/src/com/android/tests/applaunch/AppLaunch.java index 2346f8547550..16a0def7d5a5 100644 --- a/tests/AppLaunch/src/com/android/tests/applaunch/AppLaunch.java +++ b/tests/AppLaunch/src/com/android/tests/applaunch/AppLaunch.java @@ -574,6 +574,7 @@ public class AppLaunch extends InstrumentationTestCase { mLaunchIntent = intent; mForceStopBeforeLaunch = forceStopBeforeLaunch; mLaunchReason = launchReason; + mResult = -1L; } public Long getResult() { diff --git a/tools/aapt/Command.cpp b/tools/aapt/Command.cpp index 9976d00fa872..59da467a1cc3 100644 --- a/tools/aapt/Command.cpp +++ b/tools/aapt/Command.cpp @@ -529,6 +529,16 @@ struct FeatureGroup { int openGLESVersion; }; +static bool hasFeature(const char* name, const FeatureGroup& grp, + const KeyedVector<String8, ImpliedFeature>& implied) { + String8 name8(name); + ssize_t idx = grp.features.indexOfKey(name8); + if (idx < 0) { + idx = implied.indexOfKey(name8); + } + return idx >= 0; +} + static void addImpliedFeature(KeyedVector<String8, ImpliedFeature>* impliedFeatures, const char* name, const char* reason, bool sdk23) { String8 name8(name); @@ -616,9 +626,16 @@ static void addParentFeatures(FeatureGroup* grp, const String8& name) { } else if (name == "android.hardware.location.gps" || name == "android.hardware.location.network") { grp->features.add(String8("android.hardware.location"), Feature(true)); + } else if (name == "android.hardware.faketouch.multitouch") { + grp->features.add(String8("android.hardware.faketouch"), Feature(true)); + } else if (name == "android.hardware.faketouch.multitouch.distinct" || + name == "android.hardware.faketouch.multitouch.jazzhands") { + grp->features.add(String8("android.hardware.faketouch.multitouch"), Feature(true)); + grp->features.add(String8("android.hardware.faketouch"), Feature(true)); } else if (name == "android.hardware.touchscreen.multitouch") { grp->features.add(String8("android.hardware.touchscreen"), Feature(true)); - } else if (name == "android.hardware.touchscreen.multitouch.distinct") { + } else if (name == "android.hardware.touchscreen.multitouch.distinct" || + name == "android.hardware.touchscreen.multitouch.jazzhands") { grp->features.add(String8("android.hardware.touchscreen.multitouch"), Feature(true)); grp->features.add(String8("android.hardware.touchscreen"), Feature(true)); } else if (name == "android.hardware.opengles.aep") { @@ -2005,8 +2022,12 @@ int doDump(Bundle* bundle) } } - addImpliedFeature(&impliedFeatures, "android.hardware.touchscreen", - "default feature for all apps", false); + // If the app hasn't declared the touchscreen as a feature requirement (either + // directly or implied, required or not), then the faketouch feature is implied. + if (!hasFeature("android.hardware.touchscreen", commonFeatures, impliedFeatures)) { + addImpliedFeature(&impliedFeatures, "android.hardware.faketouch", + "default feature for all apps", false); + } const size_t numFeatureGroups = featureGroups.size(); if (numFeatureGroups == 0) { diff --git a/tools/aapt/ResourceTable.cpp b/tools/aapt/ResourceTable.cpp index 6d80a69b7444..4d5bb312aaf1 100644 --- a/tools/aapt/ResourceTable.cpp +++ b/tools/aapt/ResourceTable.cpp @@ -2623,6 +2623,14 @@ status_t ResourceTable::assignResourceIds() const SourcePos unknown(String8("????"), 0); sp<Type> attr = p->getType(String16("attr"), unknown); + // Force creation of ID if we are building feature splits. + // Auto-generated ID resources won't apply the type ID offset correctly unless + // the offset is applied here first. + // b/30607637 + if (mPackageType == AppFeature && p->getName() == mAssetsPackage) { + sp<Type> id = p->getType(String16("id"), unknown); + } + // Assign indices... const size_t typeCount = p->getOrderedTypes().size(); for (size_t ti = 0; ti < typeCount; ti++) { diff --git a/wifi/java/android/net/wifi/WifiConfiguration.java b/wifi/java/android/net/wifi/WifiConfiguration.java index 9d0c20ce4c5d..d3d5ea05c1af 100644 --- a/wifi/java/android/net/wifi/WifiConfiguration.java +++ b/wifi/java/android/net/wifi/WifiConfiguration.java @@ -817,6 +817,7 @@ public class WifiConfiguration implements Parcelable { */ public static final int NETWORK_SELECTION_ENABLE = 0; /** + * @deprecated it is not used any more. * This network is disabled because higher layer (>2) network is bad */ public static final int DISABLED_BAD_LINK = 1; @@ -862,7 +863,7 @@ public class WifiConfiguration implements Parcelable { */ private static final String[] QUALITY_NETWORK_SELECTION_DISABLE_REASON = { "NETWORK_SELECTION_ENABLE", - "NETWORK_SELECTION_DISABLED_BAD_LINK", + "NETWORK_SELECTION_DISABLED_BAD_LINK", // deprecated "NETWORK_SELECTION_DISABLED_ASSOCIATION_REJECTION ", "NETWORK_SELECTION_DISABLED_AUTHENTICATION_FAILURE", "NETWORK_SELECTION_DISABLED_DHCP_FAILURE", |
