diff options
244 files changed, 3874 insertions, 999 deletions
diff --git a/StubLibraries.bp b/StubLibraries.bp index 941a1fa033e4..44c55c26153d 100644 --- a/StubLibraries.bp +++ b/StubLibraries.bp @@ -410,7 +410,7 @@ java_library { ], static_libs: [ "android-non-updatable.stubs.module_lib", - "art.module.public.api.stubs", + "art.module.public.api.stubs.module_lib", ], dist: { dir: "apistubs/android/module-lib", diff --git a/apex/jobscheduler/service/java/com/android/server/job/JobServiceContext.java b/apex/jobscheduler/service/java/com/android/server/job/JobServiceContext.java index 3fa1c12ce762..90baa8e54220 100644 --- a/apex/jobscheduler/service/java/com/android/server/job/JobServiceContext.java +++ b/apex/jobscheduler/service/java/com/android/server/job/JobServiceContext.java @@ -116,6 +116,16 @@ public final class JobServiceContext implements ServiceConnection { @VisibleForTesting int mVerb; private boolean mCancelled; + /** + * True if the previous job on this context successfully finished (ie. called jobFinished or + * dequeueWork with no work left). + */ + private boolean mPreviousJobHadSuccessfulFinish; + /** + * The last time a job on this context didn't finish successfully, in the elapsed realtime + * timebase. + */ + private long mLastUnsuccessfulFinishElapsed; /** * All the information maintained about the job currently being executed. @@ -439,7 +449,9 @@ public final class JobServiceContext implements ServiceConnection { final long ident = Binder.clearCallingIdentity(); try { synchronized (mLock) { - assertCallerLocked(cb); + if (!assertCallerLocked(cb)) { + return null; + } if (mVerb == VERB_STOPPING || mVerb == VERB_FINISHED) { // This job is either all done, or on its way out. Either way, it // should not dispatch any more work. We will pick up any remaining @@ -465,7 +477,11 @@ public final class JobServiceContext implements ServiceConnection { final long ident = Binder.clearCallingIdentity(); try { synchronized (mLock) { - assertCallerLocked(cb); + if (!assertCallerLocked(cb)) { + // Return true instead of false here so we don't just kick the + // Exception-throwing-can down the road to JobParameters.completeWork >:( + return true; + } return mRunningJob.completeWorkLocked(workId); } } finally { @@ -554,18 +570,34 @@ public final class JobServiceContext implements ServiceConnection { return true; } - private void assertCallerLocked(JobCallback cb) { + /** + * Will throw a {@link SecurityException} if the callback is not for the currently running job, + * but may decide not to throw an exception if the call from the previous job appears to be an + * accident. + * + * @return true if the callback is for the current job, false otherwise + */ + private boolean assertCallerLocked(JobCallback cb) { if (!verifyCallerLocked(cb)) { + final long nowElapsed = sElapsedRealtimeClock.millis(); + if (!mPreviousJobHadSuccessfulFinish + && (nowElapsed - mLastUnsuccessfulFinishElapsed) < 15_000L) { + // Don't punish apps for race conditions + return false; + } + // It's been long enough that the app should really not be calling into JS for the + // stopped job. StringBuilder sb = new StringBuilder(128); sb.append("Caller no longer running"); if (cb.mStoppedReason != null) { sb.append(", last stopped "); - TimeUtils.formatDuration(sElapsedRealtimeClock.millis() - cb.mStoppedTime, sb); + TimeUtils.formatDuration(nowElapsed - cb.mStoppedTime, sb); sb.append(" because: "); sb.append(cb.mStoppedReason); } throw new SecurityException(sb.toString()); } + return true; } /** @@ -911,6 +943,11 @@ public final class JobServiceContext implements ServiceConnection { applyStoppedReasonLocked(reason); completedJob = mRunningJob; final int internalStopReason = mParams.getInternalStopReasonCode(); + mPreviousJobHadSuccessfulFinish = + (internalStopReason == JobParameters.INTERNAL_STOP_REASON_SUCCESSFUL_FINISH); + if (!mPreviousJobHadSuccessfulFinish) { + mLastUnsuccessfulFinishElapsed = sElapsedRealtimeClock.millis(); + } mJobPackageTracker.noteInactive(completedJob, internalStopReason, reason); FrameworkStatsLog.write_non_chained(FrameworkStatsLog.SCHEDULED_JOB_STATE_CHANGED, completedJob.getSourceUid(), null, completedJob.getBatteryName(), diff --git a/core/api/test-current.txt b/core/api/test-current.txt index a0799394177d..ea6d0cecfd73 100644 --- a/core/api/test-current.txt +++ b/core/api/test-current.txt @@ -3176,7 +3176,6 @@ package android.window { public final class SplashScreenView extends android.widget.FrameLayout { method @Nullable public android.view.View getBrandingView(); - method @ColorInt public int getIconBackgroundColor(); } public final class StartingWindowInfo implements android.os.Parcelable { diff --git a/core/java/android/app/ContextImpl.java b/core/java/android/app/ContextImpl.java index f52fdc562b13..4db1f71e8256 100644 --- a/core/java/android/app/ContextImpl.java +++ b/core/java/android/app/ContextImpl.java @@ -26,6 +26,7 @@ import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.UiContext; import android.compat.annotation.UnsupportedAppUsage; +import android.content.AttributionSource; import android.content.AutofillOptions; import android.content.BroadcastReceiver; import android.content.ComponentName; @@ -60,7 +61,6 @@ import android.database.sqlite.SQLiteDatabase.CursorFactory; import android.graphics.Bitmap; import android.graphics.drawable.Drawable; import android.net.Uri; -import android.content.AttributionSource; import android.os.Binder; import android.os.Build; import android.os.Bundle; @@ -3120,6 +3120,7 @@ class ContextImpl extends Context { mForceDisplayOverrideInResources = container.mForceDisplayOverrideInResources; mIsConfigurationBasedContext = container.mIsConfigurationBasedContext; mContextType = container.mContextType; + mContentCaptureOptions = container.mContentCaptureOptions; } else { mBasePackageName = packageInfo.mPackageName; ApplicationInfo ainfo = packageInfo.getApplicationInfo(); diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index 549ab6e2df83..0e04ad3768c7 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -10997,6 +10997,16 @@ public class DevicePolicyManager { * {@link #EXTRA_PROVISIONING_SENSORS_PERMISSION_GRANT_OPT_OUT} in the provisioning parameters. * In that case the device owner's control will be limited do denying these permissions. * <p> + * NOTE: On devices running {@link android.os.Build.VERSION_CODES#S} and above, control over + * the following permissions are restricted for managed profile owners: + * <ul> + * <li>Manifest.permission.READ_SMS</li> + * </ul> + * <p> + * A managed profile owner may not grant these permissions (i.e. call this method with any of + * the permissions listed above and {@code grantState} of + * {@code #PERMISSION_GRANT_STATE_GRANTED}), but may deny them. + * <p> * Attempts by the admin to grant these permissions, when the admin is restricted from doing * so, will be silently ignored (no exception will be thrown). * diff --git a/core/java/android/hardware/ISensorPrivacyManager.aidl b/core/java/android/hardware/ISensorPrivacyManager.aidl index debc074ea21a..d69a9e14b4bf 100644 --- a/core/java/android/hardware/ISensorPrivacyManager.aidl +++ b/core/java/android/hardware/ISensorPrivacyManager.aidl @@ -48,4 +48,8 @@ interface ISensorPrivacyManager { void suppressIndividualSensorPrivacyReminders(int userId, int sensor, IBinder token, boolean suppress); + + void addUserGlobalIndividualSensorPrivacyListener(int sensor, in ISensorPrivacyListener listener); + + void removeUserGlobalIndividualSensorPrivacyListener(int sensor, in ISensorPrivacyListener listener); }
\ No newline at end of file diff --git a/core/java/android/hardware/SensorPrivacyManager.java b/core/java/android/hardware/SensorPrivacyManager.java index b7d95e7dea74..4526ab770bc6 100644 --- a/core/java/android/hardware/SensorPrivacyManager.java +++ b/core/java/android/hardware/SensorPrivacyManager.java @@ -24,6 +24,7 @@ import android.annotation.SystemApi; import android.annotation.SystemService; import android.annotation.TestApi; import android.annotation.UserIdInt; +import android.app.ActivityManager; import android.content.Context; import android.os.Binder; import android.os.IBinder; @@ -247,8 +248,7 @@ public final class SensorPrivacyManager { @RequiresPermission(Manifest.permission.OBSERVE_SENSOR_PRIVACY) public void addSensorPrivacyListener(@Sensors.Sensor int sensor, @NonNull OnSensorPrivacyChangedListener listener) { - addSensorPrivacyListener(sensor, mContext.getUserId(), mContext.getMainExecutor(), - listener); + addSensorPrivacyListener(sensor, mContext.getMainExecutor(), listener); } /** @@ -283,7 +283,25 @@ public final class SensorPrivacyManager { @RequiresPermission(Manifest.permission.OBSERVE_SENSOR_PRIVACY) public void addSensorPrivacyListener(@Sensors.Sensor int sensor, @NonNull Executor executor, @NonNull OnSensorPrivacyChangedListener listener) { - addSensorPrivacyListener(sensor, mContext.getUserId(), executor, listener); + Pair<OnSensorPrivacyChangedListener, Integer> key = new Pair<>(listener, sensor); + synchronized (mIndividualListeners) { + ISensorPrivacyListener iListener = mIndividualListeners.get(key); + if (iListener == null) { + iListener = new ISensorPrivacyListener.Stub() { + @Override + public void onSensorPrivacyChanged(boolean enabled) { + executor.execute(() -> listener.onSensorPrivacyChanged(sensor, enabled)); + } + }; + mIndividualListeners.put(key, iListener); + } + + try { + mService.addUserGlobalIndividualSensorPrivacyListener(sensor, iListener); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } + } } /** @@ -361,7 +379,7 @@ public final class SensorPrivacyManager { @SystemApi @RequiresPermission(Manifest.permission.OBSERVE_SENSOR_PRIVACY) public boolean isSensorPrivacyEnabled(@Sensors.Sensor int sensor) { - return isSensorPrivacyEnabled(sensor, mContext.getUserId()); + return isSensorPrivacyEnabled(sensor, getCurrentUserId()); } /** @@ -392,7 +410,7 @@ public final class SensorPrivacyManager { @RequiresPermission(Manifest.permission.MANAGE_SENSOR_PRIVACY) public void setSensorPrivacy(@Sources.Source int source, @Sensors.Sensor int sensor, boolean enable) { - setSensorPrivacy(source, sensor, enable, mContext.getUserId()); + setSensorPrivacy(source, sensor, enable, getCurrentUserId()); } /** @@ -428,7 +446,7 @@ public final class SensorPrivacyManager { @RequiresPermission(Manifest.permission.MANAGE_SENSOR_PRIVACY) public void setSensorPrivacyForProfileGroup(@Sources.Source int source, @Sensors.Sensor int sensor, boolean enable) { - setSensorPrivacyForProfileGroup(source , sensor, enable, mContext.getUserId()); + setSensorPrivacyForProfileGroup(source , sensor, enable, getCurrentUserId()); } /** @@ -463,7 +481,7 @@ public final class SensorPrivacyManager { @RequiresPermission(Manifest.permission.MANAGE_SENSOR_PRIVACY) public void suppressSensorPrivacyReminders(int sensor, boolean suppress) { - suppressSensorPrivacyReminders(sensor, suppress, mContext.getUserId()); + suppressSensorPrivacyReminders(sensor, suppress, getCurrentUserId()); } /** @@ -590,4 +608,13 @@ public final class SensorPrivacyManager { throw e.rethrowFromSystemServer(); } } + + private int getCurrentUserId() { + try { + return ActivityManager.getService().getCurrentUserId(); + } catch (RemoteException e) { + e.rethrowFromSystemServer(); + } + return 0; + } } diff --git a/core/java/android/hardware/face/FaceManager.java b/core/java/android/hardware/face/FaceManager.java index c2a2c4c0678c..3c3ba595f3fb 100644 --- a/core/java/android/hardware/face/FaceManager.java +++ b/core/java/android/hardware/face/FaceManager.java @@ -169,31 +169,6 @@ public class FaceManager implements BiometricAuthenticator, BiometricFaceConstan } /** - * Request authentication of a crypto object. This call operates the face recognition hardware - * and starts capturing images. It terminates when - * {@link AuthenticationCallback#onAuthenticationError(int, CharSequence)} or - * {@link AuthenticationCallback#onAuthenticationSucceeded(AuthenticationResult)} is called, at - * which point the object is no longer valid. The operation can be canceled by using the - * provided cancel object. - * - * @param crypto object associated with the call or null if none required. - * @param cancel an object that can be used to cancel authentication - * @param callback an object to receive authentication events - * @param handler an optional handler to handle callback events - * @throws IllegalArgumentException if the crypto operation is not supported or is not backed - * by - * <a href="{@docRoot}training/articles/keystore.html">Android - * Keystore facility</a>. - * @throws IllegalStateException if the crypto primitive is not initialized. - * @hide - */ - @RequiresPermission(USE_BIOMETRIC_INTERNAL) - public void authenticate(@Nullable CryptoObject crypto, @Nullable CancellationSignal cancel, - @NonNull AuthenticationCallback callback, @Nullable Handler handler) { - authenticate(crypto, cancel, callback, handler, mContext.getUserId()); - } - - /** * Use the provided handler thread for events. */ private void useHandler(Handler handler) { @@ -224,8 +199,10 @@ public class FaceManager implements BiometricAuthenticator, BiometricFaceConstan * @throws IllegalStateException if the crypto primitive is not initialized. * @hide */ + @RequiresPermission(USE_BIOMETRIC_INTERNAL) public void authenticate(@Nullable CryptoObject crypto, @Nullable CancellationSignal cancel, - @NonNull AuthenticationCallback callback, @Nullable Handler handler, int userId) { + @NonNull AuthenticationCallback callback, @Nullable Handler handler, int userId, + boolean isKeyguardBypassEnabled) { if (callback == null) { throw new IllegalArgumentException("Must supply an authentication callback"); } @@ -247,7 +224,7 @@ public class FaceManager implements BiometricAuthenticator, BiometricFaceConstan final long operationId = crypto != null ? crypto.getOpId() : 0; Trace.beginSection("FaceManager#authenticate"); mService.authenticate(mToken, operationId, userId, mServiceReceiver, - mContext.getOpPackageName()); + mContext.getOpPackageName(), isKeyguardBypassEnabled); } catch (RemoteException e) { Slog.w(TAG, "Remote exception while authenticating: ", e); if (callback != null) { diff --git a/core/java/android/hardware/face/IFaceService.aidl b/core/java/android/hardware/face/IFaceService.aidl index b9a49c6ced09..db02a0ef2a10 100644 --- a/core/java/android/hardware/face/IFaceService.aidl +++ b/core/java/android/hardware/face/IFaceService.aidl @@ -46,7 +46,7 @@ interface IFaceService { // Authenticate the given sessionId with a face void authenticate(IBinder token, long operationId, int userId, IFaceServiceReceiver receiver, - String opPackageName); + String opPackageName, boolean isKeyguardBypassEnabled); // Uses the face hardware to detect for the presence of a face, without giving details // about accept/reject/lockout. diff --git a/core/java/android/os/Trace.java b/core/java/android/os/Trace.java index c8cbc517b226..ddb6533547bb 100644 --- a/core/java/android/os/Trace.java +++ b/core/java/android/os/Trace.java @@ -102,8 +102,6 @@ public final class Trace { /** @hide */ public static final long TRACE_TAG_RRO = 1L << 26; /** @hide */ - public static final long TRACE_TAG_SYSPROP = 1L << 27; - /** @hide */ public static final long TRACE_TAG_APEX_MANAGER = 1L << 18; private static final long TRACE_TAG_NOT_READY = 1L << 63; diff --git a/core/java/android/service/voice/HotwordDetectionService.java b/core/java/android/service/voice/HotwordDetectionService.java index a43523974480..e3bb589c9a19 100644 --- a/core/java/android/service/voice/HotwordDetectionService.java +++ b/core/java/android/service/voice/HotwordDetectionService.java @@ -72,8 +72,7 @@ import java.util.function.IntConsumer; @SystemApi public abstract class HotwordDetectionService extends Service { private static final String TAG = "HotwordDetectionService"; - // TODO (b/177502877): Set the Debug flag to false before shipping. - private static final boolean DBG = true; + private static final boolean DBG = false; private static final long UPDATE_TIMEOUT_MILLIS = 5000; @@ -151,9 +150,7 @@ public abstract class HotwordDetectionService extends Service { @Override public void updateState(PersistableBundle options, SharedMemory sharedMemory, IRemoteCallback callback) throws RemoteException { - if (DBG) { - Log.d(TAG, "#updateState"); - } + Log.v(TAG, "#updateState" + (callback != null ? " with callback" : "")); HotwordDetectionService.this.onUpdateStateInternal( options, sharedMemory, diff --git a/core/java/android/service/voice/SoftwareHotwordDetector.java b/core/java/android/service/voice/SoftwareHotwordDetector.java index fb540b1622e6..02294e5720ae 100644 --- a/core/java/android/service/voice/SoftwareHotwordDetector.java +++ b/core/java/android/service/voice/SoftwareHotwordDetector.java @@ -47,7 +47,7 @@ import java.io.PrintWriter; **/ class SoftwareHotwordDetector extends AbstractHotwordDetector { private static final String TAG = SoftwareHotwordDetector.class.getSimpleName(); - private static final boolean DEBUG = true; + private static final boolean DEBUG = false; private final IVoiceInteractionManagerService mManagerService; private final HotwordDetector.Callback mCallback; diff --git a/core/java/android/service/wallpaper/WallpaperService.java b/core/java/android/service/wallpaper/WallpaperService.java index fe1fcfc489c1..7a61511dfb4e 100644 --- a/core/java/android/service/wallpaper/WallpaperService.java +++ b/core/java/android/service/wallpaper/WallpaperService.java @@ -1033,6 +1033,9 @@ public abstract class WallpaperService extends Service { .build(); updateSurfaceDimming(); } + // Propagate transform hint from WM so we can use the right hint for the + // first frame. + mBbqSurfaceControl.setTransformHint(mSurfaceControl.getTransformHint()); Surface blastSurface = getOrCreateBLASTSurface(mSurfaceSize.x, mSurfaceSize.y, mFormat); // If blastSurface == null that means it hasn't changed since the last diff --git a/core/java/android/window/SplashScreenView.java b/core/java/android/window/SplashScreenView.java index 1efd2e381289..acf20d701eeb 100644 --- a/core/java/android/window/SplashScreenView.java +++ b/core/java/android/window/SplashScreenView.java @@ -89,11 +89,11 @@ public final class SplashScreenView extends FrameLayout { private boolean mNotCopyable; private boolean mIsCopied; private int mInitBackgroundColor; - private int mInitIconBackgroundColor; private View mIconView; private Bitmap mParceledIconBitmap; private View mBrandingImageView; private Bitmap mParceledBrandingBitmap; + private Bitmap mParceledIconBackgroundBitmap; private Duration mIconAnimationDuration; private Instant mIconAnimationStart; @@ -130,11 +130,12 @@ public final class SplashScreenView extends FrameLayout { private final Context mContext; private int mIconSize; private @ColorInt int mBackgroundColor; - private @ColorInt int mIconBackground; private Bitmap mParceledIconBitmap; + private Bitmap mParceledIconBackgroundBitmap; private Drawable mIconDrawable; // It is only set for legacy splash screen which won't be sent across processes. private Drawable mOverlayDrawable; + private Drawable mIconBackground; private SurfaceControlViewHost.SurfacePackage mSurfacePackage; private RemoteCallback mClientCallback; private int mBrandingImageWidth; @@ -155,7 +156,6 @@ public final class SplashScreenView extends FrameLayout { public Builder createFromParcel(SplashScreenViewParcelable parcelable) { mIconSize = parcelable.getIconSize(); mBackgroundColor = parcelable.getBackgroundColor(); - mIconBackground = parcelable.getIconBackground(); mSurfacePackage = parcelable.mSurfacePackage; if (mSurfacePackage == null && parcelable.mIconBitmap != null) { // We only create a Bitmap copies of immobile icons since animated icon are using @@ -163,6 +163,11 @@ public final class SplashScreenView extends FrameLayout { mIconDrawable = new BitmapDrawable(mContext.getResources(), parcelable.mIconBitmap); mParceledIconBitmap = parcelable.mIconBitmap; } + if (parcelable.mIconBackground != null) { + mIconBackground = new BitmapDrawable(mContext.getResources(), + parcelable.mIconBackground); + mParceledIconBackgroundBitmap = parcelable.mIconBackground; + } if (parcelable.mBrandingBitmap != null) { setBrandingDrawable(new BitmapDrawable(mContext.getResources(), parcelable.mBrandingBitmap), parcelable.mBrandingWidth, @@ -213,8 +218,8 @@ public final class SplashScreenView extends FrameLayout { /** * Set the background color for the icon. */ - public Builder setIconBackground(int color) { - mIconBackground = color; + public Builder setIconBackground(Drawable iconBackground) { + mIconBackground = iconBackground; return this; } @@ -245,7 +250,6 @@ public final class SplashScreenView extends FrameLayout { final SplashScreenView view = (SplashScreenView) layoutInflater.inflate(R.layout.splash_screen_view, null, false); view.mInitBackgroundColor = mBackgroundColor; - view.mInitIconBackgroundColor = mIconBackground; if (mOverlayDrawable != null) { view.setBackground(mOverlayDrawable); } else { @@ -263,25 +267,29 @@ public final class SplashScreenView extends FrameLayout { mIconAnimationDuration != null ? mIconAnimationDuration.toMillis() : 0); view.mIconAnimationStart = mIconAnimationStart; view.mIconAnimationDuration = mIconAnimationDuration; - } else { - view.mIconView = view.findViewById(R.id.splashscreen_icon_view); - if (mIconSize != 0) { - final ViewGroup.LayoutParams params = view.mIconView.getLayoutParams(); - params.width = mIconSize; - params.height = mIconSize; - view.mIconView.setLayoutParams(params); - if (mIconDrawable != null) { - view.mIconView.setBackground(mIconDrawable); - } + } else if (mIconSize != 0) { + ImageView imageView = view.findViewById(R.id.splashscreen_icon_view); + assert imageView != null; + + final ViewGroup.LayoutParams params = imageView.getLayoutParams(); + params.width = mIconSize; + params.height = mIconSize; + imageView.setLayoutParams(params); + if (mIconDrawable != null) { + imageView.setImageDrawable(mIconDrawable); } + if (mIconBackground != null) { + imageView.setBackground(mIconBackground); + } + view.mIconView = imageView; } if (mOverlayDrawable != null || mIconDrawable == null) { view.setNotCopyable(); } - if (mParceledIconBitmap != null) { - view.mParceledIconBitmap = mParceledIconBitmap; - } + view.mParceledIconBackgroundBitmap = mParceledIconBackgroundBitmap; + view.mParceledIconBitmap = mParceledIconBitmap; + // branding image if (mBrandingImageHeight > 0 && mBrandingImageWidth > 0 && mBrandingDrawable != null) { final ViewGroup.LayoutParams params = view.mBrandingImageView.getLayoutParams(); @@ -310,6 +318,7 @@ public final class SplashScreenView extends FrameLayout { private SurfaceView createSurfaceView(@NonNull SplashScreenView view) { final SurfaceView surfaceView = new SurfaceView(view.getContext()); surfaceView.setPadding(0, 0, 0, 0); + surfaceView.setBackground(mIconBackground); if (mSurfacePackage == null) { if (DEBUG) { Log.d(TAG, @@ -475,7 +484,11 @@ public final class SplashScreenView extends FrameLayout { } setVisibility(GONE); if (mParceledIconBitmap != null) { - mIconView.setBackground(null); + if (mIconView instanceof ImageView) { + ((ImageView) mIconView).setImageDrawable(null); + } else if (mIconView != null) { + mIconView.setBackground(null); + } mParceledIconBitmap.recycle(); mParceledIconBitmap = null; } @@ -484,6 +497,13 @@ public final class SplashScreenView extends FrameLayout { mParceledBrandingBitmap.recycle(); mParceledBrandingBitmap = null; } + if (mParceledIconBackgroundBitmap != null) { + if (mIconView != null) { + mIconView.setBackground(null); + } + mParceledIconBackgroundBitmap.recycle(); + mParceledIconBackgroundBitmap = null; + } if (mWindow != null) { final DecorView decorView = (DecorView) mWindow.peekDecorView(); if (DEBUG) { @@ -600,15 +620,6 @@ public final class SplashScreenView extends FrameLayout { } /** - * Get the icon background color - * @hide - */ - @TestApi - public @ColorInt int getIconBackgroundColor() { - return mInitIconBackgroundColor; - } - - /** * Get the initial background color of this view. * @hide */ @@ -637,7 +648,7 @@ public final class SplashScreenView extends FrameLayout { public static class SplashScreenViewParcelable implements Parcelable { private int mIconSize; private int mBackgroundColor; - private int mIconBackground; + private Bitmap mIconBackground; private Bitmap mIconBitmap = null; private int mBrandingWidth; @@ -653,11 +664,11 @@ public final class SplashScreenView extends FrameLayout { public SplashScreenViewParcelable(SplashScreenView view) { mIconSize = view.mIconView.getWidth(); mBackgroundColor = view.getInitBackgroundColor(); - mIconBackground = view.getIconBackgroundColor(); + mIconBackground = copyDrawable(view.getIconView().getBackground()); mSurfacePackage = view.mSurfacePackageCopy; if (mSurfacePackage == null) { // We only need to copy the drawable if we are not using a SurfaceView - mIconBitmap = copyDrawable(view.getIconView().getBackground()); + mIconBitmap = copyDrawable(((ImageView) view.getIconView()).getDrawable()); } mBrandingBitmap = copyDrawable(view.getBrandingView().getBackground()); @@ -703,7 +714,7 @@ public final class SplashScreenView extends FrameLayout { mBrandingBitmap = source.readTypedObject(Bitmap.CREATOR); mIconAnimationStartMillis = source.readLong(); mIconAnimationDurationMillis = source.readLong(); - mIconBackground = source.readInt(); + mIconBackground = source.readTypedObject(Bitmap.CREATOR); mSurfacePackage = source.readTypedObject(SurfaceControlViewHost.SurfacePackage.CREATOR); mClientCallback = source.readTypedObject(RemoteCallback.CREATOR); } @@ -723,7 +734,7 @@ public final class SplashScreenView extends FrameLayout { dest.writeTypedObject(mBrandingBitmap, flags); dest.writeLong(mIconAnimationStartMillis); dest.writeLong(mIconAnimationDurationMillis); - dest.writeInt(mIconBackground); + dest.writeTypedObject(mIconBackground, flags); dest.writeTypedObject(mSurfacePackage, flags); dest.writeTypedObject(mClientCallback, flags); } @@ -760,10 +771,6 @@ public final class SplashScreenView extends FrameLayout { return mBackgroundColor; } - int getIconBackground() { - return mIconBackground; - } - /** * Sets the {@link RemoteCallback} that will be called by the client to notify the shell * of the removal of the {@link SplashScreenView}. diff --git a/core/java/android/window/StartingWindowInfo.java b/core/java/android/window/StartingWindowInfo.java index 566f154fba3b..8c64474dc887 100644 --- a/core/java/android/window/StartingWindowInfo.java +++ b/core/java/android/window/StartingWindowInfo.java @@ -22,6 +22,7 @@ import android.annotation.Nullable; import android.annotation.TestApi; import android.app.ActivityManager; import android.app.TaskInfo; +import android.content.pm.ActivityInfo; import android.os.Parcel; import android.os.Parcelable; import android.view.InsetsState; @@ -78,6 +79,14 @@ public final class StartingWindowInfo implements Parcelable { public ActivityManager.RunningTaskInfo taskInfo; /** + * The {@link ActivityInfo} of the target activity which to create the starting window. + * It can be null if the info is the same as the top in task info. + * @hide + */ + @Nullable + public ActivityInfo targetActivityInfo; + + /** * InsetsState of TopFullscreenOpaqueWindow * @hide */ @@ -174,6 +183,7 @@ public final class StartingWindowInfo implements Parcelable { @Override public void writeToParcel(@NonNull Parcel dest, int flags) { dest.writeTypedObject(taskInfo, flags); + dest.writeTypedObject(targetActivityInfo, flags); dest.writeInt(startingWindowTypeParameter); dest.writeTypedObject(topOpaqueWindowInsetsState, flags); dest.writeTypedObject(topOpaqueWindowLayoutParams, flags); @@ -185,6 +195,7 @@ public final class StartingWindowInfo implements Parcelable { void readFromParcel(@NonNull Parcel source) { taskInfo = source.readTypedObject(ActivityManager.RunningTaskInfo.CREATOR); + targetActivityInfo = source.readTypedObject(ActivityInfo.CREATOR); startingWindowTypeParameter = source.readInt(); topOpaqueWindowInsetsState = source.readTypedObject(InsetsState.CREATOR); topOpaqueWindowLayoutParams = source.readTypedObject( @@ -198,6 +209,7 @@ public final class StartingWindowInfo implements Parcelable { @Override public String toString() { return "StartingWindowInfo{taskId=" + taskInfo.taskId + + " targetActivityInfo=" + targetActivityInfo + " displayId=" + taskInfo.displayId + " topActivityType=" + taskInfo.topActivityType + " preferredStartingWindowType=" diff --git a/core/java/com/android/internal/app/AbstractResolverComparator.java b/core/java/com/android/internal/app/AbstractResolverComparator.java index 40ada0b2ffdc..c00d16ca143e 100644 --- a/core/java/com/android/internal/app/AbstractResolverComparator.java +++ b/core/java/com/android/internal/app/AbstractResolverComparator.java @@ -22,6 +22,7 @@ import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; +import android.os.BadParcelableException; import android.os.Handler; import android.os.Looper; import android.os.Message; @@ -109,17 +110,22 @@ public abstract class AbstractResolverComparator implements Comparator<ResolvedC // get annotations of content from intent. private void getContentAnnotations(Intent intent) { - ArrayList<String> annotations = intent.getStringArrayListExtra( - Intent.EXTRA_CONTENT_ANNOTATIONS); - if (annotations != null) { - int size = annotations.size(); - if (size > NUM_OF_TOP_ANNOTATIONS_TO_USE) { - size = NUM_OF_TOP_ANNOTATIONS_TO_USE; - } - mAnnotations = new String[size]; - for (int i = 0; i < size; i++) { - mAnnotations[i] = annotations.get(i); + try { + ArrayList<String> annotations = intent.getStringArrayListExtra( + Intent.EXTRA_CONTENT_ANNOTATIONS); + if (annotations != null) { + int size = annotations.size(); + if (size > NUM_OF_TOP_ANNOTATIONS_TO_USE) { + size = NUM_OF_TOP_ANNOTATIONS_TO_USE; + } + mAnnotations = new String[size]; + for (int i = 0; i < size; i++) { + mAnnotations[i] = annotations.get(i); + } } + } catch (BadParcelableException e) { + Log.i(TAG, "Couldn't unparcel intent annotations. Ignoring."); + mAnnotations = new String[0]; } } diff --git a/core/java/com/android/internal/app/ChooserActivity.java b/core/java/com/android/internal/app/ChooserActivity.java index eeceafae531d..786af5f0823e 100644 --- a/core/java/com/android/internal/app/ChooserActivity.java +++ b/core/java/com/android/internal/app/ChooserActivity.java @@ -1269,7 +1269,8 @@ public class ChooserActivity extends ResolverActivity implements SELECTION_TYPE_NEARBY, "", -1); - safelyStartActivity(ti); + // Action bar is user-independent, always start as primary + safelyStartActivityAsUser(ti, getPersonalProfileUserHandle()); finish(); } ); @@ -1290,7 +1291,8 @@ public class ChooserActivity extends ResolverActivity implements SELECTION_TYPE_EDIT, "", -1); - safelyStartActivity(ti); + // Action bar is user-independent, always start as primary + safelyStartActivityAsUser(ti, getPersonalProfileUserHandle()); finish(); } ); @@ -3452,8 +3454,6 @@ public class ChooserActivity extends ResolverActivity implements private View createProfileView(ViewGroup parent) { View profileRow = mLayoutInflater.inflate(R.layout.chooser_profile_row, parent, false); - profileRow.setBackground( - getResources().getDrawable(R.drawable.chooser_row_layer_list, null)); mProfileView = profileRow.findViewById(R.id.profile_button); mProfileView.setOnClickListener(ChooserActivity.this::onProfileClick); updateProfileViewButton(); @@ -3599,10 +3599,6 @@ public class ChooserActivity extends ResolverActivity implements final ViewGroup viewGroup = (ViewGroup) holder.itemView; int start = getListPosition(position); int startType = getRowType(start); - if (viewGroup.getForeground() == null && position > 0) { - viewGroup.setForeground( - getResources().getDrawable(R.drawable.chooser_row_layer_list, null)); - } int columnCount = holder.getColumnCount(); int end = start + columnCount - 1; diff --git a/core/java/com/android/internal/app/ResolverActivity.java b/core/java/com/android/internal/app/ResolverActivity.java index 6f9da6fa94a3..d08f21c9f257 100644 --- a/core/java/com/android/internal/app/ResolverActivity.java +++ b/core/java/com/android/internal/app/ResolverActivity.java @@ -1257,13 +1257,32 @@ public class ResolverActivity extends Activity implements // don't kill ourselves. StrictMode.disableDeathOnFileUriExposure(); try { - safelyStartActivityInternal(cti); + UserHandle currentUserHandle = mMultiProfilePagerAdapter.getCurrentUserHandle(); + safelyStartActivityInternal(cti, currentUserHandle); } finally { StrictMode.enableDeathOnFileUriExposure(); } } - private void safelyStartActivityInternal(TargetInfo cti) { + /** + * Start activity as a fixed user handle. + * @param cti TargetInfo to be launched. + * @param user User to launch this activity as. + */ + @VisibleForTesting + public void safelyStartActivityAsUser(TargetInfo cti, UserHandle user) { + // We're dispatching intents that might be coming from legacy apps, so + // don't kill ourselves. + StrictMode.disableDeathOnFileUriExposure(); + try { + safelyStartActivityInternal(cti, user); + } finally { + StrictMode.enableDeathOnFileUriExposure(); + } + } + + + private void safelyStartActivityInternal(TargetInfo cti, UserHandle user) { // If the target is suspended, the activity will not be successfully launched. // Do not unregister from package manager updates in this case if (!cti.isSuspended() && mRegistered) { @@ -1280,18 +1299,17 @@ public class ResolverActivity extends Activity implements if (mProfileSwitchMessageId != -1) { Toast.makeText(this, getString(mProfileSwitchMessageId), Toast.LENGTH_LONG).show(); } - UserHandle currentUserHandle = mMultiProfilePagerAdapter.getCurrentUserHandle(); if (!mSafeForwardingMode) { - if (cti.startAsUser(this, null, currentUserHandle)) { + if (cti.startAsUser(this, null, user)) { onActivityStarted(cti); - maybeLogCrossProfileTargetLaunch(cti, currentUserHandle); + maybeLogCrossProfileTargetLaunch(cti, user); } return; } try { - if (cti.startAsCaller(this, null, currentUserHandle.getIdentifier())) { + if (cti.startAsCaller(this, null, user.getIdentifier())) { onActivityStarted(cti); - maybeLogCrossProfileTargetLaunch(cti, currentUserHandle); + maybeLogCrossProfileTargetLaunch(cti, user); } } catch (RuntimeException e) { Slog.wtf(TAG, "Unable to launch as uid " + mLaunchedFromUid diff --git a/core/java/com/android/internal/display/BrightnessSynchronizer.java b/core/java/com/android/internal/display/BrightnessSynchronizer.java index c9a9e51dceed..55a2052f9242 100644 --- a/core/java/com/android/internal/display/BrightnessSynchronizer.java +++ b/core/java/com/android/internal/display/BrightnessSynchronizer.java @@ -16,9 +16,11 @@ package com.android.internal.display; +import android.annotation.NonNull; import android.content.ContentResolver; import android.content.Context; import android.database.ContentObserver; +import android.hardware.display.BrightnessInfo; import android.hardware.display.DisplayManager; import android.hardware.display.DisplayManager.DisplayListener; import android.net.Uri; @@ -61,10 +63,10 @@ public class BrightnessSynchronizer { updateBrightnessFloatFromInt(msg.arg1); break; case MSG_UPDATE_INT: - updateBrightnessIntFromFloat(Float.intBitsToFloat(msg.arg1)); + updateBrightnessIntFromFloat((BrightnessInfo) msg.obj); break; case MSG_UPDATE_BOTH: - updateBoth(Float.intBitsToFloat(msg.arg1)); + updateBoth((BrightnessInfo) msg.obj, Float.intBitsToFloat(msg.arg1)); break; default: super.handleMessage(msg); @@ -95,11 +97,11 @@ public class BrightnessSynchronizer { brightnessSyncObserver = new BrightnessSyncObserver(); brightnessSyncObserver.startObserving(); - final float currentFloatBrightness = getScreenBrightnessFloat(); + final BrightnessInfo brightnessInfo = getBrightnessInfo(); final int currentIntBrightness = getScreenBrightnessInt(mContext); - if (!Float.isNaN(currentFloatBrightness)) { - updateBrightnessIntFromFloat(currentFloatBrightness); + if (brightnessInfo != null && !Float.isNaN(brightnessInfo.brightness)) { + updateBrightnessIntFromFloat(brightnessInfo); } else if (currentIntBrightness != -1) { updateBrightnessFloatFromInt(currentIntBrightness); } else { @@ -112,15 +114,23 @@ public class BrightnessSynchronizer { /** * Converts between the int brightness system and the float brightness system. + * + * @param brightnessInt The int brightness value to convert. */ public static float brightnessIntToFloat(int brightnessInt) { + return brightnessIntToFloat(brightnessInt, null); + } + + private static float brightnessIntToFloat(int brightnessInt, BrightnessInfo info) { if (brightnessInt == PowerManager.BRIGHTNESS_OFF) { return PowerManager.BRIGHTNESS_OFF_FLOAT; } else if (brightnessInt == PowerManager.BRIGHTNESS_INVALID) { return PowerManager.BRIGHTNESS_INVALID_FLOAT; } else { - final float minFloat = PowerManager.BRIGHTNESS_MIN; - final float maxFloat = PowerManager.BRIGHTNESS_MAX; + final float minFloat = info != null + ? info.brightnessMinimum : PowerManager.BRIGHTNESS_MIN; + final float maxFloat = info != null + ? info.brightnessMaximum : PowerManager.BRIGHTNESS_MAX; final float minInt = PowerManager.BRIGHTNESS_OFF + 1; final float maxInt = PowerManager.BRIGHTNESS_ON; return MathUtils.constrainedMap(minFloat, maxFloat, minInt, maxInt, brightnessInt); @@ -128,29 +138,28 @@ public class BrightnessSynchronizer { } /** - * Converts between the float brightness system and the int brightness system. - */ - public static int brightnessFloatToInt(float brightnessFloat) { - return Math.round(brightnessFloatToIntRange(brightnessFloat)); - } - - /** * Translates specified value from the float brightness system to the int brightness system, * given the min/max of each range. Accounts for special values such as OFF and invalid values. * Value returned as a float primitive (to preserve precision), but is a value within the * int-system range. + * + * @param brightnessFloat The float brightness value to convert. + * @param info Brightness information to use in the conversion. */ - public static float brightnessFloatToIntRange(float brightnessFloat) { + public static int brightnessFloatToInt(float brightnessFloat, BrightnessInfo info) { if (floatEquals(brightnessFloat, PowerManager.BRIGHTNESS_OFF_FLOAT)) { return PowerManager.BRIGHTNESS_OFF; } else if (Float.isNaN(brightnessFloat)) { return PowerManager.BRIGHTNESS_INVALID; } else { - final float minFloat = PowerManager.BRIGHTNESS_MIN; - final float maxFloat = PowerManager.BRIGHTNESS_MAX; + final float minFloat = info != null + ? info.brightnessMinimum : PowerManager.BRIGHTNESS_MIN; + final float maxFloat = info != null + ? info.brightnessMaximum : PowerManager.BRIGHTNESS_MAX; final float minInt = PowerManager.BRIGHTNESS_OFF + 1; final float maxInt = PowerManager.BRIGHTNESS_ON; - return MathUtils.constrainedMap(minInt, maxInt, minFloat, maxFloat, brightnessFloat); + return Math.round(MathUtils.constrainedMap(minInt, maxInt, minFloat, maxFloat, + brightnessFloat)); } } @@ -185,35 +194,37 @@ public class BrightnessSynchronizer { * @param value Brightness value as int to store in the float setting. */ private void updateBrightnessFloatFromInt(int value) { - if (brightnessFloatToInt(mPreferredSettingValue) == value) { + final BrightnessInfo info = getBrightnessInfo(); + if (brightnessFloatToInt(mPreferredSettingValue, info) == value) { return; } - mPreferredSettingValue = brightnessIntToFloat(value); + mPreferredSettingValue = brightnessIntToFloat(value, info); final int newBrightnessAsIntBits = Float.floatToIntBits(mPreferredSettingValue); mHandler.removeMessages(MSG_UPDATE_BOTH); mHandler.obtainMessage(MSG_UPDATE_BOTH, newBrightnessAsIntBits, 0).sendToTarget(); } /** - * Updates the settings based on a passed in float value. This is called whenever the float - * setting changes. mPreferredSettingValue holds the most recently updated brightness value - * as a float that we would like the display to be set to. + * Updates the settings from the specified {@link BrightnessInfo}. This is called whenever the + * float brightness changed from DisplayManager. mPreferredSettingValue holds the most recently + * updated brightness value as a float that we would like the display to be set to. * * We then schedule an update to both the int and float settings, but, remove all the other * messages to update all, to prevent us getting stuck in a loop. * - * @param value Brightness setting as float to store in int setting. + * @param brightnessInfo Current brightness information */ - private void updateBrightnessIntFromFloat(float value) { + private void updateBrightnessIntFromFloat(@NonNull BrightnessInfo brightnessInfo) { + final float value = brightnessInfo.brightness; if (floatEquals(mPreferredSettingValue, value)) { return; } mPreferredSettingValue = value; - final int newBrightnessAsIntBits = Float.floatToIntBits(mPreferredSettingValue); mHandler.removeMessages(MSG_UPDATE_BOTH); - mHandler.obtainMessage(MSG_UPDATE_BOTH, newBrightnessAsIntBits, 0).sendToTarget(); + mHandler.obtainMessage(MSG_UPDATE_BOTH, Float.floatToIntBits(value), 0, brightnessInfo) + .sendToTarget(); } @@ -222,16 +233,24 @@ public class BrightnessSynchronizer { * mDisplayManager.setBrightness automatically checks for changes * Settings.System.putIntForUser needs to be checked, to prevent an extra callback to this class * + * @param brightnessInfo Brightness information, takes precedent over newBrightnessFloat * @param newBrightnessFloat Brightness setting as float to store in both settings */ - private void updateBoth(float newBrightnessFloat) { - int newBrightnessInt = brightnessFloatToInt(newBrightnessFloat); + private void updateBoth(BrightnessInfo brightnessInfo, float newBrightnessFloat) { + int newBrightnessInt = brightnessFloatToInt(newBrightnessFloat, brightnessInfo); mDisplayManager.setBrightness(Display.DEFAULT_DISPLAY, newBrightnessFloat); if (getScreenBrightnessInt(mContext) != newBrightnessInt) { Settings.System.putIntForUser(mContext.getContentResolver(), Settings.System.SCREEN_BRIGHTNESS, newBrightnessInt, UserHandle.USER_CURRENT); } + } + private BrightnessInfo getBrightnessInfo() { + final Display display = mDisplayManager.getDisplay(Display.DEFAULT_DISPLAY); + if (display != null) { + return display.getBrightnessInfo(); + } + return null; } /** @@ -263,10 +282,15 @@ public class BrightnessSynchronizer { @Override public void onDisplayChanged(int displayId) { - float currentFloat = getScreenBrightnessFloat(); - int toSend = Float.floatToIntBits(currentFloat); - mHandler.removeMessages(MSG_UPDATE_INT); - mHandler.obtainMessage(MSG_UPDATE_INT, toSend, 0).sendToTarget(); + if (displayId != Display.DEFAULT_DISPLAY) { + return; + } + + final BrightnessInfo info = getBrightnessInfo(); + if (info != null) { + mHandler.removeMessages(MSG_UPDATE_INT); + mHandler.obtainMessage(MSG_UPDATE_INT, info).sendToTarget(); + } } }; diff --git a/core/java/com/android/internal/os/BinderCallsStats.java b/core/java/com/android/internal/os/BinderCallsStats.java index 6ce7cea12dfa..be91aaca5d39 100644 --- a/core/java/com/android/internal/os/BinderCallsStats.java +++ b/core/java/com/android/internal/os/BinderCallsStats.java @@ -220,8 +220,9 @@ public class BinderCallsStats implements BinderInternal.Observer { public CallSession callStarted(Binder binder, int code, int workSourceUid) { noteNativeThreadId(); + boolean collectCpu = canCollect(); // We always want to collect data for latency if it's enabled, regardless of device state. - if (!mCollectLatencyData && !canCollect()) { + if (!mCollectLatencyData && !collectCpu) { return null; } @@ -233,7 +234,7 @@ public class BinderCallsStats implements BinderInternal.Observer { s.timeStarted = -1; s.recordedCall = shouldRecordDetailedData(); - if (mRecordingAllTransactionsForUid || s.recordedCall) { + if (collectCpu && (mRecordingAllTransactionsForUid || s.recordedCall)) { s.cpuTimeStarted = getThreadTimeMicro(); s.timeStarted = getElapsedRealtimeMicro(); } else if (mCollectLatencyData) { diff --git a/core/res/res/drawable/chooser_row_layer_list.xml b/core/res/res/drawable/chooser_row_layer_list.xml index 080081521ddf..f5ba1e9d633b 100644 --- a/core/res/res/drawable/chooser_row_layer_list.xml +++ b/core/res/res/drawable/chooser_row_layer_list.xml @@ -17,9 +17,11 @@ */ --> <layer-list xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:bottom="-5dp" android:left="-5dp" android:right="-5dp"> + <item> <shape android:shape="rectangle"> - <stroke android:width="1dp" android:color="@color/chooser_row_divider"/> + <solid android:color="?android:attr/colorAccentSecondary"/> + <size android:width="128dp" android:height="2dp"/> + <corners android:radius="2dp" /> </shape> </item> </layer-list> diff --git a/core/res/res/layout/chooser_az_label_row.xml b/core/res/res/layout/chooser_az_label_row.xml index 1b733fc907cc..baf07cec9875 100644 --- a/core/res/res/layout/chooser_az_label_row.xml +++ b/core/res/res/layout/chooser_az_label_row.xml @@ -15,17 +15,12 @@ ~ limitations under the License --> -<!-- Separator applied as background --> -<TextView xmlns:android="http://schemas.android.com/apk/res/android" - android:text="@string/chooser_all_apps_button_label" +<ImageView xmlns:android="http://schemas.android.com/apk/res/android" android:contentDescription="@string/chooser_all_apps_button_label" - android:background="@drawable/chooser_row_layer_list" - android:textAppearance="?attr/textAppearanceSmall" - android:textColor="?attr/textColorSecondary" - android:textSize="14sp" - android:singleLine="true" + android:src="@drawable/chooser_row_layer_list" android:paddingTop="16dp" android:layout_width="match_parent" android:layout_height="wrap_content" + android:scaleType="center" android:gravity="center"/> diff --git a/core/res/res/layout/splash_screen_view.xml b/core/res/res/layout/splash_screen_view.xml index 0b7b49cdea83..aa050f3a364d 100644 --- a/core/res/res/layout/splash_screen_view.xml +++ b/core/res/res/layout/splash_screen_view.xml @@ -21,12 +21,11 @@ android:padding="0dp" android:orientation="vertical"> - <View android:id="@+id/splashscreen_icon_view" + <ImageView android:id="@+id/splashscreen_icon_view" android:layout_height="wrap_content" android:layout_width="wrap_content" android:layout_gravity="center" android:padding="0dp" - android:background="@null" android:contentDescription="@string/splash_screen_view_icon_description"/> <View android:id="@+id/splashscreen_branding_view" diff --git a/core/res/res/values-be/strings.xml b/core/res/res/values-be/strings.xml index 0970fc50da49..2d94ffe2b0eb 100644 --- a/core/res/res/values-be/strings.xml +++ b/core/res/res/values-be/strings.xml @@ -1248,9 +1248,9 @@ <string name="whichImageCaptureApplication" msgid="2737413019463215284">"Зрабіць здымак з дапамогай"</string> <string name="whichImageCaptureApplicationNamed" msgid="8820702441847612202">"Зрабіць здымак з дапамогай %1$s"</string> <string name="whichImageCaptureApplicationLabel" msgid="6505433734824988277">"Зрабіць здымак"</string> - <string name="alwaysUse" msgid="3153558199076112903">"Выкарыстоўваць па змаўчанні для гэтага дзеяння."</string> + <string name="alwaysUse" msgid="3153558199076112903">"Выкарыстоўваць стандартна для гэтага дзеяння."</string> <string name="use_a_different_app" msgid="4987790276170972776">"Выкарыстоўваць іншую праграму"</string> - <string name="clearDefaultHintMsg" msgid="1325866337702524936">"Ачысціць па змаўчанні ў раздзеле \"Налады сістэмы > Прыкладанні > Спампаваныя\"."</string> + <string name="clearDefaultHintMsg" msgid="1325866337702524936">"Ачысціць стандартныя налады ў раздзеле \"Налады сістэмы > Праграмы > Спампаваныя\"."</string> <string name="chooseActivity" msgid="8563390197659779956">"Выберыце дзеянне"</string> <string name="chooseUsbActivity" msgid="2096269989990986612">"Выберыце прыкладанне для USB-прылады"</string> <string name="noApplications" msgid="1186909265235544019">"Няма прыкладанняў, якія могуць выконваць гэты працэс."</string> diff --git a/core/res/res/values-en-rAU/strings.xml b/core/res/res/values-en-rAU/strings.xml index 141cf4e60e94..8cf968d503a7 100644 --- a/core/res/res/values-en-rAU/strings.xml +++ b/core/res/res/values-en-rAU/strings.xml @@ -700,8 +700,8 @@ <string name="permdesc_bindConditionProviderService" msgid="6106018791256120258">"Allows the holder to bind to the top-level interface of a condition provider service. Should never be needed for normal apps."</string> <string name="permlab_bindDreamService" msgid="4776175992848982706">"bind to a dream service"</string> <string name="permdesc_bindDreamService" msgid="9129615743300572973">"Allows the holder to bind to the top-level interface of a dream service. Should never be needed for normal apps."</string> - <string name="permlab_invokeCarrierSetup" msgid="5098810760209818140">"invoke the carrier-provided configuration app"</string> - <string name="permdesc_invokeCarrierSetup" msgid="4790845896063237887">"Allows the holder to invoke the carrier-provided configuration app. Should never be needed for normal apps."</string> + <string name="permlab_invokeCarrierSetup" msgid="5098810760209818140">"invoke the operator-provided configuration app"</string> + <string name="permdesc_invokeCarrierSetup" msgid="4790845896063237887">"Allows the holder to invoke the operator-provided configuration app. Should never be needed for normal apps."</string> <string name="permlab_accessNetworkConditions" msgid="1270732533356286514">"listen for observations on network conditions"</string> <string name="permdesc_accessNetworkConditions" msgid="2959269186741956109">"Allows an application to listen for observations on network conditions. Should never be needed for normal apps."</string> <string name="permlab_setInputCalibration" msgid="932069700285223434">"change input device calibration"</string> @@ -712,8 +712,8 @@ <string name="permdesc_handoverStatus" msgid="3842269451732571070">"Allows this application to receive information about current Android Beam transfers"</string> <string name="permlab_removeDrmCertificates" msgid="710576248717404416">"remove DRM certificates"</string> <string name="permdesc_removeDrmCertificates" msgid="4068445390318355716">"Allows an application to remove DRM certficates. Should never be needed for normal apps."</string> - <string name="permlab_bindCarrierMessagingService" msgid="3363450860593096967">"bind to a carrier messaging service"</string> - <string name="permdesc_bindCarrierMessagingService" msgid="6316457028173478345">"Allows the holder to bind to the top-level interface of a carrier messaging service. Should never be needed for normal apps."</string> + <string name="permlab_bindCarrierMessagingService" msgid="3363450860593096967">"bind to an operator messaging service"</string> + <string name="permdesc_bindCarrierMessagingService" msgid="6316457028173478345">"Allows the holder to bind to the top-level interface of an operator messaging service. Should never be needed for normal apps."</string> <string name="permlab_bindCarrierServices" msgid="2395596978626237474">"bind to operator services"</string> <string name="permdesc_bindCarrierServices" msgid="9185614481967262900">"Allows the holder to bind to operator services. Should never be needed for normal apps."</string> <string name="permlab_access_notification_policy" msgid="5524112842876975537">"access Do Not Disturb"</string> @@ -1655,7 +1655,7 @@ <string name="kg_sim_pin_instructions" msgid="6479401489471690359">"Enter SIM PIN"</string> <string name="kg_pin_instructions" msgid="7355933174673539021">"Enter PIN"</string> <string name="kg_password_instructions" msgid="7179782578809398050">"Enter Password"</string> - <string name="kg_puk_enter_puk_hint" msgid="6696187482616360994">"SIM is now disabled. Enter PUK code to continue. Contact carrier for details."</string> + <string name="kg_puk_enter_puk_hint" msgid="6696187482616360994">"SIM is now disabled. Enter PUK code to continue. Contact operator for details."</string> <string name="kg_puk_enter_pin_hint" msgid="8190982314659429770">"Enter desired PIN code"</string> <string name="kg_enter_confirm_pin_hint" msgid="6372557107414074580">"Confirm desired PIN code"</string> <string name="kg_sim_unlock_progress_dialog_message" msgid="8871937892678885545">"Unlocking SIM card…"</string> diff --git a/core/res/res/values-en-rCA/strings.xml b/core/res/res/values-en-rCA/strings.xml index 2b1d3e0708f2..b772335a6438 100644 --- a/core/res/res/values-en-rCA/strings.xml +++ b/core/res/res/values-en-rCA/strings.xml @@ -700,8 +700,8 @@ <string name="permdesc_bindConditionProviderService" msgid="6106018791256120258">"Allows the holder to bind to the top-level interface of a condition provider service. Should never be needed for normal apps."</string> <string name="permlab_bindDreamService" msgid="4776175992848982706">"bind to a dream service"</string> <string name="permdesc_bindDreamService" msgid="9129615743300572973">"Allows the holder to bind to the top-level interface of a dream service. Should never be needed for normal apps."</string> - <string name="permlab_invokeCarrierSetup" msgid="5098810760209818140">"invoke the carrier-provided configuration app"</string> - <string name="permdesc_invokeCarrierSetup" msgid="4790845896063237887">"Allows the holder to invoke the carrier-provided configuration app. Should never be needed for normal apps."</string> + <string name="permlab_invokeCarrierSetup" msgid="5098810760209818140">"invoke the operator-provided configuration app"</string> + <string name="permdesc_invokeCarrierSetup" msgid="4790845896063237887">"Allows the holder to invoke the operator-provided configuration app. Should never be needed for normal apps."</string> <string name="permlab_accessNetworkConditions" msgid="1270732533356286514">"listen for observations on network conditions"</string> <string name="permdesc_accessNetworkConditions" msgid="2959269186741956109">"Allows an application to listen for observations on network conditions. Should never be needed for normal apps."</string> <string name="permlab_setInputCalibration" msgid="932069700285223434">"change input device calibration"</string> @@ -712,8 +712,8 @@ <string name="permdesc_handoverStatus" msgid="3842269451732571070">"Allows this application to receive information about current Android Beam transfers"</string> <string name="permlab_removeDrmCertificates" msgid="710576248717404416">"remove DRM certificates"</string> <string name="permdesc_removeDrmCertificates" msgid="4068445390318355716">"Allows an application to remove DRM certficates. Should never be needed for normal apps."</string> - <string name="permlab_bindCarrierMessagingService" msgid="3363450860593096967">"bind to a carrier messaging service"</string> - <string name="permdesc_bindCarrierMessagingService" msgid="6316457028173478345">"Allows the holder to bind to the top-level interface of a carrier messaging service. Should never be needed for normal apps."</string> + <string name="permlab_bindCarrierMessagingService" msgid="3363450860593096967">"bind to an operator messaging service"</string> + <string name="permdesc_bindCarrierMessagingService" msgid="6316457028173478345">"Allows the holder to bind to the top-level interface of an operator messaging service. Should never be needed for normal apps."</string> <string name="permlab_bindCarrierServices" msgid="2395596978626237474">"bind to operator services"</string> <string name="permdesc_bindCarrierServices" msgid="9185614481967262900">"Allows the holder to bind to operator services. Should never be needed for normal apps."</string> <string name="permlab_access_notification_policy" msgid="5524112842876975537">"access Do Not Disturb"</string> @@ -1655,7 +1655,7 @@ <string name="kg_sim_pin_instructions" msgid="6479401489471690359">"Enter SIM PIN"</string> <string name="kg_pin_instructions" msgid="7355933174673539021">"Enter PIN"</string> <string name="kg_password_instructions" msgid="7179782578809398050">"Enter Password"</string> - <string name="kg_puk_enter_puk_hint" msgid="6696187482616360994">"SIM is now disabled. Enter PUK code to continue. Contact carrier for details."</string> + <string name="kg_puk_enter_puk_hint" msgid="6696187482616360994">"SIM is now disabled. Enter PUK code to continue. Contact operator for details."</string> <string name="kg_puk_enter_pin_hint" msgid="8190982314659429770">"Enter desired PIN code"</string> <string name="kg_enter_confirm_pin_hint" msgid="6372557107414074580">"Confirm desired PIN code"</string> <string name="kg_sim_unlock_progress_dialog_message" msgid="8871937892678885545">"Unlocking SIM card…"</string> diff --git a/core/res/res/values-en-rGB/strings.xml b/core/res/res/values-en-rGB/strings.xml index 01d8b392e90a..e1e81870cfa3 100644 --- a/core/res/res/values-en-rGB/strings.xml +++ b/core/res/res/values-en-rGB/strings.xml @@ -700,8 +700,8 @@ <string name="permdesc_bindConditionProviderService" msgid="6106018791256120258">"Allows the holder to bind to the top-level interface of a condition provider service. Should never be needed for normal apps."</string> <string name="permlab_bindDreamService" msgid="4776175992848982706">"bind to a dream service"</string> <string name="permdesc_bindDreamService" msgid="9129615743300572973">"Allows the holder to bind to the top-level interface of a dream service. Should never be needed for normal apps."</string> - <string name="permlab_invokeCarrierSetup" msgid="5098810760209818140">"invoke the carrier-provided configuration app"</string> - <string name="permdesc_invokeCarrierSetup" msgid="4790845896063237887">"Allows the holder to invoke the carrier-provided configuration app. Should never be needed for normal apps."</string> + <string name="permlab_invokeCarrierSetup" msgid="5098810760209818140">"invoke the operator-provided configuration app"</string> + <string name="permdesc_invokeCarrierSetup" msgid="4790845896063237887">"Allows the holder to invoke the operator-provided configuration app. Should never be needed for normal apps."</string> <string name="permlab_accessNetworkConditions" msgid="1270732533356286514">"listen for observations on network conditions"</string> <string name="permdesc_accessNetworkConditions" msgid="2959269186741956109">"Allows an application to listen for observations on network conditions. Should never be needed for normal apps."</string> <string name="permlab_setInputCalibration" msgid="932069700285223434">"change input device calibration"</string> @@ -712,8 +712,8 @@ <string name="permdesc_handoverStatus" msgid="3842269451732571070">"Allows this application to receive information about current Android Beam transfers"</string> <string name="permlab_removeDrmCertificates" msgid="710576248717404416">"remove DRM certificates"</string> <string name="permdesc_removeDrmCertificates" msgid="4068445390318355716">"Allows an application to remove DRM certficates. Should never be needed for normal apps."</string> - <string name="permlab_bindCarrierMessagingService" msgid="3363450860593096967">"bind to a carrier messaging service"</string> - <string name="permdesc_bindCarrierMessagingService" msgid="6316457028173478345">"Allows the holder to bind to the top-level interface of a carrier messaging service. Should never be needed for normal apps."</string> + <string name="permlab_bindCarrierMessagingService" msgid="3363450860593096967">"bind to an operator messaging service"</string> + <string name="permdesc_bindCarrierMessagingService" msgid="6316457028173478345">"Allows the holder to bind to the top-level interface of an operator messaging service. Should never be needed for normal apps."</string> <string name="permlab_bindCarrierServices" msgid="2395596978626237474">"bind to operator services"</string> <string name="permdesc_bindCarrierServices" msgid="9185614481967262900">"Allows the holder to bind to operator services. Should never be needed for normal apps."</string> <string name="permlab_access_notification_policy" msgid="5524112842876975537">"access Do Not Disturb"</string> @@ -1655,7 +1655,7 @@ <string name="kg_sim_pin_instructions" msgid="6479401489471690359">"Enter SIM PIN"</string> <string name="kg_pin_instructions" msgid="7355933174673539021">"Enter PIN"</string> <string name="kg_password_instructions" msgid="7179782578809398050">"Enter Password"</string> - <string name="kg_puk_enter_puk_hint" msgid="6696187482616360994">"SIM is now disabled. Enter PUK code to continue. Contact carrier for details."</string> + <string name="kg_puk_enter_puk_hint" msgid="6696187482616360994">"SIM is now disabled. Enter PUK code to continue. Contact operator for details."</string> <string name="kg_puk_enter_pin_hint" msgid="8190982314659429770">"Enter desired PIN code"</string> <string name="kg_enter_confirm_pin_hint" msgid="6372557107414074580">"Confirm desired PIN code"</string> <string name="kg_sim_unlock_progress_dialog_message" msgid="8871937892678885545">"Unlocking SIM card…"</string> diff --git a/core/res/res/values-en-rIN/strings.xml b/core/res/res/values-en-rIN/strings.xml index 3ed0279fb8f2..892041c2332d 100644 --- a/core/res/res/values-en-rIN/strings.xml +++ b/core/res/res/values-en-rIN/strings.xml @@ -700,8 +700,8 @@ <string name="permdesc_bindConditionProviderService" msgid="6106018791256120258">"Allows the holder to bind to the top-level interface of a condition provider service. Should never be needed for normal apps."</string> <string name="permlab_bindDreamService" msgid="4776175992848982706">"bind to a dream service"</string> <string name="permdesc_bindDreamService" msgid="9129615743300572973">"Allows the holder to bind to the top-level interface of a dream service. Should never be needed for normal apps."</string> - <string name="permlab_invokeCarrierSetup" msgid="5098810760209818140">"invoke the carrier-provided configuration app"</string> - <string name="permdesc_invokeCarrierSetup" msgid="4790845896063237887">"Allows the holder to invoke the carrier-provided configuration app. Should never be needed for normal apps."</string> + <string name="permlab_invokeCarrierSetup" msgid="5098810760209818140">"invoke the operator-provided configuration app"</string> + <string name="permdesc_invokeCarrierSetup" msgid="4790845896063237887">"Allows the holder to invoke the operator-provided configuration app. Should never be needed for normal apps."</string> <string name="permlab_accessNetworkConditions" msgid="1270732533356286514">"listen for observations on network conditions"</string> <string name="permdesc_accessNetworkConditions" msgid="2959269186741956109">"Allows an application to listen for observations on network conditions. Should never be needed for normal apps."</string> <string name="permlab_setInputCalibration" msgid="932069700285223434">"change input device calibration"</string> @@ -712,8 +712,8 @@ <string name="permdesc_handoverStatus" msgid="3842269451732571070">"Allows this application to receive information about current Android Beam transfers"</string> <string name="permlab_removeDrmCertificates" msgid="710576248717404416">"remove DRM certificates"</string> <string name="permdesc_removeDrmCertificates" msgid="4068445390318355716">"Allows an application to remove DRM certficates. Should never be needed for normal apps."</string> - <string name="permlab_bindCarrierMessagingService" msgid="3363450860593096967">"bind to a carrier messaging service"</string> - <string name="permdesc_bindCarrierMessagingService" msgid="6316457028173478345">"Allows the holder to bind to the top-level interface of a carrier messaging service. Should never be needed for normal apps."</string> + <string name="permlab_bindCarrierMessagingService" msgid="3363450860593096967">"bind to an operator messaging service"</string> + <string name="permdesc_bindCarrierMessagingService" msgid="6316457028173478345">"Allows the holder to bind to the top-level interface of an operator messaging service. Should never be needed for normal apps."</string> <string name="permlab_bindCarrierServices" msgid="2395596978626237474">"bind to operator services"</string> <string name="permdesc_bindCarrierServices" msgid="9185614481967262900">"Allows the holder to bind to operator services. Should never be needed for normal apps."</string> <string name="permlab_access_notification_policy" msgid="5524112842876975537">"access Do Not Disturb"</string> @@ -1655,7 +1655,7 @@ <string name="kg_sim_pin_instructions" msgid="6479401489471690359">"Enter SIM PIN"</string> <string name="kg_pin_instructions" msgid="7355933174673539021">"Enter PIN"</string> <string name="kg_password_instructions" msgid="7179782578809398050">"Enter Password"</string> - <string name="kg_puk_enter_puk_hint" msgid="6696187482616360994">"SIM is now disabled. Enter PUK code to continue. Contact carrier for details."</string> + <string name="kg_puk_enter_puk_hint" msgid="6696187482616360994">"SIM is now disabled. Enter PUK code to continue. Contact operator for details."</string> <string name="kg_puk_enter_pin_hint" msgid="8190982314659429770">"Enter desired PIN code"</string> <string name="kg_enter_confirm_pin_hint" msgid="6372557107414074580">"Confirm desired PIN code"</string> <string name="kg_sim_unlock_progress_dialog_message" msgid="8871937892678885545">"Unlocking SIM card…"</string> diff --git a/core/res/res/values-es/strings.xml b/core/res/res/values-es/strings.xml index 8c465f174a96..9a07025ad760 100644 --- a/core/res/res/values-es/strings.xml +++ b/core/res/res/values-es/strings.xml @@ -244,7 +244,7 @@ <string name="global_actions" product="default" msgid="6410072189971495460">"Opciones del teléfono"</string> <string name="global_action_lock" msgid="6949357274257655383">"Bloqueo de pantalla"</string> <string name="global_action_power_off" msgid="4404936470711393203">"Apagar"</string> - <string name="global_action_power_options" msgid="1185286119330160073">"Encender o apagar"</string> + <string name="global_action_power_options" msgid="1185286119330160073">"Apagar o reiniciar"</string> <string name="global_action_restart" msgid="4678451019561687074">"Reiniciar"</string> <string name="global_action_emergency" msgid="1387617624177105088">"Emergencia"</string> <string name="global_action_bug_report" msgid="5127867163044170003">"Informe de errores"</string> diff --git a/core/res/res/values-gu/strings.xml b/core/res/res/values-gu/strings.xml index 5add36bd2005..e473ab670e75 100644 --- a/core/res/res/values-gu/strings.xml +++ b/core/res/res/values-gu/strings.xml @@ -34,7 +34,7 @@ <string name="defaultMsisdnAlphaTag" msgid="2285034592902077488">"MSISDN1"</string> <string name="mmiError" msgid="2862759606579822246">"કનેક્શન સમસ્યા અથવા અમાન્ય MMI કોડ."</string> <string name="mmiFdnError" msgid="3975490266767565852">"ઑપરેશન ફક્ત સ્થિર ડાયલિંગ નંબર્સ પર પ્રતિબંધિત છે."</string> - <string name="mmiErrorWhileRoaming" msgid="1204173664713870114">"તમે રોમિંગમાં હોવ તે વખતે તમારા ફોન પરથી કૉલ ફોરવર્ડિગ સેટિંગ્સ બદલી શકતાં નથી."</string> + <string name="mmiErrorWhileRoaming" msgid="1204173664713870114">"તમે રોમિંગમાં હો તે વખતે તમારા ફોન પરથી કૉલ ફૉરવર્ડિગ સેટિંગ બદલી શકતાં નથી."</string> <string name="serviceEnabled" msgid="7549025003394765639">"સેવા સક્ષમ હતી."</string> <string name="serviceEnabledFor" msgid="1463104778656711613">"સેવા આ માટે સક્ષમ હતી:"</string> <string name="serviceDisabled" msgid="641878791205871379">"સેવા અક્ષમ કરવામાં આવી છે."</string> @@ -124,7 +124,7 @@ <string name="roamingTextSearching" msgid="5323235489657753486">"સેવા શોધી રહ્યું છે"</string> <string name="wfcRegErrorTitle" msgid="3193072971584858020">"વાઇ-ફાઇ કૉલિંગ સેટ કરી શકાયું નથી"</string> <string-array name="wfcOperatorErrorAlertMessages"> - <item msgid="468830943567116703">"વાઇ-ફાઇ પરથી કૉલ કરવા અને સંદેશા મોકલવા માટે પહેલાં તમારા કૅરિઅરને આ સેવા સેટ કરવા માટે કહો. પછી સેટિંગ્સમાંથી વાઇ-ફાઇ કૉલિંગ ફરીથી ચાલુ કરો. (ભૂલ કોડ: <xliff:g id="CODE">%1$s</xliff:g>)"</item> + <item msgid="468830943567116703">"વાઇ-ફાઇ પરથી કૉલ કરવા અને સંદેશા મોકલવા માટે પહેલાં તમારા કૅરિઅરને આ સેવા સેટ કરવા માટે કહો. પછી સેટિંગમાંથી વાઇ-ફાઇ કૉલિંગ ફરીથી ચાલુ કરો. (ભૂલ કોડ: <xliff:g id="CODE">%1$s</xliff:g>)"</item> </string-array> <string-array name="wfcOperatorErrorNotificationMessages"> <item msgid="4795145070505729156">"તમારા કૅરિઅરમાં વાઇ-ફાઇ કૉલિંગ રજિસ્ટર કરવામાં સમસ્યા આવી: <xliff:g id="CODE">%1$s</xliff:g>"</item> @@ -401,7 +401,7 @@ <string name="permlab_getPackageSize" msgid="375391550792886641">"ઍપ્લિકેશન સંગ્રહ સ્થાન માપો"</string> <string name="permdesc_getPackageSize" msgid="742743530909966782">"એપ્લિકેશનને તેનો કોડ, ડેટા અને કેશ કદ પુનઃપ્રાપ્ત કરવાની મંજૂરી આપે છે."</string> <string name="permlab_writeSettings" msgid="8057285063719277394">"સિસ્ટમ સેટિંગમાં ફેરફાર કરો"</string> - <string name="permdesc_writeSettings" msgid="8293047411196067188">"એપ્લિકેશનને તમારા સિસ્ટમના સેટિંગ્સ ડેટાને સંશોધિત કરવાની મંજૂરી આપે છે. દુર્ભાવનાપૂર્ણ ઍપ્લિકેશનો તમારા સિસ્ટમની ગોઠવણીને દૂષિત કરી શકે છે."</string> + <string name="permdesc_writeSettings" msgid="8293047411196067188">"ઍપને તમારા સિસ્ટમના સેટિંગ ડેટાને સંશોધિત કરવાની મંજૂરી આપે છે. દુર્ભાવનાપૂર્ણ ઍપ તમારા સિસ્ટમની ગોઠવણીને દૂષિત કરી શકે છે."</string> <string name="permlab_receiveBootCompleted" msgid="6643339400247325379">"સ્ટાર્ટઅપ પર શરૂ કરો"</string> <string name="permdesc_receiveBootCompleted" product="tablet" msgid="5565659082718177484">"એપ્લિકેશનને સિસ્ટમ બૂટ થવાનું સમાપ્ત કરી લે કે તરત જ પોતાની જાતે પ્રારંભ થવાની મંજૂરી આપે છે. આનાથી ટેબ્લેટને પ્રારંભ થવામાં વધુ લાંબો સમય લાગી શકે છે અને એપ્લિકેશનને હંમેશા ચાલુ રહીને ટેબ્લેટને એકંદર ધીમું કરવાની મંજૂરી આપી શકે છે."</string> <string name="permdesc_receiveBootCompleted" product="tv" msgid="4900842256047614307">"ઍપને સિસ્ટમ બૂટ થવાનું સમાપ્ત કરી લે કે તરત જ પોતાની જાતે પ્રારંભ થવાની મંજૂરી આપે છે. આનાથી તમારા Android TV ડિવાઇસને શરૂ થવામાં વધુ સમય લાગી શકે છે અને ઍપને હંમેશાં ચાલુ રહીને ડિવાઇસને એકંદર ધીમું કરવાની મંજૂરી આપે છે."</string> @@ -442,8 +442,8 @@ <string name="permdesc_accessCoarseLocation" msgid="778521847873199160">"ઍપ ઉપયોગમાં હોય તે વખતે સ્થાન સેવાઓમાંથી આ ઍપ તમારું અંદાજિત સ્થાન મેળવી શકે છે. ઍપ સ્થાન મેળવી શકે તે માટે તમારા ડિવાઇસમાં સ્થાન સેવાઓ ચાલુ કરેલી હોવી જરૂરી છે."</string> <string name="permlab_accessBackgroundLocation" msgid="1721164702777366138">"બૅકગ્રાઉન્ડમાં સ્થાન ઍક્સેસ કરો"</string> <string name="permdesc_accessBackgroundLocation" msgid="8264885066095638105">"આ ઍપ કોઈપણ સમયે સ્થાનને ઍક્સેસ કરી શકે છે, પછી ભલેને આ ઍપ ઉપયોગમાં ન હોય."</string> - <string name="permlab_modifyAudioSettings" msgid="6129039778010031815">"તમારી ઑડિઓ સેટિંગ્સ બદલો"</string> - <string name="permdesc_modifyAudioSettings" msgid="8687227609663124921">"એપ્લિકેશનને વૈશ્વિક ઑડિઓ સેટિંગ્સને સંશોધિત કરવાની મંજૂરી આપે છે, જેમ કે વૉલ્યૂમ અને આઉટપુટ માટે કયા સ્પીકરનો ઉપયોગ કરવો."</string> + <string name="permlab_modifyAudioSettings" msgid="6129039778010031815">"તમારા ઑડિયો સેટિંગ બદલો"</string> + <string name="permdesc_modifyAudioSettings" msgid="8687227609663124921">"ઍપને વૈશ્વિક ઑડિયો સેટિંગમાં ફેરફાર કરવાની મંજૂરી આપે છે, જેમ કે વૉલ્યૂમ અને આઉટપુટ માટે કયા સ્પીકરનો ઉપયોગ કરવો."</string> <string name="permlab_recordAudio" msgid="1208457423054219147">"ઑડિઓ રેકોર્ડ કરવાની"</string> <string name="permdesc_recordAudio" msgid="5857246765327514062">"આ ઍપ ઉપયોગમાં હોય ત્યારે તે માઇક્રોફોનનો ઉપયોગ કરીને ઑડિયો રેકોર્ડ કરી શકે છે."</string> <string name="permlab_recordBackgroundAudio" msgid="5891032812308878254">"બૅકગ્રાઉન્ડમાં ઑડિયો રેકોર્ડ કરો"</string> @@ -519,7 +519,7 @@ <string name="permdesc_changeWifiMulticastState" product="tablet" msgid="191079868596433554">"એપ્લિકેશનને ફક્ત તમારા ટેબ્લેટ પર નહીં, પણ મલ્ટિકાસ્ટ સરનામાંનો ઉપયોગ કરીને વાઇ-ફાઇ નેટવર્ક પરના તમામ ઉપકરણોને મોકલાયેલ પૅકેટ્સ પ્રાપ્ત કરવાની મંજૂરી આપે છે. તે બિન-મલ્ટિકાસ્ટ મોડ કરતાં વધુ પાવર વાપરે છે."</string> <string name="permdesc_changeWifiMulticastState" product="tv" msgid="1336952358450652595">"ઍપને ફક્ત તમારા Android TV ડિવાઇસ પર નહીં, પણ મલ્ટિકાસ્ટ ઍડ્રેસનો ઉપયોગ કરીને વાઇ-ફાઇ નેટવર્ક પરના તમામ ડિવાઇસને મોકલાયેલા પૅકેટ પ્રાપ્ત કરવાની મંજૂરી આપે છે. તે બિન-મલ્ટિકાસ્ટ મોડ કરતાં વધુ પાવર વાપરે છે."</string> <string name="permdesc_changeWifiMulticastState" product="default" msgid="8296627590220222740">"એપ્લિકેશનને ફક્ત તમારા ફોન પર નહીં, પણ મલ્ટિકાસ્ટ સરનામાંનો ઉપયોગ કરીને વાઇ-ફાઇ નેટવર્ક પર તમામ ઉપકરણોને મોકલાયેલ પૅકેટ્સ પ્રાપ્ત કરવાની મંજૂરી આપે છે. તે બિન-મલ્ટિકાસ્ટ મોડ કરતાં વધુ પાવર વાપરે છે."</string> - <string name="permlab_bluetoothAdmin" msgid="6490373569441946064">"બ્લૂટૂથ સેટિંગ્સ ઍક્સેસ કરો"</string> + <string name="permlab_bluetoothAdmin" msgid="6490373569441946064">"બ્લૂટૂથ સેટિંગ ઍક્સેસ કરો"</string> <string name="permdesc_bluetoothAdmin" product="tablet" msgid="5370837055438574863">"એપ્લિકેશનને સ્થાનિક બ્લૂટૂથ ટેબ્લેટ ગોઠવવાની અને રિમોટ ઉપકરણો શોધવા અને તેમની સાથે જોડી કરવાની મંજૂરી આપે છે."</string> <string name="permdesc_bluetoothAdmin" product="tv" msgid="1623992984547014588">"ઍપને તમારા Android TV ડિવાઇસ પર બ્લૂટૂથને ગોઠવવાની અને રિમોટ ડિવાઇસ શોધવા અને તેમની સાથે જોડાણ કરવાની મંજૂરી આપે છે."</string> <string name="permdesc_bluetoothAdmin" product="default" msgid="7381341743021234863">"એપ્લિકેશનને સ્થાનિક બ્લૂટૂથ ફોન ગોઠવવાની અને રિમોટ ઉપકરણો શોધવા અને તેમની સાથે જોડી કરવાની મંજૂરી આપે છે."</string> @@ -662,10 +662,10 @@ <string-array name="face_error_vendor"> </string-array> <string name="face_icon_content_description" msgid="465030547475916280">"ચહેરા આઇકન"</string> - <string name="permlab_readSyncSettings" msgid="6250532864893156277">"સમન્વયન સેટિંગ્સ વાંચો"</string> - <string name="permdesc_readSyncSettings" msgid="1325658466358779298">"ઍપ્લિકેશનને એકાઉન્ટ માટે સમન્વયન સેટિંગ્સને વાંચવાની મંજૂરી આપે છે. ઉદાહરણ તરીકે, આ એકાઉન્ટ સાથે લોકો ઍપ્લિકેશન સમન્વયિત થઈ છે કે કેમ તે નિર્ધારિત કરી શકે છે."</string> + <string name="permlab_readSyncSettings" msgid="6250532864893156277">"સિંક સેટિંગ વાંચો"</string> + <string name="permdesc_readSyncSettings" msgid="1325658466358779298">"ઍપને એકાઉન્ટ માટે સિંક સેટિંગને વાંચવાની મંજૂરી આપે છે. ઉદાહરણ તરીકે, આ એકાઉન્ટ સાથે લોકો ઍપ સિંક થઈ છે કે કેમ તે નિર્ધારિત કરી શકે છે."</string> <string name="permlab_writeSyncSettings" msgid="6583154300780427399">"સમન્વયન ચાલુ અને બંધ ટોગલ કરો"</string> - <string name="permdesc_writeSyncSettings" msgid="6029151549667182687">"એપ્લિકેશનને એકાઉન્ટ માટે સમન્વયન સેટિંગ્સ સંશોધિત કરવાની મંજૂરી આપે છે. ઉદાહરણ તરીકે, આનો ઉપયોગ એકાઉન્ટ સાથે લોકો એપ્લિકેશનના સમન્વયનને સક્ષમ કરવા માટે થઈ શકે છે."</string> + <string name="permdesc_writeSyncSettings" msgid="6029151549667182687">"ઍપને એકાઉન્ટ માટે સિંક સેટિંગમાં ફેરફાર કરવાની મંજૂરી આપે છે. ઉદાહરણ તરીકે, આનો ઉપયોગ એકાઉન્ટ સાથે લોકો ઍપના સિંકને ચાલુ કરવા માટે થઈ શકે છે."</string> <string name="permlab_readSyncStats" msgid="3747407238320105332">"સમન્વયન આંકડા વાંચો"</string> <string name="permdesc_readSyncStats" msgid="3867809926567379434">"એપ્લિકેશનને સમન્વયન ઇવેન્ટ્સનો ઇતિહાસ અને કેટલો ડેટા સમન્વયિત થયો છે તે સહિત કોઈ એકાઉન્ટ માટેનાં સમન્વયન આંકડા વાંચવાની મંજૂરી આપે છે."</string> <string name="permlab_sdcardRead" msgid="5791467020950064920">"તમારા શેર કરેલા સ્ટોરેજના કન્ટેન્ટને વાંચો"</string> @@ -1210,7 +1210,7 @@ <string name="whichImageCaptureApplicationLabel" msgid="6505433734824988277">"છબી કૅપ્ચર કરો"</string> <string name="alwaysUse" msgid="3153558199076112903">"આ ક્રિયા માટે ડિફોલ્ટ તરીકે ઉપયોગમાં લો."</string> <string name="use_a_different_app" msgid="4987790276170972776">"અલગ એપ્લિકેશનનો ઉપયોગ કરો"</string> - <string name="clearDefaultHintMsg" msgid="1325866337702524936">"સિસ્ટમ સેટિંગ્સ > ઍપ્લિકેશનો > ડાઉનલોડ કરેલમાં ડિફોલ્ટ સાફ કરો."</string> + <string name="clearDefaultHintMsg" msgid="1325866337702524936">"સિસ્ટમ સેટિંગ > ઍપ > ડાઉનલોડ કરેલામાં ડિફૉલ્ટ સાફ કરો."</string> <string name="chooseActivity" msgid="8563390197659779956">"એક ક્રિયા પસંદ કરો"</string> <string name="chooseUsbActivity" msgid="2096269989990986612">"USB ઉપકરણ માટે ઍપ્લિકેશન પસંદ કરો"</string> <string name="noApplications" msgid="1186909265235544019">"કોઈ ઍપ્લિકેશન આ ક્રિયા કરી શકતી નથી."</string> @@ -1238,8 +1238,8 @@ <string name="launch_warning_original" msgid="3332206576800169626">"<xliff:g id="APP_NAME">%1$s</xliff:g> મૂળરૂપે લોંચ થઈ હતી."</string> <string name="screen_compat_mode_scale" msgid="8627359598437527726">"સ્કેલ"</string> <string name="screen_compat_mode_show" msgid="5080361367584709857">"હંમેશા બતાવો"</string> - <string name="screen_compat_mode_hint" msgid="4032272159093750908">"આને સિસ્ટમ સેટિંગ્સ > ઍપ્લિકેશનો > ડાઉનલોડ કરેલમાં ફરીથી સક્ષમ કરો."</string> - <string name="unsupported_display_size_message" msgid="7265211375269394699">"<xliff:g id="APP_NAME">%1$s</xliff:g> વર્તમાન પ્રદર્શન કદની સેટિંગનું સમર્થન કરતું નથી અને અનપેક્ષિત રીતે વર્તી શકે છે."</string> + <string name="screen_compat_mode_hint" msgid="4032272159093750908">"આને સિસ્ટમ સેટિંગ > ઍપ > ડાઉનલોડ કરેલામાં ફરીથી ચાલુ કરો."</string> + <string name="unsupported_display_size_message" msgid="7265211375269394699">"<xliff:g id="APP_NAME">%1$s</xliff:g> વર્તમાન ડિસ્પ્લે કદની સેટિંગને સપોર્ટ કરતું નથી અને અનપેક્ષિત રીતે વર્તી શકે છે."</string> <string name="unsupported_display_size_show" msgid="980129850974919375">"હંમેશાં બતાવો"</string> <string name="unsupported_compile_sdk_message" msgid="7326293500707890537">"<xliff:g id="APP_NAME">%1$s</xliff:g>ને Android OSના અસંગત વર્ઝન માટે બનાવવામાં આવ્યું હતું અને તે અનપેક્ષિત રીતે કાર્ય કરી શકે છે. ઍપનું અપડેટ કરેલ વર્ઝન ઉપલબ્ધ હોઈ શકે છે."</string> <string name="unsupported_compile_sdk_show" msgid="1601210057960312248">"હંમેશાં બતાવો"</string> @@ -1335,7 +1335,7 @@ <string name="sms_short_code_confirm_allow" msgid="920477594325526691">"મોકલો"</string> <string name="sms_short_code_confirm_deny" msgid="1356917469323768230">"રદ કરો"</string> <string name="sms_short_code_remember_choice" msgid="1374526438647744862">"મારી પસંદગી યાદ રાખો"</string> - <string name="sms_short_code_remember_undo_instruction" msgid="2620984439143080410">"તમે પછીથી આને સેટિંગ્સ > એપ્લિકેશન્સમાં બદલી શકો છો"</string> + <string name="sms_short_code_remember_undo_instruction" msgid="2620984439143080410">"તમે પછીથી આને સેટિંગ > ઍપમાં બદલી શકો છો"</string> <string name="sms_short_code_confirm_always_allow" msgid="2223014893129755950">"હંમેશા મંજૂરી આપો"</string> <string name="sms_short_code_confirm_never_allow" msgid="2688828813521652079">"ક્યારેય મંજૂરી આપશો નહીં"</string> <string name="sim_removed_title" msgid="5387212933992546283">"સિમ કાર્ડ કાઢી નાખ્યો"</string> @@ -1502,7 +1502,7 @@ <string name="vpn_lockdown_connected" msgid="2853127976590658469">"હંમેશા-ચાલુ VPN કનેક્ટ થયું"</string> <string name="vpn_lockdown_disconnected" msgid="5573611651300764955">"હંમેશાં-ચાલુ VPN થી ડિસ્કનેક્ટ થયું"</string> <string name="vpn_lockdown_error" msgid="4453048646854247947">"હંમેશાં-ચાલુ VPN સાથે કનેક્ટ કરી શકાયું નથી"</string> - <string name="vpn_lockdown_config" msgid="8331697329868252169">"નેટવર્ક અથવા VPN સેટિંગ્સ બદલો"</string> + <string name="vpn_lockdown_config" msgid="8331697329868252169">"નેટવર્ક અથવા VPN સેટિંગ બદલો"</string> <string name="upload_file" msgid="8651942222301634271">"ફાઇલ પસંદ કરો"</string> <string name="no_file_chosen" msgid="4146295695162318057">"કોઈ ફાઇલ પસંદ કરેલી નથી"</string> <string name="reset" msgid="3865826612628171429">"ફરીથી સેટ કરો"</string> @@ -1616,7 +1616,7 @@ <string name="SetupCallDefault" msgid="5581740063237175247">"કૉલ સ્વીકારીએ?"</string> <string name="activity_resolver_use_always" msgid="5575222334666843269">"હંમેશાં"</string> <string name="activity_resolver_use_once" msgid="948462794469672658">"ફક્ત એક વાર"</string> - <string name="activity_resolver_work_profiles_support" msgid="4071345609235361269">"%1$s કાર્ય પ્રોફાઇલનું સમર્થન કરતું નથી"</string> + <string name="activity_resolver_work_profiles_support" msgid="4071345609235361269">"%1$s ઑફિસની પ્રોફાઇલને સપોર્ટ કરતું નથી"</string> <string name="default_audio_route_name" product="tablet" msgid="367936735632195517">"ટેબ્લેટ"</string> <string name="default_audio_route_name" product="tv" msgid="4908971385068087367">"TV"</string> <string name="default_audio_route_name" product="default" msgid="9213546147739983977">"ફોન"</string> @@ -2067,7 +2067,7 @@ <string name="popup_window_default_title" msgid="6907717596694826919">"પૉપઅપ વિંડો"</string> <string name="slice_more_content" msgid="3377367737876888459">"+ <xliff:g id="NUMBER">%1$d</xliff:g>"</string> <string name="shortcut_restored_on_lower_version" msgid="9206301954024286063">"આ ઍપનું વર્ઝન ડાઉનગ્રેડ કરવામાં આવ્યું છે અથવા આ શૉર્ટકટ સાથે સુસંગત નથી"</string> - <string name="shortcut_restore_not_supported" msgid="4763198938588468400">"શૉર્ટકટ ફરી મેળવી શકાયો નથી કારણ કે ઍપ બૅકઅપ અને ફરી મેળવવાનું સમર્થન કરતી નથી"</string> + <string name="shortcut_restore_not_supported" msgid="4763198938588468400">"શૉર્ટકટ ફરી મેળવી શકાયો નથી કારણ કે ઍપ બૅકઅપ અને ફરી મેળવવાને સપોર્ટ કરતી નથી"</string> <string name="shortcut_restore_signature_mismatch" msgid="579345304221605479">"શૉર્ટકટ ફરી મેળવી શકાયો નથી કારણ કે ઍપમાં છે તે સહી મેળ ખાતી નથી"</string> <string name="shortcut_restore_unknown_issue" msgid="2478146134395982154">"શૉર્ટકટ પાછો મેળવી શકાયો નથી"</string> <string name="shortcut_disabled_reason_unknown" msgid="753074793553599166">"શૉર્ટકટને બંધ કરવામાં આવ્યો છે"</string> diff --git a/core/res/res/values-sl/strings.xml b/core/res/res/values-sl/strings.xml index 93f2d7420124..d632e0c53b6f 100644 --- a/core/res/res/values-sl/strings.xml +++ b/core/res/res/values-sl/strings.xml @@ -434,7 +434,7 @@ <string name="permdesc_bodySensors" product="default" msgid="2365357960407973997">"Aplikaciji omogoča dostop do podatkov tipal, ki nadzirajo vaše fizično stanje, med drugim vaš srčni utrip."</string> <string name="permlab_readCalendar" msgid="6408654259475396200">"Branje dogodkov v koledarjih in podrobnosti koledarjev"</string> <string name="permdesc_readCalendar" product="tablet" msgid="515452384059803326">"Ta aplikacija lahko prebere vse dogodke v koledarju, ki so shranjeni v tabličnem računalniku, ter shrani podatke koledarja ali jih deli z drugimi."</string> - <string name="permdesc_readCalendar" product="tv" msgid="5811726712981647628">"Ta aplikacija lahko prebere vse dogodke v koledarju, ki so shranjeni v napravi Android TV, ter shrani podatke koledarja ali jih da v skupno rabo z drugimi."</string> + <string name="permdesc_readCalendar" product="tv" msgid="5811726712981647628">"Ta aplikacija lahko prebere vse dogodke v koledarju, ki so shranjeni v napravi Android TV, ter shrani podatke koledarja ali jih deli z drugimi."</string> <string name="permdesc_readCalendar" product="default" msgid="9118823807655829957">"Ta aplikacija lahko prebere vse dogodke v koledarju, ki so shranjeni v telefonu, ter shrani podatke koledarja ali jih deli z drugimi."</string> <string name="permlab_writeCalendar" msgid="6422137308329578076">"dodajanje ali spreminjanje dogodkov v koledarju in pošiljanje e-pošte gostom brez vedenja lastnikov"</string> <string name="permdesc_writeCalendar" product="tablet" msgid="8722230940717092850">"Ta aplikacija lahko dodaja, odstranjuje in spreminja dogodke v koledarju, ki so shranjeni v tabličnem računalniku. Ta aplikacija lahko pošilja sporočila, ki bodo morda videti, kot da prihajajo od lastnikov koledarjev, ali spreminja dogodke brez vednosti lastnikov."</string> @@ -932,7 +932,7 @@ <string name="lockscreen_forgot_pattern_button_text" msgid="8362442730606839031">"Ali ste pozabili vzorec?"</string> <string name="lockscreen_glogin_forgot_pattern" msgid="9218940117797602518">"Odklepanje računa"</string> <string name="lockscreen_glogin_too_many_attempts" msgid="3775904917743034195">"Preveč poskusov vzorca"</string> - <string name="lockscreen_glogin_instructions" msgid="4695162942525531700">"Če želite odkleniti telefon, se prijavite z Google Računom."</string> + <string name="lockscreen_glogin_instructions" msgid="4695162942525531700">"Če želite odkleniti telefon, se prijavite z računom Google."</string> <string name="lockscreen_glogin_username_hint" msgid="6916101478673157045">"Uporabniško ime (e-pošta)"</string> <string name="lockscreen_glogin_password_hint" msgid="3031027901286812848">"Geslo"</string> <string name="lockscreen_glogin_submit_button" msgid="3590556636347843733">"Prijava"</string> @@ -1237,8 +1237,8 @@ <string name="whichEditApplicationNamed" msgid="8096494987978521514">"Urejanje z aplikacijo %1$s"</string> <string name="whichEditApplicationLabel" msgid="1463288652070140285">"Urejanje"</string> <string name="whichSendApplication" msgid="4143847974460792029">"Deljenje z drugimi"</string> - <string name="whichSendApplicationNamed" msgid="4470386782693183461">"Skupna raba z aplikacijo %1$s"</string> - <string name="whichSendApplicationLabel" msgid="7467813004769188515">"Skupna raba"</string> + <string name="whichSendApplicationNamed" msgid="4470386782693183461">"Deljenje z aplikacijo %1$s"</string> + <string name="whichSendApplicationLabel" msgid="7467813004769188515">"Deljenje"</string> <string name="whichSendToApplication" msgid="77101541959464018">"Pošiljanje z aplikacijo"</string> <string name="whichSendToApplicationNamed" msgid="3385686512014670003">"Pošiljanje z aplikacijo %1$s"</string> <string name="whichSendToApplicationLabel" msgid="3543240188816513303">"Pošiljanje"</string> @@ -1400,14 +1400,14 @@ <string name="perm_costs_money" msgid="749054595022779685">"to je lahko plačljivo"</string> <string name="dlg_ok" msgid="5103447663504839312">"V redu"</string> <string name="usb_charging_notification_title" msgid="1674124518282666955">"Polnjenje naprave prek USB-ja"</string> - <string name="usb_supplying_notification_title" msgid="5378546632408101811">"Polnjenje akumulatorja v povezani napravi prek USB-ja"</string> + <string name="usb_supplying_notification_title" msgid="5378546632408101811">"Polnjenje baterije v povezani napravi prek USB-ja"</string> <string name="usb_mtp_notification_title" msgid="1065989144124499810">"Vklopljen je prenos datotek prek USB-ja"</string> <string name="usb_ptp_notification_title" msgid="5043437571863443281">"Vklopljen je način PTP prek USB-ja"</string> <string name="usb_tether_notification_title" msgid="8828527870612663771">"Vklopljen je internet prek USB-ja"</string> <string name="usb_midi_notification_title" msgid="7404506788950595557">"Vklopljen je način MIDI prek USB-ja"</string> <string name="usb_accessory_notification_title" msgid="1385394660861956980">"Dodatek USB je priključen"</string> <string name="usb_notification_message" msgid="4715163067192110676">"Dotaknite se za več možnosti."</string> - <string name="usb_power_notification_message" msgid="7284765627437897702">"Polnjenje akumulatorja v povezani napravi. Dotaknite se za več možnosti."</string> + <string name="usb_power_notification_message" msgid="7284765627437897702">"Polnjenje baterije v povezani napravi. Dotaknite se za več možnosti."</string> <string name="usb_unsupported_audio_accessory_title" msgid="2335775548086533065">"Zaznana je analogna dodatna zvočna oprema"</string> <string name="usb_unsupported_audio_accessory_message" msgid="1300168007129796621">"Priključena naprava ni združljiva s tem telefonom. Dotaknite se za več informacij."</string> <string name="adb_active_notification_title" msgid="408390247354560331">"Iskanje napak prek USB-ja je povezano"</string> @@ -1427,8 +1427,8 @@ <string name="taking_remote_bugreport_notification_title" msgid="1582531382166919850">"Zajemanje poročila o napakah …"</string> <string name="share_remote_bugreport_notification_title" msgid="6708897723753334999">"Želite poslati poročilo o napakah?"</string> <string name="sharing_remote_bugreport_notification_title" msgid="3077385149217638550">"Pošiljanje poročila o napakah …"</string> - <string name="share_remote_bugreport_notification_message_finished" msgid="7325635795739260135">"Skrbnik je zahteval poročilo o napakah za pomoč pri odpravljanju napak v tej napravi. Aplikacije in podatki bodo morda dani v skupno rabo."</string> - <string name="share_remote_bugreport_action" msgid="7630880678785123682">"SKUPNA RABA"</string> + <string name="share_remote_bugreport_notification_message_finished" msgid="7325635795739260135">"Skrbnik je zahteval poročilo o napakah za pomoč pri odpravljanju napak v tej napravi. Aplikacije in podatki bodo morda deljeni."</string> + <string name="share_remote_bugreport_action" msgid="7630880678785123682">"DELJENJE"</string> <string name="decline_remote_bugreport_action" msgid="4040894777519784346">"NE SPREJMEM"</string> <string name="select_input_method" msgid="3971267998568587025">"Izberite način vnosa"</string> <string name="show_ime" msgid="6406112007347443383">"Ohrani na zaslonu, dokler je aktivna fizična tipkovnica"</string> @@ -1616,7 +1616,7 @@ <string name="action_menu_overflow_description" msgid="4579536843510088170">"Več možnosti"</string> <string name="action_bar_home_description_format" msgid="5087107531331621803">"%1$s, %2$s"</string> <string name="action_bar_home_subtitle_description_format" msgid="4346835454749569826">"%1$s, %2$s, %3$s"</string> - <string name="storage_internal" msgid="8490227947584914460">"Notranja shramba v skupni rabi"</string> + <string name="storage_internal" msgid="8490227947584914460">"Notranja deljena shramba"</string> <string name="storage_sd_card" msgid="3404740277075331881">"Kartica SD"</string> <string name="storage_sd_card_label" msgid="7526153141147470509">"Kartica SD <xliff:g id="MANUFACTURER">%s</xliff:g>"</string> <string name="storage_usb_drive" msgid="448030813201444573">"Pogon USB"</string> @@ -1709,7 +1709,7 @@ <string name="kg_invalid_puk" msgid="4809502818518963344">"Vnovič vnesite pravilno kodo PUK. Večkratni poskusi bodo trajno onemogočili kartico SIM."</string> <string name="kg_invalid_confirm_pin_hint" product="default" msgid="4705368340409816254">"Kodi PIN se ne ujemata"</string> <string name="kg_login_too_many_attempts" msgid="699292728290654121">"Preveč poskusov vzorca"</string> - <string name="kg_login_instructions" msgid="3619844310339066827">"Če želite odkleniti napravo, se prijavite z Google Računom."</string> + <string name="kg_login_instructions" msgid="3619844310339066827">"Če želite odkleniti napravo, se prijavite z računom Google."</string> <string name="kg_login_username_hint" msgid="1765453775467133251">"Uporabniško ime (e-pošta)"</string> <string name="kg_login_password_hint" msgid="3330530727273164402">"Geslo"</string> <string name="kg_login_submit_button" msgid="893611277617096870">"Prijava"</string> diff --git a/core/res/res/values-sq/strings.xml b/core/res/res/values-sq/strings.xml index 25e2820611f6..239c9f8709da 100644 --- a/core/res/res/values-sq/strings.xml +++ b/core/res/res/values-sq/strings.xml @@ -1197,7 +1197,7 @@ <string name="whichEditApplicationNamed" msgid="8096494987978521514">"Redakto me %1$s"</string> <string name="whichEditApplicationLabel" msgid="1463288652070140285">"Redakto"</string> <string name="whichSendApplication" msgid="4143847974460792029">"Ndaj"</string> - <string name="whichSendApplicationNamed" msgid="4470386782693183461">"Shpërnda publikisht me %1$s"</string> + <string name="whichSendApplicationNamed" msgid="4470386782693183461">"Shpërndaj me %1$s"</string> <string name="whichSendApplicationLabel" msgid="7467813004769188515">"Ndaj"</string> <string name="whichSendToApplication" msgid="77101541959464018">"Dërgo me"</string> <string name="whichSendToApplicationNamed" msgid="3385686512014670003">"Dërgo me %1$s"</string> @@ -1565,8 +1565,8 @@ <string name="keyboardview_keycode_enter" msgid="168054869339091055">"Enter"</string> <string name="activitychooserview_choose_application" msgid="3500574466367891463">"Zgjidh një aplikacion"</string> <string name="activitychooserview_choose_application_error" msgid="6937782107559241734">"Nuk mundi ta hapte <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string> - <string name="shareactionprovider_share_with" msgid="2753089758467748982">"Shpërnda publikisht me"</string> - <string name="shareactionprovider_share_with_application" msgid="4902832247173666973">"Shpërnda me <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string> + <string name="shareactionprovider_share_with" msgid="2753089758467748982">"Shpërndaj me"</string> + <string name="shareactionprovider_share_with_application" msgid="4902832247173666973">"Shpërndaj me <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string> <string name="content_description_sliding_handle" msgid="982510275422590757">"Dorezë me rrëshqitje. Preke dhe mbaje të shtypur."</string> <string name="description_target_unlock_tablet" msgid="7431571180065859551">"Rrëshqit për të shkyçur."</string> <string name="action_bar_home_description" msgid="1501655419158631974">"Orientohu për në shtëpi"</string> @@ -1610,7 +1610,7 @@ <string name="sha1_fingerprint" msgid="2339915142825390774">"Gjurma e gishtit SHA-1:"</string> <string name="activity_chooser_view_see_all" msgid="3917045206812726099">"Shikoji të gjitha"</string> <string name="activity_chooser_view_dialog_title_default" msgid="8880731437191978314">"Zgjidh aktivitetin"</string> - <string name="share_action_provider_share_with" msgid="1904096863622941880">"Shpërnda publikisht me"</string> + <string name="share_action_provider_share_with" msgid="1904096863622941880">"Shpërndaj me"</string> <string name="sending" msgid="206925243621664438">"Po dërgon…"</string> <string name="launchBrowserDefault" msgid="6328349989932924119">"Të hapet shfletuesi?"</string> <string name="SetupCallDefault" msgid="5581740063237175247">"Dëshiron ta pranosh telefonatën?"</string> diff --git a/core/res/res/values-sv/strings.xml b/core/res/res/values-sv/strings.xml index cb0b420d7f17..940ee568228d 100644 --- a/core/res/res/values-sv/strings.xml +++ b/core/res/res/values-sv/strings.xml @@ -572,7 +572,7 @@ <string name="biometric_error_user_canceled" msgid="6732303949695293730">"Autentiseringen avbröts"</string> <string name="biometric_not_recognized" msgid="5106687642694635888">"Identifierades inte"</string> <string name="biometric_error_canceled" msgid="8266582404844179778">"Autentiseringen avbröts"</string> - <string name="biometric_error_device_not_secured" msgid="3129845065043995924">"Pinkod, grafiskt lösenord eller lösenord har inte angetts"</string> + <string name="biometric_error_device_not_secured" msgid="3129845065043995924">"Pinkod, mönster eller lösenord har inte angetts"</string> <string name="biometric_error_generic" msgid="6784371929985434439">"Ett fel uppstod vid autentiseringen"</string> <string name="screen_lock_app_setting_name" msgid="6054944352976789228">"Använd skärmlåset"</string> <string name="screen_lock_dialog_default_subtitle" msgid="120359538048533695">"Fortsätt med hjälp av ditt skärmlås"</string> @@ -881,7 +881,7 @@ <string name="lockscreen_screen_locked" msgid="7364905540516041817">"Skärmen har låsts."</string> <string name="lockscreen_instructions_when_pattern_enabled" msgid="7982445492532123308">"Tryck på Menu för att låsa upp eller ringa nödsamtal."</string> <string name="lockscreen_instructions_when_pattern_disabled" msgid="7434061749374801753">"Tryck på Menu för att låsa upp."</string> - <string name="lockscreen_pattern_instructions" msgid="3169991838169244941">"Rita grafiskt lösenord för att låsa upp"</string> + <string name="lockscreen_pattern_instructions" msgid="3169991838169244941">"Rita mönster för att låsa upp"</string> <string name="lockscreen_emergency_call" msgid="7549683825868928636">"Nödsamtal"</string> <string name="lockscreen_return_to_call" msgid="3156883574692006382">"Tillbaka till samtal"</string> <string name="lockscreen_pattern_correct" msgid="8050630103651508582">"Korrekt!"</string> @@ -925,7 +925,7 @@ <string name="lockscreen_too_many_failed_attempts_countdown" msgid="6807200118164539589">"Försök igen om <xliff:g id="NUMBER">%d</xliff:g> sekunder."</string> <string name="lockscreen_forgot_pattern_button_text" msgid="8362442730606839031">"Glömt ditt grafiska lösenord?"</string> <string name="lockscreen_glogin_forgot_pattern" msgid="9218940117797602518">"Lås upp konto"</string> - <string name="lockscreen_glogin_too_many_attempts" msgid="3775904917743034195">"För många försök med grafiskt lösenord"</string> + <string name="lockscreen_glogin_too_many_attempts" msgid="3775904917743034195">"För många försök med mönster"</string> <string name="lockscreen_glogin_instructions" msgid="4695162942525531700">"Logga in med ditt Google-konto om du vill låsa upp."</string> <string name="lockscreen_glogin_username_hint" msgid="6916101478673157045">"Användarnamn (e-post)"</string> <string name="lockscreen_glogin_password_hint" msgid="3031027901286812848">"Lösenord"</string> @@ -936,12 +936,12 @@ <string name="lockscreen_unlock_label" msgid="4648257878373307582">"Lås upp"</string> <string name="lockscreen_sound_on_label" msgid="1660281470535492430">"Ljud på"</string> <string name="lockscreen_sound_off_label" msgid="2331496559245450053">"Ljud av"</string> - <string name="lockscreen_access_pattern_start" msgid="3778502525702613399">"Skriver grafiskt lösenord"</string> - <string name="lockscreen_access_pattern_cleared" msgid="7493849102641167049">"Grafiskt lösenord har tagits bort"</string> + <string name="lockscreen_access_pattern_start" msgid="3778502525702613399">"Ritar mönster"</string> + <string name="lockscreen_access_pattern_cleared" msgid="7493849102641167049">"Mönster har tagits bort"</string> <string name="lockscreen_access_pattern_cell_added" msgid="6746676335293144163">"En cell har lagts till"</string> <string name="lockscreen_access_pattern_cell_added_verbose" msgid="2931364927622563465">"Cell <xliff:g id="CELL_INDEX">%1$s</xliff:g> har lagts till"</string> - <string name="lockscreen_access_pattern_detected" msgid="3931150554035194012">"Grafiskt lösenord har slutförts"</string> - <string name="lockscreen_access_pattern_area" msgid="1288780416685002841">"Fält för grafiskt lösenord."</string> + <string name="lockscreen_access_pattern_detected" msgid="3931150554035194012">"Mönster har slutförts"</string> + <string name="lockscreen_access_pattern_area" msgid="1288780416685002841">"Fält för mönster."</string> <string name="keyguard_accessibility_widget_changed" msgid="7298011259508200234">"%1$s. Widget %2$d av %3$d."</string> <string name="keyguard_accessibility_add_widget" msgid="8245795023551343672">"Lägg till en widget."</string> <string name="keyguard_accessibility_widget_empty_slot" msgid="544239307077644480">"Tom"</string> @@ -957,13 +957,13 @@ <string name="keyguard_accessibility_widget_deleted" msgid="1509738950119878705">"Widgeten <xliff:g id="WIDGET_INDEX">%1$s</xliff:g> har tagits bort."</string> <string name="keyguard_accessibility_expand_lock_area" msgid="4215280881346033434">"Expandera upplåsningsytan."</string> <string name="keyguard_accessibility_slide_unlock" msgid="2968195219692413046">"Lås upp genom att dra."</string> - <string name="keyguard_accessibility_pattern_unlock" msgid="8669128146589233293">"Lås upp med grafiskt lösenord."</string> + <string name="keyguard_accessibility_pattern_unlock" msgid="8669128146589233293">"Lås upp med mönster."</string> <string name="keyguard_accessibility_face_unlock" msgid="4533832120787386728">"Ansiktslås."</string> <string name="keyguard_accessibility_pin_unlock" msgid="4020864007967340068">"Lås upp med PIN-kod."</string> <string name="keyguard_accessibility_sim_pin_unlock" msgid="4895939120871890557">"Lås upp med SIM-kortets pinkod."</string> <string name="keyguard_accessibility_sim_puk_unlock" msgid="3459003464041899101">"Lås upp med SIM-kortets PUK-kod."</string> <string name="keyguard_accessibility_password_unlock" msgid="6130186108581153265">"Lås upp med lösenord."</string> - <string name="keyguard_accessibility_pattern_area" msgid="1419570880512350689">"Fält för grafiskt lösenord."</string> + <string name="keyguard_accessibility_pattern_area" msgid="1419570880512350689">"Fält för mönster."</string> <string name="keyguard_accessibility_slide_area" msgid="4331399051142520176">"Fält med dragreglage."</string> <string name="password_keyboard_label_symbol_key" msgid="2716255580853511949">"?123"</string> <string name="password_keyboard_label_alpha_key" msgid="5294837425652726684">"ABC"</string> @@ -1644,7 +1644,7 @@ <string name="display_manager_overlay_display_title" msgid="1480158037150469170">"<xliff:g id="NAME">%1$s</xliff:g>: <xliff:g id="WIDTH">%2$d</xliff:g> x <xliff:g id="HEIGHT">%3$d</xliff:g>, <xliff:g id="DPI">%4$d</xliff:g> dpi"</string> <string name="display_manager_overlay_display_secure_suffix" msgid="2810034719482834679">", säker"</string> <string name="kg_forgot_pattern_button_text" msgid="406145459223122537">"Har du glömt ditt grafiska lösenord?"</string> - <string name="kg_wrong_pattern" msgid="1342812634464179931">"Fel grafiskt lösenord"</string> + <string name="kg_wrong_pattern" msgid="1342812634464179931">"Fel mönster"</string> <string name="kg_wrong_password" msgid="2384677900494439426">"Fel lösenord"</string> <string name="kg_wrong_pin" msgid="3680925703673166482">"Fel PIN-kod"</string> <plurals name="kg_too_many_failed_attempts_countdown" formatted="false" msgid="236717428673283568"> @@ -1664,7 +1664,7 @@ <string name="kg_invalid_sim_puk_hint" msgid="2539364558870734339">"PUK-koden ska vara åtta siffror."</string> <string name="kg_invalid_puk" msgid="4809502818518963344">"Ange rätt PUK-kod igen. Om försöken upprepas inaktiveras SIM-kortet permanent."</string> <string name="kg_invalid_confirm_pin_hint" product="default" msgid="4705368340409816254">"PIN-koderna stämmer inte överens"</string> - <string name="kg_login_too_many_attempts" msgid="699292728290654121">"För många försök med grafiskt lösenord"</string> + <string name="kg_login_too_many_attempts" msgid="699292728290654121">"För många försök med mönster"</string> <string name="kg_login_instructions" msgid="3619844310339066827">"Logga in med ditt Google-konto om du vill låsa upp."</string> <string name="kg_login_username_hint" msgid="1765453775467133251">"Användarnamn (e-post)"</string> <string name="kg_login_password_hint" msgid="3330530727273164402">"Lösenord"</string> diff --git a/core/res/res/values-te/strings.xml b/core/res/res/values-te/strings.xml index d68c088d5867..89a77495eefd 100644 --- a/core/res/res/values-te/strings.xml +++ b/core/res/res/values-te/strings.xml @@ -815,7 +815,7 @@ <string name="phoneTypeTtyTdd" msgid="532038552105328779">"TTY TDD"</string> <string name="phoneTypeWorkMobile" msgid="7522314392003565121">"కార్యాలయ మొబైల్"</string> <string name="phoneTypeWorkPager" msgid="3748332310638505234">"కార్యాలయ పేజర్"</string> - <string name="phoneTypeAssistant" msgid="757550783842231039">"Assistant"</string> + <string name="phoneTypeAssistant" msgid="757550783842231039">"అసిస్టెంట్"</string> <string name="phoneTypeMms" msgid="1799747455131365989">"MMS"</string> <string name="eventTypeCustom" msgid="3257367158986466481">"అనుకూలం"</string> <string name="eventTypeBirthday" msgid="7770026752793912283">"పుట్టినరోజు"</string> diff --git a/libs/WindowManager/Shell/res/values-ky/strings.xml b/libs/WindowManager/Shell/res/values-ky/strings.xml index c16041d87149..8056d15de3f4 100644 --- a/libs/WindowManager/Shell/res/values-ky/strings.xml +++ b/libs/WindowManager/Shell/res/values-ky/strings.xml @@ -46,7 +46,7 @@ <string name="accessibility_action_divider_top_30" msgid="3572788224908570257">"Үстүнкү экранды 30%"</string> <string name="accessibility_action_divider_bottom_full" msgid="2831868345092314060">"Ылдыйкы экранды толук экран режимине өткөрүү"</string> <string name="one_handed_tutorial_title" msgid="4583241688067426350">"Бир кол режимин колдонуу"</string> - <string name="one_handed_tutorial_description" msgid="3486582858591353067">"Чыгуу үчүн экранды ылдый жагынан өйдө көздөй сүрүңүз же колдонмонун өйдө жагын басыңыз"</string> + <string name="one_handed_tutorial_description" msgid="3486582858591353067">"Чыгуу үчүн экранды ылдый жагынан өйдө сүрүңүз же колдонмонун өйдө жагын басыңыз"</string> <string name="accessibility_action_start_one_handed" msgid="5070337354072861426">"Бир кол режимин баштоо"</string> <string name="accessibility_action_stop_one_handed" msgid="1369940261782179442">"Бир кол режиминен чыгуу"</string> <string name="bubbles_settings_button_description" msgid="1301286017420516912">"<xliff:g id="APP_NAME">%1$s</xliff:g> калкып чыкма билдирмелер жөндөөлөрү"</string> diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/startingsurface/SplashscreenContentDrawer.java b/libs/WindowManager/Shell/src/com/android/wm/shell/startingsurface/SplashscreenContentDrawer.java index 56ad2be11853..29326ec90e31 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/startingsurface/SplashscreenContentDrawer.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/startingsurface/SplashscreenContentDrawer.java @@ -23,7 +23,9 @@ import static android.window.StartingWindowInfo.STARTING_WINDOW_TYPE_LEGACY_SPLA import static android.window.StartingWindowInfo.STARTING_WINDOW_TYPE_SPLASH_SCREEN; import android.annotation.ColorInt; +import android.annotation.IntDef; import android.annotation.NonNull; +import android.annotation.Nullable; import android.app.ActivityThread; import android.content.BroadcastReceiver; import android.content.Context; @@ -64,6 +66,7 @@ import com.android.wm.shell.common.TransactionPool; import java.util.List; import java.util.function.Consumer; +import java.util.function.IntPredicate; import java.util.function.IntSupplier; import java.util.function.Supplier; import java.util.function.UnaryOperator; @@ -132,7 +135,6 @@ public class SplashscreenContentDrawer { * @param splashScreenViewConsumer Receiving the SplashScreenView object, which will also be * executed on splash screen thread. Note that the view can be * null if failed. - * @param bgColorConsumer Receiving the background color once it's estimated complete. */ void createContentView(Context context, @StartingWindowType int suggestType, ActivityInfo info, int taskId, Consumer<SplashScreenView> splashScreenViewConsumer) { @@ -209,9 +211,9 @@ public class SplashscreenContentDrawer { } private static int estimateWindowBGColor(Drawable themeBGDrawable) { - final DrawableColorTester themeBGTester = - new DrawableColorTester(themeBGDrawable, true /* filterTransparent */); - if (themeBGTester.nonTransparentRatio() == 0) { + final DrawableColorTester themeBGTester = new DrawableColorTester( + themeBGDrawable, DrawableColorTester.TRANSPARENT_FILTER /* filterType */); + if (themeBGTester.passFilterRatio() == 0) { // the window background is transparent, unable to draw Slog.w(TAG, "Window background is transparent, fill background with black color"); return getSystemBGColor(); @@ -314,7 +316,7 @@ public class SplashscreenContentDrawer { private Drawable mOverlayDrawable; private int mSuggestType; private int mThemeColor; - private Drawable mFinalIconDrawable; + private Drawable[] mFinalIconDrawables; private int mFinalIconSize = mIconSize; StartingWindowViewBuilder(@NonNull Context context, @NonNull ActivityInfo aInfo) { @@ -346,12 +348,13 @@ public class SplashscreenContentDrawer { animationDuration = 0; mFinalIconSize = 0; } else if (mTmpAttrs.mSplashScreenIcon != null) { - // replaced icon, don't process + // Using the windowSplashScreenAnimatedIcon attribute iconDrawable = mTmpAttrs.mSplashScreenIcon; animationDuration = mTmpAttrs.mAnimationDuration; // There is no background below the icon, so scale the icon up - if (mTmpAttrs.mIconBgColor == Color.TRANSPARENT) { + if (mTmpAttrs.mIconBgColor == Color.TRANSPARENT + || mTmpAttrs.mIconBgColor == mThemeColor) { mFinalIconSize *= NO_BACKGROUND_SCALE; } createIconDrawable(iconDrawable, false); @@ -382,7 +385,7 @@ public class SplashscreenContentDrawer { animationDuration = 0; } - return fillViewWithIcon(mFinalIconSize, mFinalIconDrawable, animationDuration); + return fillViewWithIcon(mFinalIconSize, mFinalIconDrawables, animationDuration); } private class ShapeIconFactory extends BaseIconFactory { @@ -393,12 +396,11 @@ public class SplashscreenContentDrawer { private void createIconDrawable(Drawable iconDrawable, boolean legacy) { if (legacy) { - mFinalIconDrawable = SplashscreenIconDrawableFactory.makeLegacyIconDrawable( + mFinalIconDrawables = SplashscreenIconDrawableFactory.makeLegacyIconDrawable( iconDrawable, mDefaultIconSize, mFinalIconSize, mSplashscreenWorkerHandler); } else { - mFinalIconDrawable = SplashscreenIconDrawableFactory.makeIconDrawable( - mTmpAttrs.mIconBgColor != Color.TRANSPARENT - ? mTmpAttrs.mIconBgColor : mThemeColor, + mFinalIconDrawables = SplashscreenIconDrawableFactory.makeIconDrawable( + mTmpAttrs.mIconBgColor, mThemeColor, iconDrawable, mDefaultIconSize, mFinalIconSize, mSplashscreenWorkerHandler); } } @@ -414,7 +416,8 @@ public class SplashscreenContentDrawer { final ColorCache.IconColor iconColor = mColorCache.getIconColor( mActivityInfo.packageName, mActivityInfo.getIconResource(), mLastPackageContextConfigHash, - () -> new DrawableColorTester(iconForeground, true /* filterTransparent */), + () -> new DrawableColorTester(iconForeground, + DrawableColorTester.TRANSLUCENT_FILTER /* filterType */), () -> new DrawableColorTester(adaptiveIconDrawable.getBackground())); if (DEBUG) { @@ -443,7 +446,7 @@ public class SplashscreenContentDrawer { // Reference AdaptiveIcon description, outer is 108 and inner is 72, so we // scale by 192/160 if we only draw adaptiveIcon's foreground. final float noBgScale = - iconColor.mFgNonTransparentRatio < ENLARGE_FOREGROUND_ICON_THRESHOLD + iconColor.mFgNonTranslucentRatio < ENLARGE_FOREGROUND_ICON_THRESHOLD ? NO_BACKGROUND_SCALE : 1f; // Using AdaptiveIconDrawable here can help keep the shape consistent with the // current settings. @@ -459,18 +462,24 @@ public class SplashscreenContentDrawer { return true; } - private SplashScreenView fillViewWithIcon(int iconSize, Drawable iconDrawable, + private SplashScreenView fillViewWithIcon(int iconSize, @Nullable Drawable[] iconDrawable, int animationDuration) { - Trace.traceBegin(TRACE_TAG_WINDOW_MANAGER, "fillViewWithIcon"); - final SplashScreenView.Builder builder = new SplashScreenView.Builder(mContext); - builder.setBackgroundColor(mThemeColor); - builder.setOverlayDrawable(mOverlayDrawable); + Drawable foreground = null; + Drawable background = null; if (iconDrawable != null) { - builder.setIconSize(iconSize) - .setIconBackground(mTmpAttrs.mIconBgColor) - .setCenterViewDrawable(iconDrawable) - .setAnimationDurationMillis(animationDuration); + foreground = iconDrawable.length > 0 ? iconDrawable[0] : null; + background = iconDrawable.length > 1 ? iconDrawable[1] : null; } + + Trace.traceBegin(TRACE_TAG_WINDOW_MANAGER, "fillViewWithIcon"); + final SplashScreenView.Builder builder = new SplashScreenView.Builder(mContext) + .setBackgroundColor(mThemeColor) + .setOverlayDrawable(mOverlayDrawable) + .setIconSize(iconSize) + .setIconBackground(background) + .setCenterViewDrawable(foreground) + .setAnimationDurationMillis(animationDuration); + if (mSuggestType == STARTING_WINDOW_TYPE_SPLASH_SCREEN && mTmpAttrs.mBrandingImage != null) { builder.setBrandingDrawable(mTmpAttrs.mBrandingImage, mBrandingImageWidth, @@ -545,13 +554,26 @@ public class SplashscreenContentDrawer { } private static class DrawableColorTester { + private static final int NO_ALPHA_FILTER = 0; + // filter out completely invisible pixels + private static final int TRANSPARENT_FILTER = 1; + // filter out translucent and invisible pixels + private static final int TRANSLUCENT_FILTER = 2; + + @IntDef(flag = true, value = { + NO_ALPHA_FILTER, + TRANSPARENT_FILTER, + TRANSLUCENT_FILTER + }) + private @interface QuantizerFilterType {} + private final ColorTester mColorChecker; DrawableColorTester(Drawable drawable) { - this(drawable, false /* filterTransparent */); + this(drawable, NO_ALPHA_FILTER /* filterType */); } - DrawableColorTester(Drawable drawable, boolean filterTransparent) { + DrawableColorTester(Drawable drawable, @QuantizerFilterType int filterType) { // Some applications use LayerDrawable for their windowBackground. To ensure that we // only get the real background, so that the color is not affected by the alpha of the // upper layer, try to get the lower layer here. This can also speed up the calculation. @@ -570,12 +592,12 @@ public class SplashscreenContentDrawer { } else { mColorChecker = drawable instanceof ColorDrawable ? new SingleColorTester((ColorDrawable) drawable) - : new ComplexDrawableTester(drawable, filterTransparent); + : new ComplexDrawableTester(drawable, filterType); } } - public float nonTransparentRatio() { - return mColorChecker.nonTransparentRatio(); + public float passFilterRatio() { + return mColorChecker.passFilterRatio(); } public boolean isComplexColor() { @@ -594,7 +616,7 @@ public class SplashscreenContentDrawer { * A help class to check the color information from a Drawable. */ private interface ColorTester { - float nonTransparentRatio(); + float passFilterRatio(); boolean isComplexColor(); @@ -622,7 +644,7 @@ public class SplashscreenContentDrawer { } @Override - public float nonTransparentRatio() { + public float passFilterRatio() { final int alpha = mColorDrawable.getAlpha(); return (float) (alpha / 255); } @@ -651,15 +673,21 @@ public class SplashscreenContentDrawer { private static final int MAX_BITMAP_SIZE = 40; private final Palette mPalette; private final boolean mFilterTransparent; - private static final TransparentFilterQuantizer TRANSPARENT_FILTER_QUANTIZER = - new TransparentFilterQuantizer(); - - ComplexDrawableTester(Drawable drawable, boolean filterTransparent) { + private static final AlphaFilterQuantizer ALPHA_FILTER_QUANTIZER = + new AlphaFilterQuantizer(); + + /** + * @param drawable The test target. + * @param filterType Targeting to filter out transparent or translucent pixels, + * this would be needed if want to check + * {@link #passFilterRatio()}, also affecting the estimated result + * of the dominant color. + */ + ComplexDrawableTester(Drawable drawable, @QuantizerFilterType int filterType) { Trace.traceBegin(TRACE_TAG_WINDOW_MANAGER, "ComplexDrawableTester"); final Rect initialBounds = drawable.copyBounds(); int width = drawable.getIntrinsicWidth(); int height = drawable.getIntrinsicHeight(); - // Some drawables do not have intrinsic dimensions if (width <= 0 || height <= 0) { width = MAX_BITMAP_SIZE; @@ -680,9 +708,10 @@ public class SplashscreenContentDrawer { // The Palette API will ignore Alpha, so it cannot handle transparent pixels, but // sometimes we will need this information to know if this Drawable object is // transparent. - mFilterTransparent = filterTransparent; + mFilterTransparent = filterType != NO_ALPHA_FILTER; if (mFilterTransparent) { - builder = new Palette.Builder(bitmap, TRANSPARENT_FILTER_QUANTIZER) + ALPHA_FILTER_QUANTIZER.setFilter(filterType); + builder = new Palette.Builder(bitmap, ALPHA_FILTER_QUANTIZER) .maximumColorCount(5); } else { builder = new Palette.Builder(bitmap, null) @@ -694,8 +723,8 @@ public class SplashscreenContentDrawer { } @Override - public float nonTransparentRatio() { - return mFilterTransparent ? TRANSPARENT_FILTER_QUANTIZER.mNonTransparentRatio : 1; + public float passFilterRatio() { + return mFilterTransparent ? ALPHA_FILTER_QUANTIZER.mPassFilterRatio : 1; } @Override @@ -726,17 +755,34 @@ public class SplashscreenContentDrawer { return true; } - private static class TransparentFilterQuantizer implements Quantizer { + private static class AlphaFilterQuantizer implements Quantizer { private static final int NON_TRANSPARENT = 0xFF000000; private final Quantizer mInnerQuantizer = new VariationalKMeansQuantizer(); - private float mNonTransparentRatio; + private final IntPredicate mTransparentFilter = i -> (i & NON_TRANSPARENT) != 0; + private final IntPredicate mTranslucentFilter = i -> + (i & NON_TRANSPARENT) == NON_TRANSPARENT; + + private IntPredicate mFilter = mTransparentFilter; + private float mPassFilterRatio; + + void setFilter(@QuantizerFilterType int filterType) { + switch (filterType) { + case TRANSLUCENT_FILTER: + mFilter = mTranslucentFilter; + break; + case TRANSPARENT_FILTER: + default: + mFilter = mTransparentFilter; + break; + } + } @Override public void quantize(final int[] pixels, final int maxColors) { - mNonTransparentRatio = 0; + mPassFilterRatio = 0; int realSize = 0; for (int i = pixels.length - 1; i > 0; i--) { - if ((pixels[i] & NON_TRANSPARENT) != 0) { + if (mFilter.test(pixels[i])) { realSize++; } } @@ -747,11 +793,11 @@ public class SplashscreenContentDrawer { mInnerQuantizer.quantize(pixels, maxColors); return; } - mNonTransparentRatio = (float) realSize / pixels.length; + mPassFilterRatio = (float) realSize / pixels.length; final int[] samplePixels = new int[realSize]; int rowIndex = 0; for (int i = pixels.length - 1; i > 0; i--) { - if ((pixels[i] & NON_TRANSPARENT) == NON_TRANSPARENT) { + if (mFilter.test(pixels[i])) { samplePixels[rowIndex] = pixels[i]; rowIndex++; } @@ -810,16 +856,16 @@ public class SplashscreenContentDrawer { final int mBgColor; final boolean mIsBgComplex; final boolean mIsBgGrayscale; - final float mFgNonTransparentRatio; + final float mFgNonTranslucentRatio; IconColor(int hash, int fgColor, int bgColor, boolean isBgComplex, - boolean isBgGrayscale, float fgNonTransparentRatio) { + boolean isBgGrayscale, float fgNonTranslucnetRatio) { super(hash); mFgColor = fgColor; mBgColor = bgColor; mIsBgComplex = isBgComplex; mIsBgGrayscale = isBgGrayscale; - mFgNonTransparentRatio = fgNonTransparentRatio; + mFgNonTranslucentRatio = fgNonTranslucnetRatio; } } @@ -905,7 +951,7 @@ public class SplashscreenContentDrawer { final DrawableColorTester bgTester = bgColorTesterSupplier.get(); final IconColor iconColor = new IconColor(hash, fgTester.getDominateColor(), bgTester.getDominateColor(), bgTester.isComplexColor(), bgTester.isGrayscale(), - fgTester.nonTransparentRatio()); + fgTester.passFilterRatio()); colors.mIconColors[leastUsedIndex[0]] = iconColor; return iconColor; } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/startingsurface/SplashscreenIconDrawableFactory.java b/libs/WindowManager/Shell/src/com/android/wm/shell/startingsurface/SplashscreenIconDrawableFactory.java index ba9123dca999..951b97e791c9 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/startingsurface/SplashscreenIconDrawableFactory.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/startingsurface/SplashscreenIconDrawableFactory.java @@ -22,9 +22,11 @@ import android.animation.Animator; import android.animation.ValueAnimator; import android.annotation.ColorInt; import android.annotation.NonNull; +import android.annotation.Nullable; import android.content.res.Resources; import android.graphics.Bitmap; import android.graphics.Canvas; +import android.graphics.Color; import android.graphics.ColorFilter; import android.graphics.Matrix; import android.graphics.Paint; @@ -33,7 +35,6 @@ import android.graphics.PixelFormat; import android.graphics.Rect; import android.graphics.drawable.AdaptiveIconDrawable; import android.graphics.drawable.Animatable; -import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.Drawable; import android.os.Handler; import android.os.Trace; @@ -44,32 +45,55 @@ import com.android.internal.R; /** * Creating a lightweight Drawable object used for splash screen. + * * @hide */ public class SplashscreenIconDrawableFactory { - static Drawable makeIconDrawable(@ColorInt int backgroundColor, + /** + * @return An array containing the foreground drawable at index 0 and if needed a background + * drawable at index 1. + */ + static Drawable[] makeIconDrawable(@ColorInt int backgroundColor, @ColorInt int themeColor, @NonNull Drawable foregroundDrawable, int srcIconSize, int iconSize, Handler splashscreenWorkerHandler) { + Drawable foreground; + Drawable background = null; + boolean drawBackground = + backgroundColor != Color.TRANSPARENT && backgroundColor != themeColor; + if (foregroundDrawable instanceof Animatable) { - return new AnimatableIconAnimateListener(backgroundColor, foregroundDrawable); + foreground = new AnimatableIconAnimateListener(foregroundDrawable); } else if (foregroundDrawable instanceof AdaptiveIconDrawable) { - return new ImmobileIconDrawable(foregroundDrawable, + // If the icon is Adaptive, we already use the icon background. + drawBackground = false; + foreground = new ImmobileIconDrawable(foregroundDrawable, srcIconSize, iconSize, splashscreenWorkerHandler); } else { - // single layer icon - return new ImmobileIconDrawable(new AdaptiveIconDrawable( - new ColorDrawable(backgroundColor), foregroundDrawable), + // Adaptive icon don't handle transparency so we draw the background of the adaptive + // icon with the same color as the window background color instead of using two layers + foreground = new ImmobileIconDrawable( + new AdaptiveForegroundDrawable(foregroundDrawable), srcIconSize, iconSize, splashscreenWorkerHandler); } + + if (drawBackground) { + background = new MaskBackgroundDrawable(backgroundColor); + } + + return new Drawable[]{foreground, background}; } - static Drawable makeLegacyIconDrawable(@NonNull Drawable iconDrawable, int srcIconSize, + static Drawable[] makeLegacyIconDrawable(@NonNull Drawable iconDrawable, int srcIconSize, int iconSize, Handler splashscreenWorkerHandler) { - return new ImmobileIconDrawable(iconDrawable, srcIconSize, iconSize, - splashscreenWorkerHandler); + return new Drawable[]{new ImmobileIconDrawable(iconDrawable, srcIconSize, iconSize, + splashscreenWorkerHandler)}; } + /** + * Drawable pre-drawing the scaled icon in a separate thread to increase the speed of the + * final drawing. + */ private static class ImmobileIconDrawable extends Drawable { private final Paint mPaint = new Paint(Paint.ANTI_ALIAS_FLAG | Paint.DITHER_FLAG | Paint.FILTER_BITMAP_FLAG); @@ -121,8 +145,10 @@ public class SplashscreenIconDrawableFactory { } } - // Base class the draw the circle background - private abstract static class MaskBackgroundDrawable extends Drawable { + /** + * Base class the draw a background clipped by the system mask. + */ + public static class MaskBackgroundDrawable extends Drawable { private static final float MASK_SIZE = AdaptiveIconDrawable.MASK_SIZE; private static final float EXTRA_INSET_PERCENTAGE = 1 / 4f; static final float DEFAULT_VIEW_PORT_SCALE = 1f / (1 + 2 * EXTRA_INSET_PERCENTAGE); @@ -132,17 +158,24 @@ public class SplashscreenIconDrawableFactory { private static Path sMask; private final Path mMaskScaleOnly; private final Matrix mMaskMatrix; - private final Paint mPaint = new Paint(Paint.ANTI_ALIAS_FLAG | Paint.DITHER_FLAG - | Paint.FILTER_BITMAP_FLAG); - MaskBackgroundDrawable(@ColorInt int backgroundColor) { + @Nullable + private final Paint mBackgroundPaint; + + public MaskBackgroundDrawable(@ColorInt int backgroundColor) { final Resources r = Resources.getSystem(); sMask = PathParser.createPathFromPathData(r.getString(R.string.config_icon_mask)); Path mask = new Path(sMask); mMaskScaleOnly = new Path(mask); mMaskMatrix = new Matrix(); - mPaint.setColor(backgroundColor); - mPaint.setStyle(Paint.Style.FILL); + if (backgroundColor != Color.TRANSPARENT) { + mBackgroundPaint = new Paint(Paint.ANTI_ALIAS_FLAG | Paint.DITHER_FLAG + | Paint.FILTER_BITMAP_FLAG); + mBackgroundPaint.setColor(backgroundColor); + mBackgroundPaint.setStyle(Paint.Style.FILL); + } else { + mBackgroundPaint = null; + } } @Override @@ -162,40 +195,80 @@ public class SplashscreenIconDrawableFactory { @Override public void draw(Canvas canvas) { canvas.clipPath(mMaskScaleOnly); - if (mMaskScaleOnly != null) { - canvas.drawPath(mMaskScaleOnly, mPaint); + if (mBackgroundPaint != null) { + canvas.drawPath(mMaskScaleOnly, mBackgroundPaint); } } @Override public void setAlpha(int alpha) { - mPaint.setAlpha(alpha); + if (mBackgroundPaint != null) { + mBackgroundPaint.setAlpha(alpha); + } } @Override public int getOpacity() { return PixelFormat.RGBA_8888; } + + @Override + public void setColorFilter(ColorFilter colorFilter) { + } + } + + private static class AdaptiveForegroundDrawable extends MaskBackgroundDrawable { + + @NonNull + protected final Drawable mForegroundDrawable; + private final Rect mTmpOutRect = new Rect(); + + AdaptiveForegroundDrawable(@NonNull Drawable foregroundDrawable) { + super(Color.TRANSPARENT); + mForegroundDrawable = foregroundDrawable; + } + + @Override + protected void updateLayerBounds(Rect bounds) { + super.updateLayerBounds(bounds); + int cX = bounds.width() / 2; + int cY = bounds.height() / 2; + + int insetWidth = (int) (bounds.width() / (DEFAULT_VIEW_PORT_SCALE * 2)); + int insetHeight = (int) (bounds.height() / (DEFAULT_VIEW_PORT_SCALE * 2)); + final Rect outRect = mTmpOutRect; + outRect.set(cX - insetWidth, cY - insetHeight, cX + insetWidth, cY + insetHeight); + if (mForegroundDrawable != null) { + mForegroundDrawable.setBounds(outRect); + } + invalidateSelf(); + } + + @Override + public void draw(Canvas canvas) { + super.draw(canvas); + mForegroundDrawable.draw(canvas); + } + + @Override + public void setColorFilter(ColorFilter colorFilter) { + mForegroundDrawable.setColorFilter(colorFilter); + } } /** * A lightweight AdaptiveIconDrawable which support foreground to be Animatable, and keep this * drawable masked by config_icon_mask. */ - private static class AnimatableIconAnimateListener extends MaskBackgroundDrawable + private static class AnimatableIconAnimateListener extends AdaptiveForegroundDrawable implements SplashScreenView.IconAnimateListener { - private final Drawable mForegroundDrawable; private Animatable mAnimatableIcon; private Animator mIconAnimator; private boolean mAnimationTriggered; - private final Rect mTmpOutRect = new Rect(); - AnimatableIconAnimateListener(@ColorInt int backgroundColor, Drawable foregroundDrawable) { - super(backgroundColor); - mForegroundDrawable = foregroundDrawable; - if (mForegroundDrawable != null) { - mForegroundDrawable.setCallback(mCallback); - } + AnimatableIconAnimateListener(@NonNull Drawable foregroundDrawable) { + super(foregroundDrawable); + mForegroundDrawable.setCallback(mCallback); } @Override @@ -231,22 +304,6 @@ public class SplashscreenIconDrawableFactory { return true; } - @Override - protected void updateLayerBounds(Rect bounds) { - super.updateLayerBounds(bounds); - int cX = bounds.width() / 2; - int cY = bounds.height() / 2; - - int insetWidth = (int) (bounds.width() / (DEFAULT_VIEW_PORT_SCALE * 2)); - int insetHeight = (int) (bounds.height() / (DEFAULT_VIEW_PORT_SCALE * 2)); - final Rect outRect = mTmpOutRect; - outRect.set(cX - insetWidth, cY - insetHeight, cX + insetWidth, cY + insetHeight); - if (mForegroundDrawable != null) { - mForegroundDrawable.setBounds(outRect); - } - invalidateSelf(); - } - private final Callback mCallback = new Callback() { @Override public void invalidateDrawable(@NonNull Drawable who) { @@ -276,19 +333,8 @@ public class SplashscreenIconDrawableFactory { @Override public void draw(Canvas canvas) { + ensureAnimationStarted(); super.draw(canvas); - if (mForegroundDrawable != null) { - ensureAnimationStarted(); - mForegroundDrawable.draw(canvas); - } - } - - @Override - public void setColorFilter(ColorFilter colorFilter) { - if (mForegroundDrawable != null) { - mForegroundDrawable.setColorFilter(colorFilter); - } } } - } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/startingsurface/StartingSurfaceDrawer.java b/libs/WindowManager/Shell/src/com/android/wm/shell/startingsurface/StartingSurfaceDrawer.java index 243751fe13e8..fc7c86d669cb 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/startingsurface/StartingSurfaceDrawer.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/startingsurface/StartingSurfaceDrawer.java @@ -168,16 +168,14 @@ public class StartingSurfaceDrawer { void addSplashScreenStartingWindow(StartingWindowInfo windowInfo, IBinder appToken, @StartingWindowType int suggestType) { final RunningTaskInfo taskInfo = windowInfo.taskInfo; - final ActivityInfo activityInfo = taskInfo.topActivityInfo; - if (activityInfo == null) { + final ActivityInfo activityInfo = windowInfo.targetActivityInfo != null + ? windowInfo.targetActivityInfo + : taskInfo.topActivityInfo; + if (activityInfo == null || activityInfo.packageName == null) { return; } final int displayId = taskInfo.displayId; - if (activityInfo.packageName == null) { - return; - } - final int taskId = taskInfo.taskId; Context context = mContext; // replace with the default theme if the application didn't set diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/startingsurface/StartingSurfaceDrawerTests.java b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/startingsurface/StartingSurfaceDrawerTests.java index 284f384a3d26..d536adb9f8ae 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/startingsurface/StartingSurfaceDrawerTests.java +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/startingsurface/StartingSurfaceDrawerTests.java @@ -214,6 +214,7 @@ public class StartingSurfaceDrawerTests { final ActivityManager.RunningTaskInfo taskInfo = new ActivityManager.RunningTaskInfo(); taskInfo.topActivityInfo = info; taskInfo.taskId = taskId; + windowInfo.targetActivityInfo = info; windowInfo.taskInfo = taskInfo; return windowInfo; } diff --git a/media/java/android/media/metrics/PlaybackErrorEvent.java b/media/java/android/media/metrics/PlaybackErrorEvent.java index 184b35913783..4e3b426c0630 100644 --- a/media/java/android/media/metrics/PlaybackErrorEvent.java +++ b/media/java/android/media/metrics/PlaybackErrorEvent.java @@ -317,7 +317,7 @@ public final class PlaybackErrorEvent extends Event implements Parcelable { */ public static final class Builder { private @Nullable Exception mException; - private int mErrorCode; + private int mErrorCode = ERROR_UNKNOWN; private int mSubErrorCode; private long mTimeSinceCreatedMillis = -1; private Bundle mMetricsBundle = new Bundle(); diff --git a/media/java/android/media/metrics/PlaybackMetrics.java b/media/java/android/media/metrics/PlaybackMetrics.java index bbcc48480e68..e71ee204f564 100644 --- a/media/java/android/media/metrics/PlaybackMetrics.java +++ b/media/java/android/media/metrics/PlaybackMetrics.java @@ -502,9 +502,9 @@ public final class PlaybackMetrics implements Parcelable { private long mMediaDurationMillis = -1; private int mStreamSource = STREAM_SOURCE_UNKNOWN; private int mStreamType = STREAM_TYPE_UNKNOWN; - private int mPlaybackType = PLAYBACK_TYPE_OTHER; + private int mPlaybackType = PLAYBACK_TYPE_UNKNOWN; private int mDrmType = DRM_TYPE_NONE; - private int mContentType = CONTENT_TYPE_OTHER; + private int mContentType = CONTENT_TYPE_UNKNOWN; private @Nullable String mPlayerName; private @Nullable String mPlayerVersion; private @NonNull List<Long> mExperimentIds = new ArrayList<>(); diff --git a/packages/EasterEgg/AndroidManifest.xml b/packages/EasterEgg/AndroidManifest.xml index 3d62af020627..7f258eb2f910 100644 --- a/packages/EasterEgg/AndroidManifest.xml +++ b/packages/EasterEgg/AndroidManifest.xml @@ -1,26 +1,28 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.android.egg" - android:versionCode="1" + android:versionCode="12" android:versionName="1.0"> <uses-permission android:name="android.permission.WRITE_SETTINGS" /> <!-- used for cat notifications --> <uses-permission android:name="android.permission.SUBSTITUTE_NOTIFICATION_APP_NAME" /> + <!-- used to save cat images --> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> + <!-- controls --> <uses-permission android:name="android.permission.BIND_CONTROLS" /> <application android:icon="@drawable/icon" android:label="@string/app_name"> - - <activity android:name=".quares.QuaresActivity" + <activity + android:name=".quares.QuaresActivity" + android:exported="true" android:icon="@drawable/q_icon" android:label="@string/q_egg_name" - android:exported="true" android:theme="@style/QuaresTheme"> <intent-filter> <action android:name="android.intent.action.MAIN" /> @@ -29,9 +31,9 @@ <activity android:name=".paint.PaintActivity" android:configChanges="orientation|keyboardHidden|screenSize|uiMode" + android:exported="true" android:icon="@drawable/p_icon" android:label="@string/p_egg_name" - android:exported="true" android:theme="@style/AppTheme"> <intent-filter> <action android:name="android.intent.action.MAIN" /> @@ -39,13 +41,15 @@ </activity> <!-- Android N easter egg bits --> - <activity android:name=".neko.NekoLand" - android:theme="@android:style/Theme.Material.NoActionBar" + <activity + android:name=".neko.NekoLand" android:exported="true" - android:label="@string/app_name"> + android:label="@string/app_name" + android:theme="@android:style/Theme.Material.NoActionBar"> <intent-filter> <action android:name="android.service.quicksettings.action.QS_TILE_PREFERENCES" /> <action android:name="android.intent.action.MAIN" /> + <category android:name="android.intent.category.DEFAULT" /> </intent-filter> </activity> @@ -54,25 +58,24 @@ <service android:name=".neko.NekoService" android:enabled="true" - android:permission="android.permission.BIND_JOB_SERVICE" - android:exported="true" > - </service> - + android:exported="true" + android:permission="android.permission.BIND_JOB_SERVICE" /> <!-- Used to show over lock screen --> - <activity android:name=".neko.NekoLockedActivity" + <activity + android:name=".neko.NekoLockedActivity" android:excludeFromRecents="true" android:exported="true" - android:theme="@android:style/Theme.Material.Light.Dialog.NoActionBar" - android:showOnLockScreen="true" /> - + android:showOnLockScreen="true" + android:theme="@android:style/Theme.Material.Light.Dialog.NoActionBar" /> <!-- Used to enable easter egg --> - <activity android:name=".neko.NekoActivationActivity" + <activity + android:name=".ComponentActivationActivity" android:excludeFromRecents="true" android:exported="true" - android:theme="@android:style/Theme.NoDisplay" - > + android:theme="@android:style/Theme.NoDisplay"> <intent-filter> - <action android:name="android.intent.action.MAIN"/> + <action android:name="android.intent.action.MAIN" /> + <category android:name="android.intent.category.DEFAULT" /> <category android:name="com.android.internal.category.PLATLOGO" /> </intent-filter> @@ -81,37 +84,65 @@ <!-- The quick settings tile, disabled by default --> <service android:name=".neko.NekoTile" - android:permission="android.permission.BIND_QUICK_SETTINGS_TILE" - android:icon="@drawable/stat_icon" android:enabled="false" android:exported="true" - android:label="@string/default_tile_name"> + android:icon="@drawable/stat_icon" + android:label="@string/default_tile_name" + android:permission="android.permission.BIND_QUICK_SETTINGS_TILE"> <intent-filter> <action android:name="android.service.quicksettings.action.QS_TILE" /> </intent-filter> </service> - - <service android:name=".neko.NekoControlsService" - android:permission="android.permission.BIND_CONTROLS" - android:label="@string/r_egg_name" - android:icon="@drawable/ic_fullcat_icon" + <service + android:name=".neko.NekoControlsService" android:enabled="false" - android:exported="true"> + android:exported="true" + android:icon="@drawable/ic_fullcat_icon" + android:label="@string/r_egg_name" + android:permission="android.permission.BIND_CONTROLS"> <intent-filter> <action android:name="android.service.controls.ControlsProviderService" /> </intent-filter> - </service> - - <!-- FileProvider for sending pictures --> + </service> <!-- FileProvider for sending pictures --> <provider android:name="androidx.core.content.FileProvider" android:authorities="com.android.egg.fileprovider" - android:grantUriPermissions="true" - android:exported="false"> + android:exported="false" + android:grantUriPermissions="true"> <meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/filepaths" /> </provider> + + <!-- Android S easter egg bits --> + + <!-- List of all system theme colors on the device. --> + <activity + android:name=".widget.PaintChipsActivity" + android:theme="@android:style/Theme.Material.Wallpaper.NoTitleBar" + android:configChanges="orientation|keyboardHidden|screenSize|uiMode" + android:label="@string/s_egg_name" + android:enabled="false" + android:exported="true"> + <intent-filter> + <action android:name="android.intent.action.MAIN" /> + </intent-filter> + </activity> + + <!-- Homescreen widget also showing paint chips (may be affected by the exact position in + the workspace) --> + <receiver + android:name=".widget.PaintChipsWidget" + android:label="@string/s_egg_name" + android:enabled="false"> + <intent-filter> + <action android:name="android.appwidget.action.APPWIDGET_UPDATE" /> + </intent-filter> + + <meta-data + android:name="android.appwidget.provider" + android:resource="@xml/paint_chips_widget_info" /> + </receiver> </application> -</manifest> +</manifest>
\ No newline at end of file diff --git a/packages/EasterEgg/build.gradle b/packages/EasterEgg/build.gradle index 20b469898498..0565369fe81f 100644 --- a/packages/EasterEgg/build.gradle +++ b/packages/EasterEgg/build.gradle @@ -7,8 +7,8 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:4.0.0' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" + classpath 'com.android.tools.build:gradle:7.0.0-alpha08' + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.30" } } @@ -62,6 +62,9 @@ android { proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } } + buildFeatures { + viewBinding true + } } @@ -74,6 +77,7 @@ dependencies { implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.6' implementation "androidx.recyclerview:recyclerview:${ANDROID_X_VERSION}" implementation "androidx.dynamicanimation:dynamicanimation:${ANDROID_X_VERSION}" + implementation 'com.google.android.material:material:1.3.0' testImplementation 'junit:junit:4.12' androidTestImplementation 'androidx.test.ext:junit:1.1.1' androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' diff --git a/packages/EasterEgg/gradle.properties b/packages/EasterEgg/gradle.properties index e8e6450e2943..0b5a73677b3b 100644 --- a/packages/EasterEgg/gradle.properties +++ b/packages/EasterEgg/gradle.properties @@ -19,5 +19,5 @@ android.enableJetifier=true kotlin.code.style=official ANDROID_X_VERSION=1+ -COMPILE_SDK=android-30 +COMPILE_SDK=android-S BUILD_TOOLS_VERSION=28.0.3 diff --git a/packages/EasterEgg/res/drawable/android_s.xml b/packages/EasterEgg/res/drawable/android_s.xml new file mode 100644 index 000000000000..9cecab103ac8 --- /dev/null +++ b/packages/EasterEgg/res/drawable/android_s.xml @@ -0,0 +1,23 @@ +<vector android:height="108dp" android:viewportHeight="48" + android:viewportWidth="48" android:width="108dp" xmlns:android="http://schemas.android.com/apk/res/android"> + <group> + <clip-path android:pathData="M17,14h14v20h-14z"/> + <path android:fillColor="#00000000" + android:pathData="M18,21C18,21.7956 18.3161,22.5587 18.8787,23.1213C19.4413,23.6839 20.2044,24 21,24H27C27.7956,24 28.5587,24.3161 29.1213,24.8787C29.6839,25.4413 30,26.2044 30,27" + android:strokeColor="#ffffff" android:strokeWidth="2"/> + <path android:fillColor="#ffffff" android:pathData="M22,21C22.5523,21 23,20.5523 23,20C23,19.4477 22.5523,19 22,19C21.4477,19 21,19.4477 21,20C21,20.5523 21.4477,21 22,21Z"/> + <path android:fillColor="#ffffff" android:pathData="M26,21C26.5523,21 27,20.5523 27,20C27,19.4477 26.5523,19 26,19C25.4477,19 25,19.4477 25,20C25,20.5523 25.4477,21 26,21Z"/> + <path android:fillColor="#00000000" + android:pathData="M19.5,16.5L18,15" + android:strokeColor="#ffffff" android:strokeLineCap="round" android:strokeWidth="2"/> + <path android:fillColor="#00000000" + android:pathData="M28.5,16.5L30,15" + android:strokeColor="#ffffff" android:strokeLineCap="round" android:strokeWidth="2"/> + <path android:fillColor="#00000000" + android:pathData="M29.92,20C29.8637,19.6605 29.7801,19.3261 29.67,19C29.205,17.6561 28.2777,16.5211 27.0536,15.7973C25.8294,15.0735 24.388,14.8081 22.9864,15.0483C21.5847,15.2885 20.314,16.0188 19.4007,17.1088C18.4874,18.1989 17.991,19.5779 18,21" + android:strokeColor="#ffffff" android:strokeLineCap="round" android:strokeWidth="2"/> + <path android:fillColor="#00000000" + android:pathData="M18.08,28C18.1363,28.3395 18.2199,28.6739 18.33,29C18.795,30.3439 19.7223,31.4789 20.9464,32.2027C22.1705,32.9265 23.612,33.1919 25.0136,32.9517C26.4153,32.7115 27.686,31.9812 28.5993,30.8912C29.5126,29.8011 30.009,28.4221 30,27" + android:strokeColor="#ffffff" android:strokeLineCap="round" android:strokeWidth="2"/> + </group> +</vector> diff --git a/packages/EasterEgg/res/drawable/icon.xml b/packages/EasterEgg/res/drawable/icon.xml index 7f8d4fa8833f..7054962b3503 100644 --- a/packages/EasterEgg/res/drawable/icon.xml +++ b/packages/EasterEgg/res/drawable/icon.xml @@ -15,5 +15,5 @@ Copyright (C) 2018 The Android Open Source Project --> <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> <background android:drawable="@drawable/icon_bg"/> - <foreground android:drawable="@drawable/android_11_dial"/> + <foreground android:drawable="@drawable/android_s"/> </adaptive-icon> diff --git a/packages/EasterEgg/res/drawable/icon_bg.xml b/packages/EasterEgg/res/drawable/icon_bg.xml index 31b2a7f9a333..d08e160ea312 100644 --- a/packages/EasterEgg/res/drawable/icon_bg.xml +++ b/packages/EasterEgg/res/drawable/icon_bg.xml @@ -14,5 +14,5 @@ Copyright (C) 2018 The Android Open Source Project limitations under the License. --> <color xmlns:android="http://schemas.android.com/apk/res/android" - android:color="#073042" /> + android:color="@android:color/system_accent2_500" /> diff --git a/packages/EasterEgg/res/drawable/roundrect.xml b/packages/EasterEgg/res/drawable/roundrect.xml new file mode 100644 index 000000000000..070adadf3814 --- /dev/null +++ b/packages/EasterEgg/res/drawable/roundrect.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8"?> +<shape xmlns:android="http://schemas.android.com/apk/res/android" + android:shape="rectangle"> + <solid android:color="#FF000000" /> + <corners + android:radius="12dp" /> +</shape>
\ No newline at end of file diff --git a/packages/EasterEgg/res/layout/paint_chip.xml b/packages/EasterEgg/res/layout/paint_chip.xml new file mode 100644 index 000000000000..d5745b94d163 --- /dev/null +++ b/packages/EasterEgg/res/layout/paint_chip.xml @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2021 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. +--> +<TextView xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/chip" + android:layout_width="10dp" android:layout_height="10dp" + android:layout_gravity="fill" android:layout_columnWeight="1" android:layout_rowWeight="1" + android:text="A1-500" + android:backgroundTint="@android:color/system_accent1_500" + android:background="@drawable/roundrect" + android:gravity="center" + android:textColor="?android:attr/textColorPrimary" + android:fontFamily="?android:attr/textAppearanceLarge" + android:layout_margin="2dp" + android:singleLine="true" + />
\ No newline at end of file diff --git a/packages/EasterEgg/res/layout/paint_chips_grid.xml b/packages/EasterEgg/res/layout/paint_chips_grid.xml new file mode 100644 index 000000000000..79f701322149 --- /dev/null +++ b/packages/EasterEgg/res/layout/paint_chips_grid.xml @@ -0,0 +1,25 @@ +<!-- + Copyright (C) 2021 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. +--> +<GridLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/paint_grid" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:padding="0dp" + android:orientation="vertical" + android:alignmentMode="alignBounds" + android:rowOrderPreserved="false" + > +</GridLayout> diff --git a/packages/EasterEgg/res/layout/paint_chips_widget_preview.xml b/packages/EasterEgg/res/layout/paint_chips_widget_preview.xml new file mode 100644 index 000000000000..9893ec054992 --- /dev/null +++ b/packages/EasterEgg/res/layout/paint_chips_widget_preview.xml @@ -0,0 +1,79 @@ +<GridLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="300dp" + android:layout_height="50dp" + android:alignmentMode="alignBounds" + android:columnCount="5" + android:padding="0dp" + android:rowCount="1" + android:rowOrderPreserved="false"> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_rowWeight="1" + android:layout_columnWeight="1" + android:layout_gravity="fill" + android:layout_margin="2dp" + android:background="@drawable/roundrect" + android:backgroundTint="@android:color/system_neutral1_500" + android:fontFamily="?android:attr/textAppearanceLarge" + android:gravity="center" + android:text="N1-500" + android:textColor="?android:attr/textColorPrimary" /> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_rowWeight="1" + android:layout_columnWeight="1" + android:layout_gravity="fill" + android:layout_margin="2dp" + android:background="@drawable/roundrect" + android:backgroundTint="@android:color/system_neutral2_500" + android:fontFamily="?android:attr/textAppearanceLarge" + android:gravity="center" + android:text="N2-500" + android:textColor="?android:attr/textColorPrimary" /> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_rowWeight="1" + android:layout_columnWeight="1" + android:layout_gravity="fill" + android:layout_margin="2dp" + android:background="@drawable/roundrect" + android:backgroundTint="@android:color/system_accent1_500" + android:fontFamily="?android:attr/textAppearanceLarge" + android:gravity="center" + android:text="A1-500" + android:textColor="?android:attr/textColorPrimary" /> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_rowWeight="1" + android:layout_columnWeight="1" + android:layout_gravity="fill" + android:layout_margin="2dp" + android:background="@drawable/roundrect" + android:backgroundTint="@android:color/system_accent2_500" + android:fontFamily="?android:attr/textAppearanceLarge" + android:gravity="center" + android:text="A2-500" + android:textColor="?android:attr/textColorPrimary" /> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_rowWeight="1" + android:layout_columnWeight="1" + android:layout_gravity="fill" + android:layout_margin="2dp" + android:background="@drawable/roundrect" + android:backgroundTint="@android:color/system_accent3_500" + android:fontFamily="?android:attr/textAppearanceLarge" + android:gravity="center" + android:text="A3-500" + android:textColor="?android:attr/textColorPrimary" /> +</GridLayout> diff --git a/packages/EasterEgg/res/values-night/themes.xml b/packages/EasterEgg/res/values-night/themes.xml new file mode 100644 index 000000000000..83ec7a5557c3 --- /dev/null +++ b/packages/EasterEgg/res/values-night/themes.xml @@ -0,0 +1,7 @@ +<resources> + + <style name="ThemeOverlay.EasterEgg.AppWidgetContainer" parent=""> + <item name="appWidgetBackgroundColor">@color/light_blue_900</item> + <item name="appWidgetTextColor">@color/light_blue_200</item> + </style> +</resources>
\ No newline at end of file diff --git a/packages/EasterEgg/res/values/attrs.xml b/packages/EasterEgg/res/values/attrs.xml new file mode 100644 index 000000000000..97531a25692c --- /dev/null +++ b/packages/EasterEgg/res/values/attrs.xml @@ -0,0 +1,6 @@ +<resources> + <declare-styleable name="AppWidgetAttrs"> + <attr name="appWidgetBackgroundColor" format="color" /> + <attr name="appWidgetTextColor" format="color" /> + </declare-styleable> +</resources>
\ No newline at end of file diff --git a/packages/EasterEgg/res/values/colors.xml b/packages/EasterEgg/res/values/colors.xml index 1a5388b738dd..d79e83b8af0c 100644 --- a/packages/EasterEgg/res/values/colors.xml +++ b/packages/EasterEgg/res/values/colors.xml @@ -1,5 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- +<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2018 The Android Open Source Project Licensed under the Apache License, Version 2.0 (the "License"); @@ -18,4 +17,8 @@ <color name="toolbar_bg_color">#FFDDDDDD</color> <color name="paper_color">#FFFFFFFF</color> <color name="paint_color">#FF000000</color> + <color name="light_blue_50">#FFE1F5FE</color> + <color name="light_blue_200">#FF81D4FA</color> + <color name="light_blue_600">#FF039BE5</color> + <color name="light_blue_900">#FF01579B</color> </resources>
\ No newline at end of file diff --git a/packages/EasterEgg/res/values/dimens.xml b/packages/EasterEgg/res/values/dimens.xml index e9dcebd27f7b..0de2c3cb7b43 100644 --- a/packages/EasterEgg/res/values/dimens.xml +++ b/packages/EasterEgg/res/values/dimens.xml @@ -1,5 +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"); @@ -16,4 +15,10 @@ Copyright (C) 2016 The Android Open Source Project --> <resources xmlns:android="http://schemas.android.com/apk/res/android"> <dimen name="neko_display_size">64dp</dimen> + + <!-- +Refer to App Widget Documentation for margin information +http://developer.android.com/guide/topics/appwidgets/index.html#CreatingLayout + --> + <dimen name="widget_margin">0dp</dimen> </resources> diff --git a/packages/EasterEgg/res/values/strings.xml b/packages/EasterEgg/res/values/strings.xml index 25f94215d433..743947ad281e 100644 --- a/packages/EasterEgg/res/values/strings.xml +++ b/packages/EasterEgg/res/values/strings.xml @@ -14,7 +14,7 @@ Copyright (C) 2018 The Android Open Source Project limitations under the License. --> <resources xmlns:android="http://schemas.android.com/apk/res/android"> - <string name="app_name" translatable="false">Android R Easter Egg</string> + <string name="app_name" translatable="false">Android S Easter Egg</string> <!-- name of the Q easter egg, a nonogram-style icon puzzle --> <string name="q_egg_name" translatable="false">Icon Quiz</string> @@ -23,4 +23,8 @@ Copyright (C) 2018 The Android Open Source Project <string name="p_egg_name" translatable="false">PAINT.APK</string> <string name="r_egg_name" translatable="false">Cat Controls</string> + + <!-- name of the S easter egg, a widget that displays the system color palette + in a manner similar to a set of paint samples from a hardware store --> + <string name="s_egg_name" translatable="false">Paint Chips</string> </resources> diff --git a/packages/EasterEgg/res/values/themes.xml b/packages/EasterEgg/res/values/themes.xml new file mode 100644 index 000000000000..5b163043a356 --- /dev/null +++ b/packages/EasterEgg/res/values/themes.xml @@ -0,0 +1,7 @@ +<resources> + + <style name="ThemeOverlay.EasterEgg.AppWidgetContainer" parent=""> + <item name="appWidgetBackgroundColor">@color/light_blue_600</item> + <item name="appWidgetTextColor">@color/light_blue_50</item> + </style> +</resources>
\ No newline at end of file diff --git a/packages/EasterEgg/res/xml/paint_chips_widget_info.xml b/packages/EasterEgg/res/xml/paint_chips_widget_info.xml new file mode 100644 index 000000000000..7780a757f01c --- /dev/null +++ b/packages/EasterEgg/res/xml/paint_chips_widget_info.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2021 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android" + android:initialLayout="@layout/paint_chip" + android:previewLayout="@layout/paint_chips_widget_preview" + android:minWidth="50dp" + android:minHeight="50dp" + android:resizeMode="horizontal|vertical" + android:updatePeriodMillis="86400000" + android:widgetCategory="home_screen"></appwidget-provider>
\ No newline at end of file diff --git a/packages/EasterEgg/src/com/android/egg/ComponentActivationActivity.java b/packages/EasterEgg/src/com/android/egg/ComponentActivationActivity.java new file mode 100644 index 000000000000..5820b5a75894 --- /dev/null +++ b/packages/EasterEgg/src/com/android/egg/ComponentActivationActivity.java @@ -0,0 +1,83 @@ +/* + * Copyright (C) 2021 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.egg; + +import android.app.Activity; +import android.content.ComponentName; +import android.content.pm.PackageManager; +import android.provider.Settings; +import android.util.Log; +import android.widget.Toast; + +import com.android.egg.neko.NekoControlsService; +import com.android.egg.widget.PaintChipsActivity; +import com.android.egg.widget.PaintChipsWidget; + +/** + * Launched from the PlatLogoActivity. Enables everything else in this easter egg. + */ +public class ComponentActivationActivity extends Activity { + private static final String TAG = "EasterEgg"; + + private static final String S_EGG_UNLOCK_SETTING = "egg_mode_s"; + + private void toastUp(String s) { + Toast toast = Toast.makeText(this, s, Toast.LENGTH_SHORT); + toast.show(); + } + + @Override + public void onStart() { + super.onStart(); + + final PackageManager pm = getPackageManager(); + final ComponentName[] cns = new ComponentName[] { + new ComponentName(this, NekoControlsService.class), + new ComponentName(this, PaintChipsActivity.class), + new ComponentName(this, PaintChipsWidget.class) + }; + final long unlockValue = Settings.System.getLong(getContentResolver(), + S_EGG_UNLOCK_SETTING, 0); + for (ComponentName cn : cns) { + final boolean componentEnabled = pm.getComponentEnabledSetting(cn) + == PackageManager.COMPONENT_ENABLED_STATE_ENABLED; + if (unlockValue == 0) { + if (componentEnabled) { + Log.v(TAG, "Disabling component: " + cn); + pm.setComponentEnabledSetting(cn, + PackageManager.COMPONENT_ENABLED_STATE_DISABLED, + PackageManager.DONT_KILL_APP); + //toastUp("\uD83D\uDEAB"); + } else { + Log.v(TAG, "Already disabled: " + cn); + } + } else { + if (!componentEnabled) { + Log.v(TAG, "Enabling component: " + cn); + pm.setComponentEnabledSetting(cn, + PackageManager.COMPONENT_ENABLED_STATE_ENABLED, + PackageManager.DONT_KILL_APP); + //toastUp("\uD83D\uDC31"); + } else { + Log.v(TAG, "Already enabled: " + cn); + } + } + } + + finish(); + } +} diff --git a/packages/EasterEgg/src/com/android/egg/neko/NekoActivationActivity.java b/packages/EasterEgg/src/com/android/egg/neko/NekoActivationActivity.java deleted file mode 100644 index df461c6878f0..000000000000 --- a/packages/EasterEgg/src/com/android/egg/neko/NekoActivationActivity.java +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Copyright (C) 2016 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the - * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the specific language governing - * permissions and limitations under the License. - */ - -package com.android.egg.neko; - -import android.app.Activity; -import android.content.ComponentName; -import android.content.pm.PackageManager; -import android.provider.Settings; -import android.util.Log; -import android.widget.Toast; - -import com.android.internal.logging.MetricsLogger; - -public class NekoActivationActivity extends Activity { - private static final String R_EGG_UNLOCK_SETTING = "egg_mode_r"; - - private void toastUp(String s) { - Toast toast = Toast.makeText(this, s, Toast.LENGTH_SHORT); - toast.show(); - } - - @Override - public void onStart() { - super.onStart(); - - final PackageManager pm = getPackageManager(); - final ComponentName cn = new ComponentName(this, NekoControlsService.class); - final boolean componentEnabled = pm.getComponentEnabledSetting(cn) - == PackageManager.COMPONENT_ENABLED_STATE_ENABLED; - if (Settings.System.getLong(getContentResolver(), - R_EGG_UNLOCK_SETTING, 0) == 0) { - if (componentEnabled) { - Log.v("Neko", "Disabling controls."); - pm.setComponentEnabledSetting(cn, PackageManager.COMPONENT_ENABLED_STATE_DISABLED, - PackageManager.DONT_KILL_APP); - MetricsLogger.histogram(this, "egg_neko_enable", 0); - toastUp("\uD83D\uDEAB"); - } else { - Log.v("Neko", "Controls already disabled."); - } - } else { - if (!componentEnabled) { - Log.v("Neko", "Enabling controls."); - pm.setComponentEnabledSetting(cn, PackageManager.COMPONENT_ENABLED_STATE_ENABLED, - PackageManager.DONT_KILL_APP); - MetricsLogger.histogram(this, "egg_neko_enable", 1); - toastUp("\uD83D\uDC31"); - } else { - Log.v("Neko", "Controls already enabled."); - } - } - finish(); - } -} diff --git a/packages/EasterEgg/src/com/android/egg/widget/PaintChipsActivity.kt b/packages/EasterEgg/src/com/android/egg/widget/PaintChipsActivity.kt new file mode 100644 index 000000000000..8799aecf5516 --- /dev/null +++ b/packages/EasterEgg/src/com/android/egg/widget/PaintChipsActivity.kt @@ -0,0 +1,67 @@ +/* + * Copyright (C) 2021 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.egg.widget + +import android.app.Activity +import android.content.res.Configuration +import android.os.Bundle +import android.widget.FrameLayout + +/** + * Activity to show off the current dynamic system theme in all its glory. + */ +class PaintChipsActivity : Activity() { + private lateinit var layout: FrameLayout + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + + window.navigationBarColor = 0 + window.statusBarColor = 0 + actionBar?.hide() + + layout = FrameLayout(this) + layout.setPadding(dp2px(8f), dp2px(8f), dp2px(8f), dp2px(8f)) + rebuildGrid() + + setContentView(layout) + } + + fun dp2px(dp: Float): Int { + return (dp * resources.displayMetrics.density).toInt() + } + + override fun onResume() { + super.onResume() + + rebuildGrid() + } + + override fun onConfigurationChanged(newConfig: Configuration) { + super.onConfigurationChanged(newConfig) + + rebuildGrid() + } + + private fun rebuildGrid() { + layout.removeAllViews() + val grid = buildFullWidget(this, ClickBehavior.SHARE) + val asView = grid.apply(this, layout) + layout.addView(asView, FrameLayout.LayoutParams(FrameLayout.LayoutParams.MATCH_PARENT, + FrameLayout.LayoutParams.MATCH_PARENT)) + } +} diff --git a/packages/EasterEgg/src/com/android/egg/widget/PaintChipsWidget.kt b/packages/EasterEgg/src/com/android/egg/widget/PaintChipsWidget.kt new file mode 100644 index 000000000000..c15cabbb0eb6 --- /dev/null +++ b/packages/EasterEgg/src/com/android/egg/widget/PaintChipsWidget.kt @@ -0,0 +1,293 @@ +/* + * Copyright (C) 2021 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.egg.widget + +import android.app.PendingIntent +import android.appwidget.AppWidgetManager +import android.appwidget.AppWidgetProvider +import android.content.ComponentName +import android.content.Context +import android.content.Intent +import android.os.Bundle +import android.util.Log +import android.util.SizeF +import android.widget.RemoteViews + +import com.android.egg.R + +/** + * A homescreen widget to explore the current dynamic system theme. + */ +class PaintChipsWidget : AppWidgetProvider() { + override fun onUpdate( + context: Context, + appWidgetManager: AppWidgetManager, + appWidgetIds: IntArray + ) { + for (appWidgetId in appWidgetIds) { + updateAppWidget(context, appWidgetManager, appWidgetId) + } + } + + override fun onAppWidgetOptionsChanged( + context: Context, + appWidgetManager: AppWidgetManager, + appWidgetId: Int, + newOptions: Bundle? + ) { + // Log.v(TAG, "onAppWidgetOptionsChanged: id=${appWidgetId}") + updateAppWidget(context, appWidgetManager, appWidgetId) + super.onAppWidgetOptionsChanged(context, appWidgetManager, appWidgetId, newOptions) + } +} + +const val TAG = "PaintChips" + +val SHADE_NUMBERS = intArrayOf(0, 10, 50, 100, 200, 300, 400, 500, 600, 700, 800, 900, 1000) + +val COLORS_NEUTRAL1 = intArrayOf( + android.R.color.system_neutral1_0, + android.R.color.system_neutral1_10, + android.R.color.system_neutral1_50, + android.R.color.system_neutral1_100, + android.R.color.system_neutral1_200, + android.R.color.system_neutral1_300, + android.R.color.system_neutral1_400, + android.R.color.system_neutral1_500, + android.R.color.system_neutral1_600, + android.R.color.system_neutral1_700, + android.R.color.system_neutral1_800, + android.R.color.system_neutral1_900, + android.R.color.system_neutral1_1000 +) + +val COLORS_NEUTRAL2 = intArrayOf( + android.R.color.system_neutral2_0, + android.R.color.system_neutral2_10, + android.R.color.system_neutral2_50, + android.R.color.system_neutral2_100, + android.R.color.system_neutral2_200, + android.R.color.system_neutral2_300, + android.R.color.system_neutral2_400, + android.R.color.system_neutral2_500, + android.R.color.system_neutral2_600, + android.R.color.system_neutral2_700, + android.R.color.system_neutral2_800, + android.R.color.system_neutral2_900, + android.R.color.system_neutral2_1000 +) + +var COLORS_ACCENT1 = intArrayOf( + android.R.color.system_accent1_0, + android.R.color.system_accent1_10, + android.R.color.system_accent1_50, + android.R.color.system_accent1_100, + android.R.color.system_accent1_200, + android.R.color.system_accent1_300, + android.R.color.system_accent1_400, + android.R.color.system_accent1_500, + android.R.color.system_accent1_600, + android.R.color.system_accent1_700, + android.R.color.system_accent1_800, + android.R.color.system_accent1_900, + android.R.color.system_accent1_1000 +) + +var COLORS_ACCENT2 = intArrayOf( + android.R.color.system_accent2_0, + android.R.color.system_accent2_10, + android.R.color.system_accent2_50, + android.R.color.system_accent2_100, + android.R.color.system_accent2_200, + android.R.color.system_accent2_300, + android.R.color.system_accent2_400, + android.R.color.system_accent2_500, + android.R.color.system_accent2_600, + android.R.color.system_accent2_700, + android.R.color.system_accent2_800, + android.R.color.system_accent2_900, + android.R.color.system_accent2_1000 +) + +var COLORS_ACCENT3 = intArrayOf( + android.R.color.system_accent3_0, + android.R.color.system_accent3_10, + android.R.color.system_accent3_50, + android.R.color.system_accent3_100, + android.R.color.system_accent3_200, + android.R.color.system_accent3_300, + android.R.color.system_accent3_400, + android.R.color.system_accent3_500, + android.R.color.system_accent3_600, + android.R.color.system_accent3_700, + android.R.color.system_accent3_800, + android.R.color.system_accent3_900, + android.R.color.system_accent3_1000 +) + +var COLOR_NAMES = arrayOf( + "N1", "N2", "A1", "A2", "A3" +) + +var COLORS = arrayOf( + COLORS_NEUTRAL1, + COLORS_NEUTRAL2, + COLORS_ACCENT1, + COLORS_ACCENT2, + COLORS_ACCENT3 +) + +internal fun updateAppWidget( + context: Context, + appWidgetManager: AppWidgetManager, + appWidgetId: Int +) { + // val opts = appWidgetManager.getAppWidgetOptions(appWidgetId) + // Log.v(TAG, "requested sizes=${opts[OPTION_APPWIDGET_SIZES]}") + + val allSizes = mapOf( + SizeF(50f, 50f) + to buildWidget(context, 1, 1, ClickBehavior.LAUNCH), + SizeF(100f, 50f) + to buildWidget(context, 1, 2, ClickBehavior.LAUNCH), + SizeF(150f, 50f) + to buildWidget(context, 1, 3, ClickBehavior.LAUNCH), + SizeF(200f, 50f) + to buildWidget(context, 1, 4, ClickBehavior.LAUNCH), + SizeF(250f, 50f) + to buildWidget(context, 1, 5, ClickBehavior.LAUNCH), + + SizeF(50f, 120f) + to buildWidget(context, 3, 1, ClickBehavior.LAUNCH), + SizeF(100f, 120f) + to buildWidget(context, 3, 2, ClickBehavior.LAUNCH), + SizeF(150f, 120f) + to buildWidget(context, 3, 3, ClickBehavior.LAUNCH), + SizeF(200f, 120f) + to buildWidget(context, 3, 4, ClickBehavior.LAUNCH), + SizeF(250f, 120f) + to buildWidget(context, 3, 5, ClickBehavior.LAUNCH), + + SizeF(50f, 250f) + to buildWidget(context, 5, 1, ClickBehavior.LAUNCH), + SizeF(100f, 250f) + to buildWidget(context, 5, 2, ClickBehavior.LAUNCH), + SizeF(150f, 250f) + to buildWidget(context, 5, 3, ClickBehavior.LAUNCH), + SizeF(200f, 250f) + to buildWidget(context, 5, 4, ClickBehavior.LAUNCH), + SizeF(250f, 250f) + to buildWidget(context, 5, 5, ClickBehavior.LAUNCH), + + SizeF(300f, 300f) + to buildWidget(context, SHADE_NUMBERS.size, COLORS.size, ClickBehavior.LAUNCH) + ) + + // Instruct the widget manager to update the widget + appWidgetManager.updateAppWidget(appWidgetId, RemoteViews(allSizes)) +} + +fun buildFullWidget(context: Context, clickable: ClickBehavior): RemoteViews { + return buildWidget(context, SHADE_NUMBERS.size, COLORS.size, clickable) +} + +fun buildWidget(context: Context, numShades: Int, numColors: Int, clickable: ClickBehavior): + RemoteViews { + val grid = RemoteViews(context.packageName, R.layout.paint_chips_grid) + + // shouldn't be necessary but sometimes the RV instructions get played twice in launcher. + grid.removeAllViews(R.id.paint_grid) + + grid.setInt(R.id.paint_grid, "setRowCount", numShades) + grid.setInt(R.id.paint_grid, "setColumnCount", numColors) + + Log.v(TAG, "building widget: shade rows=$numShades, color columns=$numColors") + + COLORS.forEachIndexed colorLoop@{ i, colorlist -> + when (colorlist) { + COLORS_NEUTRAL1 -> if (numColors < 2) return@colorLoop + COLORS_NEUTRAL2 -> if (numColors < 4) return@colorLoop + COLORS_ACCENT2 -> if (numColors < 3) return@colorLoop + COLORS_ACCENT3 -> if (numColors < 5) return@colorLoop + else -> {} // always do ACCENT1 + } + colorlist.forEachIndexed shadeLoop@{ j, resId -> + when (SHADE_NUMBERS[j]) { + 500 -> {} + 300, 700 -> if (numShades < 3) return@shadeLoop + 100, 900 -> if (numShades < 5) return@shadeLoop + else -> if (numShades < SHADE_NUMBERS.size) return@shadeLoop + } + val cell = RemoteViews(context.packageName, R.layout.paint_chip) + cell.setTextViewText(R.id.chip, "${COLOR_NAMES[i]}-${SHADE_NUMBERS[j]}") + val textColor = if (SHADE_NUMBERS[j] > 500) + colorlist[0] + else colorlist[colorlist.size - 1] + cell.setTextColor(R.id.chip, context.getColor(textColor)) + cell.setColorStateList(R.id.chip, "setBackgroundTintList", resId) + val text = """ + ${COLOR_NAMES[i]}-${SHADE_NUMBERS[j]} (@${ + context.resources.getResourceName(resId) }) + currently: #${ String.format("%06x", context.getColor(resId) and 0xFFFFFF) } + """.trimIndent() + when (clickable) { + ClickBehavior.SHARE -> cell.setOnClickPendingIntent( + R.id.chip, + makeTextSharePendingIntent(context, text) + ) + ClickBehavior.LAUNCH -> cell.setOnClickPendingIntent( + R.id.chip, + makeActivityLaunchPendingIntent(context) + ) + ClickBehavior.NONE -> { } + } + grid.addView(R.id.paint_grid, cell) + } + } + + return grid +} + +enum class ClickBehavior { + NONE, + SHARE, + LAUNCH +} + +fun makeTextSharePendingIntent(context: Context, text: String): PendingIntent { + val shareIntent: Intent = Intent().apply { + action = Intent.ACTION_SEND + putExtra(Intent.EXTRA_TEXT, text) + type = "text/plain" + } + + val chooserIntent = Intent.createChooser(shareIntent, null).apply { + identifier = text // incredible quality-of-life improvement, thanks framework team + } + + return PendingIntent.getActivity(context, 0, chooserIntent, + PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT) +} + +fun makeActivityLaunchPendingIntent(context: Context): PendingIntent { + return PendingIntent.getActivity(context, 0, + Intent().apply { + component = ComponentName(context, PaintChipsActivity::class.java) + action = Intent.ACTION_MAIN + }, + PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT) +} diff --git a/packages/SettingsLib/IllustrationPreference/src/com/android/settingslib/widget/IllustrationPreference.java b/packages/SettingsLib/IllustrationPreference/src/com/android/settingslib/widget/IllustrationPreference.java index f04b0e338959..266fc78b2b6a 100644 --- a/packages/SettingsLib/IllustrationPreference/src/com/android/settingslib/widget/IllustrationPreference.java +++ b/packages/SettingsLib/IllustrationPreference/src/com/android/settingslib/widget/IllustrationPreference.java @@ -267,26 +267,22 @@ public class IllustrationPreference extends Preference { private static void startLottieAnimationWith(LottieAnimationView illustrationView, Uri imageUri) { - try { - final InputStream inputStream = - getInputStreamFromUri(illustrationView.getContext(), imageUri); - illustrationView.setAnimation(inputStream, /* cacheKey= */ null); - illustrationView.setRepeatCount(LottieDrawable.INFINITE); - illustrationView.playAnimation(); - } catch (IllegalStateException e) { - Log.w(TAG, "Invalid illustration image uri: " + imageUri, e); - } + final InputStream inputStream = + getInputStreamFromUri(illustrationView.getContext(), imageUri); + illustrationView.setFailureListener( + result -> Log.w(TAG, "Invalid illustration image uri: " + imageUri, result)); + illustrationView.setAnimation(inputStream, /* cacheKey= */ null); + illustrationView.setRepeatCount(LottieDrawable.INFINITE); + illustrationView.playAnimation(); } private static void startLottieAnimationWith(LottieAnimationView illustrationView, @RawRes int rawRes) { - try { - illustrationView.setAnimation(rawRes); - illustrationView.setRepeatCount(LottieDrawable.INFINITE); - illustrationView.playAnimation(); - } catch (IllegalStateException e) { - Log.w(TAG, "Invalid illustration resource id: " + rawRes, e); - } + illustrationView.setFailureListener( + result -> Log.w(TAG, "Invalid illustration resource id: " + rawRes, result)); + illustrationView.setAnimation(rawRes); + illustrationView.setRepeatCount(LottieDrawable.INFINITE); + illustrationView.playAnimation(); } private static void resetAnimations(LottieAnimationView illustrationView) { diff --git a/packages/SettingsLib/res/values-be/strings.xml b/packages/SettingsLib/res/values-be/strings.xml index 710ca3229e00..08ca17fd802d 100644 --- a/packages/SettingsLib/res/values-be/strings.xml +++ b/packages/SettingsLib/res/values-be/strings.xml @@ -172,7 +172,7 @@ <string name="tts_engine_security_warning" msgid="3372432853837988146">"Гэты модуль сінтэзу гаворкі можа збіраць увесь тэкст, які будзе прамоўлены, у тым ліку асабістыя дадзеныя, напрыклад паролі і нумары крэдытных карт. Ён адносіцца да модуля <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. Уключыць гэты модуль сінтэзу гаворкі?"</string> <string name="tts_engine_network_required" msgid="8722087649733906851">"Гэта мова патрабуе актыўнага падключэння да сеткі, каб выконваць функцыю прамаўлення тэксту."</string> <string name="tts_default_sample_string" msgid="6388016028292967973">"Гэта прыклад сінтэзу гаворкі"</string> - <string name="tts_status_title" msgid="8190784181389278640">"Статус мовы па змаўчанні"</string> + <string name="tts_status_title" msgid="8190784181389278640">"Статус стандартнай мовы"</string> <string name="tts_status_ok" msgid="8583076006537547379">"<xliff:g id="LOCALE">%1$s</xliff:g> цалкам падтрымліваецца"</string> <string name="tts_status_requires_network" msgid="8327617638884678896">"Для <xliff:g id="LOCALE">%1$s</xliff:g> патрабуецца падлучэнне да сеткі"</string> <string name="tts_status_not_supported" msgid="2702997696245523743">"<xliff:g id="LOCALE">%1$s</xliff:g> не падтрымліваецца"</string> @@ -388,7 +388,7 @@ <string name="local_backup_password_toast_validation_failure" msgid="714669442363647122">"Збой пры ўсталёўцы паролю для рэзервовага капіявання"</string> <string name="loading_injected_setting_summary" msgid="8394446285689070348">"Ідзе загрузка…"</string> <string-array name="color_mode_names"> - <item msgid="3836559907767149216">"Сочны (па змаўчанні)"</item> + <item msgid="3836559907767149216">"Насычаны (стандартна)"</item> <item msgid="9112200311983078311">"Натуральныя"</item> <item msgid="6564241960833766170">"Стандартны"</item> </string-array> diff --git a/packages/SettingsLib/res/values-gu/strings.xml b/packages/SettingsLib/res/values-gu/strings.xml index 8052e2aa2984..ac078fdcb585 100644 --- a/packages/SettingsLib/res/values-gu/strings.xml +++ b/packages/SettingsLib/res/values-gu/strings.xml @@ -85,7 +85,7 @@ <string name="bluetooth_profile_a2dp" msgid="4632426382762851724">"મીડિયા ઑડિયો"</string> <string name="bluetooth_profile_headset" msgid="5395952236133499331">"ફોન કૉલ"</string> <string name="bluetooth_profile_opp" msgid="6692618568149493430">"ફાઇલ સ્થાનાંતરણ"</string> - <string name="bluetooth_profile_hid" msgid="2969922922664315866">"ઇનપુટ ઉપકરણ"</string> + <string name="bluetooth_profile_hid" msgid="2969922922664315866">"ઇનપુટ ડિવાઇસ"</string> <string name="bluetooth_profile_pan" msgid="1006235139308318188">"ઇન્ટરનેટ ઍક્સેસ"</string> <string name="bluetooth_profile_pbap" msgid="7064307749579335765">"સંપર્ક શેરિંગ"</string> <string name="bluetooth_profile_pbap_summary" msgid="2955819694801952056">"સંપર્ક શેરિંગ માટે ઉપયોગ કરો"</string> @@ -102,7 +102,7 @@ <string name="bluetooth_map_profile_summary_connected" msgid="4141725591784669181">"નકશા સાથે કનેક્ટ થયું"</string> <string name="bluetooth_sap_profile_summary_connected" msgid="1280297388033001037">"SAP થી કનેક્ટ કરેલ"</string> <string name="bluetooth_opp_profile_summary_not_connected" msgid="3959741824627764954">"ફાઇલ સ્થાનાંતરણ સેવાથી કનેક્ટ થયેલ નથી"</string> - <string name="bluetooth_hid_profile_summary_connected" msgid="3923653977051684833">"ઇનપુટ ઉપકરણ સાથે કનેક્ટ થયાં"</string> + <string name="bluetooth_hid_profile_summary_connected" msgid="3923653977051684833">"ઇનપુટ ડિવાઇસ સાથે કનેક્ટ થયાં"</string> <string name="bluetooth_pan_user_profile_summary_connected" msgid="380469653827505727">"ઇન્ટરનેટ ઍક્સેસ માટે ઉપકરણથી કનેક્ટેડ છીએ"</string> <string name="bluetooth_pan_nap_profile_summary_connected" msgid="3744773111299503493">"ઉપકરણ સાથે સ્થાનિક ઇન્ટરનેટ કનેક્શન શેર કરી રહ્યાં છીએ"</string> <string name="bluetooth_pan_profile_summary_use_for" msgid="7422039765025340313">"ઇન્ટરનેટ ઍક્સેસ માટે ઉપયોગ કરો"</string> @@ -155,7 +155,7 @@ <string name="running_process_item_user_label" msgid="3988506293099805796">"વપરાશકર્તા: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string> <string name="launch_defaults_some" msgid="3631650616557252926">"કેટલાંક ડિફોલ્ટ્સ સેટ કરેલ છે"</string> <string name="launch_defaults_none" msgid="8049374306261262709">"કોઈ ડિફૉલ્ટ સેટ કરેલા નથી"</string> - <string name="tts_settings" msgid="8130616705989351312">"ટેક્સ્ટ-ટુ-સ્પીચ સેટિંગ્સ"</string> + <string name="tts_settings" msgid="8130616705989351312">"ટેક્સ્ટ ટૂ સ્પીચ સેટિંગ"</string> <string name="tts_settings_title" msgid="7602210956640483039">"ટેક્સ્ટ ટુ સ્પીચ આઉટપુટ"</string> <string name="tts_default_rate_title" msgid="3964187817364304022">"વાણી દર"</string> <string name="tts_default_rate_summary" msgid="3781937042151716987">"ટેક્સ્ટ બોલાયેલ છે તે ઝડપ"</string> @@ -177,8 +177,8 @@ <string name="tts_status_requires_network" msgid="8327617638884678896">"<xliff:g id="LOCALE">%1$s</xliff:g> નેટવર્ક કનેક્શનની આવશ્યકતા છે"</string> <string name="tts_status_not_supported" msgid="2702997696245523743">"<xliff:g id="LOCALE">%1$s</xliff:g> સમર્થિત નથી"</string> <string name="tts_status_checking" msgid="8026559918948285013">"તપાસી રહ્યું છે..."</string> - <string name="tts_engine_settings_title" msgid="7849477533103566291">"<xliff:g id="TTS_ENGINE_NAME">%s</xliff:g> માટેની સેટિંગ્સ"</string> - <string name="tts_engine_settings_button" msgid="477155276199968948">"એન્જિન સેટિંગ્સ લોંચ કરો"</string> + <string name="tts_engine_settings_title" msgid="7849477533103566291">"<xliff:g id="TTS_ENGINE_NAME">%s</xliff:g> માટેના સેટિંગ"</string> + <string name="tts_engine_settings_button" msgid="477155276199968948">"એન્જિન સેટિંગ લૉન્ચ કરો"</string> <string name="tts_engine_preference_section_title" msgid="3861562305498624904">"મનપસંદ એન્જિન"</string> <string name="tts_general_section_title" msgid="8919671529502364567">"સામાન્ય"</string> <string name="tts_reset_speech_pitch_title" msgid="7149398585468413246">"સ્પીચની પિચ ફરીથી સેટ કરો"</string> @@ -201,9 +201,9 @@ <string name="development_settings_enable" msgid="4285094651288242183">"વિકાસકર્તાનાં વિકલ્પો સક્ષમ કરો"</string> <string name="development_settings_summary" msgid="8718917813868735095">"ઍપ્લિકેશન વિકાસ માટે વિકલ્પો સેટ કરો"</string> <string name="development_settings_not_available" msgid="355070198089140951">"આ વપરાશકર્તા માટે વિકાસકર્તા વિકલ્પો ઉપલબ્ધ નથી"</string> - <string name="vpn_settings_not_available" msgid="2894137119965668920">"આ વપરાશકર્તા માટે VPN સેટિંગ્સ ઉપલબ્ધ નથી"</string> - <string name="tethering_settings_not_available" msgid="266821736434699780">"આ વપરાશકર્તા માટે ટિથરિંગ સેટિંગ્સ ઉપલબ્ધ નથી"</string> - <string name="apn_settings_not_available" msgid="1147111671403342300">"અૅક્સેસ પોઇન્ટનું નામ સેટિંગ્સ આ વપરાશકર્તા માટે ઉપલબ્ધ નથી"</string> + <string name="vpn_settings_not_available" msgid="2894137119965668920">"આ વપરાશકર્તા માટે VPN સેટિંગ ઉપલબ્ધ નથી"</string> + <string name="tethering_settings_not_available" msgid="266821736434699780">"આ વપરાશકર્તા માટે ટિથરિંગ સેટિંગ ઉપલબ્ધ નથી"</string> + <string name="apn_settings_not_available" msgid="1147111671403342300">"અૅક્સેસ પૉઇન્ટનું નામ સેટિંગ આ વપરાશકર્તા માટે ઉપલબ્ધ નથી"</string> <string name="enable_adb" msgid="8072776357237289039">"USB ડિબગીંગ"</string> <string name="enable_adb_summary" msgid="3711526030096574316">"જ્યારે USB કનેક્ટ કરેલું હોય ત્યારે ડિબગ મોડ"</string> <string name="clear_adb_keys" msgid="3010148733140369917">"USB ડીબગિંગ પ્રમાણીકરણોને રદબાતલ કરો"</string> @@ -259,7 +259,7 @@ <string name="bluetooth_disable_absolute_volume" msgid="1452342324349203434">"ચોક્કસ વૉલ્યૂમને બંધ કરો"</string> <string name="bluetooth_enable_gabeldorsche" msgid="9131730396242883416">"Gabeldorsche ચાલુ કરો"</string> <string name="bluetooth_select_avrcp_version_string" msgid="1710571610177659127">"બ્લૂટૂથ AVRCP વર્ઝન"</string> - <string name="bluetooth_select_avrcp_version_dialog_title" msgid="7846922290083709633">"બ્લૂટૂથ AVRCP સંસ્કરણ પસંદ કરો"</string> + <string name="bluetooth_select_avrcp_version_dialog_title" msgid="7846922290083709633">"બ્લૂટૂથ AVRCP વર્ઝન પસંદ કરો"</string> <string name="bluetooth_select_map_version_string" msgid="526308145174175327">"બ્લૂટૂથ MAP વર્ઝન"</string> <string name="bluetooth_select_map_version_dialog_title" msgid="7085934373987428460">"બ્લૂટૂથ MAP વર્ઝન પસંદ કરો"</string> <string name="bluetooth_select_a2dp_codec_type" msgid="952001408455456494">"બ્લૂટૂથ ઑડિયો કોડેક"</string> @@ -301,12 +301,12 @@ <string name="mobile_data_always_on_summary" msgid="1112156365594371019">"વાઇ-ફાઇ સક્રિય હોય ત્યારે પણ, હંમેશા મોબાઇલ ડેટાને સક્રિય રાખો (ઝડપી નેટવર્ક સ્વિચિંગ માટે)."</string> <string name="tethering_hardware_offload_summary" msgid="7801345335142803029">"જો ટિથરિંગ માટે હાર્ડવેર ગતિવૃદ્ધિ ઉપલબ્ધ હોય તો તેનો ઉપયોગ કરો"</string> <string name="adb_warning_title" msgid="7708653449506485728">"USB ડિબગિંગને મંજૂરી આપીએ?"</string> - <string name="adb_warning_message" msgid="8145270656419669221">"USB ડિબગીંગ ફક્ત વિકાસ હેતુઓ માટે જ બનાવાયેલ છે. તેનો ઉપયોગ તમારા કમ્પ્યુટર અને તમારા ઉપકરણ વચ્ચે ડેટાને કૉપિ કરવા, નોટિફિકેશન વગર તમારા ઉપકરણ પર ઍપ્લિકેશનો ઇન્સ્ટોલ કરવા અને લૉગ ડેટા વાંચવા માટે કરો."</string> + <string name="adb_warning_message" msgid="8145270656419669221">"USB ડિબગીંગ ફક્ત વિકાસ હેતુઓ માટે જ બનાવાયેલ છે. તેનો ઉપયોગ તમારા કમ્પ્યુટર અને તમારા ડિવાઇસ વચ્ચે ડેટાને કૉપિ કરવા, નોટિફિકેશન વગર તમારા ડિવાઇસ પર ઍપ ઇન્સ્ટોલ કરવા અને લૉગ ડેટા વાંચવા માટે કરો."</string> <string name="adbwifi_warning_title" msgid="727104571653031865">"વાયરલેસ ડિબગીંગને મંજૂરી આપીએ?"</string> <string name="adbwifi_warning_message" msgid="8005936574322702388">"વાયરલેસ ડિબગીંગ ફક્ત ડેવલપમેન્ટના હેતુઓ માટે જ બનાવાયું છે. તેનો ઉપયોગ તમારા કમ્પ્યુટર અને તમારા ડિવાઇસ વચ્ચે ડેટાને કૉપિ કરવા, નોટિફિકેશન વગર તમારા ડિવાઇસ પર ઍપને ઇન્સ્ટૉલ કરવા અને લૉગ ડેટા વાંચવા માટે કરો."</string> <string name="adb_keys_warning_message" msgid="2968555274488101220">"તમે અગાઉ અધિકૃત કરેલા તમામ કમ્પ્યુટર્સમાંથી USB ડિબગિંગ પરની અૅક્સેસ રદબાતલ કરીએ?"</string> - <string name="dev_settings_warning_title" msgid="8251234890169074553">"વિકાસ સેટિંગ્સને મંજૂરી આપીએ?"</string> - <string name="dev_settings_warning_message" msgid="37741686486073668">"આ સેટિંગ્સ ફક્ત વિકાસનાં ઉપયોગ માટે જ હેતુબદ્ધ છે. તે તમારા ઉપકરણ અને તેના પરની એપ્લિકેશન્સનાં ભંગ થવા અથવા ખરાબ વર્તનનું કારણ બની શકે છે."</string> + <string name="dev_settings_warning_title" msgid="8251234890169074553">"ડેવલપમેન્ટ સેટિંગને મંજૂરી આપીએ?"</string> + <string name="dev_settings_warning_message" msgid="37741686486073668">"આ સેટિંગ ફક્ત વિકાસનાં ઉપયોગ માટે જ હેતુબદ્ધ છે. તે તમારા ડિવાઇસ અને તેના પરની ઍપના ભંગ થવા અથવા ખરાબ વર્તનનું કારણ બની શકે છે."</string> <string name="verify_apps_over_usb_title" msgid="6031809675604442636">"USB પર ઍપ ચકાસો"</string> <string name="verify_apps_over_usb_summary" msgid="1317933737581167839">"હાનિકારક વર્તણૂંક માટે ADB/ADT મારફતે ઇન્સ્ટોલ કરવામાં આવેલી ઍપ તપાસો."</string> <string name="bluetooth_show_devices_without_names_summary" msgid="780964354377854507">"નામ વગરના (ફક્ત MAC ઍડ્રેસવાળા) બ્લૂટૂથ ડિવાઇસ બતાવવામાં આવશે"</string> @@ -468,7 +468,7 @@ <string name="external_source_trusted" msgid="1146522036773132905">"મંજૂરી છે"</string> <string name="external_source_untrusted" msgid="5037891688911672227">"મંજૂરી નથી"</string> <string name="install_other_apps" msgid="3232595082023199454">"અજાણી ઍપ ઇન્સ્ટૉલ કરો"</string> - <string name="home" msgid="973834627243661438">"સેટિંગ્સ હોમ"</string> + <string name="home" msgid="973834627243661438">"સેટિંગ હોમ"</string> <string-array name="battery_labels"> <item msgid="7878690469765357158">"0%"</item> <item msgid="8894873528875953317">"50%"</item> @@ -488,7 +488,7 @@ <string name="retail_demo_reset_title" msgid="1866911701095959800">"પાસવર્ડ આવશ્યક છે"</string> <string name="active_input_method_subtypes" msgid="4232680535471633046">"ઇનપુટ પદ્ધતિઓ સક્રિય કરો"</string> <string name="use_system_language_to_select_input_method_subtypes" msgid="4865195835541387040">"સિસ્ટમ ભાષાઓનો ઉપયોગ કરો"</string> - <string name="failed_to_open_app_settings_toast" msgid="764897252657692092">"<xliff:g id="SPELL_APPLICATION_NAME">%1$s</xliff:g> માટેની સેટિંગ્સ ખોલવામાં નિષ્ફળ"</string> + <string name="failed_to_open_app_settings_toast" msgid="764897252657692092">"<xliff:g id="SPELL_APPLICATION_NAME">%1$s</xliff:g> માટેના સેટિંગ ખોલવામાં નિષ્ફળ"</string> <string name="ime_security_warning" msgid="6547562217880551450">"આ ઇનપુટ પદ્ધતિ પાસવર્ડ્સ અને ક્રેડિટ કાર્ડ નંબર જેવી વ્યક્તિગત માહિતી સહિત તમે લખો છો તે તમામ ટેક્સ્ટ એકત્રિત કરવા માટે સક્ષમ હોઈ શકે છે. તે ઍપ્લિકેશન <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g> માંથી આવે છે. આ ઇનપુટ પદ્ધતિ વાપરીએ?"</string> <string name="direct_boot_unaware_dialog_message" msgid="7845398276735021548">"નોંધ: રીબૂટ કર્યાં પછી, જ્યાં સુધી તમે તમારો ફોન અનલૉક કરશો નહીં ત્યાં સુધી આ ઍપ્લિકેશન શરૂ થઈ શકશે નહીં"</string> <string name="ims_reg_title" msgid="8197592958123671062">"IMS રજિસ્ટ્રેશનની સ્થિતિ"</string> diff --git a/packages/SettingsLib/res/values-mn/strings.xml b/packages/SettingsLib/res/values-mn/strings.xml index 5ac22ffbf751..25769936ebfc 100644 --- a/packages/SettingsLib/res/values-mn/strings.xml +++ b/packages/SettingsLib/res/values-mn/strings.xml @@ -155,8 +155,8 @@ <string name="running_process_item_user_label" msgid="3988506293099805796">"Хэрэглэгч: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string> <string name="launch_defaults_some" msgid="3631650616557252926">"Зарим үндсэн тохиргоонуудыг суулгасан"</string> <string name="launch_defaults_none" msgid="8049374306261262709">"Ямар ч үндсэн тохиргоог суулгаагүй байна"</string> - <string name="tts_settings" msgid="8130616705989351312">"Текст-ярианы тохиргоо"</string> - <string name="tts_settings_title" msgid="7602210956640483039">"Текстийг яриа болгон гаргах"</string> + <string name="tts_settings" msgid="8130616705989351312">"Бичвэрийг ярианд хувиргах тохиргоо"</string> + <string name="tts_settings_title" msgid="7602210956640483039">"Бичвэрийг ярианд хувиргах"</string> <string name="tts_default_rate_title" msgid="3964187817364304022">"Ярианы түвшин"</string> <string name="tts_default_rate_summary" msgid="3781937042151716987">"Текстийг унших хурд"</string> <string name="tts_default_pitch_title" msgid="6988592215554485479">"Авиа тон"</string> @@ -170,7 +170,7 @@ <string name="tts_install_data_title" msgid="1829942496472751703">"Хоолойн өгөгдлийг суулгах"</string> <string name="tts_install_data_summary" msgid="3608874324992243851">"Яриа үүсгэхэд шаардлагатай дууны өгөгдлийг суулгах"</string> <string name="tts_engine_security_warning" msgid="3372432853837988146">"Энэ яриа үүсгүүр нь нууц үг, зээлийн картын дугаар гэх мэт таны хувийн мэдээллийг оруулан унших бүх текстийг цуглуулах боломжтой. Үүнийг <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> үүсгүүрээс нийлүүлдэг. Энэ яриа үүсгүүрийн ашиглалтыг идэвхжүүлэх үү?"</string> - <string name="tts_engine_network_required" msgid="8722087649733906851">"Энэ хэл нь текстээс дуунд хөрвүүлэхэд ажлын сүлжээний холболтыг шаарддаг."</string> + <string name="tts_engine_network_required" msgid="8722087649733906851">"Энэ хэл нь бичвэрийг ярианд хувиргахад ажлын сүлжээний холболт шаардана."</string> <string name="tts_default_sample_string" msgid="6388016028292967973">"Энэ бол яриа үүсгэх жишээ юм."</string> <string name="tts_status_title" msgid="8190784181389278640">"Үндсэн хэлний статус"</string> <string name="tts_status_ok" msgid="8583076006537547379">"<xliff:g id="LOCALE">%1$s</xliff:g> бүрэн дэмжигдсэн"</string> diff --git a/packages/SettingsLib/res/values-pl/arrays.xml b/packages/SettingsLib/res/values-pl/arrays.xml index db621be9a36b..22b05399346b 100644 --- a/packages/SettingsLib/res/values-pl/arrays.xml +++ b/packages/SettingsLib/res/values-pl/arrays.xml @@ -247,7 +247,7 @@ <item msgid="5023908510820531131">"W: <xliff:g id="AS_TYPED_COMMAND">adb shell dumpsys gfxinfo</xliff:g>"</item> </string-array> <string-array name="debug_hw_overdraw_entries"> - <item msgid="1968128556747588800">"Wył."</item> + <item msgid="1968128556747588800">"Wyłączone"</item> <item msgid="3033215374382962216">"Pokaż przerysowywane obszary"</item> <item msgid="3474333938380896988">"Pokaż obszary dostosowane do deuteranomalii"</item> </string-array> diff --git a/packages/SettingsLib/res/values-sl/strings.xml b/packages/SettingsLib/res/values-sl/strings.xml index 490d3aaef0e2..055760dae173 100644 --- a/packages/SettingsLib/res/values-sl/strings.xml +++ b/packages/SettingsLib/res/values-sl/strings.xml @@ -88,8 +88,8 @@ <string name="bluetooth_profile_hid" msgid="2969922922664315866">"Vnosna naprava"</string> <string name="bluetooth_profile_pan" msgid="1006235139308318188">"Internetni dostop"</string> <string name="bluetooth_profile_pbap" msgid="7064307749579335765">"Deljenje stikov"</string> - <string name="bluetooth_profile_pbap_summary" msgid="2955819694801952056">"Uporabi za dajanje stikov v skupno rabo"</string> - <string name="bluetooth_profile_pan_nap" msgid="7871974753822470050">"Skupna raba internetne povezave"</string> + <string name="bluetooth_profile_pbap_summary" msgid="2955819694801952056">"Uporabi za deljenje stikov"</string> + <string name="bluetooth_profile_pan_nap" msgid="7871974753822470050">"Deljenje internetne povezave"</string> <string name="bluetooth_profile_map" msgid="8907204701162107271">"Sporočila SMS"</string> <string name="bluetooth_profile_sap" msgid="8304170950447934386">"Dostop do kartice SIM"</string> <string name="bluetooth_profile_a2dp_high_quality" msgid="4739440941324792775">"Zvok visoke kakovosti: <xliff:g id="CODEC_NAME">%1$s</xliff:g>"</string> @@ -104,7 +104,7 @@ <string name="bluetooth_opp_profile_summary_not_connected" msgid="3959741824627764954">"Povezava s strežnikom za prenos datotek ni vzpostavljena"</string> <string name="bluetooth_hid_profile_summary_connected" msgid="3923653977051684833">"Povezava z vnosno napravo je vzpostavljena"</string> <string name="bluetooth_pan_user_profile_summary_connected" msgid="380469653827505727">"Povezava z napravo za internetni dostop"</string> - <string name="bluetooth_pan_nap_profile_summary_connected" msgid="3744773111299503493">"Skupna raba lok. internetne povezave z napravo"</string> + <string name="bluetooth_pan_nap_profile_summary_connected" msgid="3744773111299503493">"Deljenje lok. internetne povezave z napravo"</string> <string name="bluetooth_pan_profile_summary_use_for" msgid="7422039765025340313">"Uporabi za dostop do interneta"</string> <string name="bluetooth_map_profile_summary_use_for" msgid="4453622103977592583">"Uporabi za zemljevid"</string> <string name="bluetooth_sap_profile_summary_use_for" msgid="6204902866176714046">"Uporablja se za dostop do kartice SIM"</string> diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/IllustrationPreferenceTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/IllustrationPreferenceTest.java index ea9be04527be..9e3312ae2ddf 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/IllustrationPreferenceTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/IllustrationPreferenceTest.java @@ -18,6 +18,8 @@ package com.android.settingslib.widget; import static com.google.common.truth.Truth.assertThat; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; @@ -130,4 +132,27 @@ public class IllustrationPreferenceTest { verify(drawable).start(); } + + @Test + public void playLottieAnimationWithUri_verifyFailureListener() { + doReturn(null).when(mAnimationView).getDrawable(); + + mPreference.setImageUri(mImageUri); + mPreference.onBindViewHolder(mViewHolder); + + verify(mAnimationView).setFailureListener(any()); + } + + @Test + public void playLottieAnimationWithResource_verifyFailureListener() { + // fake the valid lottie image + final int fakeValidResId = 111; + doNothing().when(mAnimationView).setImageResource(fakeValidResId); + doReturn(null).when(mAnimationView).getDrawable(); + + mPreference.setLottieAnimationResId(fakeValidResId); + mPreference.onBindViewHolder(mViewHolder); + + verify(mAnimationView).setFailureListener(any()); + } } diff --git a/packages/SettingsProvider/res/values-gu/strings.xml b/packages/SettingsProvider/res/values-gu/strings.xml index 1f91f71be546..dded10ea7006 100644 --- a/packages/SettingsProvider/res/values-gu/strings.xml +++ b/packages/SettingsProvider/res/values-gu/strings.xml @@ -19,7 +19,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="app_label" msgid="4567566098528588863">"સેટિંગ્સ સંગ્રહ"</string> + <string name="app_label" msgid="4567566098528588863">"સેટિંગ સ્ટોરેજ"</string> <string name="wifi_softap_config_change" msgid="5688373762357941645">"હૉટસ્પૉટ સેટિંગ બદલાઈ ગઈ છે"</string> <string name="wifi_softap_config_change_summary" msgid="8946397286141531087">"વિગતો જોવા માટે ટૅપ કરો"</string> </resources> diff --git a/packages/Shell/res/values-sl/strings.xml b/packages/Shell/res/values-sl/strings.xml index 1fc27ca3d391..76702d6ccba2 100644 --- a/packages/Shell/res/values-sl/strings.xml +++ b/packages/Shell/res/values-sl/strings.xml @@ -24,7 +24,7 @@ <string name="bugreport_updating_wait" msgid="3322151947853929470">"Počakajte ..."</string> <string name="bugreport_finished_text" product="watch" msgid="1223616207145252689">"Poročilo o napakah bo kmalu prikazano v telefonu"</string> <string name="bugreport_finished_text" product="tv" msgid="5758325479058638893">"Izberite za pošiljanje poročila o napakah"</string> - <string name="bugreport_finished_text" product="default" msgid="8353769438382138847">"Dotaknite se, če želite poročilo o napaki dati v skupno rabo"</string> + <string name="bugreport_finished_text" product="default" msgid="8353769438382138847">"Dotaknite se, če želite deliti poročilo o napaki"</string> <string name="bugreport_finished_pending_screenshot_text" product="tv" msgid="2343263822812016950">"Izberite za pošiljanje poročila o napakah brez posnetka zaslona ali počakajte, da se ta dokonča"</string> <string name="bugreport_finished_pending_screenshot_text" product="watch" msgid="1474435374470177193">"Dotaknite se za pošiljanje poročila o napakah brez posnetka zaslona ali počakajte, da se ta dokonča"</string> <string name="bugreport_finished_pending_screenshot_text" product="default" msgid="1474435374470177193">"Dotaknite se za pošiljanje poročila o napakah brez posnetka zaslona ali počakajte, da se ta dokonča"</string> diff --git a/packages/SystemUI/plugin/src/com/android/systemui/plugins/qs/QS.java b/packages/SystemUI/plugin/src/com/android/systemui/plugins/qs/QS.java index bd2209b0d292..0424382a1b88 100644 --- a/packages/SystemUI/plugin/src/com/android/systemui/plugins/qs/QS.java +++ b/packages/SystemUI/plugin/src/com/android/systemui/plugins/qs/QS.java @@ -52,13 +52,6 @@ public interface QS extends FragmentBase { void setListening(boolean listening); boolean isShowingDetail(); void closeDetail(); - - /** - * Set that we're currently pulse expanding - * - * @param pulseExpanding if we're currently expanding during pulsing - */ - default void setPulseExpanding(boolean pulseExpanding) {} void animateHeaderSlidingOut(); void setQsExpansion(float qsExpansionFraction, float headerTranslation); void setHeaderListening(boolean listening); diff --git a/packages/SystemUI/res-keyguard/values-en-rAU/strings.xml b/packages/SystemUI/res-keyguard/values-en-rAU/strings.xml index 1abd3931ce7b..009b7cbcaf19 100644 --- a/packages/SystemUI/res-keyguard/values-en-rAU/strings.xml +++ b/packages/SystemUI/res-keyguard/values-en-rAU/strings.xml @@ -74,7 +74,7 @@ <string name="kg_sim_lock_esim_instructions" msgid="5577169988158738030">"<xliff:g id="PREVIOUS_MSG">%1$s</xliff:g> Disable eSIM to use device without mobile service."</string> <string name="kg_pin_instructions" msgid="822353548385014361">"Enter PIN"</string> <string name="kg_password_instructions" msgid="324455062831719903">"Enter Password"</string> - <string name="kg_puk_enter_puk_hint" msgid="3005288372875367017">"SIM is now disabled. Enter PUK code to continue. Contact carrier for details."</string> + <string name="kg_puk_enter_puk_hint" msgid="3005288372875367017">"SIM is now disabled. Enter PUK code to continue. Contact operator for details."</string> <string name="kg_puk_enter_puk_hint_multi" msgid="4876780689904862943">"SIM \"<xliff:g id="CARRIER">%1$s</xliff:g>\" is now disabled. Enter PUK code to continue. Contact operator for details."</string> <string name="kg_puk_enter_pin_hint" msgid="6028432138916150399">"Enter desired PIN code"</string> <string name="kg_enter_confirm_pin_hint" msgid="4261064020391799132">"Confirm desired PIN code"</string> diff --git a/packages/SystemUI/res-keyguard/values-en-rCA/strings.xml b/packages/SystemUI/res-keyguard/values-en-rCA/strings.xml index c3e8e61cf81d..21f32cf59ad1 100644 --- a/packages/SystemUI/res-keyguard/values-en-rCA/strings.xml +++ b/packages/SystemUI/res-keyguard/values-en-rCA/strings.xml @@ -74,7 +74,7 @@ <string name="kg_sim_lock_esim_instructions" msgid="5577169988158738030">"<xliff:g id="PREVIOUS_MSG">%1$s</xliff:g> Disable eSIM to use device without mobile service."</string> <string name="kg_pin_instructions" msgid="822353548385014361">"Enter PIN"</string> <string name="kg_password_instructions" msgid="324455062831719903">"Enter Password"</string> - <string name="kg_puk_enter_puk_hint" msgid="3005288372875367017">"SIM is now disabled. Enter PUK code to continue. Contact carrier for details."</string> + <string name="kg_puk_enter_puk_hint" msgid="3005288372875367017">"SIM is now disabled. Enter PUK code to continue. Contact operator for details."</string> <string name="kg_puk_enter_puk_hint_multi" msgid="4876780689904862943">"SIM \"<xliff:g id="CARRIER">%1$s</xliff:g>\" is now disabled. Enter PUK code to continue. Contact operator for details."</string> <string name="kg_puk_enter_pin_hint" msgid="6028432138916150399">"Enter desired PIN code"</string> <string name="kg_enter_confirm_pin_hint" msgid="4261064020391799132">"Confirm desired PIN code"</string> diff --git a/packages/SystemUI/res-keyguard/values-en-rGB/strings.xml b/packages/SystemUI/res-keyguard/values-en-rGB/strings.xml index 1abd3931ce7b..009b7cbcaf19 100644 --- a/packages/SystemUI/res-keyguard/values-en-rGB/strings.xml +++ b/packages/SystemUI/res-keyguard/values-en-rGB/strings.xml @@ -74,7 +74,7 @@ <string name="kg_sim_lock_esim_instructions" msgid="5577169988158738030">"<xliff:g id="PREVIOUS_MSG">%1$s</xliff:g> Disable eSIM to use device without mobile service."</string> <string name="kg_pin_instructions" msgid="822353548385014361">"Enter PIN"</string> <string name="kg_password_instructions" msgid="324455062831719903">"Enter Password"</string> - <string name="kg_puk_enter_puk_hint" msgid="3005288372875367017">"SIM is now disabled. Enter PUK code to continue. Contact carrier for details."</string> + <string name="kg_puk_enter_puk_hint" msgid="3005288372875367017">"SIM is now disabled. Enter PUK code to continue. Contact operator for details."</string> <string name="kg_puk_enter_puk_hint_multi" msgid="4876780689904862943">"SIM \"<xliff:g id="CARRIER">%1$s</xliff:g>\" is now disabled. Enter PUK code to continue. Contact operator for details."</string> <string name="kg_puk_enter_pin_hint" msgid="6028432138916150399">"Enter desired PIN code"</string> <string name="kg_enter_confirm_pin_hint" msgid="4261064020391799132">"Confirm desired PIN code"</string> diff --git a/packages/SystemUI/res-keyguard/values-en-rIN/strings.xml b/packages/SystemUI/res-keyguard/values-en-rIN/strings.xml index 1abd3931ce7b..009b7cbcaf19 100644 --- a/packages/SystemUI/res-keyguard/values-en-rIN/strings.xml +++ b/packages/SystemUI/res-keyguard/values-en-rIN/strings.xml @@ -74,7 +74,7 @@ <string name="kg_sim_lock_esim_instructions" msgid="5577169988158738030">"<xliff:g id="PREVIOUS_MSG">%1$s</xliff:g> Disable eSIM to use device without mobile service."</string> <string name="kg_pin_instructions" msgid="822353548385014361">"Enter PIN"</string> <string name="kg_password_instructions" msgid="324455062831719903">"Enter Password"</string> - <string name="kg_puk_enter_puk_hint" msgid="3005288372875367017">"SIM is now disabled. Enter PUK code to continue. Contact carrier for details."</string> + <string name="kg_puk_enter_puk_hint" msgid="3005288372875367017">"SIM is now disabled. Enter PUK code to continue. Contact operator for details."</string> <string name="kg_puk_enter_puk_hint_multi" msgid="4876780689904862943">"SIM \"<xliff:g id="CARRIER">%1$s</xliff:g>\" is now disabled. Enter PUK code to continue. Contact operator for details."</string> <string name="kg_puk_enter_pin_hint" msgid="6028432138916150399">"Enter desired PIN code"</string> <string name="kg_enter_confirm_pin_hint" msgid="4261064020391799132">"Confirm desired PIN code"</string> diff --git a/packages/SystemUI/res-keyguard/values-sv/strings.xml b/packages/SystemUI/res-keyguard/values-sv/strings.xml index 0b1efa84e369..fb2571e157b2 100644 --- a/packages/SystemUI/res-keyguard/values-sv/strings.xml +++ b/packages/SystemUI/res-keyguard/values-sv/strings.xml @@ -61,7 +61,7 @@ <string name="error_disable_esim_msg" msgid="2441188596467999327">"Det gick inte att inaktivera eSIM-kortet på grund av ett fel."</string> <string name="keyboardview_keycode_enter" msgid="6727192265631761174">"Retur"</string> <string name="kg_forgot_pattern_button_text" msgid="3304688032024541260">"Har du glömt ditt grafiska lösenord?"</string> - <string name="kg_wrong_pattern" msgid="5907301342430102842">"Fel grafiskt lösenord"</string> + <string name="kg_wrong_pattern" msgid="5907301342430102842">"Fel mönster"</string> <string name="kg_wrong_password" msgid="4143127991071670512">"Fel lösenord"</string> <string name="kg_wrong_pin" msgid="4160978845968732624">"Fel pinkod"</string> <plurals name="kg_too_many_failed_attempts_countdown" formatted="false" msgid="991400408675793914"> @@ -82,7 +82,7 @@ <string name="kg_invalid_sim_pin_hint" msgid="2762202646949552978">"Ange en pinkod med fyra till åtta siffror."</string> <string name="kg_invalid_sim_puk_hint" msgid="5319756880543857694">"PUK-koden ska vara minst åtta siffror."</string> <string name="kg_invalid_puk" msgid="1774337070084931186">"Ange rätt PUK-kod. Om försöken upprepas inaktiveras SIM-kortet permanent."</string> - <string name="kg_login_too_many_attempts" msgid="4519957179182578690">"För många försök med grafiskt lösenord"</string> + <string name="kg_login_too_many_attempts" msgid="4519957179182578690">"För många försök med mönster"</string> <string name="kg_too_many_failed_pin_attempts_dialog_message" msgid="544687656831558971">"Du har angett fel pinkod <xliff:g id="NUMBER_0">%1$d</xliff:g> gånger. \n\nFörsök igen om <xliff:g id="NUMBER_1">%2$d</xliff:g> sekunder."</string> <string name="kg_too_many_failed_password_attempts_dialog_message" msgid="190984061975729494">"Du har angett fel lösenord <xliff:g id="NUMBER_0">%1$d</xliff:g> gånger. \n\nFörsök igen om <xliff:g id="NUMBER_1">%2$d</xliff:g> sekunder."</string> <string name="kg_too_many_failed_pattern_attempts_dialog_message" msgid="4252405904570284368">"Du har ritat ditt grafiska lösenord fel <xliff:g id="NUMBER_0">%1$d</xliff:g> gånger. \n\nFörsök igen om <xliff:g id="NUMBER_1">%2$d</xliff:g> sekunder."</string> @@ -102,13 +102,13 @@ <string name="keyguard_carrier_default" msgid="6359808469637388586">"Ingen tjänst."</string> <string name="accessibility_ime_switch_button" msgid="9082358310194861329">"Byt inmatningsmetod"</string> <string name="airplane_mode" msgid="2528005343938497866">"Flygplansläge"</string> - <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"Du måste ange grafiskt lösenord när du har startat om enheten"</string> + <string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"Du måste rita mönster när du har startat om enheten"</string> <string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"Du måste ange pinkod när du har startat om enheten"</string> <string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"Du måste ange lösenord när du har startat om enheten"</string> - <string name="kg_prompt_reason_timeout_pattern" msgid="9170360502528959889">"Du måste ange grafiskt lösenord för ytterligare säkerhet"</string> + <string name="kg_prompt_reason_timeout_pattern" msgid="9170360502528959889">"Du måste rita mönster för ytterligare säkerhet"</string> <string name="kg_prompt_reason_timeout_pin" msgid="5945186097160029201">"Du måste ange pinkod för ytterligare säkerhet"</string> <string name="kg_prompt_reason_timeout_password" msgid="2258263949430384278">"Du måste ange lösenord för ytterligare säkerhet"</string> - <string name="kg_prompt_reason_switch_profiles_pattern" msgid="1922016914701991230">"Du måste ange grafiskt lösenord när du byter profil"</string> + <string name="kg_prompt_reason_switch_profiles_pattern" msgid="1922016914701991230">"Du måste rita mönster när du byter profil"</string> <string name="kg_prompt_reason_switch_profiles_pin" msgid="6490434826361055400">"Du måste ange pinkod när du byter profil"</string> <string name="kg_prompt_reason_switch_profiles_password" msgid="1680374696393804441">"Du måste ange lösenord när du byter profil"</string> <string name="kg_prompt_reason_device_admin" msgid="6961159596224055685">"Administratören har låst enheten"</string> diff --git a/packages/SystemUI/res/drawable-nodpi/android_12.xml b/packages/SystemUI/res/drawable-nodpi/android_12.xml new file mode 100644 index 000000000000..bdeeced2d290 --- /dev/null +++ b/packages/SystemUI/res/drawable-nodpi/android_12.xml @@ -0,0 +1,37 @@ +<!-- +Copyright (C) 2021 The Android Open Source Project + + Licensed under the Apache License, Version 2 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="48dp" + android:height="48dp" + android:viewportWidth="48" + android:viewportHeight="48"> + <group> + <clip-path + android:pathData="M14,14h21v20h-21z"/> + <path + android:pathData="M15,15C15.7956,15 16.5587,15.3161 17.1213,15.8787C17.6839,16.4413 18,17.2044 18,18V33" + android:strokeWidth="2" + android:fillColor="#00000000" + android:strokeColor="#ffffff" + android:strokeLineCap="round"/> + <path + android:pathData="M34,33H22V30C22,28.4087 22.6321,26.8826 23.7574,25.7574C24.8826,24.6321 26.4087,24 28,24H31C31.7956,24 32.5587,23.6839 33.1213,23.1213C33.6839,22.5587 34,21.7957 34,21C34.009,19.5779 33.5126,18.1989 32.5993,17.1088C31.686,16.0188 30.4153,15.2885 29.0136,15.0483C27.612,14.8081 26.1706,15.0735 24.9464,15.7973C23.7223,16.5211 22.795,17.6561 22.33,19C22.2199,19.3261 22.1363,19.6605 22.08,20" + android:strokeWidth="2" + android:fillColor="#00000000" + android:strokeColor="#ffffff" + android:strokeLineCap="round"/> + </group> +</vector> diff --git a/packages/SystemUI/res/drawable-nodpi/icon.xml b/packages/SystemUI/res/drawable-nodpi/icon.xml index 7f8d4fa8833f..997249632709 100644 --- a/packages/SystemUI/res/drawable-nodpi/icon.xml +++ b/packages/SystemUI/res/drawable-nodpi/icon.xml @@ -15,5 +15,5 @@ Copyright (C) 2018 The Android Open Source Project --> <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> <background android:drawable="@drawable/icon_bg"/> - <foreground android:drawable="@drawable/android_11_dial"/> + <foreground android:drawable="@drawable/android_12"/> </adaptive-icon> diff --git a/packages/SystemUI/res/drawable-nodpi/icon_bg.xml b/packages/SystemUI/res/drawable-nodpi/icon_bg.xml index 31b2a7f9a333..ff7cbae16ab2 100644 --- a/packages/SystemUI/res/drawable-nodpi/icon_bg.xml +++ b/packages/SystemUI/res/drawable-nodpi/icon_bg.xml @@ -14,5 +14,5 @@ Copyright (C) 2018 The Android Open Source Project limitations under the License. --> <color xmlns:android="http://schemas.android.com/apk/res/android" - android:color="#073042" /> + android:color="@android:color/system_accent1_500" /> diff --git a/packages/SystemUI/res/drawable/controls_icon.xml b/packages/SystemUI/res/drawable/controls_icon.xml new file mode 100644 index 000000000000..f1814a228665 --- /dev/null +++ b/packages/SystemUI/res/drawable/controls_icon.xml @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2021 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License + --> +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24"> + <path + android:fillColor="#FF000000" + android:pathData="M12,3L4,9v12h16L20,9l-8,-6zM18,19h-3v-6L9,13v6L6,19v-9l6,-4.5 6,4.5v9z"/> +</vector> diff --git a/packages/SystemUI/res/drawable/wallet_lockscreen_bg.xml b/packages/SystemUI/res/drawable/keyguard_bottom_affordance_bg.xml index 1535e7276a6f..1535e7276a6f 100644 --- a/packages/SystemUI/res/drawable/wallet_lockscreen_bg.xml +++ b/packages/SystemUI/res/drawable/keyguard_bottom_affordance_bg.xml diff --git a/packages/SystemUI/res/layout/keyguard_bottom_area.xml b/packages/SystemUI/res/layout/keyguard_bottom_area.xml index 9ce83a789f59..8dbd59d42ab7 100644 --- a/packages/SystemUI/res/layout/keyguard_bottom_area.xml +++ b/packages/SystemUI/res/layout/keyguard_bottom_area.xml @@ -82,18 +82,32 @@ <ImageView android:id="@+id/wallet_button" - android:layout_height="@dimen/keyguard_affordance_wallet_height" - android:layout_width="@dimen/keyguard_affordance_wallet_width" + android:layout_height="@dimen/keyguard_affordance_fixed_height" + android:layout_width="@dimen/keyguard_affordance_fixed_width" android:layout_gravity="bottom|end" android:scaleType="center" android:tint="?android:attr/textColorPrimary" android:src="@drawable/ic_wallet_lockscreen" - android:background="@drawable/wallet_lockscreen_bg" + android:background="@drawable/keyguard_bottom_affordance_bg" android:layout_marginEnd="@dimen/keyguard_affordance_horizontal_offset" android:layout_marginBottom="@dimen/keyguard_affordance_vertical_offset" android:contentDescription="@string/accessibility_wallet_button" android:visibility="gone" /> + <ImageView + android:id="@+id/controls_button" + android:layout_height="@dimen/keyguard_affordance_fixed_height" + android:layout_width="@dimen/keyguard_affordance_fixed_width" + android:layout_gravity="bottom|start" + android:scaleType="center" + android:tint="?android:attr/textColorPrimary" + android:src="@drawable/controls_icon" + android:background="@drawable/keyguard_bottom_affordance_bg" + android:layout_marginStart="@dimen/keyguard_affordance_horizontal_offset" + android:layout_marginBottom="@dimen/keyguard_affordance_vertical_offset" + android:contentDescription="@string/quick_controls_title" + android:visibility="gone" /> + <FrameLayout android:id="@+id/overlay_container" android:layout_width="match_parent" diff --git a/packages/SystemUI/res/layout/quick_status_bar_expanded_header.xml b/packages/SystemUI/res/layout/quick_status_bar_expanded_header.xml index f9dcd390cd51..f3b8b0bfaf36 100644 --- a/packages/SystemUI/res/layout/quick_status_bar_expanded_header.xml +++ b/packages/SystemUI/res/layout/quick_status_bar_expanded_header.xml @@ -55,7 +55,7 @@ android:clipChildren="false" android:clipToPadding="false" android:focusable="true" - android:paddingBottom="10dp" + android:paddingBottom="24dp" android:importantForAccessibility="yes" /> </RelativeLayout> diff --git a/packages/SystemUI/res/values-af/strings_tv.xml b/packages/SystemUI/res/values-af/strings_tv.xml index 2e9400e2e5b6..5420779a98ca 100644 --- a/packages/SystemUI/res/values-af/strings_tv.xml +++ b/packages/SystemUI/res/values-af/strings_tv.xml @@ -26,4 +26,16 @@ <string name="notification_disclosure_vpn_text" msgid="3873532735584866236">"Via <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> <string name="tv_notification_panel_title" msgid="5311050946506276154">"Kennisgewings"</string> <string name="tv_notification_panel_no_notifications" msgid="9115191912267270678">"Geen kennisgewings nie"</string> + <!-- no translation found for mic_recording_announcement (7587123608060316575) --> + <skip /> + <!-- no translation found for camera_recording_announcement (7240177719403759112) --> + <skip /> + <!-- no translation found for mic_and_camera_recording_announcement (8599231390508812667) --> + <skip /> + <!-- no translation found for mic_stopped_recording_announcement (7301537004900721242) --> + <skip /> + <!-- no translation found for camera_stopped_recording_announcement (8540496432367032801) --> + <skip /> + <!-- no translation found for mic_camera_stopped_recording_announcement (8708524579599977412) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-am/strings_tv.xml b/packages/SystemUI/res/values-am/strings_tv.xml index 71d887d09752..ede0b782c064 100644 --- a/packages/SystemUI/res/values-am/strings_tv.xml +++ b/packages/SystemUI/res/values-am/strings_tv.xml @@ -26,4 +26,16 @@ <string name="notification_disclosure_vpn_text" msgid="3873532735584866236">"በ<xliff:g id="VPN_APP">%1$s</xliff:g> በኩል"</string> <string name="tv_notification_panel_title" msgid="5311050946506276154">"ማሳወቂያዎች"</string> <string name="tv_notification_panel_no_notifications" msgid="9115191912267270678">"ምንም ማሳወቂያዎች የሉም"</string> + <!-- no translation found for mic_recording_announcement (7587123608060316575) --> + <skip /> + <!-- no translation found for camera_recording_announcement (7240177719403759112) --> + <skip /> + <!-- no translation found for mic_and_camera_recording_announcement (8599231390508812667) --> + <skip /> + <!-- no translation found for mic_stopped_recording_announcement (7301537004900721242) --> + <skip /> + <!-- no translation found for camera_stopped_recording_announcement (8540496432367032801) --> + <skip /> + <!-- no translation found for mic_camera_stopped_recording_announcement (8708524579599977412) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-ar/strings_tv.xml b/packages/SystemUI/res/values-ar/strings_tv.xml index 769999f5f902..f6c4aefec4f1 100644 --- a/packages/SystemUI/res/values-ar/strings_tv.xml +++ b/packages/SystemUI/res/values-ar/strings_tv.xml @@ -26,4 +26,16 @@ <string name="notification_disclosure_vpn_text" msgid="3873532735584866236">"عبر <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> <string name="tv_notification_panel_title" msgid="5311050946506276154">"الإشعارات"</string> <string name="tv_notification_panel_no_notifications" msgid="9115191912267270678">"ما من إشعارات"</string> + <!-- no translation found for mic_recording_announcement (7587123608060316575) --> + <skip /> + <!-- no translation found for camera_recording_announcement (7240177719403759112) --> + <skip /> + <!-- no translation found for mic_and_camera_recording_announcement (8599231390508812667) --> + <skip /> + <!-- no translation found for mic_stopped_recording_announcement (7301537004900721242) --> + <skip /> + <!-- no translation found for camera_stopped_recording_announcement (8540496432367032801) --> + <skip /> + <!-- no translation found for mic_camera_stopped_recording_announcement (8708524579599977412) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-as/strings_tv.xml b/packages/SystemUI/res/values-as/strings_tv.xml index 859ea2c65093..6ceee805cdfc 100644 --- a/packages/SystemUI/res/values-as/strings_tv.xml +++ b/packages/SystemUI/res/values-as/strings_tv.xml @@ -26,4 +26,16 @@ <string name="notification_disclosure_vpn_text" msgid="3873532735584866236">"<xliff:g id="VPN_APP">%1$s</xliff:g>ৰ জৰিয়তে"</string> <string name="tv_notification_panel_title" msgid="5311050946506276154">"জাননী"</string> <string name="tv_notification_panel_no_notifications" msgid="9115191912267270678">"কোনো জাননী নাই"</string> + <!-- no translation found for mic_recording_announcement (7587123608060316575) --> + <skip /> + <!-- no translation found for camera_recording_announcement (7240177719403759112) --> + <skip /> + <!-- no translation found for mic_and_camera_recording_announcement (8599231390508812667) --> + <skip /> + <!-- no translation found for mic_stopped_recording_announcement (7301537004900721242) --> + <skip /> + <!-- no translation found for camera_stopped_recording_announcement (8540496432367032801) --> + <skip /> + <!-- no translation found for mic_camera_stopped_recording_announcement (8708524579599977412) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-az/strings_tv.xml b/packages/SystemUI/res/values-az/strings_tv.xml index 1f1b6491b533..d141ad6d3fd1 100644 --- a/packages/SystemUI/res/values-az/strings_tv.xml +++ b/packages/SystemUI/res/values-az/strings_tv.xml @@ -26,4 +26,16 @@ <string name="notification_disclosure_vpn_text" msgid="3873532735584866236">"<xliff:g id="VPN_APP">%1$s</xliff:g> vasitəsilə"</string> <string name="tv_notification_panel_title" msgid="5311050946506276154">"Bildirişlər"</string> <string name="tv_notification_panel_no_notifications" msgid="9115191912267270678">"Bildiriş yoxdur"</string> + <!-- no translation found for mic_recording_announcement (7587123608060316575) --> + <skip /> + <!-- no translation found for camera_recording_announcement (7240177719403759112) --> + <skip /> + <!-- no translation found for mic_and_camera_recording_announcement (8599231390508812667) --> + <skip /> + <!-- no translation found for mic_stopped_recording_announcement (7301537004900721242) --> + <skip /> + <!-- no translation found for camera_stopped_recording_announcement (8540496432367032801) --> + <skip /> + <!-- no translation found for mic_camera_stopped_recording_announcement (8708524579599977412) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-b+sr+Latn/strings_tv.xml b/packages/SystemUI/res/values-b+sr+Latn/strings_tv.xml index 2eaa4996b101..04a7e813765b 100644 --- a/packages/SystemUI/res/values-b+sr+Latn/strings_tv.xml +++ b/packages/SystemUI/res/values-b+sr+Latn/strings_tv.xml @@ -26,4 +26,16 @@ <string name="notification_disclosure_vpn_text" msgid="3873532735584866236">"Preko: <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> <string name="tv_notification_panel_title" msgid="5311050946506276154">"Obaveštenja"</string> <string name="tv_notification_panel_no_notifications" msgid="9115191912267270678">"Nema obaveštenja"</string> + <!-- no translation found for mic_recording_announcement (7587123608060316575) --> + <skip /> + <!-- no translation found for camera_recording_announcement (7240177719403759112) --> + <skip /> + <!-- no translation found for mic_and_camera_recording_announcement (8599231390508812667) --> + <skip /> + <!-- no translation found for mic_stopped_recording_announcement (7301537004900721242) --> + <skip /> + <!-- no translation found for camera_stopped_recording_announcement (8540496432367032801) --> + <skip /> + <!-- no translation found for mic_camera_stopped_recording_announcement (8708524579599977412) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-be/strings_tv.xml b/packages/SystemUI/res/values-be/strings_tv.xml index 21a2e6ed1d42..5aa771f0638c 100644 --- a/packages/SystemUI/res/values-be/strings_tv.xml +++ b/packages/SystemUI/res/values-be/strings_tv.xml @@ -26,4 +26,16 @@ <string name="notification_disclosure_vpn_text" msgid="3873532735584866236">"Праз <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> <string name="tv_notification_panel_title" msgid="5311050946506276154">"Апавяшчэнні"</string> <string name="tv_notification_panel_no_notifications" msgid="9115191912267270678">"Апавяшчэнняў няма"</string> + <!-- no translation found for mic_recording_announcement (7587123608060316575) --> + <skip /> + <!-- no translation found for camera_recording_announcement (7240177719403759112) --> + <skip /> + <!-- no translation found for mic_and_camera_recording_announcement (8599231390508812667) --> + <skip /> + <!-- no translation found for mic_stopped_recording_announcement (7301537004900721242) --> + <skip /> + <!-- no translation found for camera_stopped_recording_announcement (8540496432367032801) --> + <skip /> + <!-- no translation found for mic_camera_stopped_recording_announcement (8708524579599977412) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-bg/strings_tv.xml b/packages/SystemUI/res/values-bg/strings_tv.xml index b7af7cb26c41..49bf014d2fa6 100644 --- a/packages/SystemUI/res/values-bg/strings_tv.xml +++ b/packages/SystemUI/res/values-bg/strings_tv.xml @@ -26,4 +26,16 @@ <string name="notification_disclosure_vpn_text" msgid="3873532735584866236">"Чрез <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> <string name="tv_notification_panel_title" msgid="5311050946506276154">"Известия"</string> <string name="tv_notification_panel_no_notifications" msgid="9115191912267270678">"Няма известия"</string> + <!-- no translation found for mic_recording_announcement (7587123608060316575) --> + <skip /> + <!-- no translation found for camera_recording_announcement (7240177719403759112) --> + <skip /> + <!-- no translation found for mic_and_camera_recording_announcement (8599231390508812667) --> + <skip /> + <!-- no translation found for mic_stopped_recording_announcement (7301537004900721242) --> + <skip /> + <!-- no translation found for camera_stopped_recording_announcement (8540496432367032801) --> + <skip /> + <!-- no translation found for mic_camera_stopped_recording_announcement (8708524579599977412) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-bn/strings_tv.xml b/packages/SystemUI/res/values-bn/strings_tv.xml index 38c24ace782e..5a9b45612096 100644 --- a/packages/SystemUI/res/values-bn/strings_tv.xml +++ b/packages/SystemUI/res/values-bn/strings_tv.xml @@ -26,4 +26,16 @@ <string name="notification_disclosure_vpn_text" msgid="3873532735584866236">"<xliff:g id="VPN_APP">%1$s</xliff:g>-এর মাধ্যমে"</string> <string name="tv_notification_panel_title" msgid="5311050946506276154">"বিজ্ঞপ্তি"</string> <string name="tv_notification_panel_no_notifications" msgid="9115191912267270678">"কোনও বিজ্ঞপ্তি নেই"</string> + <!-- no translation found for mic_recording_announcement (7587123608060316575) --> + <skip /> + <!-- no translation found for camera_recording_announcement (7240177719403759112) --> + <skip /> + <!-- no translation found for mic_and_camera_recording_announcement (8599231390508812667) --> + <skip /> + <!-- no translation found for mic_stopped_recording_announcement (7301537004900721242) --> + <skip /> + <!-- no translation found for camera_stopped_recording_announcement (8540496432367032801) --> + <skip /> + <!-- no translation found for mic_camera_stopped_recording_announcement (8708524579599977412) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-bs/strings_tv.xml b/packages/SystemUI/res/values-bs/strings_tv.xml index 01916a1dea8c..92c5e2a0ebea 100644 --- a/packages/SystemUI/res/values-bs/strings_tv.xml +++ b/packages/SystemUI/res/values-bs/strings_tv.xml @@ -26,4 +26,16 @@ <string name="notification_disclosure_vpn_text" msgid="3873532735584866236">"Putem: <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> <string name="tv_notification_panel_title" msgid="5311050946506276154">"Obavještenja"</string> <string name="tv_notification_panel_no_notifications" msgid="9115191912267270678">"Nema obavještenja"</string> + <!-- no translation found for mic_recording_announcement (7587123608060316575) --> + <skip /> + <!-- no translation found for camera_recording_announcement (7240177719403759112) --> + <skip /> + <!-- no translation found for mic_and_camera_recording_announcement (8599231390508812667) --> + <skip /> + <!-- no translation found for mic_stopped_recording_announcement (7301537004900721242) --> + <skip /> + <!-- no translation found for camera_stopped_recording_announcement (8540496432367032801) --> + <skip /> + <!-- no translation found for mic_camera_stopped_recording_announcement (8708524579599977412) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-ca/strings_tv.xml b/packages/SystemUI/res/values-ca/strings_tv.xml index a0607854c0e2..dac4a1a0d0d9 100644 --- a/packages/SystemUI/res/values-ca/strings_tv.xml +++ b/packages/SystemUI/res/values-ca/strings_tv.xml @@ -26,4 +26,16 @@ <string name="notification_disclosure_vpn_text" msgid="3873532735584866236">"Mitjançant <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> <string name="tv_notification_panel_title" msgid="5311050946506276154">"Notificacions"</string> <string name="tv_notification_panel_no_notifications" msgid="9115191912267270678">"Cap notificació"</string> + <!-- no translation found for mic_recording_announcement (7587123608060316575) --> + <skip /> + <!-- no translation found for camera_recording_announcement (7240177719403759112) --> + <skip /> + <!-- no translation found for mic_and_camera_recording_announcement (8599231390508812667) --> + <skip /> + <!-- no translation found for mic_stopped_recording_announcement (7301537004900721242) --> + <skip /> + <!-- no translation found for camera_stopped_recording_announcement (8540496432367032801) --> + <skip /> + <!-- no translation found for mic_camera_stopped_recording_announcement (8708524579599977412) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-cs/strings_tv.xml b/packages/SystemUI/res/values-cs/strings_tv.xml index eeab0d9d95a2..e9f4a10eaeb1 100644 --- a/packages/SystemUI/res/values-cs/strings_tv.xml +++ b/packages/SystemUI/res/values-cs/strings_tv.xml @@ -26,4 +26,16 @@ <string name="notification_disclosure_vpn_text" msgid="3873532735584866236">"Přes <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> <string name="tv_notification_panel_title" msgid="5311050946506276154">"Oznámení"</string> <string name="tv_notification_panel_no_notifications" msgid="9115191912267270678">"Žádná oznámení"</string> + <!-- no translation found for mic_recording_announcement (7587123608060316575) --> + <skip /> + <!-- no translation found for camera_recording_announcement (7240177719403759112) --> + <skip /> + <!-- no translation found for mic_and_camera_recording_announcement (8599231390508812667) --> + <skip /> + <!-- no translation found for mic_stopped_recording_announcement (7301537004900721242) --> + <skip /> + <!-- no translation found for camera_stopped_recording_announcement (8540496432367032801) --> + <skip /> + <!-- no translation found for mic_camera_stopped_recording_announcement (8708524579599977412) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-da/strings_tv.xml b/packages/SystemUI/res/values-da/strings_tv.xml index fb0bc2d513f9..953477634f7c 100644 --- a/packages/SystemUI/res/values-da/strings_tv.xml +++ b/packages/SystemUI/res/values-da/strings_tv.xml @@ -26,4 +26,16 @@ <string name="notification_disclosure_vpn_text" msgid="3873532735584866236">"Via <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> <string name="tv_notification_panel_title" msgid="5311050946506276154">"Notifikationer"</string> <string name="tv_notification_panel_no_notifications" msgid="9115191912267270678">"Ingen notifikationer"</string> + <!-- no translation found for mic_recording_announcement (7587123608060316575) --> + <skip /> + <!-- no translation found for camera_recording_announcement (7240177719403759112) --> + <skip /> + <!-- no translation found for mic_and_camera_recording_announcement (8599231390508812667) --> + <skip /> + <!-- no translation found for mic_stopped_recording_announcement (7301537004900721242) --> + <skip /> + <!-- no translation found for camera_stopped_recording_announcement (8540496432367032801) --> + <skip /> + <!-- no translation found for mic_camera_stopped_recording_announcement (8708524579599977412) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-de/strings_tv.xml b/packages/SystemUI/res/values-de/strings_tv.xml index 0345c804f35a..ec162ef0936a 100644 --- a/packages/SystemUI/res/values-de/strings_tv.xml +++ b/packages/SystemUI/res/values-de/strings_tv.xml @@ -26,4 +26,16 @@ <string name="notification_disclosure_vpn_text" msgid="3873532735584866236">"Über <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> <string name="tv_notification_panel_title" msgid="5311050946506276154">"Benachrichtigungen"</string> <string name="tv_notification_panel_no_notifications" msgid="9115191912267270678">"Keine Benachrichtigungen"</string> + <!-- no translation found for mic_recording_announcement (7587123608060316575) --> + <skip /> + <!-- no translation found for camera_recording_announcement (7240177719403759112) --> + <skip /> + <!-- no translation found for mic_and_camera_recording_announcement (8599231390508812667) --> + <skip /> + <!-- no translation found for mic_stopped_recording_announcement (7301537004900721242) --> + <skip /> + <!-- no translation found for camera_stopped_recording_announcement (8540496432367032801) --> + <skip /> + <!-- no translation found for mic_camera_stopped_recording_announcement (8708524579599977412) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-el/strings_tv.xml b/packages/SystemUI/res/values-el/strings_tv.xml index cd9277234bd7..175c402ab8b3 100644 --- a/packages/SystemUI/res/values-el/strings_tv.xml +++ b/packages/SystemUI/res/values-el/strings_tv.xml @@ -26,4 +26,16 @@ <string name="notification_disclosure_vpn_text" msgid="3873532735584866236">"Μέσω <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> <string name="tv_notification_panel_title" msgid="5311050946506276154">"Ειδοποιήσεις"</string> <string name="tv_notification_panel_no_notifications" msgid="9115191912267270678">"Δεν υπάρχουν ειδοποιήσεις."</string> + <!-- no translation found for mic_recording_announcement (7587123608060316575) --> + <skip /> + <!-- no translation found for camera_recording_announcement (7240177719403759112) --> + <skip /> + <!-- no translation found for mic_and_camera_recording_announcement (8599231390508812667) --> + <skip /> + <!-- no translation found for mic_stopped_recording_announcement (7301537004900721242) --> + <skip /> + <!-- no translation found for camera_stopped_recording_announcement (8540496432367032801) --> + <skip /> + <!-- no translation found for mic_camera_stopped_recording_announcement (8708524579599977412) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-en-rAU/strings_tv.xml b/packages/SystemUI/res/values-en-rAU/strings_tv.xml index 3b3e2d6fef48..08fc8a67b032 100644 --- a/packages/SystemUI/res/values-en-rAU/strings_tv.xml +++ b/packages/SystemUI/res/values-en-rAU/strings_tv.xml @@ -26,4 +26,10 @@ <string name="notification_disclosure_vpn_text" msgid="3873532735584866236">"Via <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> <string name="tv_notification_panel_title" msgid="5311050946506276154">"Notifications"</string> <string name="tv_notification_panel_no_notifications" msgid="9115191912267270678">"No notifications"</string> + <string name="mic_recording_announcement" msgid="7587123608060316575">"Microphone is recording"</string> + <string name="camera_recording_announcement" msgid="7240177719403759112">"Camera is recording"</string> + <string name="mic_and_camera_recording_announcement" msgid="8599231390508812667">"Camera and microphone are recording"</string> + <string name="mic_stopped_recording_announcement" msgid="7301537004900721242">"Microphone stopped recording"</string> + <string name="camera_stopped_recording_announcement" msgid="8540496432367032801">"Camera stopped recording"</string> + <string name="mic_camera_stopped_recording_announcement" msgid="8708524579599977412">"Camera and microphone stopped recording"</string> </resources> diff --git a/packages/SystemUI/res/values-en-rCA/strings_tv.xml b/packages/SystemUI/res/values-en-rCA/strings_tv.xml index 3b3e2d6fef48..08fc8a67b032 100644 --- a/packages/SystemUI/res/values-en-rCA/strings_tv.xml +++ b/packages/SystemUI/res/values-en-rCA/strings_tv.xml @@ -26,4 +26,10 @@ <string name="notification_disclosure_vpn_text" msgid="3873532735584866236">"Via <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> <string name="tv_notification_panel_title" msgid="5311050946506276154">"Notifications"</string> <string name="tv_notification_panel_no_notifications" msgid="9115191912267270678">"No notifications"</string> + <string name="mic_recording_announcement" msgid="7587123608060316575">"Microphone is recording"</string> + <string name="camera_recording_announcement" msgid="7240177719403759112">"Camera is recording"</string> + <string name="mic_and_camera_recording_announcement" msgid="8599231390508812667">"Camera and microphone are recording"</string> + <string name="mic_stopped_recording_announcement" msgid="7301537004900721242">"Microphone stopped recording"</string> + <string name="camera_stopped_recording_announcement" msgid="8540496432367032801">"Camera stopped recording"</string> + <string name="mic_camera_stopped_recording_announcement" msgid="8708524579599977412">"Camera and microphone stopped recording"</string> </resources> diff --git a/packages/SystemUI/res/values-en-rGB/strings_tv.xml b/packages/SystemUI/res/values-en-rGB/strings_tv.xml index 3b3e2d6fef48..08fc8a67b032 100644 --- a/packages/SystemUI/res/values-en-rGB/strings_tv.xml +++ b/packages/SystemUI/res/values-en-rGB/strings_tv.xml @@ -26,4 +26,10 @@ <string name="notification_disclosure_vpn_text" msgid="3873532735584866236">"Via <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> <string name="tv_notification_panel_title" msgid="5311050946506276154">"Notifications"</string> <string name="tv_notification_panel_no_notifications" msgid="9115191912267270678">"No notifications"</string> + <string name="mic_recording_announcement" msgid="7587123608060316575">"Microphone is recording"</string> + <string name="camera_recording_announcement" msgid="7240177719403759112">"Camera is recording"</string> + <string name="mic_and_camera_recording_announcement" msgid="8599231390508812667">"Camera and microphone are recording"</string> + <string name="mic_stopped_recording_announcement" msgid="7301537004900721242">"Microphone stopped recording"</string> + <string name="camera_stopped_recording_announcement" msgid="8540496432367032801">"Camera stopped recording"</string> + <string name="mic_camera_stopped_recording_announcement" msgid="8708524579599977412">"Camera and microphone stopped recording"</string> </resources> diff --git a/packages/SystemUI/res/values-en-rIN/strings_tv.xml b/packages/SystemUI/res/values-en-rIN/strings_tv.xml index 3b3e2d6fef48..08fc8a67b032 100644 --- a/packages/SystemUI/res/values-en-rIN/strings_tv.xml +++ b/packages/SystemUI/res/values-en-rIN/strings_tv.xml @@ -26,4 +26,10 @@ <string name="notification_disclosure_vpn_text" msgid="3873532735584866236">"Via <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> <string name="tv_notification_panel_title" msgid="5311050946506276154">"Notifications"</string> <string name="tv_notification_panel_no_notifications" msgid="9115191912267270678">"No notifications"</string> + <string name="mic_recording_announcement" msgid="7587123608060316575">"Microphone is recording"</string> + <string name="camera_recording_announcement" msgid="7240177719403759112">"Camera is recording"</string> + <string name="mic_and_camera_recording_announcement" msgid="8599231390508812667">"Camera and microphone are recording"</string> + <string name="mic_stopped_recording_announcement" msgid="7301537004900721242">"Microphone stopped recording"</string> + <string name="camera_stopped_recording_announcement" msgid="8540496432367032801">"Camera stopped recording"</string> + <string name="mic_camera_stopped_recording_announcement" msgid="8708524579599977412">"Camera and microphone stopped recording"</string> </resources> diff --git a/packages/SystemUI/res/values-en-rXC/strings_tv.xml b/packages/SystemUI/res/values-en-rXC/strings_tv.xml index 34882b31129d..c030833a4eaf 100644 --- a/packages/SystemUI/res/values-en-rXC/strings_tv.xml +++ b/packages/SystemUI/res/values-en-rXC/strings_tv.xml @@ -26,4 +26,10 @@ <string name="notification_disclosure_vpn_text" msgid="3873532735584866236">"Via <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> <string name="tv_notification_panel_title" msgid="5311050946506276154">"Notifications"</string> <string name="tv_notification_panel_no_notifications" msgid="9115191912267270678">"No Notifications"</string> + <string name="mic_recording_announcement" msgid="7587123608060316575">"Microphone is recording"</string> + <string name="camera_recording_announcement" msgid="7240177719403759112">"Camera is recording"</string> + <string name="mic_and_camera_recording_announcement" msgid="8599231390508812667">"Camera and Microphone are recording"</string> + <string name="mic_stopped_recording_announcement" msgid="7301537004900721242">"Microphone stopped recording"</string> + <string name="camera_stopped_recording_announcement" msgid="8540496432367032801">"Camera stopped recording"</string> + <string name="mic_camera_stopped_recording_announcement" msgid="8708524579599977412">"Camera and Microphone stopped recording"</string> </resources> diff --git a/packages/SystemUI/res/values-es-rUS/strings.xml b/packages/SystemUI/res/values-es-rUS/strings.xml index 55b0f98fc859..4520ed33f784 100644 --- a/packages/SystemUI/res/values-es-rUS/strings.xml +++ b/packages/SystemUI/res/values-es-rUS/strings.xml @@ -534,7 +534,7 @@ <string name="quick_settings_disclosure_named_management_vpns" msgid="4046375645500668555">"Este dispositivo pertenece a <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> y está conectado a VPN"</string> <string name="quick_settings_disclosure_managed_profile_monitoring" msgid="1423899084754272514">"Tu organización puede controlar el tráfico de red en tu perfil de trabajo"</string> <string name="quick_settings_disclosure_named_managed_profile_monitoring" msgid="8321469176706219860">"Es posible que <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> controle el tráfico de red en tu perfil de trabajo"</string> - <string name="quick_settings_disclosure_managed_profile_network_activity" msgid="2636594621387832827">"El administrador de IT puede ver la actividad de red de tu perfil de trabajo"</string> + <string name="quick_settings_disclosure_managed_profile_network_activity" msgid="2636594621387832827">"El administrador de TI puede ver la actividad de red de tu perfil de trabajo"</string> <string name="quick_settings_disclosure_monitoring" msgid="8548019955631378680">"Es posible que la red esté supervisada"</string> <string name="quick_settings_disclosure_vpns" msgid="7213546797022280246">"Este dispositivo está conectado a VPN"</string> <string name="quick_settings_disclosure_managed_profile_named_vpn" msgid="8117568745060010789">"Tu perfil de trabajo está conectado a <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> diff --git a/packages/SystemUI/res/values-es-rUS/strings_tv.xml b/packages/SystemUI/res/values-es-rUS/strings_tv.xml index a0a355b8bc7a..680e7cc74885 100644 --- a/packages/SystemUI/res/values-es-rUS/strings_tv.xml +++ b/packages/SystemUI/res/values-es-rUS/strings_tv.xml @@ -26,4 +26,16 @@ <string name="notification_disclosure_vpn_text" msgid="3873532735584866236">"A través de <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> <string name="tv_notification_panel_title" msgid="5311050946506276154">"Notificaciones"</string> <string name="tv_notification_panel_no_notifications" msgid="9115191912267270678">"No hay notificaciones"</string> + <!-- no translation found for mic_recording_announcement (7587123608060316575) --> + <skip /> + <!-- no translation found for camera_recording_announcement (7240177719403759112) --> + <skip /> + <!-- no translation found for mic_and_camera_recording_announcement (8599231390508812667) --> + <skip /> + <!-- no translation found for mic_stopped_recording_announcement (7301537004900721242) --> + <skip /> + <!-- no translation found for camera_stopped_recording_announcement (8540496432367032801) --> + <skip /> + <!-- no translation found for mic_camera_stopped_recording_announcement (8708524579599977412) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-es/strings_tv.xml b/packages/SystemUI/res/values-es/strings_tv.xml index 4607ad5d4fcb..16154a453321 100644 --- a/packages/SystemUI/res/values-es/strings_tv.xml +++ b/packages/SystemUI/res/values-es/strings_tv.xml @@ -26,4 +26,16 @@ <string name="notification_disclosure_vpn_text" msgid="3873532735584866236">"A través de <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> <string name="tv_notification_panel_title" msgid="5311050946506276154">"Notificaciones"</string> <string name="tv_notification_panel_no_notifications" msgid="9115191912267270678">"Sin notificaciones"</string> + <!-- no translation found for mic_recording_announcement (7587123608060316575) --> + <skip /> + <!-- no translation found for camera_recording_announcement (7240177719403759112) --> + <skip /> + <!-- no translation found for mic_and_camera_recording_announcement (8599231390508812667) --> + <skip /> + <!-- no translation found for mic_stopped_recording_announcement (7301537004900721242) --> + <skip /> + <!-- no translation found for camera_stopped_recording_announcement (8540496432367032801) --> + <skip /> + <!-- no translation found for mic_camera_stopped_recording_announcement (8708524579599977412) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-et/strings_tv.xml b/packages/SystemUI/res/values-et/strings_tv.xml index 593298efc8d1..373202004093 100644 --- a/packages/SystemUI/res/values-et/strings_tv.xml +++ b/packages/SystemUI/res/values-et/strings_tv.xml @@ -26,4 +26,16 @@ <string name="notification_disclosure_vpn_text" msgid="3873532735584866236">"Teenuse <xliff:g id="VPN_APP">%1$s</xliff:g> kaudu"</string> <string name="tv_notification_panel_title" msgid="5311050946506276154">"Märguanded"</string> <string name="tv_notification_panel_no_notifications" msgid="9115191912267270678">"Märguandeid pole"</string> + <!-- no translation found for mic_recording_announcement (7587123608060316575) --> + <skip /> + <!-- no translation found for camera_recording_announcement (7240177719403759112) --> + <skip /> + <!-- no translation found for mic_and_camera_recording_announcement (8599231390508812667) --> + <skip /> + <!-- no translation found for mic_stopped_recording_announcement (7301537004900721242) --> + <skip /> + <!-- no translation found for camera_stopped_recording_announcement (8540496432367032801) --> + <skip /> + <!-- no translation found for mic_camera_stopped_recording_announcement (8708524579599977412) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-eu/strings_tv.xml b/packages/SystemUI/res/values-eu/strings_tv.xml index e1c4fcc73ee4..524165e6ac87 100644 --- a/packages/SystemUI/res/values-eu/strings_tv.xml +++ b/packages/SystemUI/res/values-eu/strings_tv.xml @@ -26,4 +26,16 @@ <string name="notification_disclosure_vpn_text" msgid="3873532735584866236">"<xliff:g id="VPN_APP">%1$s</xliff:g> bidez"</string> <string name="tv_notification_panel_title" msgid="5311050946506276154">"Jakinarazpenak"</string> <string name="tv_notification_panel_no_notifications" msgid="9115191912267270678">"Ez dago jakinarazpenik"</string> + <!-- no translation found for mic_recording_announcement (7587123608060316575) --> + <skip /> + <!-- no translation found for camera_recording_announcement (7240177719403759112) --> + <skip /> + <!-- no translation found for mic_and_camera_recording_announcement (8599231390508812667) --> + <skip /> + <!-- no translation found for mic_stopped_recording_announcement (7301537004900721242) --> + <skip /> + <!-- no translation found for camera_stopped_recording_announcement (8540496432367032801) --> + <skip /> + <!-- no translation found for mic_camera_stopped_recording_announcement (8708524579599977412) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-fa/strings_tv.xml b/packages/SystemUI/res/values-fa/strings_tv.xml index 5ad12dfd9d53..803875528c90 100644 --- a/packages/SystemUI/res/values-fa/strings_tv.xml +++ b/packages/SystemUI/res/values-fa/strings_tv.xml @@ -26,4 +26,16 @@ <string name="notification_disclosure_vpn_text" msgid="3873532735584866236">"ازطریق <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> <string name="tv_notification_panel_title" msgid="5311050946506276154">"اعلانها"</string> <string name="tv_notification_panel_no_notifications" msgid="9115191912267270678">"اعلانی ندارید"</string> + <!-- no translation found for mic_recording_announcement (7587123608060316575) --> + <skip /> + <!-- no translation found for camera_recording_announcement (7240177719403759112) --> + <skip /> + <!-- no translation found for mic_and_camera_recording_announcement (8599231390508812667) --> + <skip /> + <!-- no translation found for mic_stopped_recording_announcement (7301537004900721242) --> + <skip /> + <!-- no translation found for camera_stopped_recording_announcement (8540496432367032801) --> + <skip /> + <!-- no translation found for mic_camera_stopped_recording_announcement (8708524579599977412) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-fi/strings_tv.xml b/packages/SystemUI/res/values-fi/strings_tv.xml index 61cd5ab16d88..17797d75e944 100644 --- a/packages/SystemUI/res/values-fi/strings_tv.xml +++ b/packages/SystemUI/res/values-fi/strings_tv.xml @@ -26,4 +26,16 @@ <string name="notification_disclosure_vpn_text" msgid="3873532735584866236">"Palvelun <xliff:g id="VPN_APP">%1$s</xliff:g> kautta"</string> <string name="tv_notification_panel_title" msgid="5311050946506276154">"Ilmoitukset"</string> <string name="tv_notification_panel_no_notifications" msgid="9115191912267270678">"Ei ilmoituksia"</string> + <!-- no translation found for mic_recording_announcement (7587123608060316575) --> + <skip /> + <!-- no translation found for camera_recording_announcement (7240177719403759112) --> + <skip /> + <!-- no translation found for mic_and_camera_recording_announcement (8599231390508812667) --> + <skip /> + <!-- no translation found for mic_stopped_recording_announcement (7301537004900721242) --> + <skip /> + <!-- no translation found for camera_stopped_recording_announcement (8540496432367032801) --> + <skip /> + <!-- no translation found for mic_camera_stopped_recording_announcement (8708524579599977412) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-fr-rCA/strings_tv.xml b/packages/SystemUI/res/values-fr-rCA/strings_tv.xml index a667d76a834a..7f45411c939c 100644 --- a/packages/SystemUI/res/values-fr-rCA/strings_tv.xml +++ b/packages/SystemUI/res/values-fr-rCA/strings_tv.xml @@ -26,4 +26,16 @@ <string name="notification_disclosure_vpn_text" msgid="3873532735584866236">"Par <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> <string name="tv_notification_panel_title" msgid="5311050946506276154">"Notifications"</string> <string name="tv_notification_panel_no_notifications" msgid="9115191912267270678">"Aucune notification"</string> + <!-- no translation found for mic_recording_announcement (7587123608060316575) --> + <skip /> + <!-- no translation found for camera_recording_announcement (7240177719403759112) --> + <skip /> + <!-- no translation found for mic_and_camera_recording_announcement (8599231390508812667) --> + <skip /> + <!-- no translation found for mic_stopped_recording_announcement (7301537004900721242) --> + <skip /> + <!-- no translation found for camera_stopped_recording_announcement (8540496432367032801) --> + <skip /> + <!-- no translation found for mic_camera_stopped_recording_announcement (8708524579599977412) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-fr/strings_tv.xml b/packages/SystemUI/res/values-fr/strings_tv.xml index 25fab4e5d6d9..99bab800abe5 100644 --- a/packages/SystemUI/res/values-fr/strings_tv.xml +++ b/packages/SystemUI/res/values-fr/strings_tv.xml @@ -26,4 +26,16 @@ <string name="notification_disclosure_vpn_text" msgid="3873532735584866236">"Via <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> <string name="tv_notification_panel_title" msgid="5311050946506276154">"Notifications"</string> <string name="tv_notification_panel_no_notifications" msgid="9115191912267270678">"Aucune notification"</string> + <!-- no translation found for mic_recording_announcement (7587123608060316575) --> + <skip /> + <!-- no translation found for camera_recording_announcement (7240177719403759112) --> + <skip /> + <!-- no translation found for mic_and_camera_recording_announcement (8599231390508812667) --> + <skip /> + <!-- no translation found for mic_stopped_recording_announcement (7301537004900721242) --> + <skip /> + <!-- no translation found for camera_stopped_recording_announcement (8540496432367032801) --> + <skip /> + <!-- no translation found for mic_camera_stopped_recording_announcement (8708524579599977412) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-gl/strings_tv.xml b/packages/SystemUI/res/values-gl/strings_tv.xml index cd12b94e779d..0d35c4dcfaca 100644 --- a/packages/SystemUI/res/values-gl/strings_tv.xml +++ b/packages/SystemUI/res/values-gl/strings_tv.xml @@ -26,4 +26,16 @@ <string name="notification_disclosure_vpn_text" msgid="3873532735584866236">"A través de <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> <string name="tv_notification_panel_title" msgid="5311050946506276154">"Notificacións"</string> <string name="tv_notification_panel_no_notifications" msgid="9115191912267270678">"Non hai notificacións"</string> + <!-- no translation found for mic_recording_announcement (7587123608060316575) --> + <skip /> + <!-- no translation found for camera_recording_announcement (7240177719403759112) --> + <skip /> + <!-- no translation found for mic_and_camera_recording_announcement (8599231390508812667) --> + <skip /> + <!-- no translation found for mic_stopped_recording_announcement (7301537004900721242) --> + <skip /> + <!-- no translation found for camera_stopped_recording_announcement (8540496432367032801) --> + <skip /> + <!-- no translation found for mic_camera_stopped_recording_announcement (8708524579599977412) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-gu/strings.xml b/packages/SystemUI/res/values-gu/strings.xml index 408e79827d32..553924abda3b 100644 --- a/packages/SystemUI/res/values-gu/strings.xml +++ b/packages/SystemUI/res/values-gu/strings.xml @@ -230,7 +230,7 @@ <string name="accessibility_battery_level" msgid="5143715405241138822">"બૅટરી <xliff:g id="NUMBER">%d</xliff:g> ટકા."</string> <string name="accessibility_battery_level_with_estimate" msgid="4843119982547599452">"તમારા વપરાશના આધારે બૅટરી <xliff:g id="PERCENTAGE">%1$s</xliff:g> ટકા, જે લગભગ <xliff:g id="TIME">%2$s</xliff:g> સુધી ચાલે તેટલી બચી છે"</string> <string name="accessibility_battery_level_charging" msgid="8892191177774027364">"બૅટરી ચાર્જ થઈ રહી છે, <xliff:g id="BATTERY_PERCENTAGE">%d</xliff:g>%%."</string> - <string name="accessibility_settings_button" msgid="2197034218538913880">"સિસ્ટમ સેટિંગ્સ."</string> + <string name="accessibility_settings_button" msgid="2197034218538913880">"સિસ્ટમ સેટિંગ."</string> <string name="accessibility_notifications_button" msgid="3960913924189228831">"નોટિફિકેશન."</string> <string name="accessibility_overflow_action" msgid="8555835828182509104">"બધી સૂચના જુઓ"</string> <string name="accessibility_remove_notification" msgid="1641455251495815527">"સૂચના સાફ કરો."</string> @@ -245,7 +245,7 @@ <skip /> <string name="accessibility_notification_dismissed" msgid="4411652015138892952">"સૂચના કાઢી નાખી."</string> <string name="accessibility_desc_notification_shade" msgid="5355229129428759989">"નોટિફિકેશન શેડ."</string> - <string name="accessibility_desc_quick_settings" msgid="4374766941484719179">"ઝડપી સેટિંગ્સ."</string> + <string name="accessibility_desc_quick_settings" msgid="4374766941484719179">"ઝડપી સેટિંગ."</string> <string name="accessibility_desc_lock_screen" msgid="5983125095181194887">"લૉક સ્ક્રીન."</string> <string name="accessibility_desc_settings" msgid="6728577365389151969">"સેટિંગ"</string> <string name="accessibility_desc_recent_apps" msgid="1748675199348914194">"ઝલક."</string> @@ -315,7 +315,7 @@ <item quantity="other"><xliff:g id="NUMBER_1">%s</xliff:g> વધુ સૂચના અંદર છે.</item> </plurals> <string name="notification_summary_message_format" msgid="5158219088501909966">"<xliff:g id="CONTACT_NAME">%1$s</xliff:g>: <xliff:g id="MESSAGE_CONTENT">%2$s</xliff:g>"</string> - <string name="status_bar_notification_inspect_item_title" msgid="6818779631806163080">"સૂચનાઓની સેટિંગ્સ"</string> + <string name="status_bar_notification_inspect_item_title" msgid="6818779631806163080">"નોટિફિકેશન સેટિંગ"</string> <string name="status_bar_notification_app_settings_title" msgid="5050006438806013903">"<xliff:g id="APP_NAME">%s</xliff:g> સેટિંગ"</string> <string name="accessibility_rotation_lock_off" msgid="3880436123632448930">"સ્ક્રીન ઑટોમૅટિક રીતે ફરશે."</string> <string name="accessibility_rotation_lock_on_landscape" msgid="936972553861524360">"સ્ક્રીન લેન્ડસ્કેપ ઓરિએન્ટેશનમાં લૉક કરેલ છે."</string> @@ -565,12 +565,12 @@ <string name="monitoring_description_personal_profile_named_vpn" msgid="8179722332380953673">"તમારી વ્યક્તિગત પ્રોફાઇલ <xliff:g id="VPN_APP">%1$s</xliff:g> સાથે કનેક્ટ કરેલ છે, જે ઇમેઇલ, ઍપ્લિકેશનો અને વેબસાઇટો સહિતની તમારી નેટવર્ક પ્રવૃત્તિનું નિયમન કરી શકે છે."</string> <string name="monitoring_description_do_header_generic" msgid="6130190408164834986">"તમારું ડિવાઇસ <xliff:g id="DEVICE_OWNER_APP">%1$s</xliff:g> દ્વારા મેનેજ થાય છે."</string> <string name="monitoring_description_do_header_with_name" msgid="2696255132542779511">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>, તમારા ઉપકરણનું સંચાલન કરવા માટે <xliff:g id="DEVICE_OWNER_APP">%2$s</xliff:g> નો ઉપયોગ કરે છે."</string> - <string name="monitoring_description_do_body" msgid="7700878065625769970">"વ્યવસ્થાપક સેટિંગ્સ, કૉર્પોરેટ ઍક્સેસ, ઍપ્સ, તમારા ઉપકરણ સંબંદ્ધ ડેટા અને ઉપકરણની સ્થાન માહિતીનું નિરીક્ષણ અને સંચાલન કરી શકે છે."</string> + <string name="monitoring_description_do_body" msgid="7700878065625769970">"વ્યવસ્થાપક સેટિંગ, કૉર્પોરેટ ઍક્સેસ, ઍપ, તમારા ડિવાઇસ સંબંધિત ડેટા અને ડિવાઇસની સ્થાન માહિતીને મૉનિટર અને મેનેજ કરી શકે છે."</string> <string name="monitoring_description_do_learn_more_separator" msgid="1467280496376492558">" "</string> <string name="monitoring_description_do_learn_more" msgid="645149183455573790">"વધુ જાણો"</string> <string name="monitoring_description_do_body_vpn" msgid="7699280130070502303">"તમે <xliff:g id="VPN_APP">%1$s</xliff:g> સાથે કનેક્ટ થયાં છો, જે ઇમેઇલ્સ, ઍપ્લિકેશનો અને વેબસાઇટ્સ સહિત તમારી નેટવર્ક પ્રવૃત્તિને મૉનિટર કરી શકે છે."</string> <string name="monitoring_description_vpn_settings_separator" msgid="8292589617720435430">" "</string> - <string name="monitoring_description_vpn_settings" msgid="5264167033247632071">"VPNની સેટિંગ્સ ખોલો"</string> + <string name="monitoring_description_vpn_settings" msgid="5264167033247632071">"VPN સેટિંગ ખોલો"</string> <string name="monitoring_description_ca_cert_settings_separator" msgid="7107390013344435439">" "</string> <string name="monitoring_description_ca_cert_settings" msgid="8329781950135541003">"વિશ્વસનીય ઓળખપત્ર ખોલો"</string> <string name="monitoring_description_network_logging" msgid="577305979174002252">"તમારા વ્યવસ્થાપકે નેટવર્ક લૉગિંગ ચાલુ કર્યુ છે, જે તમારા ઉપકરણ પર ટ્રાફિકનું નિરીક્ષણ કરે છે.\n\nવધુ માહિતી માટે, તમારા વ્યવસ્થાપકનો સંપર્ક કરો."</string> @@ -617,7 +617,7 @@ <string name="screen_pinning_start" msgid="7483998671383371313">"ઍપ પિન કરી"</string> <string name="screen_pinning_exit" msgid="4553787518387346893">"ઍપ અનપિન કરી"</string> <string name="quick_settings_reset_confirmation_title" msgid="463533331480997595">"<xliff:g id="TILE_LABEL">%1$s</xliff:g> ને છુપાવીએ?"</string> - <string name="quick_settings_reset_confirmation_message" msgid="2320586180785674186">"તે સેટિંગ્સમાં તમે તેને ચાલુ કરશો ત્યારે આગલી વખતે ફરીથી દેખાશે."</string> + <string name="quick_settings_reset_confirmation_message" msgid="2320586180785674186">"તે સેટિંગમાં તમે તેને ચાલુ કરશો ત્યારે આગલી વખતે ફરીથી દેખાશે."</string> <string name="quick_settings_reset_confirmation_button" msgid="3341477479055016776">"છુપાવો"</string> <string name="stream_voice_call" msgid="7468348170702375660">"કૉલ કરો"</string> <string name="stream_system" msgid="7663148785370565134">"સિસ્ટમ"</string> @@ -655,7 +655,7 @@ <string name="system_ui_tuner" msgid="1471348823289954729">"સિસ્ટમ UI ટ્યૂનર"</string> <string name="show_battery_percentage" msgid="6235377891802910455">"એમ્બેડ કરેલ બૅટરી ટકા બતાવો"</string> <string name="show_battery_percentage_summary" msgid="9053024758304102915">"જ્યારે ચાર્જ ન થઈ રહ્યું હોય ત્યારે સ્ટેટસ બાર આયકનની અંદર બૅટરી સ્તર ટકા બતાવો"</string> - <string name="quick_settings" msgid="6211774484997470203">"ઝડપી સેટિંગ્સ"</string> + <string name="quick_settings" msgid="6211774484997470203">"ઝડપી સેટિંગ"</string> <string name="status_bar" msgid="4357390266055077437">"સ્ટેટસ બાર"</string> <string name="overview" msgid="3522318590458536816">"ઝલક"</string> <string name="demo_mode" msgid="263484519766901593">"સિસ્ટમ UI ડેમો મોડ"</string> @@ -680,21 +680,21 @@ <string name="zen_alarm_warning" msgid="7844303238486849503">"તમે <xliff:g id="WHEN">%1$s</xliff:g> એ તમારો આગલો એલાર્મ સાંભળશો નહીં"</string> <string name="alarm_template" msgid="2234991538018805736">"<xliff:g id="WHEN">%1$s</xliff:g> વાગ્યે"</string> <string name="alarm_template_far" msgid="3561752195856839456">"<xliff:g id="WHEN">%1$s</xliff:g> એ"</string> - <string name="accessibility_quick_settings_detail" msgid="544463655956179791">"ઝડપી સેટિંગ્સ, <xliff:g id="TITLE">%s</xliff:g>."</string> + <string name="accessibility_quick_settings_detail" msgid="544463655956179791">"ઝડપી સેટિંગ, <xliff:g id="TITLE">%s</xliff:g>."</string> <string name="accessibility_status_bar_hotspot" msgid="2888479317489131669">"હૉટસ્પૉટ"</string> <string name="accessibility_managed_profile" msgid="4703836746209377356">"ઑફિસની પ્રોફાઇલ"</string> <string name="tuner_warning_title" msgid="7721976098452135267">"કેટલાક માટે મજા પરંતુ બધા માટે નહીં"</string> <string name="tuner_warning" msgid="1861736288458481650">"સિસ્ટમ UI ટ્યૂનર તમને Android વપરાશકર્તા ઇન્ટરફેસને ટ્વીક અને કસ્ટમાઇઝ કરવાની વધારાની રીતો આપે છે. ભાવિ રીલિઝેસમાં આ પ્રાયોગિક સુવિધાઓ બદલાઈ, ભંગ અથવા અદૃશ્ય થઈ શકે છે. સાવધાની સાથે આગળ વધો."</string> <string name="tuner_persistent_warning" msgid="230466285569307806">"ભાવિ રીલિઝેસમાં આ પ્રાયોગિક સુવિધાઓ બદલાઈ, ભંગ અથવા અદૃશ્ય થઈ શકે છે. સાવધાની સાથે આગળ વધો."</string> <string name="got_it" msgid="477119182261892069">"સમજાઈ ગયું"</string> - <string name="tuner_toast" msgid="3812684836514766951">"અભિનંદન! સિસ્ટમ UI ટ્યૂનરને સેટિંગ્સમાં ઉમેરવામાં આવ્યું છે"</string> - <string name="remove_from_settings" msgid="633775561782209994">"સેટિંગ્સમાંથી દૂર કરો"</string> - <string name="remove_from_settings_prompt" msgid="551565437265615426">"સેટિંગ્સમાંથી સિસ્ટમ UI ટ્યૂનર દૂર કરી અને તેની તમામ સુવિધાઓનો ઉપયોગ કરવાનું બંધ કરીએ?"</string> + <string name="tuner_toast" msgid="3812684836514766951">"અભિનંદન! સિસ્ટમ UI ટ્યૂનરને સેટિંગમાં ઉમેરવામાં આવ્યું છે"</string> + <string name="remove_from_settings" msgid="633775561782209994">"સેટિંગમાંથી કાઢી નાખો"</string> + <string name="remove_from_settings_prompt" msgid="551565437265615426">"સેટિંગમાંથી સિસ્ટમ UI ટ્યૂનર કાઢી નાખી અને તેની તમામ સુવિધાઓનો ઉપયોગ કરવાનું બંધ કરીએ?"</string> <string name="activity_not_found" msgid="8711661533828200293">"તમારા ઉપકરણ પર ઍપ્લિકેશન ઇન્સ્ટોલ થયેલ નથી"</string> <string name="clock_seconds" msgid="8709189470828542071">"ઘડિયાળ સેકન્ડ બતાવો"</string> <string name="clock_seconds_desc" msgid="2415312788902144817">"ઘડિયાળ સેકન્ડ સ્થિતિ બારમાં બતાવો. બૅટરીની આવરદા પર અસર કરી શકે છે."</string> - <string name="qs_rearrange" msgid="484816665478662911">"ઝડપી સેટિંગ્સને ફરીથી ગોઠવો"</string> - <string name="show_brightness" msgid="6700267491672470007">"ઝડપી સેટિંગ્સમાં તેજ બતાવો"</string> + <string name="qs_rearrange" msgid="484816665478662911">"ઝડપી સેટિંગને ફરીથી ગોઠવો"</string> + <string name="show_brightness" msgid="6700267491672470007">"ઝડપી સેટિંગમાં બ્રાઇટનેસ બતાવો"</string> <string name="experimental" msgid="3549865454812314826">"પ્રાયોગિક"</string> <string name="enable_bluetooth_title" msgid="866883307336662596">"બ્લૂટૂથ ચાલુ કરવુ છે?"</string> <string name="enable_bluetooth_message" msgid="6740938333772779717">"તમારા ટેબ્લેટ સાથે કીબોર્ડ કનેક્ટ કરવા માટે, તમારે પહેલાં બ્લૂટૂથ ચાલુ કરવાની જરૂર પડશે."</string> @@ -916,19 +916,19 @@ <string name="accessibility_qs_edit_position" msgid="4509277359815711830">"જગ્યા <xliff:g id="POSITION">%1$d</xliff:g>"</string> <string name="accessibility_qs_edit_tile_added" msgid="9067146040380836334">"ટાઇલ ઉમેરી"</string> <string name="accessibility_qs_edit_tile_removed" msgid="1175925632436612036">"ટાઇલ કાઢી નાખી"</string> - <string name="accessibility_desc_quick_settings_edit" msgid="741658939453595297">"ઝડપી સેટિંગ્સ સંપાદક."</string> + <string name="accessibility_desc_quick_settings_edit" msgid="741658939453595297">"ઝડપી સેટિંગ એડિટર."</string> <string name="accessibility_desc_notification_icon" msgid="7331265967584178674">"<xliff:g id="ID_1">%1$s</xliff:g> નોટિફિકેશન: <xliff:g id="ID_2">%2$s</xliff:g>"</string> - <string name="accessibility_quick_settings_settings" msgid="7098489591715844713">"સેટિંગ્સ ખોલો."</string> - <string name="accessibility_quick_settings_expand" msgid="2609275052412521467">"ઝડપી સેટિંગ્સ ખોલો."</string> - <string name="accessibility_quick_settings_collapse" msgid="4674876336725041982">"ઝડપી સેટિંગ્સ બંધ કરો."</string> + <string name="accessibility_quick_settings_settings" msgid="7098489591715844713">"સેટિંગ ખોલો."</string> + <string name="accessibility_quick_settings_expand" msgid="2609275052412521467">"ઝડપી સેટિંગ ખોલો."</string> + <string name="accessibility_quick_settings_collapse" msgid="4674876336725041982">"ઝડપી સેટિંગ બંધ કરો."</string> <string name="accessibility_quick_settings_alarm_set" msgid="7237918261045099853">"એલાર્મ સેટ કર્યો."</string> <string name="accessibility_quick_settings_user" msgid="505821942882668619">"<xliff:g id="ID_1">%s</xliff:g> તરીકે સાઇન ઇન કર્યું"</string> <string name="accessibility_quick_settings_choose_user_action" msgid="4554388498186576087">"વપરાશકર્તા પસંદ કરો"</string> <string name="data_connection_no_internet" msgid="691058178914184544">"કોઈ ઇન્ટરનેટ નથી"</string> <string name="accessibility_quick_settings_open_details" msgid="4879279912389052142">"વિગતો ખોલો."</string> <string name="accessibility_quick_settings_not_available" msgid="6860875849497473854">"<xliff:g id="REASON">%s</xliff:g>ને કારણે અનુપલબ્ધ છે"</string> - <string name="accessibility_quick_settings_open_settings" msgid="536838345505030893">"<xliff:g id="ID_1">%s</xliff:g> સેટિંગ્સ ખોલો."</string> - <string name="accessibility_quick_settings_edit" msgid="1523745183383815910">"સેટિંગ્સનો ક્રમ સંપાદિત કરો."</string> + <string name="accessibility_quick_settings_open_settings" msgid="536838345505030893">"<xliff:g id="ID_1">%s</xliff:g> સેટિંગ ખોલો."</string> + <string name="accessibility_quick_settings_edit" msgid="1523745183383815910">"સેટિંગના ક્રમમાં ફેરફાર કરો."</string> <string name="accessibility_quick_settings_power_menu" msgid="6820426108301758412">"પાવર મેનૂ"</string> <string name="accessibility_quick_settings_page" msgid="7506322631645550961">"<xliff:g id="ID_2">%2$d</xliff:g> માંથી <xliff:g id="ID_1">%1$d</xliff:g> પૃષ્ઠ"</string> <string name="tuner_lock_screen" msgid="2267383813241144544">"લૉક સ્ક્રીન"</string> @@ -986,7 +986,7 @@ <string name="mobile_data_disable_title" msgid="5366476131671617790">"મોબાઇલ ડેટા બંધ કરીએ?"</string> <string name="mobile_data_disable_message" msgid="8604966027899770415">"તમને <xliff:g id="CARRIER">%s</xliff:g> મારફતે ડેટા અથવા ઇન્ટરનેટનો ઍક્સેસ મળશે નહીં. ઇન્ટરનેટ માત્ર વાઇ-ફાઇ દ્વારા ઉપલબ્ધ થશે."</string> <string name="mobile_data_disable_message_default_carrier" msgid="6496033312431658238">"તમારા કૅરિઅર"</string> - <string name="touch_filtered_warning" msgid="8119511393338714836">"એક ઍપ પરવાનગી વિનંતીને અસ્પષ્ટ કરતી હોવાને કારણે, સેટિંગ્સ તમારા પ્રતિસાદને ચકાસી શકતી નથી."</string> + <string name="touch_filtered_warning" msgid="8119511393338714836">"કોઈ ઍપ પરવાનગી વિનંતીને અસ્પષ્ટ કરતી હોવાને કારણે, સેટિંગ તમારા પ્રતિસાદને ચકાસી શકતું નથી."</string> <string name="slice_permission_title" msgid="3262615140094151017">"<xliff:g id="APP_0">%1$s</xliff:g>ને <xliff:g id="APP_2">%2$s</xliff:g> સ્લાઇસ બતાવવાની મંજૂરી આપીએ?"</string> <string name="slice_permission_text_1" msgid="6675965177075443714">"- મારાથી <xliff:g id="APP">%1$s</xliff:g>ની માહિતી વાંચી શકાતી નથી"</string> <string name="slice_permission_text_2" msgid="6758906940360746983">"- મારાથી <xliff:g id="APP">%1$s</xliff:g>ની અંદર ક્રિયાઓ કરી શકાતી નથી"</string> diff --git a/packages/SystemUI/res/values-gu/strings_tv.xml b/packages/SystemUI/res/values-gu/strings_tv.xml index a53e9838b4a0..c2c8ad647b7e 100644 --- a/packages/SystemUI/res/values-gu/strings_tv.xml +++ b/packages/SystemUI/res/values-gu/strings_tv.xml @@ -26,4 +26,16 @@ <string name="notification_disclosure_vpn_text" msgid="3873532735584866236">"<xliff:g id="VPN_APP">%1$s</xliff:g> મારફતે"</string> <string name="tv_notification_panel_title" msgid="5311050946506276154">"નોટિફિકેશન"</string> <string name="tv_notification_panel_no_notifications" msgid="9115191912267270678">"કોઈ નોટિફિકેશન નથી"</string> + <!-- no translation found for mic_recording_announcement (7587123608060316575) --> + <skip /> + <!-- no translation found for camera_recording_announcement (7240177719403759112) --> + <skip /> + <!-- no translation found for mic_and_camera_recording_announcement (8599231390508812667) --> + <skip /> + <!-- no translation found for mic_stopped_recording_announcement (7301537004900721242) --> + <skip /> + <!-- no translation found for camera_stopped_recording_announcement (8540496432367032801) --> + <skip /> + <!-- no translation found for mic_camera_stopped_recording_announcement (8708524579599977412) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-hi/strings_tv.xml b/packages/SystemUI/res/values-hi/strings_tv.xml index fedaae3f4710..eb8f1504c9d9 100644 --- a/packages/SystemUI/res/values-hi/strings_tv.xml +++ b/packages/SystemUI/res/values-hi/strings_tv.xml @@ -26,4 +26,16 @@ <string name="notification_disclosure_vpn_text" msgid="3873532735584866236">"<xliff:g id="VPN_APP">%1$s</xliff:g> के ज़रिए"</string> <string name="tv_notification_panel_title" msgid="5311050946506276154">"सूचनाएं"</string> <string name="tv_notification_panel_no_notifications" msgid="9115191912267270678">"कोई सूचना नहीं है"</string> + <!-- no translation found for mic_recording_announcement (7587123608060316575) --> + <skip /> + <!-- no translation found for camera_recording_announcement (7240177719403759112) --> + <skip /> + <!-- no translation found for mic_and_camera_recording_announcement (8599231390508812667) --> + <skip /> + <!-- no translation found for mic_stopped_recording_announcement (7301537004900721242) --> + <skip /> + <!-- no translation found for camera_stopped_recording_announcement (8540496432367032801) --> + <skip /> + <!-- no translation found for mic_camera_stopped_recording_announcement (8708524579599977412) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-hr/strings_tv.xml b/packages/SystemUI/res/values-hr/strings_tv.xml index 3bfdf7038018..241195bade80 100644 --- a/packages/SystemUI/res/values-hr/strings_tv.xml +++ b/packages/SystemUI/res/values-hr/strings_tv.xml @@ -26,4 +26,16 @@ <string name="notification_disclosure_vpn_text" msgid="3873532735584866236">"Putem mreže <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> <string name="tv_notification_panel_title" msgid="5311050946506276154">"Obavijesti"</string> <string name="tv_notification_panel_no_notifications" msgid="9115191912267270678">"Nema obavijesti"</string> + <!-- no translation found for mic_recording_announcement (7587123608060316575) --> + <skip /> + <!-- no translation found for camera_recording_announcement (7240177719403759112) --> + <skip /> + <!-- no translation found for mic_and_camera_recording_announcement (8599231390508812667) --> + <skip /> + <!-- no translation found for mic_stopped_recording_announcement (7301537004900721242) --> + <skip /> + <!-- no translation found for camera_stopped_recording_announcement (8540496432367032801) --> + <skip /> + <!-- no translation found for mic_camera_stopped_recording_announcement (8708524579599977412) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-hu/strings_tv.xml b/packages/SystemUI/res/values-hu/strings_tv.xml index 91183af142a5..e825584d42c7 100644 --- a/packages/SystemUI/res/values-hu/strings_tv.xml +++ b/packages/SystemUI/res/values-hu/strings_tv.xml @@ -26,4 +26,16 @@ <string name="notification_disclosure_vpn_text" msgid="3873532735584866236">"Ezzel: <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> <string name="tv_notification_panel_title" msgid="5311050946506276154">"Értesítések"</string> <string name="tv_notification_panel_no_notifications" msgid="9115191912267270678">"Nincs értesítés"</string> + <!-- no translation found for mic_recording_announcement (7587123608060316575) --> + <skip /> + <!-- no translation found for camera_recording_announcement (7240177719403759112) --> + <skip /> + <!-- no translation found for mic_and_camera_recording_announcement (8599231390508812667) --> + <skip /> + <!-- no translation found for mic_stopped_recording_announcement (7301537004900721242) --> + <skip /> + <!-- no translation found for camera_stopped_recording_announcement (8540496432367032801) --> + <skip /> + <!-- no translation found for mic_camera_stopped_recording_announcement (8708524579599977412) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-hy/strings_tv.xml b/packages/SystemUI/res/values-hy/strings_tv.xml index cf4eb90faff2..0fab090af8a4 100644 --- a/packages/SystemUI/res/values-hy/strings_tv.xml +++ b/packages/SystemUI/res/values-hy/strings_tv.xml @@ -26,4 +26,16 @@ <string name="notification_disclosure_vpn_text" msgid="3873532735584866236">"<xliff:g id="VPN_APP">%1$s</xliff:g>-ի միջոցով"</string> <string name="tv_notification_panel_title" msgid="5311050946506276154">"Ծանուցումներ"</string> <string name="tv_notification_panel_no_notifications" msgid="9115191912267270678">"Ծանուցումներ չկան"</string> + <!-- no translation found for mic_recording_announcement (7587123608060316575) --> + <skip /> + <!-- no translation found for camera_recording_announcement (7240177719403759112) --> + <skip /> + <!-- no translation found for mic_and_camera_recording_announcement (8599231390508812667) --> + <skip /> + <!-- no translation found for mic_stopped_recording_announcement (7301537004900721242) --> + <skip /> + <!-- no translation found for camera_stopped_recording_announcement (8540496432367032801) --> + <skip /> + <!-- no translation found for mic_camera_stopped_recording_announcement (8708524579599977412) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-in/strings_tv.xml b/packages/SystemUI/res/values-in/strings_tv.xml index 3b446ad23ed5..c787ca2dd573 100644 --- a/packages/SystemUI/res/values-in/strings_tv.xml +++ b/packages/SystemUI/res/values-in/strings_tv.xml @@ -26,4 +26,16 @@ <string name="notification_disclosure_vpn_text" msgid="3873532735584866236">"Melalui <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> <string name="tv_notification_panel_title" msgid="5311050946506276154">"Notifikasi"</string> <string name="tv_notification_panel_no_notifications" msgid="9115191912267270678">"Tidak Ada Notifikasi"</string> + <!-- no translation found for mic_recording_announcement (7587123608060316575) --> + <skip /> + <!-- no translation found for camera_recording_announcement (7240177719403759112) --> + <skip /> + <!-- no translation found for mic_and_camera_recording_announcement (8599231390508812667) --> + <skip /> + <!-- no translation found for mic_stopped_recording_announcement (7301537004900721242) --> + <skip /> + <!-- no translation found for camera_stopped_recording_announcement (8540496432367032801) --> + <skip /> + <!-- no translation found for mic_camera_stopped_recording_announcement (8708524579599977412) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-is/strings_tv.xml b/packages/SystemUI/res/values-is/strings_tv.xml index 7c23e62dfdcf..6d7c91c03760 100644 --- a/packages/SystemUI/res/values-is/strings_tv.xml +++ b/packages/SystemUI/res/values-is/strings_tv.xml @@ -26,4 +26,16 @@ <string name="notification_disclosure_vpn_text" msgid="3873532735584866236">"Í gegnum <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> <string name="tv_notification_panel_title" msgid="5311050946506276154">"Tilkynningar"</string> <string name="tv_notification_panel_no_notifications" msgid="9115191912267270678">"Engar tilkynningar"</string> + <!-- no translation found for mic_recording_announcement (7587123608060316575) --> + <skip /> + <!-- no translation found for camera_recording_announcement (7240177719403759112) --> + <skip /> + <!-- no translation found for mic_and_camera_recording_announcement (8599231390508812667) --> + <skip /> + <!-- no translation found for mic_stopped_recording_announcement (7301537004900721242) --> + <skip /> + <!-- no translation found for camera_stopped_recording_announcement (8540496432367032801) --> + <skip /> + <!-- no translation found for mic_camera_stopped_recording_announcement (8708524579599977412) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-it/strings_tv.xml b/packages/SystemUI/res/values-it/strings_tv.xml index 57931b02d58a..c6760290446f 100644 --- a/packages/SystemUI/res/values-it/strings_tv.xml +++ b/packages/SystemUI/res/values-it/strings_tv.xml @@ -26,4 +26,16 @@ <string name="notification_disclosure_vpn_text" msgid="3873532735584866236">"Tramite <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> <string name="tv_notification_panel_title" msgid="5311050946506276154">"Notifiche"</string> <string name="tv_notification_panel_no_notifications" msgid="9115191912267270678">"Nessuna notifica"</string> + <!-- no translation found for mic_recording_announcement (7587123608060316575) --> + <skip /> + <!-- no translation found for camera_recording_announcement (7240177719403759112) --> + <skip /> + <!-- no translation found for mic_and_camera_recording_announcement (8599231390508812667) --> + <skip /> + <!-- no translation found for mic_stopped_recording_announcement (7301537004900721242) --> + <skip /> + <!-- no translation found for camera_stopped_recording_announcement (8540496432367032801) --> + <skip /> + <!-- no translation found for mic_camera_stopped_recording_announcement (8708524579599977412) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-iw/strings_tv.xml b/packages/SystemUI/res/values-iw/strings_tv.xml index f01321efc967..46e61d0c5bb5 100644 --- a/packages/SystemUI/res/values-iw/strings_tv.xml +++ b/packages/SystemUI/res/values-iw/strings_tv.xml @@ -26,4 +26,16 @@ <string name="notification_disclosure_vpn_text" msgid="3873532735584866236">"דרך <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> <string name="tv_notification_panel_title" msgid="5311050946506276154">"התראות"</string> <string name="tv_notification_panel_no_notifications" msgid="9115191912267270678">"אין התראות"</string> + <!-- no translation found for mic_recording_announcement (7587123608060316575) --> + <skip /> + <!-- no translation found for camera_recording_announcement (7240177719403759112) --> + <skip /> + <!-- no translation found for mic_and_camera_recording_announcement (8599231390508812667) --> + <skip /> + <!-- no translation found for mic_stopped_recording_announcement (7301537004900721242) --> + <skip /> + <!-- no translation found for camera_stopped_recording_announcement (8540496432367032801) --> + <skip /> + <!-- no translation found for mic_camera_stopped_recording_announcement (8708524579599977412) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-ja/strings_tv.xml b/packages/SystemUI/res/values-ja/strings_tv.xml index 7f676b5acbe2..798caec1404b 100644 --- a/packages/SystemUI/res/values-ja/strings_tv.xml +++ b/packages/SystemUI/res/values-ja/strings_tv.xml @@ -26,4 +26,16 @@ <string name="notification_disclosure_vpn_text" msgid="3873532735584866236">"<xliff:g id="VPN_APP">%1$s</xliff:g> 経由"</string> <string name="tv_notification_panel_title" msgid="5311050946506276154">"通知"</string> <string name="tv_notification_panel_no_notifications" msgid="9115191912267270678">"通知はありません"</string> + <!-- no translation found for mic_recording_announcement (7587123608060316575) --> + <skip /> + <!-- no translation found for camera_recording_announcement (7240177719403759112) --> + <skip /> + <!-- no translation found for mic_and_camera_recording_announcement (8599231390508812667) --> + <skip /> + <!-- no translation found for mic_stopped_recording_announcement (7301537004900721242) --> + <skip /> + <!-- no translation found for camera_stopped_recording_announcement (8540496432367032801) --> + <skip /> + <!-- no translation found for mic_camera_stopped_recording_announcement (8708524579599977412) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-ka/strings_tv.xml b/packages/SystemUI/res/values-ka/strings_tv.xml index 081978125ee3..b158e5cef3bf 100644 --- a/packages/SystemUI/res/values-ka/strings_tv.xml +++ b/packages/SystemUI/res/values-ka/strings_tv.xml @@ -26,4 +26,16 @@ <string name="notification_disclosure_vpn_text" msgid="3873532735584866236">"<xliff:g id="VPN_APP">%1$s</xliff:g>-ის მიერ"</string> <string name="tv_notification_panel_title" msgid="5311050946506276154">"შეტყობინებები"</string> <string name="tv_notification_panel_no_notifications" msgid="9115191912267270678">"შეტყობინებები არ არის"</string> + <!-- no translation found for mic_recording_announcement (7587123608060316575) --> + <skip /> + <!-- no translation found for camera_recording_announcement (7240177719403759112) --> + <skip /> + <!-- no translation found for mic_and_camera_recording_announcement (8599231390508812667) --> + <skip /> + <!-- no translation found for mic_stopped_recording_announcement (7301537004900721242) --> + <skip /> + <!-- no translation found for camera_stopped_recording_announcement (8540496432367032801) --> + <skip /> + <!-- no translation found for mic_camera_stopped_recording_announcement (8708524579599977412) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-kk/strings_tv.xml b/packages/SystemUI/res/values-kk/strings_tv.xml index 768e3ac19316..36440c920793 100644 --- a/packages/SystemUI/res/values-kk/strings_tv.xml +++ b/packages/SystemUI/res/values-kk/strings_tv.xml @@ -26,4 +26,16 @@ <string name="notification_disclosure_vpn_text" msgid="3873532735584866236">"<xliff:g id="VPN_APP">%1$s</xliff:g> арқылы жалғанған"</string> <string name="tv_notification_panel_title" msgid="5311050946506276154">"Хабарландырулар"</string> <string name="tv_notification_panel_no_notifications" msgid="9115191912267270678">"Хабарландырулар жоқ"</string> + <!-- no translation found for mic_recording_announcement (7587123608060316575) --> + <skip /> + <!-- no translation found for camera_recording_announcement (7240177719403759112) --> + <skip /> + <!-- no translation found for mic_and_camera_recording_announcement (8599231390508812667) --> + <skip /> + <!-- no translation found for mic_stopped_recording_announcement (7301537004900721242) --> + <skip /> + <!-- no translation found for camera_stopped_recording_announcement (8540496432367032801) --> + <skip /> + <!-- no translation found for mic_camera_stopped_recording_announcement (8708524579599977412) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-km/strings_tv.xml b/packages/SystemUI/res/values-km/strings_tv.xml index 0dec2d65e5bf..b04cc2b7149f 100644 --- a/packages/SystemUI/res/values-km/strings_tv.xml +++ b/packages/SystemUI/res/values-km/strings_tv.xml @@ -26,4 +26,16 @@ <string name="notification_disclosure_vpn_text" msgid="3873532735584866236">"តាមរយៈ <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> <string name="tv_notification_panel_title" msgid="5311050946506276154">"ការជូនដំណឹង"</string> <string name="tv_notification_panel_no_notifications" msgid="9115191912267270678">"គ្មានការជូនដំណឹងទេ"</string> + <!-- no translation found for mic_recording_announcement (7587123608060316575) --> + <skip /> + <!-- no translation found for camera_recording_announcement (7240177719403759112) --> + <skip /> + <!-- no translation found for mic_and_camera_recording_announcement (8599231390508812667) --> + <skip /> + <!-- no translation found for mic_stopped_recording_announcement (7301537004900721242) --> + <skip /> + <!-- no translation found for camera_stopped_recording_announcement (8540496432367032801) --> + <skip /> + <!-- no translation found for mic_camera_stopped_recording_announcement (8708524579599977412) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-kn/strings_tv.xml b/packages/SystemUI/res/values-kn/strings_tv.xml index ef10e3a2a664..e4b33140af11 100644 --- a/packages/SystemUI/res/values-kn/strings_tv.xml +++ b/packages/SystemUI/res/values-kn/strings_tv.xml @@ -26,4 +26,16 @@ <string name="notification_disclosure_vpn_text" msgid="3873532735584866236">"<xliff:g id="VPN_APP">%1$s</xliff:g> ಮೂಲಕ"</string> <string name="tv_notification_panel_title" msgid="5311050946506276154">"ಅಧಿಸೂಚನೆಗಳು"</string> <string name="tv_notification_panel_no_notifications" msgid="9115191912267270678">"ಯಾವುದೇ ಅಧಿಸೂಚನೆಗಳಿಲ್ಲ"</string> + <!-- no translation found for mic_recording_announcement (7587123608060316575) --> + <skip /> + <!-- no translation found for camera_recording_announcement (7240177719403759112) --> + <skip /> + <!-- no translation found for mic_and_camera_recording_announcement (8599231390508812667) --> + <skip /> + <!-- no translation found for mic_stopped_recording_announcement (7301537004900721242) --> + <skip /> + <!-- no translation found for camera_stopped_recording_announcement (8540496432367032801) --> + <skip /> + <!-- no translation found for mic_camera_stopped_recording_announcement (8708524579599977412) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-ko/strings_tv.xml b/packages/SystemUI/res/values-ko/strings_tv.xml index f9c723a3b33b..8849265b3f23 100644 --- a/packages/SystemUI/res/values-ko/strings_tv.xml +++ b/packages/SystemUI/res/values-ko/strings_tv.xml @@ -26,4 +26,16 @@ <string name="notification_disclosure_vpn_text" msgid="3873532735584866236">"<xliff:g id="VPN_APP">%1$s</xliff:g>에 연결됨"</string> <string name="tv_notification_panel_title" msgid="5311050946506276154">"알림"</string> <string name="tv_notification_panel_no_notifications" msgid="9115191912267270678">"알림 없음"</string> + <!-- no translation found for mic_recording_announcement (7587123608060316575) --> + <skip /> + <!-- no translation found for camera_recording_announcement (7240177719403759112) --> + <skip /> + <!-- no translation found for mic_and_camera_recording_announcement (8599231390508812667) --> + <skip /> + <!-- no translation found for mic_stopped_recording_announcement (7301537004900721242) --> + <skip /> + <!-- no translation found for camera_stopped_recording_announcement (8540496432367032801) --> + <skip /> + <!-- no translation found for mic_camera_stopped_recording_announcement (8708524579599977412) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-ky/strings.xml b/packages/SystemUI/res/values-ky/strings.xml index 9c2929d731e2..0a0bf4c4ef96 100644 --- a/packages/SystemUI/res/values-ky/strings.xml +++ b/packages/SystemUI/res/values-ky/strings.xml @@ -1017,8 +1017,8 @@ <string name="device_services" msgid="1549944177856658705">"Түзмөк кызматтары"</string> <string name="music_controls_no_title" msgid="4166497066552290938">"Аталышы жок"</string> <string name="bubble_accessibility_action_move" msgid="3185080443743819178">"Жылдыруу"</string> - <string name="notification_content_system_nav_changed" msgid="5077913144844684544">"Тутум чабыттоосу жаңырды. Өзгөртүү үчүн, Жөндөөлөргө өтүңүз."</string> - <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"Тутум чабыттоосун жаңыртуу үчүн Жөндөөлөргө өтүңүз"</string> + <string name="notification_content_system_nav_changed" msgid="5077913144844684544">"Тутум чабыттоосу жаңырды. Өзгөртүү үчүн, жөндөөлөргө өтүңүз."</string> + <string name="notification_content_gesture_nav_available" msgid="4431460803004659888">"Тутум чабыттоосун жаңыртуу үчүн жөндөөлөргө өтүңүз"</string> <string name="inattentive_sleep_warning_title" msgid="3891371591713990373">"Көшүү режими"</string> <string name="magnification_window_title" msgid="4863914360847258333">"Чоңойтуу терезеси"</string> <string name="magnification_controls_title" msgid="8421106606708891519">"Чоңойтуу терезесин башкаруу каражаттары"</string> diff --git a/packages/SystemUI/res/values-ky/strings_tv.xml b/packages/SystemUI/res/values-ky/strings_tv.xml index 1dba865803d2..128c7e0c0a33 100644 --- a/packages/SystemUI/res/values-ky/strings_tv.xml +++ b/packages/SystemUI/res/values-ky/strings_tv.xml @@ -26,4 +26,16 @@ <string name="notification_disclosure_vpn_text" msgid="3873532735584866236">"<xliff:g id="VPN_APP">%1$s</xliff:g> аркылуу"</string> <string name="tv_notification_panel_title" msgid="5311050946506276154">"Билдирмелер"</string> <string name="tv_notification_panel_no_notifications" msgid="9115191912267270678">"Билдирме жок"</string> + <!-- no translation found for mic_recording_announcement (7587123608060316575) --> + <skip /> + <!-- no translation found for camera_recording_announcement (7240177719403759112) --> + <skip /> + <!-- no translation found for mic_and_camera_recording_announcement (8599231390508812667) --> + <skip /> + <!-- no translation found for mic_stopped_recording_announcement (7301537004900721242) --> + <skip /> + <!-- no translation found for camera_stopped_recording_announcement (8540496432367032801) --> + <skip /> + <!-- no translation found for mic_camera_stopped_recording_announcement (8708524579599977412) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-lo/strings_tv.xml b/packages/SystemUI/res/values-lo/strings_tv.xml index a45fb45cc76f..b8524568abb2 100644 --- a/packages/SystemUI/res/values-lo/strings_tv.xml +++ b/packages/SystemUI/res/values-lo/strings_tv.xml @@ -26,4 +26,16 @@ <string name="notification_disclosure_vpn_text" msgid="3873532735584866236">"ຜ່ານ <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> <string name="tv_notification_panel_title" msgid="5311050946506276154">"ການແຈ້ງເຕືອນ"</string> <string name="tv_notification_panel_no_notifications" msgid="9115191912267270678">"ບໍ່ມີການແຈ້ງເຕືອນ"</string> + <!-- no translation found for mic_recording_announcement (7587123608060316575) --> + <skip /> + <!-- no translation found for camera_recording_announcement (7240177719403759112) --> + <skip /> + <!-- no translation found for mic_and_camera_recording_announcement (8599231390508812667) --> + <skip /> + <!-- no translation found for mic_stopped_recording_announcement (7301537004900721242) --> + <skip /> + <!-- no translation found for camera_stopped_recording_announcement (8540496432367032801) --> + <skip /> + <!-- no translation found for mic_camera_stopped_recording_announcement (8708524579599977412) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-lt/strings_tv.xml b/packages/SystemUI/res/values-lt/strings_tv.xml index 8c329f961b5c..7cd7507162c9 100644 --- a/packages/SystemUI/res/values-lt/strings_tv.xml +++ b/packages/SystemUI/res/values-lt/strings_tv.xml @@ -26,4 +26,16 @@ <string name="notification_disclosure_vpn_text" msgid="3873532735584866236">"Per „<xliff:g id="VPN_APP">%1$s</xliff:g>“"</string> <string name="tv_notification_panel_title" msgid="5311050946506276154">"Pranešimai"</string> <string name="tv_notification_panel_no_notifications" msgid="9115191912267270678">"Nėra jokių pranešimų"</string> + <!-- no translation found for mic_recording_announcement (7587123608060316575) --> + <skip /> + <!-- no translation found for camera_recording_announcement (7240177719403759112) --> + <skip /> + <!-- no translation found for mic_and_camera_recording_announcement (8599231390508812667) --> + <skip /> + <!-- no translation found for mic_stopped_recording_announcement (7301537004900721242) --> + <skip /> + <!-- no translation found for camera_stopped_recording_announcement (8540496432367032801) --> + <skip /> + <!-- no translation found for mic_camera_stopped_recording_announcement (8708524579599977412) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-lv/strings_tv.xml b/packages/SystemUI/res/values-lv/strings_tv.xml index 758d28cddc82..4c648438ff66 100644 --- a/packages/SystemUI/res/values-lv/strings_tv.xml +++ b/packages/SystemUI/res/values-lv/strings_tv.xml @@ -26,4 +26,16 @@ <string name="notification_disclosure_vpn_text" msgid="3873532735584866236">"Izmantojot: <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> <string name="tv_notification_panel_title" msgid="5311050946506276154">"Paziņojumi"</string> <string name="tv_notification_panel_no_notifications" msgid="9115191912267270678">"Nav paziņojumu"</string> + <!-- no translation found for mic_recording_announcement (7587123608060316575) --> + <skip /> + <!-- no translation found for camera_recording_announcement (7240177719403759112) --> + <skip /> + <!-- no translation found for mic_and_camera_recording_announcement (8599231390508812667) --> + <skip /> + <!-- no translation found for mic_stopped_recording_announcement (7301537004900721242) --> + <skip /> + <!-- no translation found for camera_stopped_recording_announcement (8540496432367032801) --> + <skip /> + <!-- no translation found for mic_camera_stopped_recording_announcement (8708524579599977412) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-mk/strings_tv.xml b/packages/SystemUI/res/values-mk/strings_tv.xml index 0dfbd79de131..55d9df7b9a9c 100644 --- a/packages/SystemUI/res/values-mk/strings_tv.xml +++ b/packages/SystemUI/res/values-mk/strings_tv.xml @@ -26,4 +26,16 @@ <string name="notification_disclosure_vpn_text" msgid="3873532735584866236">"Преку <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> <string name="tv_notification_panel_title" msgid="5311050946506276154">"Известувања"</string> <string name="tv_notification_panel_no_notifications" msgid="9115191912267270678">"Нема известувања"</string> + <!-- no translation found for mic_recording_announcement (7587123608060316575) --> + <skip /> + <!-- no translation found for camera_recording_announcement (7240177719403759112) --> + <skip /> + <!-- no translation found for mic_and_camera_recording_announcement (8599231390508812667) --> + <skip /> + <!-- no translation found for mic_stopped_recording_announcement (7301537004900721242) --> + <skip /> + <!-- no translation found for camera_stopped_recording_announcement (8540496432367032801) --> + <skip /> + <!-- no translation found for mic_camera_stopped_recording_announcement (8708524579599977412) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-ml/strings_tv.xml b/packages/SystemUI/res/values-ml/strings_tv.xml index 70cced8e810c..6ae342cf9bd6 100644 --- a/packages/SystemUI/res/values-ml/strings_tv.xml +++ b/packages/SystemUI/res/values-ml/strings_tv.xml @@ -26,4 +26,16 @@ <string name="notification_disclosure_vpn_text" msgid="3873532735584866236">"<xliff:g id="VPN_APP">%1$s</xliff:g> വഴി"</string> <string name="tv_notification_panel_title" msgid="5311050946506276154">"അറിയിപ്പുകൾ"</string> <string name="tv_notification_panel_no_notifications" msgid="9115191912267270678">"അറിയിപ്പുകൾ ഒന്നുമില്ല"</string> + <!-- no translation found for mic_recording_announcement (7587123608060316575) --> + <skip /> + <!-- no translation found for camera_recording_announcement (7240177719403759112) --> + <skip /> + <!-- no translation found for mic_and_camera_recording_announcement (8599231390508812667) --> + <skip /> + <!-- no translation found for mic_stopped_recording_announcement (7301537004900721242) --> + <skip /> + <!-- no translation found for camera_stopped_recording_announcement (8540496432367032801) --> + <skip /> + <!-- no translation found for mic_camera_stopped_recording_announcement (8708524579599977412) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-mn/strings_tv.xml b/packages/SystemUI/res/values-mn/strings_tv.xml index 221d8ae058f9..bbb302f6f07e 100644 --- a/packages/SystemUI/res/values-mn/strings_tv.xml +++ b/packages/SystemUI/res/values-mn/strings_tv.xml @@ -26,4 +26,16 @@ <string name="notification_disclosure_vpn_text" msgid="3873532735584866236">"<xliff:g id="VPN_APP">%1$s</xliff:g>-р"</string> <string name="tv_notification_panel_title" msgid="5311050946506276154">"Мэдэгдэл"</string> <string name="tv_notification_panel_no_notifications" msgid="9115191912267270678">"Мэдэгдэл байхгүй байна"</string> + <!-- no translation found for mic_recording_announcement (7587123608060316575) --> + <skip /> + <!-- no translation found for camera_recording_announcement (7240177719403759112) --> + <skip /> + <!-- no translation found for mic_and_camera_recording_announcement (8599231390508812667) --> + <skip /> + <!-- no translation found for mic_stopped_recording_announcement (7301537004900721242) --> + <skip /> + <!-- no translation found for camera_stopped_recording_announcement (8540496432367032801) --> + <skip /> + <!-- no translation found for mic_camera_stopped_recording_announcement (8708524579599977412) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-mr/strings_tv.xml b/packages/SystemUI/res/values-mr/strings_tv.xml index ac0cad132fd0..d596d95c28c9 100644 --- a/packages/SystemUI/res/values-mr/strings_tv.xml +++ b/packages/SystemUI/res/values-mr/strings_tv.xml @@ -26,4 +26,16 @@ <string name="notification_disclosure_vpn_text" msgid="3873532735584866236">"<xliff:g id="VPN_APP">%1$s</xliff:g> द्वारे"</string> <string name="tv_notification_panel_title" msgid="5311050946506276154">"सूचना"</string> <string name="tv_notification_panel_no_notifications" msgid="9115191912267270678">"सूचना नाहीत"</string> + <!-- no translation found for mic_recording_announcement (7587123608060316575) --> + <skip /> + <!-- no translation found for camera_recording_announcement (7240177719403759112) --> + <skip /> + <!-- no translation found for mic_and_camera_recording_announcement (8599231390508812667) --> + <skip /> + <!-- no translation found for mic_stopped_recording_announcement (7301537004900721242) --> + <skip /> + <!-- no translation found for camera_stopped_recording_announcement (8540496432367032801) --> + <skip /> + <!-- no translation found for mic_camera_stopped_recording_announcement (8708524579599977412) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-ms/strings_tv.xml b/packages/SystemUI/res/values-ms/strings_tv.xml index 46e345efc16b..e28d032dd9e0 100644 --- a/packages/SystemUI/res/values-ms/strings_tv.xml +++ b/packages/SystemUI/res/values-ms/strings_tv.xml @@ -26,4 +26,16 @@ <string name="notification_disclosure_vpn_text" msgid="3873532735584866236">"Melalui <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> <string name="tv_notification_panel_title" msgid="5311050946506276154">"Pemberitahuan"</string> <string name="tv_notification_panel_no_notifications" msgid="9115191912267270678">"Tiada Pemberitahuan"</string> + <!-- no translation found for mic_recording_announcement (7587123608060316575) --> + <skip /> + <!-- no translation found for camera_recording_announcement (7240177719403759112) --> + <skip /> + <!-- no translation found for mic_and_camera_recording_announcement (8599231390508812667) --> + <skip /> + <!-- no translation found for mic_stopped_recording_announcement (7301537004900721242) --> + <skip /> + <!-- no translation found for camera_stopped_recording_announcement (8540496432367032801) --> + <skip /> + <!-- no translation found for mic_camera_stopped_recording_announcement (8708524579599977412) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-my/strings_tv.xml b/packages/SystemUI/res/values-my/strings_tv.xml index 268c5540ef5b..848c403b9247 100644 --- a/packages/SystemUI/res/values-my/strings_tv.xml +++ b/packages/SystemUI/res/values-my/strings_tv.xml @@ -26,4 +26,16 @@ <string name="notification_disclosure_vpn_text" msgid="3873532735584866236">"<xliff:g id="VPN_APP">%1$s</xliff:g> မှတစ်ဆင့်"</string> <string name="tv_notification_panel_title" msgid="5311050946506276154">"အကြောင်းကြားချက်များ"</string> <string name="tv_notification_panel_no_notifications" msgid="9115191912267270678">"အကြောင်းကြားချက်များ မရှိပါ"</string> + <!-- no translation found for mic_recording_announcement (7587123608060316575) --> + <skip /> + <!-- no translation found for camera_recording_announcement (7240177719403759112) --> + <skip /> + <!-- no translation found for mic_and_camera_recording_announcement (8599231390508812667) --> + <skip /> + <!-- no translation found for mic_stopped_recording_announcement (7301537004900721242) --> + <skip /> + <!-- no translation found for camera_stopped_recording_announcement (8540496432367032801) --> + <skip /> + <!-- no translation found for mic_camera_stopped_recording_announcement (8708524579599977412) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-nb/strings_tv.xml b/packages/SystemUI/res/values-nb/strings_tv.xml index c5767dd94c03..11de50aff203 100644 --- a/packages/SystemUI/res/values-nb/strings_tv.xml +++ b/packages/SystemUI/res/values-nb/strings_tv.xml @@ -26,4 +26,16 @@ <string name="notification_disclosure_vpn_text" msgid="3873532735584866236">"Via <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> <string name="tv_notification_panel_title" msgid="5311050946506276154">"Varsler"</string> <string name="tv_notification_panel_no_notifications" msgid="9115191912267270678">"Ingen varsler"</string> + <!-- no translation found for mic_recording_announcement (7587123608060316575) --> + <skip /> + <!-- no translation found for camera_recording_announcement (7240177719403759112) --> + <skip /> + <!-- no translation found for mic_and_camera_recording_announcement (8599231390508812667) --> + <skip /> + <!-- no translation found for mic_stopped_recording_announcement (7301537004900721242) --> + <skip /> + <!-- no translation found for camera_stopped_recording_announcement (8540496432367032801) --> + <skip /> + <!-- no translation found for mic_camera_stopped_recording_announcement (8708524579599977412) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-ne/strings_tv.xml b/packages/SystemUI/res/values-ne/strings_tv.xml index 925f7b76c12e..0bcc1cc74ae7 100644 --- a/packages/SystemUI/res/values-ne/strings_tv.xml +++ b/packages/SystemUI/res/values-ne/strings_tv.xml @@ -26,4 +26,16 @@ <string name="notification_disclosure_vpn_text" msgid="3873532735584866236">"<xliff:g id="VPN_APP">%1$s</xliff:g> मार्फत"</string> <string name="tv_notification_panel_title" msgid="5311050946506276154">"सूचनाहरू"</string> <string name="tv_notification_panel_no_notifications" msgid="9115191912267270678">"कुनै पनि सूचना छैन"</string> + <!-- no translation found for mic_recording_announcement (7587123608060316575) --> + <skip /> + <!-- no translation found for camera_recording_announcement (7240177719403759112) --> + <skip /> + <!-- no translation found for mic_and_camera_recording_announcement (8599231390508812667) --> + <skip /> + <!-- no translation found for mic_stopped_recording_announcement (7301537004900721242) --> + <skip /> + <!-- no translation found for camera_stopped_recording_announcement (8540496432367032801) --> + <skip /> + <!-- no translation found for mic_camera_stopped_recording_announcement (8708524579599977412) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-nl/strings_tv.xml b/packages/SystemUI/res/values-nl/strings_tv.xml index 22d3b8806bbd..02c00ec3b195 100644 --- a/packages/SystemUI/res/values-nl/strings_tv.xml +++ b/packages/SystemUI/res/values-nl/strings_tv.xml @@ -26,4 +26,16 @@ <string name="notification_disclosure_vpn_text" msgid="3873532735584866236">"Via <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> <string name="tv_notification_panel_title" msgid="5311050946506276154">"Meldingen"</string> <string name="tv_notification_panel_no_notifications" msgid="9115191912267270678">"Geen meldingen"</string> + <!-- no translation found for mic_recording_announcement (7587123608060316575) --> + <skip /> + <!-- no translation found for camera_recording_announcement (7240177719403759112) --> + <skip /> + <!-- no translation found for mic_and_camera_recording_announcement (8599231390508812667) --> + <skip /> + <!-- no translation found for mic_stopped_recording_announcement (7301537004900721242) --> + <skip /> + <!-- no translation found for camera_stopped_recording_announcement (8540496432367032801) --> + <skip /> + <!-- no translation found for mic_camera_stopped_recording_announcement (8708524579599977412) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-or/strings_tv.xml b/packages/SystemUI/res/values-or/strings_tv.xml index 707c49e183c7..82890680dcbf 100644 --- a/packages/SystemUI/res/values-or/strings_tv.xml +++ b/packages/SystemUI/res/values-or/strings_tv.xml @@ -26,4 +26,16 @@ <string name="notification_disclosure_vpn_text" msgid="3873532735584866236">"<xliff:g id="VPN_APP">%1$s</xliff:g> ମାଧ୍ୟମରେ"</string> <string name="tv_notification_panel_title" msgid="5311050946506276154">"ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକ"</string> <string name="tv_notification_panel_no_notifications" msgid="9115191912267270678">"କୌଣସି ବିଜ୍ଞପ୍ତି ନାହିଁ"</string> + <!-- no translation found for mic_recording_announcement (7587123608060316575) --> + <skip /> + <!-- no translation found for camera_recording_announcement (7240177719403759112) --> + <skip /> + <!-- no translation found for mic_and_camera_recording_announcement (8599231390508812667) --> + <skip /> + <!-- no translation found for mic_stopped_recording_announcement (7301537004900721242) --> + <skip /> + <!-- no translation found for camera_stopped_recording_announcement (8540496432367032801) --> + <skip /> + <!-- no translation found for mic_camera_stopped_recording_announcement (8708524579599977412) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-pa/strings_tv.xml b/packages/SystemUI/res/values-pa/strings_tv.xml index c0761942b2ee..22fcce8decf9 100644 --- a/packages/SystemUI/res/values-pa/strings_tv.xml +++ b/packages/SystemUI/res/values-pa/strings_tv.xml @@ -26,4 +26,16 @@ <string name="notification_disclosure_vpn_text" msgid="3873532735584866236">"<xliff:g id="VPN_APP">%1$s</xliff:g> ਰਾਹੀਂ"</string> <string name="tv_notification_panel_title" msgid="5311050946506276154">"ਸੂਚਨਾਵਾਂ"</string> <string name="tv_notification_panel_no_notifications" msgid="9115191912267270678">"ਕੋਈ ਸੂਚਨਾ ਨਹੀਂ"</string> + <!-- no translation found for mic_recording_announcement (7587123608060316575) --> + <skip /> + <!-- no translation found for camera_recording_announcement (7240177719403759112) --> + <skip /> + <!-- no translation found for mic_and_camera_recording_announcement (8599231390508812667) --> + <skip /> + <!-- no translation found for mic_stopped_recording_announcement (7301537004900721242) --> + <skip /> + <!-- no translation found for camera_stopped_recording_announcement (8540496432367032801) --> + <skip /> + <!-- no translation found for mic_camera_stopped_recording_announcement (8708524579599977412) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-pl/strings_tv.xml b/packages/SystemUI/res/values-pl/strings_tv.xml index e63aadee9d65..2371b5efe7bd 100644 --- a/packages/SystemUI/res/values-pl/strings_tv.xml +++ b/packages/SystemUI/res/values-pl/strings_tv.xml @@ -26,4 +26,16 @@ <string name="notification_disclosure_vpn_text" msgid="3873532735584866236">"Przez: <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> <string name="tv_notification_panel_title" msgid="5311050946506276154">"Powiadomienia"</string> <string name="tv_notification_panel_no_notifications" msgid="9115191912267270678">"Brak powiadomień"</string> + <!-- no translation found for mic_recording_announcement (7587123608060316575) --> + <skip /> + <!-- no translation found for camera_recording_announcement (7240177719403759112) --> + <skip /> + <!-- no translation found for mic_and_camera_recording_announcement (8599231390508812667) --> + <skip /> + <!-- no translation found for mic_stopped_recording_announcement (7301537004900721242) --> + <skip /> + <!-- no translation found for camera_stopped_recording_announcement (8540496432367032801) --> + <skip /> + <!-- no translation found for mic_camera_stopped_recording_announcement (8708524579599977412) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-pt-rBR/strings_tv.xml b/packages/SystemUI/res/values-pt-rBR/strings_tv.xml index 2ea81526feed..d29bc6a34386 100644 --- a/packages/SystemUI/res/values-pt-rBR/strings_tv.xml +++ b/packages/SystemUI/res/values-pt-rBR/strings_tv.xml @@ -26,4 +26,10 @@ <string name="notification_disclosure_vpn_text" msgid="3873532735584866236">"Via <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> <string name="tv_notification_panel_title" msgid="5311050946506276154">"Notificações"</string> <string name="tv_notification_panel_no_notifications" msgid="9115191912267270678">"Nenhuma notificação"</string> + <string name="mic_recording_announcement" msgid="7587123608060316575">"O microfone está gravando"</string> + <string name="camera_recording_announcement" msgid="7240177719403759112">"A câmera está gravando"</string> + <string name="mic_and_camera_recording_announcement" msgid="8599231390508812667">"A câmera e o microfone estão gravando"</string> + <string name="mic_stopped_recording_announcement" msgid="7301537004900721242">"O microfone parou de gravar"</string> + <string name="camera_stopped_recording_announcement" msgid="8540496432367032801">"A câmera parou de gravar"</string> + <string name="mic_camera_stopped_recording_announcement" msgid="8708524579599977412">"A câmera e o microfone pararam de gravar"</string> </resources> diff --git a/packages/SystemUI/res/values-pt-rPT/strings_tv.xml b/packages/SystemUI/res/values-pt-rPT/strings_tv.xml index 8ce3e307c659..883fa3abb40b 100644 --- a/packages/SystemUI/res/values-pt-rPT/strings_tv.xml +++ b/packages/SystemUI/res/values-pt-rPT/strings_tv.xml @@ -26,4 +26,16 @@ <string name="notification_disclosure_vpn_text" msgid="3873532735584866236">"Através de <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> <string name="tv_notification_panel_title" msgid="5311050946506276154">"Notificações"</string> <string name="tv_notification_panel_no_notifications" msgid="9115191912267270678">"Sem notificações"</string> + <!-- no translation found for mic_recording_announcement (7587123608060316575) --> + <skip /> + <!-- no translation found for camera_recording_announcement (7240177719403759112) --> + <skip /> + <!-- no translation found for mic_and_camera_recording_announcement (8599231390508812667) --> + <skip /> + <!-- no translation found for mic_stopped_recording_announcement (7301537004900721242) --> + <skip /> + <!-- no translation found for camera_stopped_recording_announcement (8540496432367032801) --> + <skip /> + <!-- no translation found for mic_camera_stopped_recording_announcement (8708524579599977412) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-pt/strings_tv.xml b/packages/SystemUI/res/values-pt/strings_tv.xml index 2ea81526feed..d29bc6a34386 100644 --- a/packages/SystemUI/res/values-pt/strings_tv.xml +++ b/packages/SystemUI/res/values-pt/strings_tv.xml @@ -26,4 +26,10 @@ <string name="notification_disclosure_vpn_text" msgid="3873532735584866236">"Via <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> <string name="tv_notification_panel_title" msgid="5311050946506276154">"Notificações"</string> <string name="tv_notification_panel_no_notifications" msgid="9115191912267270678">"Nenhuma notificação"</string> + <string name="mic_recording_announcement" msgid="7587123608060316575">"O microfone está gravando"</string> + <string name="camera_recording_announcement" msgid="7240177719403759112">"A câmera está gravando"</string> + <string name="mic_and_camera_recording_announcement" msgid="8599231390508812667">"A câmera e o microfone estão gravando"</string> + <string name="mic_stopped_recording_announcement" msgid="7301537004900721242">"O microfone parou de gravar"</string> + <string name="camera_stopped_recording_announcement" msgid="8540496432367032801">"A câmera parou de gravar"</string> + <string name="mic_camera_stopped_recording_announcement" msgid="8708524579599977412">"A câmera e o microfone pararam de gravar"</string> </resources> diff --git a/packages/SystemUI/res/values-ro/strings_tv.xml b/packages/SystemUI/res/values-ro/strings_tv.xml index c64a492c59e4..9f2869356639 100644 --- a/packages/SystemUI/res/values-ro/strings_tv.xml +++ b/packages/SystemUI/res/values-ro/strings_tv.xml @@ -26,4 +26,16 @@ <string name="notification_disclosure_vpn_text" msgid="3873532735584866236">"Prin <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> <string name="tv_notification_panel_title" msgid="5311050946506276154">"Notificări"</string> <string name="tv_notification_panel_no_notifications" msgid="9115191912267270678">"Nicio notificare"</string> + <!-- no translation found for mic_recording_announcement (7587123608060316575) --> + <skip /> + <!-- no translation found for camera_recording_announcement (7240177719403759112) --> + <skip /> + <!-- no translation found for mic_and_camera_recording_announcement (8599231390508812667) --> + <skip /> + <!-- no translation found for mic_stopped_recording_announcement (7301537004900721242) --> + <skip /> + <!-- no translation found for camera_stopped_recording_announcement (8540496432367032801) --> + <skip /> + <!-- no translation found for mic_camera_stopped_recording_announcement (8708524579599977412) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-ru/strings_tv.xml b/packages/SystemUI/res/values-ru/strings_tv.xml index 8ce0dc203923..e2162eab3f29 100644 --- a/packages/SystemUI/res/values-ru/strings_tv.xml +++ b/packages/SystemUI/res/values-ru/strings_tv.xml @@ -26,4 +26,16 @@ <string name="notification_disclosure_vpn_text" msgid="3873532735584866236">"Через приложение <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> <string name="tv_notification_panel_title" msgid="5311050946506276154">"Уведомления"</string> <string name="tv_notification_panel_no_notifications" msgid="9115191912267270678">"Уведомлений нет."</string> + <!-- no translation found for mic_recording_announcement (7587123608060316575) --> + <skip /> + <!-- no translation found for camera_recording_announcement (7240177719403759112) --> + <skip /> + <!-- no translation found for mic_and_camera_recording_announcement (8599231390508812667) --> + <skip /> + <!-- no translation found for mic_stopped_recording_announcement (7301537004900721242) --> + <skip /> + <!-- no translation found for camera_stopped_recording_announcement (8540496432367032801) --> + <skip /> + <!-- no translation found for mic_camera_stopped_recording_announcement (8708524579599977412) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-si/strings_tv.xml b/packages/SystemUI/res/values-si/strings_tv.xml index 3067be345c7d..b7509885951c 100644 --- a/packages/SystemUI/res/values-si/strings_tv.xml +++ b/packages/SystemUI/res/values-si/strings_tv.xml @@ -26,4 +26,16 @@ <string name="notification_disclosure_vpn_text" msgid="3873532735584866236">"<xliff:g id="VPN_APP">%1$s</xliff:g> හරහා"</string> <string name="tv_notification_panel_title" msgid="5311050946506276154">"දැනුම්දීම්"</string> <string name="tv_notification_panel_no_notifications" msgid="9115191912267270678">"දැනුම්දීම් නැත"</string> + <!-- no translation found for mic_recording_announcement (7587123608060316575) --> + <skip /> + <!-- no translation found for camera_recording_announcement (7240177719403759112) --> + <skip /> + <!-- no translation found for mic_and_camera_recording_announcement (8599231390508812667) --> + <skip /> + <!-- no translation found for mic_stopped_recording_announcement (7301537004900721242) --> + <skip /> + <!-- no translation found for camera_stopped_recording_announcement (8540496432367032801) --> + <skip /> + <!-- no translation found for mic_camera_stopped_recording_announcement (8708524579599977412) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-sk/strings_tv.xml b/packages/SystemUI/res/values-sk/strings_tv.xml index b37648da0e7d..2b74267c5766 100644 --- a/packages/SystemUI/res/values-sk/strings_tv.xml +++ b/packages/SystemUI/res/values-sk/strings_tv.xml @@ -26,4 +26,16 @@ <string name="notification_disclosure_vpn_text" msgid="3873532735584866236">"Cez: <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> <string name="tv_notification_panel_title" msgid="5311050946506276154">"Upozornenia"</string> <string name="tv_notification_panel_no_notifications" msgid="9115191912267270678">"Žiadne upozornenia"</string> + <!-- no translation found for mic_recording_announcement (7587123608060316575) --> + <skip /> + <!-- no translation found for camera_recording_announcement (7240177719403759112) --> + <skip /> + <!-- no translation found for mic_and_camera_recording_announcement (8599231390508812667) --> + <skip /> + <!-- no translation found for mic_stopped_recording_announcement (7301537004900721242) --> + <skip /> + <!-- no translation found for camera_stopped_recording_announcement (8540496432367032801) --> + <skip /> + <!-- no translation found for mic_camera_stopped_recording_announcement (8708524579599977412) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-sl/strings_tv.xml b/packages/SystemUI/res/values-sl/strings_tv.xml index 1f66138c175a..2ef97059434d 100644 --- a/packages/SystemUI/res/values-sl/strings_tv.xml +++ b/packages/SystemUI/res/values-sl/strings_tv.xml @@ -26,4 +26,16 @@ <string name="notification_disclosure_vpn_text" msgid="3873532735584866236">"Prek storitve <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> <string name="tv_notification_panel_title" msgid="5311050946506276154">"Obvestila"</string> <string name="tv_notification_panel_no_notifications" msgid="9115191912267270678">"Ni obvestil"</string> + <!-- no translation found for mic_recording_announcement (7587123608060316575) --> + <skip /> + <!-- no translation found for camera_recording_announcement (7240177719403759112) --> + <skip /> + <!-- no translation found for mic_and_camera_recording_announcement (8599231390508812667) --> + <skip /> + <!-- no translation found for mic_stopped_recording_announcement (7301537004900721242) --> + <skip /> + <!-- no translation found for camera_stopped_recording_announcement (8540496432367032801) --> + <skip /> + <!-- no translation found for mic_camera_stopped_recording_announcement (8708524579599977412) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-sq/strings_tv.xml b/packages/SystemUI/res/values-sq/strings_tv.xml index fb74e38b4f38..ece59829013c 100644 --- a/packages/SystemUI/res/values-sq/strings_tv.xml +++ b/packages/SystemUI/res/values-sq/strings_tv.xml @@ -26,4 +26,16 @@ <string name="notification_disclosure_vpn_text" msgid="3873532735584866236">"Nëpërmjet <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> <string name="tv_notification_panel_title" msgid="5311050946506276154">"Njoftimet"</string> <string name="tv_notification_panel_no_notifications" msgid="9115191912267270678">"Asnjë njoftim"</string> + <!-- no translation found for mic_recording_announcement (7587123608060316575) --> + <skip /> + <!-- no translation found for camera_recording_announcement (7240177719403759112) --> + <skip /> + <!-- no translation found for mic_and_camera_recording_announcement (8599231390508812667) --> + <skip /> + <!-- no translation found for mic_stopped_recording_announcement (7301537004900721242) --> + <skip /> + <!-- no translation found for camera_stopped_recording_announcement (8540496432367032801) --> + <skip /> + <!-- no translation found for mic_camera_stopped_recording_announcement (8708524579599977412) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-sr/strings_tv.xml b/packages/SystemUI/res/values-sr/strings_tv.xml index 59151da2677f..38b106b30abc 100644 --- a/packages/SystemUI/res/values-sr/strings_tv.xml +++ b/packages/SystemUI/res/values-sr/strings_tv.xml @@ -26,4 +26,16 @@ <string name="notification_disclosure_vpn_text" msgid="3873532735584866236">"Преко: <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> <string name="tv_notification_panel_title" msgid="5311050946506276154">"Обавештења"</string> <string name="tv_notification_panel_no_notifications" msgid="9115191912267270678">"Нема обавештења"</string> + <!-- no translation found for mic_recording_announcement (7587123608060316575) --> + <skip /> + <!-- no translation found for camera_recording_announcement (7240177719403759112) --> + <skip /> + <!-- no translation found for mic_and_camera_recording_announcement (8599231390508812667) --> + <skip /> + <!-- no translation found for mic_stopped_recording_announcement (7301537004900721242) --> + <skip /> + <!-- no translation found for camera_stopped_recording_announcement (8540496432367032801) --> + <skip /> + <!-- no translation found for mic_camera_stopped_recording_announcement (8708524579599977412) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-sv/strings.xml b/packages/SystemUI/res/values-sv/strings.xml index 1f60b3a5c581..c27cd83f0541 100644 --- a/packages/SystemUI/res/values-sv/strings.xml +++ b/packages/SystemUI/res/values-sv/strings.xml @@ -158,21 +158,21 @@ <string name="biometric_dialog_tap_confirm" msgid="9166350738859143358">"Slutför genom att trycka på Bekräfta"</string> <string name="biometric_dialog_authenticated" msgid="7337147327545272484">"Autentiserad"</string> <string name="biometric_dialog_use_pin" msgid="8385294115283000709">"Använd pinkod"</string> - <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"Använd grafiskt lösenord"</string> + <string name="biometric_dialog_use_pattern" msgid="2315593393167211194">"Använd mönster"</string> <string name="biometric_dialog_use_password" msgid="3445033859393474779">"Använd lösenord"</string> <string name="biometric_dialog_wrong_pin" msgid="1878539073972762803">"Fel pinkod"</string> - <string name="biometric_dialog_wrong_pattern" msgid="8954812279840889029">"Fel grafiskt lösenord"</string> + <string name="biometric_dialog_wrong_pattern" msgid="8954812279840889029">"Fel mönster"</string> <string name="biometric_dialog_wrong_password" msgid="69477929306843790">"Fel lösenord"</string> <string name="biometric_dialog_credential_too_many_attempts" msgid="3083141271737748716">"För många felaktiga försök.\nFörsök igen om <xliff:g id="NUMBER">%d</xliff:g> sekunder."</string> <string name="biometric_dialog_credential_attempts_before_wipe" msgid="6751859711975516999">"Försök igen. Försök <xliff:g id="ATTEMPTS_0">%1$d</xliff:g> av <xliff:g id="MAX_ATTEMPTS">%2$d</xliff:g>."</string> <string name="biometric_dialog_last_attempt_before_wipe_dialog_title" msgid="2874250099278693477">"Din data raderas."</string> - <string name="biometric_dialog_last_pattern_attempt_before_wipe_device" msgid="6562299244825817598">"Enhetens data raderas om du anger fel grafiskt lösenord vid nästa försök."</string> + <string name="biometric_dialog_last_pattern_attempt_before_wipe_device" msgid="6562299244825817598">"Enhetens data raderas om du ritar fel mönster vid nästa försök."</string> <string name="biometric_dialog_last_pin_attempt_before_wipe_device" msgid="9151756675698215723">"Enhetens data raderas om du anger fel pinkod vid nästa försök."</string> <string name="biometric_dialog_last_password_attempt_before_wipe_device" msgid="2363778585575998317">"Enhetens data raderas om du anger fel lösenord vid nästa försök."</string> - <string name="biometric_dialog_last_pattern_attempt_before_wipe_user" msgid="8400180746043407270">"Användaren raderas om du anger fel grafiskt lösenord vid nästa försök."</string> + <string name="biometric_dialog_last_pattern_attempt_before_wipe_user" msgid="8400180746043407270">"Användaren raderas om du ritar fel mönster vid nästa försök."</string> <string name="biometric_dialog_last_pin_attempt_before_wipe_user" msgid="4159878829962411168">"Användaren raderas om du anger fel pinkod vid nästa försök."</string> <string name="biometric_dialog_last_password_attempt_before_wipe_user" msgid="4695682515465063885">"Den här användaren raderas om du anger fel lösenord vid nästa försök."</string> - <string name="biometric_dialog_last_pattern_attempt_before_wipe_profile" msgid="6045224069529284686">"Jobbprofilen och dess data raderas om du anger fel grafiskt lösenord vid nästa försök."</string> + <string name="biometric_dialog_last_pattern_attempt_before_wipe_profile" msgid="6045224069529284686">"Jobbprofilen och dess data raderas om du ritar fel mönster vid nästa försök."</string> <string name="biometric_dialog_last_pin_attempt_before_wipe_profile" msgid="545567685899091757">"Jobbprofilen och dess data raderas om du anger fel pinkod vid nästa försök."</string> <string name="biometric_dialog_last_password_attempt_before_wipe_profile" msgid="8538032972389729253">"Din jobbprofil och dess data raderas om du anger fel lösenord vid nästa försök."</string> <string name="biometric_dialog_failed_attempts_now_wiping_device" msgid="6585503524026243042">"För många felaktiga försök. Enhetens data raderas."</string> diff --git a/packages/SystemUI/res/values-sv/strings_tv.xml b/packages/SystemUI/res/values-sv/strings_tv.xml index fd8fa4b1bb8e..22f6baaa9b51 100644 --- a/packages/SystemUI/res/values-sv/strings_tv.xml +++ b/packages/SystemUI/res/values-sv/strings_tv.xml @@ -26,4 +26,16 @@ <string name="notification_disclosure_vpn_text" msgid="3873532735584866236">"via <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> <string name="tv_notification_panel_title" msgid="5311050946506276154">"Aviseringar"</string> <string name="tv_notification_panel_no_notifications" msgid="9115191912267270678">"Inga aviseringar"</string> + <!-- no translation found for mic_recording_announcement (7587123608060316575) --> + <skip /> + <!-- no translation found for camera_recording_announcement (7240177719403759112) --> + <skip /> + <!-- no translation found for mic_and_camera_recording_announcement (8599231390508812667) --> + <skip /> + <!-- no translation found for mic_stopped_recording_announcement (7301537004900721242) --> + <skip /> + <!-- no translation found for camera_stopped_recording_announcement (8540496432367032801) --> + <skip /> + <!-- no translation found for mic_camera_stopped_recording_announcement (8708524579599977412) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-sw/strings_tv.xml b/packages/SystemUI/res/values-sw/strings_tv.xml index 8f6880d4bd0b..086a09802eed 100644 --- a/packages/SystemUI/res/values-sw/strings_tv.xml +++ b/packages/SystemUI/res/values-sw/strings_tv.xml @@ -26,4 +26,16 @@ <string name="notification_disclosure_vpn_text" msgid="3873532735584866236">"Kupitia <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> <string name="tv_notification_panel_title" msgid="5311050946506276154">"Arifa"</string> <string name="tv_notification_panel_no_notifications" msgid="9115191912267270678">"Hakuna Arifa"</string> + <!-- no translation found for mic_recording_announcement (7587123608060316575) --> + <skip /> + <!-- no translation found for camera_recording_announcement (7240177719403759112) --> + <skip /> + <!-- no translation found for mic_and_camera_recording_announcement (8599231390508812667) --> + <skip /> + <!-- no translation found for mic_stopped_recording_announcement (7301537004900721242) --> + <skip /> + <!-- no translation found for camera_stopped_recording_announcement (8540496432367032801) --> + <skip /> + <!-- no translation found for mic_camera_stopped_recording_announcement (8708524579599977412) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-ta/strings_tv.xml b/packages/SystemUI/res/values-ta/strings_tv.xml index 9c62d8cf7b96..398ffe986d1a 100644 --- a/packages/SystemUI/res/values-ta/strings_tv.xml +++ b/packages/SystemUI/res/values-ta/strings_tv.xml @@ -26,4 +26,16 @@ <string name="notification_disclosure_vpn_text" msgid="3873532735584866236">"<xliff:g id="VPN_APP">%1$s</xliff:g> வழியாக"</string> <string name="tv_notification_panel_title" msgid="5311050946506276154">"அறிவிப்புகள்"</string> <string name="tv_notification_panel_no_notifications" msgid="9115191912267270678">"அறிவிப்புகள் எதுவுமில்லை"</string> + <!-- no translation found for mic_recording_announcement (7587123608060316575) --> + <skip /> + <!-- no translation found for camera_recording_announcement (7240177719403759112) --> + <skip /> + <!-- no translation found for mic_and_camera_recording_announcement (8599231390508812667) --> + <skip /> + <!-- no translation found for mic_stopped_recording_announcement (7301537004900721242) --> + <skip /> + <!-- no translation found for camera_stopped_recording_announcement (8540496432367032801) --> + <skip /> + <!-- no translation found for mic_camera_stopped_recording_announcement (8708524579599977412) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-te/strings_tv.xml b/packages/SystemUI/res/values-te/strings_tv.xml index 1879edd8d96b..33c9ec96512e 100644 --- a/packages/SystemUI/res/values-te/strings_tv.xml +++ b/packages/SystemUI/res/values-te/strings_tv.xml @@ -26,4 +26,16 @@ <string name="notification_disclosure_vpn_text" msgid="3873532735584866236">"<xliff:g id="VPN_APP">%1$s</xliff:g> ద్వారా"</string> <string name="tv_notification_panel_title" msgid="5311050946506276154">"నోటిఫికేషన్లు"</string> <string name="tv_notification_panel_no_notifications" msgid="9115191912267270678">"నోటిఫికేషన్లు లేవు"</string> + <!-- no translation found for mic_recording_announcement (7587123608060316575) --> + <skip /> + <!-- no translation found for camera_recording_announcement (7240177719403759112) --> + <skip /> + <!-- no translation found for mic_and_camera_recording_announcement (8599231390508812667) --> + <skip /> + <!-- no translation found for mic_stopped_recording_announcement (7301537004900721242) --> + <skip /> + <!-- no translation found for camera_stopped_recording_announcement (8540496432367032801) --> + <skip /> + <!-- no translation found for mic_camera_stopped_recording_announcement (8708524579599977412) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-th/strings_tv.xml b/packages/SystemUI/res/values-th/strings_tv.xml index 072482176363..57cff1fa0720 100644 --- a/packages/SystemUI/res/values-th/strings_tv.xml +++ b/packages/SystemUI/res/values-th/strings_tv.xml @@ -26,4 +26,16 @@ <string name="notification_disclosure_vpn_text" msgid="3873532735584866236">"ผ่าน <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> <string name="tv_notification_panel_title" msgid="5311050946506276154">"การแจ้งเตือน"</string> <string name="tv_notification_panel_no_notifications" msgid="9115191912267270678">"ไม่มีการแจ้งเตือน"</string> + <!-- no translation found for mic_recording_announcement (7587123608060316575) --> + <skip /> + <!-- no translation found for camera_recording_announcement (7240177719403759112) --> + <skip /> + <!-- no translation found for mic_and_camera_recording_announcement (8599231390508812667) --> + <skip /> + <!-- no translation found for mic_stopped_recording_announcement (7301537004900721242) --> + <skip /> + <!-- no translation found for camera_stopped_recording_announcement (8540496432367032801) --> + <skip /> + <!-- no translation found for mic_camera_stopped_recording_announcement (8708524579599977412) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-tl/strings_tv.xml b/packages/SystemUI/res/values-tl/strings_tv.xml index 8dcc22f2d36b..8be6a86b389e 100644 --- a/packages/SystemUI/res/values-tl/strings_tv.xml +++ b/packages/SystemUI/res/values-tl/strings_tv.xml @@ -26,4 +26,16 @@ <string name="notification_disclosure_vpn_text" msgid="3873532735584866236">"Sa pamamagitan ng <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> <string name="tv_notification_panel_title" msgid="5311050946506276154">"Mga Notification"</string> <string name="tv_notification_panel_no_notifications" msgid="9115191912267270678">"Walang Notification"</string> + <!-- no translation found for mic_recording_announcement (7587123608060316575) --> + <skip /> + <!-- no translation found for camera_recording_announcement (7240177719403759112) --> + <skip /> + <!-- no translation found for mic_and_camera_recording_announcement (8599231390508812667) --> + <skip /> + <!-- no translation found for mic_stopped_recording_announcement (7301537004900721242) --> + <skip /> + <!-- no translation found for camera_stopped_recording_announcement (8540496432367032801) --> + <skip /> + <!-- no translation found for mic_camera_stopped_recording_announcement (8708524579599977412) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-tr/strings_tv.xml b/packages/SystemUI/res/values-tr/strings_tv.xml index 49e76af004ab..28b2d77e2502 100644 --- a/packages/SystemUI/res/values-tr/strings_tv.xml +++ b/packages/SystemUI/res/values-tr/strings_tv.xml @@ -26,4 +26,16 @@ <string name="notification_disclosure_vpn_text" msgid="3873532735584866236">"<xliff:g id="VPN_APP">%1$s</xliff:g> üzerinden"</string> <string name="tv_notification_panel_title" msgid="5311050946506276154">"Bildirimler"</string> <string name="tv_notification_panel_no_notifications" msgid="9115191912267270678">"Bildirim Yok"</string> + <!-- no translation found for mic_recording_announcement (7587123608060316575) --> + <skip /> + <!-- no translation found for camera_recording_announcement (7240177719403759112) --> + <skip /> + <!-- no translation found for mic_and_camera_recording_announcement (8599231390508812667) --> + <skip /> + <!-- no translation found for mic_stopped_recording_announcement (7301537004900721242) --> + <skip /> + <!-- no translation found for camera_stopped_recording_announcement (8540496432367032801) --> + <skip /> + <!-- no translation found for mic_camera_stopped_recording_announcement (8708524579599977412) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-uk/strings_tv.xml b/packages/SystemUI/res/values-uk/strings_tv.xml index 170b06805355..c86cf3190f7a 100644 --- a/packages/SystemUI/res/values-uk/strings_tv.xml +++ b/packages/SystemUI/res/values-uk/strings_tv.xml @@ -26,4 +26,16 @@ <string name="notification_disclosure_vpn_text" msgid="3873532735584866236">"Через <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> <string name="tv_notification_panel_title" msgid="5311050946506276154">"Сповіщення"</string> <string name="tv_notification_panel_no_notifications" msgid="9115191912267270678">"Немає сповіщень"</string> + <!-- no translation found for mic_recording_announcement (7587123608060316575) --> + <skip /> + <!-- no translation found for camera_recording_announcement (7240177719403759112) --> + <skip /> + <!-- no translation found for mic_and_camera_recording_announcement (8599231390508812667) --> + <skip /> + <!-- no translation found for mic_stopped_recording_announcement (7301537004900721242) --> + <skip /> + <!-- no translation found for camera_stopped_recording_announcement (8540496432367032801) --> + <skip /> + <!-- no translation found for mic_camera_stopped_recording_announcement (8708524579599977412) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-ur/strings_tv.xml b/packages/SystemUI/res/values-ur/strings_tv.xml index fbaa3f628bf3..5810482128b2 100644 --- a/packages/SystemUI/res/values-ur/strings_tv.xml +++ b/packages/SystemUI/res/values-ur/strings_tv.xml @@ -26,4 +26,16 @@ <string name="notification_disclosure_vpn_text" msgid="3873532735584866236">"بذریعہ <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> <string name="tv_notification_panel_title" msgid="5311050946506276154">"اطلاعات"</string> <string name="tv_notification_panel_no_notifications" msgid="9115191912267270678">"کوئی اطلاع نہیں ہے"</string> + <!-- no translation found for mic_recording_announcement (7587123608060316575) --> + <skip /> + <!-- no translation found for camera_recording_announcement (7240177719403759112) --> + <skip /> + <!-- no translation found for mic_and_camera_recording_announcement (8599231390508812667) --> + <skip /> + <!-- no translation found for mic_stopped_recording_announcement (7301537004900721242) --> + <skip /> + <!-- no translation found for camera_stopped_recording_announcement (8540496432367032801) --> + <skip /> + <!-- no translation found for mic_camera_stopped_recording_announcement (8708524579599977412) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-uz/strings_tv.xml b/packages/SystemUI/res/values-uz/strings_tv.xml index f4b4b0853e69..afa82bc99a89 100644 --- a/packages/SystemUI/res/values-uz/strings_tv.xml +++ b/packages/SystemUI/res/values-uz/strings_tv.xml @@ -26,4 +26,10 @@ <string name="notification_disclosure_vpn_text" msgid="3873532735584866236">"<xliff:g id="VPN_APP">%1$s</xliff:g> orqali"</string> <string name="tv_notification_panel_title" msgid="5311050946506276154">"Bildirishnomalar"</string> <string name="tv_notification_panel_no_notifications" msgid="9115191912267270678">"Bildirishnomalar yoʻq"</string> + <string name="mic_recording_announcement" msgid="7587123608060316575">"Mikrofon yozib olmoqda"</string> + <string name="camera_recording_announcement" msgid="7240177719403759112">"Kamera yozib olmoqda"</string> + <string name="mic_and_camera_recording_announcement" msgid="8599231390508812667">"Kamera va mikrofon yozib olmoqda"</string> + <string name="mic_stopped_recording_announcement" msgid="7301537004900721242">"Mikrofon yozib olishni toʻxtatdi"</string> + <string name="camera_stopped_recording_announcement" msgid="8540496432367032801">"Kamera yozib olishni toʻxtatdi"</string> + <string name="mic_camera_stopped_recording_announcement" msgid="8708524579599977412">"Kamera va mikrofon yozib olishni toʻxtatdi"</string> </resources> diff --git a/packages/SystemUI/res/values-vi/strings_tv.xml b/packages/SystemUI/res/values-vi/strings_tv.xml index 3dfc8c186205..21f5471045e2 100644 --- a/packages/SystemUI/res/values-vi/strings_tv.xml +++ b/packages/SystemUI/res/values-vi/strings_tv.xml @@ -26,4 +26,16 @@ <string name="notification_disclosure_vpn_text" msgid="3873532735584866236">"Thông qua <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> <string name="tv_notification_panel_title" msgid="5311050946506276154">"Thông báo"</string> <string name="tv_notification_panel_no_notifications" msgid="9115191912267270678">"Không có thông báo"</string> + <!-- no translation found for mic_recording_announcement (7587123608060316575) --> + <skip /> + <!-- no translation found for camera_recording_announcement (7240177719403759112) --> + <skip /> + <!-- no translation found for mic_and_camera_recording_announcement (8599231390508812667) --> + <skip /> + <!-- no translation found for mic_stopped_recording_announcement (7301537004900721242) --> + <skip /> + <!-- no translation found for camera_stopped_recording_announcement (8540496432367032801) --> + <skip /> + <!-- no translation found for mic_camera_stopped_recording_announcement (8708524579599977412) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-zh-rCN/strings_tv.xml b/packages/SystemUI/res/values-zh-rCN/strings_tv.xml index 1e599cabcd0b..ca814a37bda7 100644 --- a/packages/SystemUI/res/values-zh-rCN/strings_tv.xml +++ b/packages/SystemUI/res/values-zh-rCN/strings_tv.xml @@ -26,4 +26,16 @@ <string name="notification_disclosure_vpn_text" msgid="3873532735584866236">"通过“<xliff:g id="VPN_APP">%1$s</xliff:g>”"</string> <string name="tv_notification_panel_title" msgid="5311050946506276154">"通知"</string> <string name="tv_notification_panel_no_notifications" msgid="9115191912267270678">"没有通知"</string> + <!-- no translation found for mic_recording_announcement (7587123608060316575) --> + <skip /> + <!-- no translation found for camera_recording_announcement (7240177719403759112) --> + <skip /> + <!-- no translation found for mic_and_camera_recording_announcement (8599231390508812667) --> + <skip /> + <!-- no translation found for mic_stopped_recording_announcement (7301537004900721242) --> + <skip /> + <!-- no translation found for camera_stopped_recording_announcement (8540496432367032801) --> + <skip /> + <!-- no translation found for mic_camera_stopped_recording_announcement (8708524579599977412) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-zh-rHK/strings_tv.xml b/packages/SystemUI/res/values-zh-rHK/strings_tv.xml index 92b176261f7b..f992b6251b46 100644 --- a/packages/SystemUI/res/values-zh-rHK/strings_tv.xml +++ b/packages/SystemUI/res/values-zh-rHK/strings_tv.xml @@ -26,4 +26,16 @@ <string name="notification_disclosure_vpn_text" msgid="3873532735584866236">"透過 <xliff:g id="VPN_APP">%1$s</xliff:g>"</string> <string name="tv_notification_panel_title" msgid="5311050946506276154">"通知"</string> <string name="tv_notification_panel_no_notifications" msgid="9115191912267270678">"沒有通知"</string> + <!-- no translation found for mic_recording_announcement (7587123608060316575) --> + <skip /> + <!-- no translation found for camera_recording_announcement (7240177719403759112) --> + <skip /> + <!-- no translation found for mic_and_camera_recording_announcement (8599231390508812667) --> + <skip /> + <!-- no translation found for mic_stopped_recording_announcement (7301537004900721242) --> + <skip /> + <!-- no translation found for camera_stopped_recording_announcement (8540496432367032801) --> + <skip /> + <!-- no translation found for mic_camera_stopped_recording_announcement (8708524579599977412) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-zh-rTW/strings_tv.xml b/packages/SystemUI/res/values-zh-rTW/strings_tv.xml index db0781acf3b5..94135d255adb 100644 --- a/packages/SystemUI/res/values-zh-rTW/strings_tv.xml +++ b/packages/SystemUI/res/values-zh-rTW/strings_tv.xml @@ -26,4 +26,16 @@ <string name="notification_disclosure_vpn_text" msgid="3873532735584866236">"透過「<xliff:g id="VPN_APP">%1$s</xliff:g>」"</string> <string name="tv_notification_panel_title" msgid="5311050946506276154">"通知"</string> <string name="tv_notification_panel_no_notifications" msgid="9115191912267270678">"沒有通知"</string> + <!-- no translation found for mic_recording_announcement (7587123608060316575) --> + <skip /> + <!-- no translation found for camera_recording_announcement (7240177719403759112) --> + <skip /> + <!-- no translation found for mic_and_camera_recording_announcement (8599231390508812667) --> + <skip /> + <!-- no translation found for mic_stopped_recording_announcement (7301537004900721242) --> + <skip /> + <!-- no translation found for camera_stopped_recording_announcement (8540496432367032801) --> + <skip /> + <!-- no translation found for mic_camera_stopped_recording_announcement (8708524579599977412) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-zu/strings_tv.xml b/packages/SystemUI/res/values-zu/strings_tv.xml index a9b759766078..79a6575d8fad 100644 --- a/packages/SystemUI/res/values-zu/strings_tv.xml +++ b/packages/SystemUI/res/values-zu/strings_tv.xml @@ -26,4 +26,16 @@ <string name="notification_disclosure_vpn_text" msgid="3873532735584866236">"Nge-<xliff:g id="VPN_APP">%1$s</xliff:g>"</string> <string name="tv_notification_panel_title" msgid="5311050946506276154">"Izaziso"</string> <string name="tv_notification_panel_no_notifications" msgid="9115191912267270678">"Azikho Izaziso"</string> + <!-- no translation found for mic_recording_announcement (7587123608060316575) --> + <skip /> + <!-- no translation found for camera_recording_announcement (7240177719403759112) --> + <skip /> + <!-- no translation found for mic_and_camera_recording_announcement (8599231390508812667) --> + <skip /> + <!-- no translation found for mic_stopped_recording_announcement (7301537004900721242) --> + <skip /> + <!-- no translation found for camera_stopped_recording_announcement (8540496432367032801) --> + <skip /> + <!-- no translation found for mic_camera_stopped_recording_announcement (8708524579599977412) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml index ae09f2689d92..34f8503ac1dd 100644 --- a/packages/SystemUI/res/values/dimens.xml +++ b/packages/SystemUI/res/values/dimens.xml @@ -906,8 +906,8 @@ <dimen name="keyguard_affordance_height">48dp</dimen> <dimen name="keyguard_affordance_width">48dp</dimen> - <dimen name="keyguard_affordance_wallet_height">48dp</dimen> - <dimen name="keyguard_affordance_wallet_width">48dp</dimen> + <dimen name="keyguard_affordance_fixed_height">48dp</dimen> + <dimen name="keyguard_affordance_fixed_width">48dp</dimen> <dimen name="keyguard_affordance_horizontal_offset">32dp</dimen> <dimen name="keyguard_affordance_vertical_offset">32dp</dimen> @@ -1456,7 +1456,7 @@ <dimen name="lockscreen_shade_notification_movement">24dp</dimen> <!-- Maximum overshoot for the pulse expansion --> - <dimen name="pulse_expansion_max_top_overshoot">16dp</dimen> + <dimen name="pulse_expansion_max_top_overshoot">32dp</dimen> <dimen name="people_space_widget_radius">28dp</dimen> <dimen name="people_space_image_radius">20dp</dimen> diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml index 5aff817baf7c..04e5dd15c5c5 100644 --- a/packages/SystemUI/res/values/strings.xml +++ b/packages/SystemUI/res/values/strings.xml @@ -1064,6 +1064,9 @@ <!-- Message shown when lock screen is tapped or face authentication fails. [CHAR LIMIT=60] --> <string name="keyguard_unlock">Swipe up to open</string> + <!-- Message shown when lock screen is tapped or face authentication fails. Provides extra instructions for how the user can enter their device (unlock or proceed to home) [CHAR LIMIT=60] --> + <string name="keyguard_unlock_press">Press to open</string> + <!-- Message shown when face authentication fails and the pin pad is visible. [CHAR LIMIT=60] --> <string name="keyguard_retry">Swipe up to try again</string> diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml index 70ed81788e58..51eabf60385e 100644 --- a/packages/SystemUI/res/values/styles.xml +++ b/packages/SystemUI/res/values/styles.xml @@ -764,6 +764,8 @@ <item name="android:windowBackground">@android:color/black</item> <item name="android:windowAnimationStyle">@null</item> <item name="android:statusBarColor">@android:color/black</item> + <!-- Setting a placeholder will avoid using the SystemUI icon on the splash screen --> + <item name="android:windowSplashScreenAnimatedIcon">@drawable/ic_blank</item> <item name="wallpaperTextColor">@*android:color/primary_text_material_dark</item> </style> @@ -898,5 +900,7 @@ <style name="Wallet.Theme" parent="@android:style/Theme.DeviceDefault"> <item name="android:colorBackground">@android:color/system_neutral1_900</item> <item name="android:itemBackground">@android:color/system_neutral1_800</item> + <!-- Setting a placeholder will avoid using the SystemUI icon on the splash screen. --> + <item name="android:windowSplashScreenAnimatedIcon">@drawable/ic_blank</item> </style> </resources> diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java b/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java index 310a0d37e7ab..9a9e4a910992 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java @@ -2068,6 +2068,15 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab } /** + * @return if udfps is available on this device. will return true even if the user hasn't + * enrolled udfps. + */ + public boolean isUdfpsAvailable() { + return mAuthController.getUdfpsProps() != null + && !mAuthController.getUdfpsProps().isEmpty(); + } + + /** * @return true if there's at least one face enrolled */ public boolean isFaceEnrolled() { @@ -2398,8 +2407,10 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab if (isEncryptedOrLockdown(userId) && supportsFaceDetection) { mFaceManager.detectFace(mFaceCancelSignal, mFaceDetectionCallback, userId); } else { + final boolean isBypassEnabled = mKeyguardBypassController != null + && mKeyguardBypassController.isBypassEnabled(); mFaceManager.authenticate(null /* crypto */, mFaceCancelSignal, - mFaceAuthenticationCallback, null /* handler */, userId); + mFaceAuthenticationCallback, null /* handler */, userId, isBypassEnabled); } setFaceRunningState(BIOMETRIC_STATE_RUNNING); } diff --git a/packages/SystemUI/src/com/android/systemui/GuestResumeSessionReceiver.java b/packages/SystemUI/src/com/android/systemui/GuestResumeSessionReceiver.java index 0ae89bc10290..b5b6b1340108 100644 --- a/packages/SystemUI/src/com/android/systemui/GuestResumeSessionReceiver.java +++ b/packages/SystemUI/src/com/android/systemui/GuestResumeSessionReceiver.java @@ -16,25 +16,24 @@ package com.android.systemui; -import android.app.ActivityManager; -import android.app.Dialog; +import android.app.AlertDialog; import android.content.BroadcastReceiver; -import android.content.ContentResolver; import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.content.IntentFilter; import android.content.pm.UserInfo; -import android.os.RemoteException; import android.os.UserHandle; -import android.provider.Settings; import android.util.Log; +import com.android.internal.annotations.VisibleForTesting; import com.android.internal.logging.UiEventLogger; import com.android.systemui.broadcast.BroadcastDispatcher; import com.android.systemui.qs.QSUserSwitcherEvent; +import com.android.systemui.settings.UserTracker; import com.android.systemui.statusbar.phone.SystemUIDialog; import com.android.systemui.statusbar.policy.UserSwitcherController; +import com.android.systemui.util.settings.SecureSettings; /** * Manages notification when a guest session is resumed. @@ -43,16 +42,23 @@ public class GuestResumeSessionReceiver extends BroadcastReceiver { private static final String TAG = "GuestResumeSessionReceiver"; - private static final String SETTING_GUEST_HAS_LOGGED_IN = "systemui.guest_has_logged_in"; + @VisibleForTesting + public static final String SETTING_GUEST_HAS_LOGGED_IN = "systemui.guest_has_logged_in"; - private Dialog mNewSessionDialog; + @VisibleForTesting + public AlertDialog mNewSessionDialog; + private final UserTracker mUserTracker; private final UserSwitcherController mUserSwitcherController; private final UiEventLogger mUiEventLogger; + private final SecureSettings mSecureSettings; public GuestResumeSessionReceiver(UserSwitcherController userSwitcherController, - UiEventLogger uiEventLogger) { + UserTracker userTracker, UiEventLogger uiEventLogger, + SecureSettings secureSettings) { mUserSwitcherController = userSwitcherController; + mUserTracker = userTracker; mUiEventLogger = uiEventLogger; + mSecureSettings = secureSettings; } /** @@ -78,26 +84,19 @@ public class GuestResumeSessionReceiver extends BroadcastReceiver { return; } - UserInfo currentUser; - try { - currentUser = ActivityManager.getService().getCurrentUser(); - } catch (RemoteException e) { - return; - } + UserInfo currentUser = mUserTracker.getUserInfo(); if (!currentUser.isGuest()) { return; } - ContentResolver cr = context.getContentResolver(); - int notFirstLogin = Settings.System.getIntForUser( - cr, SETTING_GUEST_HAS_LOGGED_IN, 0, userId); + int notFirstLogin = mSecureSettings.getIntForUser( + SETTING_GUEST_HAS_LOGGED_IN, 0, userId); if (notFirstLogin != 0) { mNewSessionDialog = new ResetSessionDialog(context, mUserSwitcherController, mUiEventLogger, userId); mNewSessionDialog.show(); } else { - Settings.System.putIntForUser( - cr, SETTING_GUEST_HAS_LOGGED_IN, 1, userId); + mSecureSettings.putIntForUser(SETTING_GUEST_HAS_LOGGED_IN, 1, userId); } } } @@ -109,18 +108,26 @@ public class GuestResumeSessionReceiver extends BroadcastReceiver { } } - private static class ResetSessionDialog extends SystemUIDialog implements + /** + * Dialog shown when user when asking for confirmation before deleting guest user. + */ + @VisibleForTesting + public static class ResetSessionDialog extends SystemUIDialog implements DialogInterface.OnClickListener { - private static final int BUTTON_WIPE = BUTTON_NEGATIVE; - private static final int BUTTON_DONTWIPE = BUTTON_POSITIVE; + @VisibleForTesting + public static final int BUTTON_WIPE = BUTTON_NEGATIVE; + @VisibleForTesting + public static final int BUTTON_DONTWIPE = BUTTON_POSITIVE; private final UserSwitcherController mUserSwitcherController; private final UiEventLogger mUiEventLogger; private final int mUserId; - ResetSessionDialog(Context context, UserSwitcherController userSwitcherController, - UiEventLogger uiEventLogger, int userId) { + ResetSessionDialog(Context context, + UserSwitcherController userSwitcherController, + UiEventLogger uiEventLogger, + int userId) { super(context); setTitle(context.getString(R.string.guest_wipe_session_title)); diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSAnimator.java b/packages/SystemUI/src/com/android/systemui/qs/QSAnimator.java index a3180738fa60..4fcd46c96fe3 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSAnimator.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSAnimator.java @@ -423,6 +423,9 @@ public class QSAnimator implements Callback, PageListener, Listener, OnLayoutCha if (mQsPanelController.shouldUseHorizontalLayout() && mQsPanelController.mMediaHost.hostView != null) { builder.addFloat(mQsPanelController.mMediaHost.hostView, "alpha", 0, 1); + } else { + // In portrait, media view should always be visible + mQsPanelController.mMediaHost.hostView.setAlpha(1.0f); } mAllPagesDelayedAnimator = builder.build(); mAllViews.add(mSecurityFooter.getView()); diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSFragment.java b/packages/SystemUI/src/com/android/systemui/qs/QSFragment.java index 0a1e9d04fab0..04f692dcc1e6 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSFragment.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSFragment.java @@ -48,6 +48,7 @@ import com.android.systemui.statusbar.CommandQueue; import com.android.systemui.statusbar.FeatureFlags; import com.android.systemui.statusbar.StatusBarState; import com.android.systemui.statusbar.notification.stack.StackStateAnimator; +import com.android.systemui.statusbar.phone.KeyguardBypassController; import com.android.systemui.statusbar.phone.NotificationsQuickSettingsContainer; import com.android.systemui.statusbar.policy.RemoteInputQuickSettingsDisabler; import com.android.systemui.util.InjectionInflationController; @@ -69,6 +70,7 @@ public class QSFragment extends LifecycleFragment implements QS, CommandQueue.Ca private final Rect mQsBounds = new Rect(); private final StatusBarStateController mStatusBarStateController; private final FalsingManager mFalsingManager; + private final KeyguardBypassController mBypassController; private boolean mQsExpanded; private boolean mHeaderAnimating; private boolean mStackScrollerOverscrolling; @@ -135,6 +137,7 @@ public class QSFragment extends LifecycleFragment implements QS, CommandQueue.Ca StatusBarStateController statusBarStateController, CommandQueue commandQueue, QSDetailDisplayer qsDetailDisplayer, @Named(QS_PANEL) MediaHost qsMediaHost, @Named(QUICK_QS_PANEL) MediaHost qqsMediaHost, + KeyguardBypassController keyguardBypassController, QSFragmentComponent.Factory qsComponentFactory, FeatureFlags featureFlags, FalsingManager falsingManager) { mRemoteInputQuickSettingsDisabler = remoteInputQsDisabler; @@ -148,6 +151,7 @@ public class QSFragment extends LifecycleFragment implements QS, CommandQueue.Ca mHost = qsTileHost; mFeatureFlags = featureFlags; mFalsingManager = falsingManager; + mBypassController = keyguardBypassController; mStatusBarStateController = statusBarStateController; } @@ -380,16 +384,8 @@ public class QSFragment extends LifecycleFragment implements QS, CommandQueue.Ca return mStatusBarStateController.getState() == StatusBarState.KEYGUARD; } - @Override - public void setPulseExpanding(boolean pulseExpanding) { - if (pulseExpanding != mPulseExpanding) { - mPulseExpanding = pulseExpanding; - updateShowCollapsedOnKeyguard(); - } - } - private void updateShowCollapsedOnKeyguard() { - boolean showCollapsed = mPulseExpanding || mTransitioningToFullShade; + boolean showCollapsed = mBypassController.getBypassEnabled() || mTransitioningToFullShade; if (showCollapsed != mShowCollapsedOnKeyguard) { mShowCollapsedOnKeyguard = showCollapsed; updateQsState(); @@ -719,5 +715,6 @@ public class QSFragment extends LifecycleFragment implements QS, CommandQueue.Ca public void onStateChanged(int newState) { mState = newState; setKeyguardShowing(newState == StatusBarState.KEYGUARD); + updateShowCollapsedOnKeyguard(); } } diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSPanel.java b/packages/SystemUI/src/com/android/systemui/qs/QSPanel.java index 7c7f56658919..425bdc24fe1b 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSPanel.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSPanel.java @@ -56,6 +56,8 @@ public class QSPanel extends LinearLayout implements Tunable { private static final String TAG = "QSPanel"; protected final Context mContext; + private final int mMediaTopMargin; + private final int mMediaTotalBottomMargin; /** * The index where the content starts that needs to be moved between parents @@ -99,13 +101,14 @@ public class QSPanel extends LinearLayout implements Tunable { protected LinearLayout mHorizontalContentContainer; protected QSTileLayout mTileLayout; - private int mMediaTotalBottomMargin; public QSPanel(Context context, AttributeSet attrs) { super(context, attrs); mUsingMediaPlayer = useQsMediaPlayer(context); mMediaTotalBottomMargin = getResources().getDimensionPixelSize( R.dimen.quick_settings_bottom_margin_media); + mMediaTopMargin = getResources().getDimensionPixelSize( + R.dimen.qs_tile_margin_vertical); mContext = context; setOrientation(VERTICAL); @@ -328,7 +331,7 @@ public class QSPanel extends LinearLayout implements Tunable { private void updateHorizontalLinearLayoutMargins() { if (mHorizontalLinearLayout != null && !displayMediaMarginsOnMedia()) { LayoutParams lp = (LayoutParams) mHorizontalLinearLayout.getLayoutParams(); - lp.bottomMargin = mMediaTotalBottomMargin - getPaddingBottom(); + lp.bottomMargin = Math.max(mMediaTotalBottomMargin - getPaddingBottom(), 0); mHorizontalLinearLayout.setLayoutParams(lp); } } @@ -343,6 +346,13 @@ public class QSPanel extends LinearLayout implements Tunable { return true; } + /** + * @return true if the media view needs margin on the top to separate it from the qs tiles + */ + protected boolean mediaNeedsTopMargin() { + return false; + } + private boolean needsDynamicRowsAndColumns() { return true; } @@ -411,7 +421,9 @@ public class QSPanel extends LinearLayout implements Tunable { // necessary if the view isn't horizontal, since otherwise the padding is // carried in the parent of this view (to ensure correct vertical alignment) layoutParams.bottomMargin = !horizontal || displayMediaMarginsOnMedia() - ? mMediaTotalBottomMargin - getPaddingBottom() : 0; + ? Math.max(mMediaTotalBottomMargin - getPaddingBottom(), 0) : 0; + layoutParams.topMargin = mediaNeedsTopMargin() && !horizontal + ? mMediaTopMargin : 0; } } @@ -674,6 +686,7 @@ public class QSPanel extends LinearLayout implements Tunable { mTileLayout.setMaxColumns(horizontal ? 2 : 4); } updateMargins(mediaHostView); + mHorizontalLinearLayout.setVisibility(horizontal ? View.VISIBLE : View.GONE); } } diff --git a/packages/SystemUI/src/com/android/systemui/qs/QuickQSPanel.java b/packages/SystemUI/src/com/android/systemui/qs/QuickQSPanel.java index 4cd4048f7286..985943bc8b05 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QuickQSPanel.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QuickQSPanel.java @@ -73,6 +73,11 @@ public class QuickQSPanel extends QSPanel { } @Override + protected boolean mediaNeedsTopMargin() { + return true; + } + + @Override protected void updatePadding() { // QS Panel is setting a top padding by default, which we don't need. } @@ -180,7 +185,6 @@ public class QuickQSPanel extends QSPanel { LayoutParams.WRAP_CONTENT); setLayoutParams(lp); setMaxColumns(4); - mLastRowPadding = true; } @Override diff --git a/packages/SystemUI/src/com/android/systemui/qs/TileLayout.java b/packages/SystemUI/src/com/android/systemui/qs/TileLayout.java index 2b96a34967f4..1a890a7ad07b 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/TileLayout.java +++ b/packages/SystemUI/src/com/android/systemui/qs/TileLayout.java @@ -31,7 +31,6 @@ public class TileLayout extends ViewGroup implements QSTileLayout { protected int mCellMarginVertical; protected int mSidePadding; protected int mRows = 1; - protected boolean mLastRowPadding = false; protected final ArrayList<TileRecord> mRecords = new ArrayList<>(); protected boolean mListening; @@ -168,9 +167,7 @@ public class TileLayout extends ViewGroup implements QSTileLayout { } int height = (mCellHeight + mCellMarginVertical) * mRows; - if (!mLastRowPadding) { - height -= mCellMarginVertical; - } + height -= mCellMarginVertical; if (height < 0) height = 0; diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/DeviceControlsTile.kt b/packages/SystemUI/src/com/android/systemui/qs/tiles/DeviceControlsTile.kt index f66b7226fbae..bc21b2d0fba7 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/DeviceControlsTile.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/DeviceControlsTile.kt @@ -69,7 +69,7 @@ class DeviceControlsTile @Inject constructor( private var hasControlsApps = AtomicBoolean(false) - private val icon = ResourceIcon.get(R.drawable.ic_device_light) + private val icon = ResourceIcon.get(R.drawable.controls_icon) private val listingCallback = object : ControlsListingController.ControlsListingCallback { override fun onServicesUpdated(serviceInfos: List<ControlsServiceInfo>) { diff --git a/packages/SystemUI/src/com/android/systemui/settings/brightness/BrightnessController.java b/packages/SystemUI/src/com/android/systemui/settings/brightness/BrightnessController.java index 1ad253e7f867..39d6c4f03585 100644 --- a/packages/SystemUI/src/com/android/systemui/settings/brightness/BrightnessController.java +++ b/packages/SystemUI/src/com/android/systemui/settings/brightness/BrightnessController.java @@ -354,9 +354,10 @@ public class BrightnessController implements ToggleSlider.Listener { convertGammaToLinearFloat(value, minBacklight, maxBacklight), maxBacklight); if (stopTracking) { - // TODO(brightnessfloat): change to use float value instead. + // Log brightness as a value between 0-1000 directly correlated to brightnesses 0-1.0 MetricsLogger.action(mContext, metric, - BrightnessSynchronizer.brightnessFloatToInt(valFloat)); + Math.round(MathUtils.constrainedMap(0, 1000, PowerManager.BRIGHTNESS_MIN, + PowerManager.BRIGHTNESS_MAX, valFloat))); } setBrightness(valFloat); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java b/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java index 120121ce7f0e..92922b634d64 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java @@ -77,6 +77,7 @@ import com.android.systemui.keyguard.KeyguardIndication; import com.android.systemui.keyguard.KeyguardIndicationRotateTextViewController; import com.android.systemui.plugins.FalsingManager; import com.android.systemui.plugins.statusbar.StatusBarStateController; +import com.android.systemui.statusbar.phone.KeyguardBypassController; import com.android.systemui.statusbar.phone.KeyguardIndicationTextView; import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager; import com.android.systemui.statusbar.policy.KeyguardStateController; @@ -100,7 +101,7 @@ public class KeyguardIndicationController { private static final boolean DEBUG_CHARGING_SPEED = false; private static final int MSG_HIDE_TRANSIENT = 1; - private static final int MSG_SWIPE_UP_TO_UNLOCK = 2; + private static final int MSG_SHOW_ACTION_TO_UNLOCK = 2; private static final long TRANSIENT_BIOMETRIC_ERROR_TIMEOUT = 1300; private static final float BOUNCE_ANIMATION_FINAL_Y = 0f; @@ -121,6 +122,7 @@ public class KeyguardIndicationController { private final LockPatternUtils mLockPatternUtils; private final IActivityManager mIActivityManager; private final FalsingManager mFalsingManager; + private final KeyguardBypassController mKeyguardBypassController; protected KeyguardIndicationRotateTextViewController mRotateTextViewController; private BroadcastReceiver mBroadcastReceiver; @@ -175,7 +177,8 @@ public class KeyguardIndicationController { @Main DelayableExecutor executor, FalsingManager falsingManager, LockPatternUtils lockPatternUtils, - IActivityManager iActivityManager) { + IActivityManager iActivityManager, + KeyguardBypassController keyguardBypassController) { mContext = context; mBroadcastDispatcher = broadcastDispatcher; mDevicePolicyManager = devicePolicyManager; @@ -191,6 +194,7 @@ public class KeyguardIndicationController { mLockPatternUtils = lockPatternUtils; mIActivityManager = iActivityManager; mFalsingManager = falsingManager; + mKeyguardBypassController = keyguardBypassController; } @@ -593,7 +597,7 @@ public class KeyguardIndicationController { mTransientIndication = transientIndication; mHideTransientMessageOnScreenOff = hideOnScreenOff && transientIndication != null; mHandler.removeMessages(MSG_HIDE_TRANSIENT); - mHandler.removeMessages(MSG_SWIPE_UP_TO_UNLOCK); + mHandler.removeMessages(MSG_SHOW_ACTION_TO_UNLOCK); if (mDozing && !TextUtils.isEmpty(mTransientIndication)) { // Make sure this doesn't get stuck and burns in. Acquire wakelock until its cleared. mWakeLock.setAcquired(true); @@ -785,27 +789,35 @@ public class KeyguardIndicationController { public void handleMessage(Message msg) { if (msg.what == MSG_HIDE_TRANSIENT) { hideTransientIndication(); - } else if (msg.what == MSG_SWIPE_UP_TO_UNLOCK) { - showSwipeUpToUnlock(); + } else if (msg.what == MSG_SHOW_ACTION_TO_UNLOCK) { + showActionToUnlock(); } } }; - private void showSwipeUpToUnlock() { + /** + * Show message on the keyguard for how the user can unlock/enter their device. + */ + public void showActionToUnlock() { if (mDozing) { return; } if (mStatusBarKeyguardViewManager.isBouncerShowing()) { if (mStatusBarKeyguardViewManager.isShowingAlternateAuth()) { - return; // udfps affordance is highlighted, no need to surface face auth error - } else { + return; // udfps affordance is highlighted, no need to show action to unlock + } else if (mKeyguardUpdateMonitor.isFaceEnrolled()) { String message = mContext.getString(R.string.keyguard_retry); mStatusBarKeyguardViewManager.showBouncerMessage(message, mInitialTextColorState); } } else if (mKeyguardUpdateMonitor.isScreenOn()) { - showTransientIndication(mContext.getString(R.string.keyguard_unlock), - false /* isError */, true /* hideOnScreenOff */); + if (mKeyguardUpdateMonitor.isUdfpsAvailable()) { + showTransientIndication(mContext.getString(R.string.keyguard_unlock_press), + false /* isError */, true /* hideOnScreenOff */); + } else { + showTransientIndication(mContext.getString(R.string.keyguard_unlock), + false /* isError */, true /* hideOnScreenOff */); + } } } @@ -894,7 +906,7 @@ public class KeyguardIndicationController { showTransientIndication(helpString, false /* isError */, showSwipeToUnlock); } if (showSwipeToUnlock) { - mHandler.sendMessageDelayed(mHandler.obtainMessage(MSG_SWIPE_UP_TO_UNLOCK), + mHandler.sendMessageDelayed(mHandler.obtainMessage(MSG_SHOW_ACTION_TO_UNLOCK), TRANSIENT_BIOMETRIC_ERROR_TIMEOUT); } } @@ -928,7 +940,7 @@ public class KeyguardIndicationController { ); } else { // suggest swiping up to unlock (try face auth again or swipe up to bouncer) - showSwipeUpToUnlock(); + showActionToUnlock(); } } else if (mStatusBarKeyguardViewManager.isBouncerShowing()) { mStatusBarKeyguardViewManager.showBouncerMessage(errString, mInitialTextColorState); @@ -1010,6 +1022,11 @@ public class KeyguardIndicationController { boolean isStrongBiometric) { super.onBiometricAuthenticated(userId, biometricSourceType, isStrongBiometric); mHandler.sendEmptyMessage(MSG_HIDE_TRANSIENT); + + if (biometricSourceType == BiometricSourceType.FACE + && !mKeyguardBypassController.canBypass()) { + mHandler.sendEmptyMessage(MSG_SHOW_ACTION_TO_UNLOCK); + } } @Override diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/LockscreenShadeTransitionController.kt b/packages/SystemUI/src/com/android/systemui/statusbar/LockscreenShadeTransitionController.kt index 6f4a73ec4516..6fa06a76dc5e 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/LockscreenShadeTransitionController.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/LockscreenShadeTransitionController.kt @@ -65,6 +65,7 @@ class LockscreenShadeTransitionController @Inject constructor( configurationController: ConfigurationController, falsingManager: FalsingManager ) { + private var pulseHeight: Float = 0f private var useSplitShade: Boolean = false private lateinit var nsslController: NotificationStackScrollLayoutController lateinit var notificationPanelController: NotificationPanelViewController @@ -88,6 +89,12 @@ class LockscreenShadeTransitionController @Inject constructor( internal var dragDownAnimator: ValueAnimator? = null /** + * The current pulse height animator if any + */ + @VisibleForTesting + internal var pulseHeightAnimator: ValueAnimator? = null + + /** * Distance that the full shade transition takes in order for scrim to fully transition to * the shade (in alpha) */ @@ -110,6 +117,12 @@ class LockscreenShadeTransitionController @Inject constructor( private var nextHideKeyguardNeedsNoAnimation = false /** + * The distance until we're showing the notifications when pulsing + */ + val distanceUntilShowingPulsingNotifications + get() = scrimTransitionDistance + + /** * The udfpsKeyguardViewController if it exists. */ var udfpsKeyguardViewController: UdfpsKeyguardViewController? = null @@ -286,22 +299,26 @@ class LockscreenShadeTransitionController @Inject constructor( nsslController.setTransitionToFullShadeAmount(field) notificationPanelController.setTransitionToFullShadeAmount(field, false /* animate */, 0 /* delay */) - val scrimProgress = MathUtils.saturate(field / scrimTransitionDistance) - scrimController.setTransitionToFullShadeProgress(scrimProgress) // TODO: appear qs also in split shade val qsAmount = if (useSplitShade) 0f else field qS.setTransitionToFullShadeAmount(qsAmount, false /* animate */) // TODO: appear media also in split shade val mediaAmount = if (useSplitShade) 0f else field mediaHierarchyManager.setTransitionToFullShadeAmount(mediaAmount) - // Fade out all content only visible on the lockscreen - notificationPanelController.setKeyguardOnlyContentAlpha(1.0f - scrimProgress) - depthController.transitionToFullShadeProgress = scrimProgress - udfpsKeyguardViewController?.setTransitionToFullShadeProgress(scrimProgress) + transitionToShadeAmountCommon(field) } } } + private fun transitionToShadeAmountCommon(dragDownAmount: Float) { + val scrimProgress = MathUtils.saturate(dragDownAmount / scrimTransitionDistance) + scrimController.setTransitionToFullShadeProgress(scrimProgress) + // Fade out all content only visible on the lockscreen + notificationPanelController.setKeyguardOnlyContentAlpha(1.0f - scrimProgress) + depthController.transitionToFullShadeProgress = scrimProgress + udfpsKeyguardViewController?.setTransitionToFullShadeProgress(scrimProgress) + } + private fun setDragDownAmountAnimated( target: Float, delay: Long = 0, @@ -453,15 +470,19 @@ class LockscreenShadeTransitionController @Inject constructor( /** * Notify this handler that the keyguard was just dismissed and that a animation to * the full shade should happen. + * + * @param delay the delay to do the animation with + * @param previousState which state were we in when we hid the keyguard? */ - fun onHideKeyguard(delay: Long) { + fun onHideKeyguard(delay: Long, previousState: Int) { if (animationHandlerOnKeyguardDismiss != null) { animationHandlerOnKeyguardDismiss!!.invoke(delay) animationHandlerOnKeyguardDismiss = null } else { if (nextHideKeyguardNeedsNoAnimation) { nextHideKeyguardNeedsNoAnimation = false - } else { + } else if (previousState != StatusBarState.SHADE_LOCKED) { + // No animation necessary if we already were in the shade locked! performDefaultGoToFullShadeAnimation(delay) } } @@ -479,6 +500,53 @@ class LockscreenShadeTransitionController @Inject constructor( notificationPanelController.animateToFullShade(delay) animateAppear(delay) } + + // + // PULSE EXPANSION + // + + /** + * Set the height how tall notifications are pulsing. This is only set whenever we are expanding + * from a pulse and determines how much the notifications are expanded. + */ + fun setPulseHeight(height: Float, animate: Boolean = false) { + if (animate) { + val pulseHeightAnimator = ValueAnimator.ofFloat(pulseHeight, height) + pulseHeightAnimator.interpolator = Interpolators.FAST_OUT_SLOW_IN + pulseHeightAnimator.duration = SPRING_BACK_ANIMATION_LENGTH_MS + pulseHeightAnimator.addUpdateListener { animation: ValueAnimator -> + setPulseHeight(animation.animatedValue as Float) + } + pulseHeightAnimator.start() + this.pulseHeightAnimator = pulseHeightAnimator + } else { + pulseHeight = height + val overflow = nsslController.setPulseHeight(height) + notificationPanelController.setOverStrechAmount(overflow) + val transitionHeight = if (keyguardBypassController.bypassEnabled) height else 0.0f + transitionToShadeAmountCommon(transitionHeight) + } + } + + /** + * Finish the pulse animation when the touch interaction finishes + * @param cancelled was the interaction cancelled and this is a reset? + */ + fun finishPulseAnimation(cancelled: Boolean) { + if (cancelled) { + setPulseHeight(0f, animate = true) + } else { + notificationPanelController.onPulseExpansionFinished() + setPulseHeight(0f, animate = false) + } + } + + /** + * Notify this class that a pulse expansion is starting + */ + fun onPulseExpansionStarted() { + pulseHeightAnimator?.cancel() + } } /** diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/PulseExpansionHandler.kt b/packages/SystemUI/src/com/android/systemui/statusbar/PulseExpansionHandler.kt index b34bfad499f8..761a20326200 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/PulseExpansionHandler.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/PulseExpansionHandler.kt @@ -19,8 +19,8 @@ package com.android.systemui.statusbar import android.animation.Animator import android.animation.AnimatorListenerAdapter import android.animation.ObjectAnimator -import android.animation.ValueAnimator import android.content.Context +import android.content.res.Configuration import android.os.PowerManager import android.os.PowerManager.WAKE_REASON_GESTURE import android.os.SystemClock @@ -42,6 +42,7 @@ import com.android.systemui.statusbar.notification.stack.NotificationRoundnessMa import com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayoutController import com.android.systemui.statusbar.phone.HeadsUpManagerPhone import com.android.systemui.statusbar.phone.KeyguardBypassController +import com.android.systemui.statusbar.policy.ConfigurationController import javax.inject.Inject import kotlin.math.max @@ -56,18 +57,17 @@ constructor( private val bypassController: KeyguardBypassController, private val headsUpManager: HeadsUpManagerPhone, private val roundnessManager: NotificationRoundnessManager, + private val configurationController: ConfigurationController, private val statusBarStateController: StatusBarStateController, private val falsingManager: FalsingManager, private val lockscreenShadeTransitionController: LockscreenShadeTransitionController, private val falsingCollector: FalsingCollector ) : Gefingerpoken { companion object { - private val RUBBERBAND_FACTOR_STATIC = 0.25f private val SPRING_BACK_ANIMATION_LENGTH_MS = 375 } private val mPowerManager: PowerManager? - private val mMinDragDistance: Int private var mInitialTouchX: Float = 0.0f private var mInitialTouchY: Float = 0.0f var isExpanding: Boolean = false @@ -81,6 +81,7 @@ constructor( topEntry?.let { roundnessManager.setTrackingHeadsUp(it.row) } + lockscreenShadeTransitionController.onPulseExpansionStarted() } else { roundnessManager.setTrackingHeadsUp(null) if (!leavingLockscreen) { @@ -93,8 +94,8 @@ constructor( } var leavingLockscreen: Boolean = false private set - private val mTouchSlop: Float - private lateinit var overStretchHandler: OverStretchHandler + private var touchSlop = 0f + private var minDragDistance = 0 private lateinit var stackScrollerController: NotificationStackScrollLayoutController private val mTemp2 = IntArray(2) private var mDraggedFarEnough: Boolean = false @@ -102,9 +103,7 @@ constructor( private var mPulsing: Boolean = false var isWakingToShadeLocked: Boolean = false private set - private var overStretchAmount: Float = 0.0f - private var mWakeUpHeight: Float = 0.0f - private var mReachedWakeUpHeight: Boolean = false + private var velocityTracker: VelocityTracker? = null private val isFalseTouch: Boolean @@ -114,12 +113,21 @@ constructor( var bouncerShowing: Boolean = false init { - mMinDragDistance = context.resources.getDimensionPixelSize( - R.dimen.keyguard_drag_down_min_distance) - mTouchSlop = ViewConfiguration.get(context).scaledTouchSlop.toFloat() + initResources(context) + configurationController.addCallback(object : ConfigurationController.ConfigurationListener { + override fun onConfigChanged(newConfig: Configuration?) { + initResources(context) + } + }) mPowerManager = context.getSystemService(PowerManager::class.java) } + private fun initResources(context: Context) { + minDragDistance = context.resources.getDimensionPixelSize( + R.dimen.keyguard_drag_down_min_distance) + touchSlop = ViewConfiguration.get(context).scaledTouchSlop.toFloat() + } + override fun onInterceptTouchEvent(event: MotionEvent): Boolean { return canHandleMotionEvent() && startExpansion(event) } @@ -148,14 +156,12 @@ constructor( MotionEvent.ACTION_MOVE -> { val h = y - mInitialTouchY - if (h > mTouchSlop && h > Math.abs(x - mInitialTouchX)) { + if (h > touchSlop && h > Math.abs(x - mInitialTouchX)) { falsingCollector.onStartExpandingFromPulse() isExpanding = true captureStartingChild(mInitialTouchX, mInitialTouchY) mInitialTouchY = y mInitialTouchX = x - mWakeUpHeight = wakeUpCoordinator.getWakeUpHeight() - mReachedWakeUpHeight = false return true } } @@ -216,7 +222,6 @@ constructor( } private fun finishExpansion() { - resetClock() val startingChild = mStartingChild if (mStartingChild != null) { setUserLocked(mStartingChild!!, false) @@ -230,6 +235,7 @@ constructor( } lockscreenShadeTransitionController.goToLockedShade(startingChild, needsQSAnimation = false) + lockscreenShadeTransitionController.finishPulseAnimation(cancelled = false) leavingLockscreen = true isExpanding = false if (mStartingChild is ExpandableNotificationRow) { @@ -240,24 +246,19 @@ constructor( private fun updateExpansionHeight(height: Float) { var expansionHeight = max(height, 0.0f) - if (!mReachedWakeUpHeight && height > mWakeUpHeight) { - mReachedWakeUpHeight = true - } if (mStartingChild != null) { val child = mStartingChild!! val newHeight = Math.min((child.collapsedHeight + expansionHeight).toInt(), child.maxContentHeight) child.actualHeight = newHeight - expansionHeight = max(newHeight.toFloat(), expansionHeight) } else { - val target = if (mReachedWakeUpHeight) mWakeUpHeight else 0.0f - wakeUpCoordinator.setNotificationsVisibleForExpansion(height > target, - true /* animate */, - true /* increaseSpeed */) - expansionHeight = max(mWakeUpHeight, expansionHeight) + wakeUpCoordinator.setNotificationsVisibleForExpansion( + height + > lockscreenShadeTransitionController.distanceUntilShowingPulsingNotifications, + true /* animate */, + true /* increaseSpeed */) } - val dragDownAmount = wakeUpCoordinator.setPulseHeight(expansionHeight) - setOverStretchAmount(dragDownAmount) + lockscreenShadeTransitionController.setPulseHeight(expansionHeight, animate = false) } private fun captureStartingChild(x: Float, y: Float) { @@ -269,11 +270,6 @@ constructor( } } - private fun setOverStretchAmount(amount: Float) { - overStretchAmount = amount - overStretchHandler.setOverStretchAmount(amount) - } - private fun reset(child: ExpandableView) { if (child.actualHeight == child.collapsedHeight) { setUserLocked(child, false) @@ -297,25 +293,14 @@ constructor( } } - private fun resetClock() { - val anim = ValueAnimator.ofFloat(overStretchAmount, 0f) - anim.interpolator = Interpolators.FAST_OUT_SLOW_IN - anim.duration = SPRING_BACK_ANIMATION_LENGTH_MS.toLong() - anim.addUpdateListener { - animation -> setOverStretchAmount(animation.animatedValue as Float) - } - anim.start() - } - private fun cancelExpansion() { isExpanding = false falsingCollector.onExpansionFromPulseStopped() if (mStartingChild != null) { reset(mStartingChild!!) mStartingChild = null - } else { - resetClock() } + lockscreenShadeTransitionController.finishPulseAnimation(cancelled = true) wakeUpCoordinator.setNotificationsVisibleForExpansion(false /* visible */, true /* animate */, false /* increaseSpeed */) @@ -333,11 +318,7 @@ constructor( } else null } - fun setUp( - stackScrollerController: NotificationStackScrollLayoutController, - overStrechHandler: OverStretchHandler - ) { - this.overStretchHandler = overStrechHandler + fun setUp(stackScrollerController: NotificationStackScrollLayoutController) { this.stackScrollerController = stackScrollerController } @@ -348,12 +329,4 @@ constructor( fun onStartedWakingUp() { isWakingToShadeLocked = false } - - interface OverStretchHandler { - - /** - * Set the overstretch amount in pixels This will be rubberbanded later - */ - fun setOverStretchAmount(amount: Float) - } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationWakeUpCoordinator.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationWakeUpCoordinator.kt index b0a7767accfc..a2c9ffc6bdc4 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationWakeUpCoordinator.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationWakeUpCoordinator.kt @@ -374,10 +374,6 @@ class NotificationWakeUpCoordinator @Inject constructor( } } - fun getWakeUpHeight(): Float { - return mStackScrollerController.wakeUpHeight - } - private fun updateHideAmount() { val linearAmount = min(1.0f - mLinearVisibilityAmount, mLinearDozeAmount) val amount = min(1.0f - mVisibilityAmount, mDozeAmount) @@ -395,16 +391,6 @@ class NotificationWakeUpCoordinator @Inject constructor( } } - /** - * Set the height how tall notifications are pulsing. This is only set whenever we are expanding - * from a pulse and determines how much the notifications are expanded. - */ - fun setPulseHeight(height: Float): Float { - val overflow = mStackScrollerController.setPulseHeight(height) - // no overflow for the bypass experience - return if (bypassController.bypassEnabled) 0.0f else overflow - } - override fun onHeadsUpStateChanged(entry: NotificationEntry, isHeadsUp: Boolean) { var animate = shouldAnimateVisibility() if (!isHeadsUp) { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java index 4ad72027b046..289c32f17b31 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java @@ -5138,12 +5138,17 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable * @return the overflow how much the height is further than he lowest notification */ public float setPulseHeight(float height) { + float overflow; mAmbientState.setPulseHeight(height); if (mKeyguardBypassEnabledProvider.getBypassEnabled()) { notifyAppearChangedListeners(); + overflow = Math.max(0, height - getIntrinsicPadding()); + } else { + overflow = Math.max(0, height + - mAmbientState.getInnerHeight(true /* ignorePulseHeight */)); } requestChildrenUpdate(); - return Math.max(0, height - mAmbientState.getInnerHeight(true /* ignorePulseHeight */)); + return overflow; } public float getPulseHeight() { @@ -5203,12 +5208,9 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable public float calculateAppearFractionBypass() { float pulseHeight = getPulseHeight(); - float wakeUpHeight = getWakeUpHeight(); - float dragDownAmount = pulseHeight - wakeUpHeight; - // The total distance required to fully reveal the header float totalDistance = getIntrinsicPadding(); - return MathUtils.smoothStep(0, totalDistance, dragDownAmount); + return MathUtils.smoothStep(0, totalDistance, pulseHeight); } public void setController( diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutController.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutController.java index 09afedb6de59..9e4adce47e0c 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutController.java @@ -885,10 +885,6 @@ public class NotificationStackScrollLayoutController { mView.setDozeAmount(amount); } - public float getWakeUpHeight() { - return mView.getWakeUpHeight(); - } - public int getSpeedBumpIndex() { return mView.getSpeedBumpIndex(); } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/StackScrollAlgorithm.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/StackScrollAlgorithm.java index d0507e1e136c..b36dc56ffdf9 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/StackScrollAlgorithm.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/StackScrollAlgorithm.java @@ -274,7 +274,9 @@ public class StackScrollAlgorithm { // expanded. Consider updating these states in updateContentView instead so that we don't // have to recalculate in every frame. float currentY = -ambientState.getScrollY(); - if (!ambientState.isOnKeyguard()) { + if (!ambientState.isOnKeyguard() + || (ambientState.isBypassEnabled() && ambientState.isPulseExpanding())) { + // add top padding at the start as long as we're not on the lock screen currentY += mNotificationScrimPadding; } state.firstViewInShelf = null; @@ -324,7 +326,8 @@ public class StackScrollAlgorithm { */ private void updatePositionsForState(StackScrollAlgorithmState algorithmState, AmbientState ambientState) { - if (!ambientState.isOnKeyguard()) { + if (!ambientState.isOnKeyguard() + || (ambientState.isBypassEnabled() && ambientState.isPulseExpanding())) { algorithmState.mCurrentYPosition += mNotificationScrimPadding; algorithmState.mCurrentExpandedYPosition += mNotificationScrimPadding; } @@ -355,7 +358,9 @@ public class StackScrollAlgorithm { && algorithmState.firstViewInShelf != null; final float shelfHeight = showingShelf ? ambientState.getShelf().getIntrinsicHeight() : 0f; - final float scrimPadding = ambientState.isOnKeyguard() ? 0 : mNotificationScrimPadding; + final float scrimPadding = ambientState.isOnKeyguard() + && (!ambientState.isBypassEnabled() || !ambientState.isPulseExpanding()) + ? 0 : mNotificationScrimPadding; final float stackHeight = ambientState.getStackHeight() - shelfHeight - scrimPadding; final float stackEndHeight = ambientState.getStackEndHeight() - shelfHeight - scrimPadding; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CollapsedStatusBarFragment.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CollapsedStatusBarFragment.java index 596fce5f7009..6d12a1cf10f5 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CollapsedStatusBarFragment.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CollapsedStatusBarFragment.java @@ -202,6 +202,7 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue public void onDestroyView() { super.onDestroyView(); mStatusBarIconController.removeIconGroup(mDarkIconManager); + mAnimationScheduler.removeCallback(this); if (mNetworkController.hasEmergencyCryptKeeperText()) { mNetworkController.removeCallback(mSignalCallback); } 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 91d503bac4fe..0a4e59c0391e 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java @@ -19,6 +19,7 @@ package com.android.systemui.statusbar.phone; import static android.view.accessibility.AccessibilityNodeInfo.ACTION_CLICK; import static android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction; +import static com.android.systemui.controls.dagger.ControlsComponent.Visibility.AVAILABLE; import static com.android.systemui.doze.util.BurnInHelperKt.getBurnInOffset; import static com.android.systemui.tuner.LockscreenFragment.LOCKSCREEN_LEFT_BUTTON; import static com.android.systemui.tuner.LockscreenFragment.LOCKSCREEN_LEFT_UNLOCK; @@ -40,6 +41,7 @@ import android.content.ServiceConnection; import android.content.pm.ActivityInfo; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; +import android.content.res.ColorStateList; import android.content.res.Configuration; import android.graphics.drawable.Drawable; import android.os.AsyncTask; @@ -81,6 +83,11 @@ import com.android.systemui.R; import com.android.systemui.animation.Interpolators; import com.android.systemui.assist.AssistManager; import com.android.systemui.camera.CameraIntents; +import com.android.systemui.controls.ControlsServiceInfo; +import com.android.systemui.controls.dagger.ControlsComponent; +import com.android.systemui.controls.management.ControlsListingController; +import com.android.systemui.controls.ui.ControlsActivity; +import com.android.systemui.controls.ui.ControlsUiController; import com.android.systemui.plugins.ActivityStarter; import com.android.systemui.plugins.FalsingManager; import com.android.systemui.plugins.IntentButtonProvider; @@ -98,6 +105,8 @@ import com.android.systemui.tuner.TunerService; import com.android.systemui.wallet.controller.QuickAccessWalletController; import com.android.systemui.wallet.ui.WalletActivity; +import java.util.List; + /** * Implementation for the bottom area of the Keyguard, including camera/phone affordance and status * text. @@ -133,9 +142,12 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL private KeyguardAffordanceView mLeftAffordanceView; private ImageView mWalletButton; + private ImageView mControlsButton; private boolean mHasCard = false; private WalletCardRetriever mCardRetriever = new WalletCardRetriever(); private QuickAccessWalletController mQuickAccessWalletController; + private ControlsComponent mControlsComponent; + private boolean mControlServicesAvailable = false; private ViewGroup mIndicationArea; private TextView mIndicationText; @@ -188,6 +200,19 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL private ActivityIntentHelper mActivityIntentHelper; private KeyguardUpdateMonitor mKeyguardUpdateMonitor; + private ControlsListingController.ControlsListingCallback mListingCallback = + new ControlsListingController.ControlsListingCallback() { + public void onServicesUpdated(List<ControlsServiceInfo> serviceInfos) { + boolean available = !serviceInfos.isEmpty(); + + if (available != mControlServicesAvailable) { + mControlServicesAvailable = available; + updateControlsVisibility(); + updateAffordanceColors(); + } + } + }; + public KeyguardBottomAreaView(Context context) { this(context, null); } @@ -253,6 +278,7 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL mRightAffordanceView = findViewById(R.id.camera_button); mLeftAffordanceView = findViewById(R.id.left_button); mWalletButton = findViewById(R.id.wallet_button); + mControlsButton = findViewById(R.id.controls_button); mIndicationArea = findViewById(R.id.keyguard_indication_area); mIndicationText = findViewById(R.id.keyguard_indication_text); mIndicationTextBottom = findViewById(R.id.keyguard_indication_text_bottom); @@ -276,6 +302,7 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL mIndicationPadding = getResources().getDimensionPixelSize( R.dimen.keyguard_indication_area_padding); updateWalletVisibility(); + updateControlsVisibility(); } /** @@ -328,6 +355,11 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL mQuickAccessWalletController.unregisterWalletChangeObservers( WALLET_PREFERENCE_CHANGE, DEFAULT_PAYMENT_APP_CHANGE); } + + if (mControlsComponent != null) { + mControlsComponent.getControlsListingController().ifPresent( + c -> c.removeCallback(mListingCallback)); + } } private void initAccessibility() { @@ -369,13 +401,20 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL updateLeftAffordanceIcon(); lp = mWalletButton.getLayoutParams(); - lp.width = getResources().getDimensionPixelSize(R.dimen.keyguard_affordance_wallet_width); - lp.height = getResources().getDimensionPixelSize(R.dimen.keyguard_affordance_wallet_width); + lp.width = getResources().getDimensionPixelSize(R.dimen.keyguard_affordance_fixed_width); + lp.height = getResources().getDimensionPixelSize(R.dimen.keyguard_affordance_fixed_height); mWalletButton.setLayoutParams(lp); + lp = mControlsButton.getLayoutParams(); + lp.width = getResources().getDimensionPixelSize(R.dimen.keyguard_affordance_fixed_width); + lp.height = getResources().getDimensionPixelSize(R.dimen.keyguard_affordance_fixed_height); + mControlsButton.setLayoutParams(lp); + mIndicationPadding = getResources().getDimensionPixelSize( R.dimen.keyguard_indication_area_padding); + updateWalletVisibility(); + updateAffordanceColors(); } private void updateRightAffordanceIcon() { @@ -454,22 +493,38 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL || !mQuickAccessWalletController.isWalletEnabled() || !mHasCard) { mWalletButton.setVisibility(GONE); - mIndicationArea.setPadding(0, 0, 0, 0); - } else { - Drawable tileIcon = mQuickAccessWalletController.getWalletClient().getTileIcon(); - if (tileIcon != null) { - mWalletButton.setImageDrawable(tileIcon); + + if (mControlsButton.getVisibility() == GONE) { + mIndicationArea.setPadding(0, 0, 0, 0); } - mWalletButton.getDrawable().setTint( - Utils.getColorAttr( - mContext, - com.android.internal.R.attr.textColorPrimary).getDefaultColor()); + } else { mWalletButton.setVisibility(VISIBLE); mWalletButton.setOnClickListener(this::onWalletClick); mIndicationArea.setPadding(mIndicationPadding, 0, mIndicationPadding, 0); } } + private void updateControlsVisibility() { + if (mControlsComponent == null) return; + + boolean hasFavorites = mControlsComponent.getControlsController() + .map(c -> c.getFavorites().size() > 0) + .orElse(false); + if (mDozing + || !hasFavorites + || !mControlServicesAvailable + || mControlsComponent.getVisibility() != AVAILABLE) { + mControlsButton.setVisibility(GONE); + if (mWalletButton.getVisibility() == GONE) { + mIndicationArea.setPadding(0, 0, 0, 0); + } + } else { + mControlsButton.setVisibility(VISIBLE); + mControlsButton.setOnClickListener(this::onControlsClick); + mIndicationArea.setPadding(mIndicationPadding, 0, mIndicationPadding, 0); + } + } + public boolean isLeftVoiceAssist() { return mLeftIsVoiceAssist; } @@ -751,6 +806,9 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL if (mWalletButton.getVisibility() == View.VISIBLE) { startFinishDozeAnimationElement(mWalletButton, delay); } + if (mControlsButton.getVisibility() == View.VISIBLE) { + startFinishDozeAnimationElement(mControlsButton, delay); + } if (mLeftAffordanceView.getVisibility() == View.VISIBLE) { startFinishDozeAnimationElement(mLeftAffordanceView, delay); delay += DOZE_ANIMATION_STAGGER_DELAY; @@ -824,6 +882,7 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL updateCameraVisibility(); updateLeftAffordanceIcon(); updateWalletVisibility(); + updateControlsVisibility(); if (dozing) { mOverlayContainer.setVisibility(INVISIBLE); @@ -857,6 +916,7 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL mRightAffordanceView.setAlpha(alpha); mIndicationArea.setAlpha(alpha); mWalletButton.setAlpha(alpha); + mControlsButton.setAlpha(alpha); } private class DefaultLeftButton implements IntentButton { @@ -950,6 +1010,32 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL mQuickAccessWalletController.queryWalletCards(mCardRetriever); updateWalletVisibility(); + updateAffordanceColors(); + } + + private void updateAffordanceColors() { + int iconColor = Utils.getColorAttrDefaultColor( + mContext, + com.android.internal.R.attr.textColorPrimary); + mWalletButton.getDrawable().setTint(iconColor); + mControlsButton.getDrawable().setTint(iconColor); + + ColorStateList bgColor = Utils.getColorAttr( + mContext, + com.android.internal.R.attr.colorSurface); + mWalletButton.setBackgroundTintList(bgColor); + mControlsButton.setBackgroundTintList(bgColor); + } + + /** + * Initialize controls via the ControlsComponent + */ + public void initControls(ControlsComponent controlsComponent) { + mControlsComponent = controlsComponent; + mControlsComponent.getControlsListingController().ifPresent( + c -> c.addCallback(mListingCallback)); + + updateAffordanceColors(); } private void onWalletClick(View v) { @@ -974,19 +1060,41 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL } } + private void onControlsClick(View v) { + if (mFalsingManager.isFalseTap(FalsingManager.LOW_PENALTY)) { + return; + } + + Intent intent = new Intent(mContext, ControlsActivity.class) + .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_NEW_TASK) + .putExtra(ControlsUiController.EXTRA_ANIMATE, true); + + if (mControlsComponent.getVisibility() == AVAILABLE) { + mContext.startActivity(intent); + } else { + mActivityStarter.postStartActivityDismissingKeyguard(intent, 0 /* delay */); + } + } + private class WalletCardRetriever implements QuickAccessWalletClient.OnWalletCardsRetrievedCallback { @Override public void onWalletCardsRetrieved(@NonNull GetWalletCardsResponse response) { mHasCard = !response.getWalletCards().isEmpty(); + Drawable tileIcon = mQuickAccessWalletController.getWalletClient().getTileIcon(); + if (tileIcon != null) { + mWalletButton.setImageDrawable(tileIcon); + } updateWalletVisibility(); + updateAffordanceColors(); } @Override public void onWalletCardRetrievalError(@NonNull GetWalletCardsError error) { mHasCard = false; updateWalletVisibility(); + updateAffordanceColors(); } } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardClockPositionAlgorithm.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardClockPositionAlgorithm.java index ad4213d212a0..f77c0520cdb1 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardClockPositionAlgorithm.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardClockPositionAlgorithm.java @@ -211,7 +211,7 @@ public class KeyguardClockPositionAlgorithm { private int getStackScrollerPadding(int clockYPosition) { if (mBypassEnabled) { - return mUnlockedStackScrollerPadding; + return (int) (mUnlockedStackScrollerPadding + mOverStretchAmount); } else if (mIsSplitShade) { return clockYPosition; } else { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationIconAreaController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationIconAreaController.java index cfe95e06fb61..6516abd143ed 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationIconAreaController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationIconAreaController.java @@ -165,14 +165,14 @@ public class NotificationIconAreaController implements * Called by the Keyguard*ViewController whose view contains the aod icons. */ public void setupAodIcons(@NonNull NotificationIconContainer aodIcons) { - boolean changed = mAodIcons != null; + boolean changed = mAodIcons != null && aodIcons != mAodIcons; if (changed) { mAodIcons.setAnimationsEnabled(false); mAodIcons.removeAllViews(); } mAodIcons = aodIcons; mAodIcons.setOnLockScreen(true); - updateAodIconsVisibility(false /* animate */); + updateAodIconsVisibility(false /* animate */, changed); updateAnimations(); if (changed) { updateAodNotificationIcons(); @@ -587,7 +587,7 @@ public class NotificationIconAreaController implements @Override public void onStateChanged(int newState) { - updateAodIconsVisibility(false /* animate */); + updateAodIconsVisibility(false /* animate */, false /* force */); updateAnimations(); } @@ -663,18 +663,18 @@ public class NotificationIconAreaController implements // since otherwise the unhide animation overlaps animate &= fullyHidden; } - updateAodIconsVisibility(animate); + updateAodIconsVisibility(animate, false /* force */); updateAodNotificationIcons(); } @Override public void onPulseExpansionChanged(boolean expandingChanged) { if (expandingChanged) { - updateAodIconsVisibility(true /* animate */); + updateAodIconsVisibility(true /* animate */, false /* force */); } } - private void updateAodIconsVisibility(boolean animate) { + private void updateAodIconsVisibility(boolean animate, boolean forceUpdate) { if (mAodIcons == null) { return; } @@ -688,10 +688,11 @@ public class NotificationIconAreaController implements && !mUnlockedScreenOffAnimationController.isScreenOffAnimationPlaying()) { visible = false; } - if (visible && mWakeUpCoordinator.isPulseExpanding()) { + if (visible && mWakeUpCoordinator.isPulseExpanding() + && !mBypassController.getBypassEnabled()) { visible = false; } - if (mAodIconsVisible != visible) { + if (mAodIconsVisible != visible || forceUpdate) { mAodIconsVisible = visible; mAodIcons.animate().cancel(); if (animate) { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java index 7958301370f5..12e85beba0c6 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java @@ -97,6 +97,7 @@ import com.android.systemui.animation.Interpolators; import com.android.systemui.biometrics.AuthController; import com.android.systemui.classifier.Classifier; import com.android.systemui.classifier.FalsingCollector; +import com.android.systemui.controls.dagger.ControlsComponent; import com.android.systemui.dagger.qualifiers.DisplayId; import com.android.systemui.dagger.qualifiers.Main; import com.android.systemui.doze.DozeLog; @@ -321,6 +322,7 @@ public class NotificationPanelViewController extends PanelViewController { private final ScrimController mScrimController; private final PrivacyDotViewController mPrivacyDotViewController; private final QuickAccessWalletController mQuickAccessWalletController; + private final ControlsComponent mControlsComponent; private final NotificationRemoteInputManager mRemoteInputManager; // Maximum # notifications to show on Keyguard; extras will be collapsed in an overflow card. @@ -606,6 +608,11 @@ public class NotificationPanelViewController extends PanelViewController { * Is the current animator resetting the qs translation. */ private boolean mIsQsTranslationResetAnimator; + + /** + * Is the current animator resetting the pulse expansion after a drag down + */ + private boolean mIsPulseExpansionResetAnimator; private final Rect mKeyguardStatusAreaClipBounds = new Rect(); private final Region mQsInterceptRegion = new Region(); @@ -717,7 +724,8 @@ public class NotificationPanelViewController extends PanelViewController { @Main Executor uiExecutor, SecureSettings secureSettings, UnlockedScreenOffAnimationController unlockedScreenOffAnimationController, - NotificationRemoteInputManager remoteInputManager) { + NotificationRemoteInputManager remoteInputManager, + ControlsComponent controlsComponent) { super(view, falsingManager, dozeLog, keyguardStateController, (SysuiStatusBarStateController) statusBarStateController, vibratorHelper, statusBarKeyguardViewManager, latencyTracker, flingAnimationUtilsBuilder.get(), @@ -727,6 +735,7 @@ public class NotificationPanelViewController extends PanelViewController { mKeyguardMediaController = keyguardMediaController; mPrivacyDotViewController = privacyDotViewController; mQuickAccessWalletController = quickAccessWalletController; + mControlsComponent = controlsComponent; mMetricsLogger = metricsLogger; mActivityManager = activityManager; mConfigurationController = configurationController; @@ -880,14 +889,7 @@ public class NotificationPanelViewController extends PanelViewController { mWakeUpCoordinator.setStackScroller(mNotificationStackScrollLayoutController); mQsFrame = mView.findViewById(R.id.qs_frame); - mPulseExpansionHandler.setUp(mNotificationStackScrollLayoutController, - amount -> { - float progress = amount / mView.getHeight(); - float overstretch = Interpolators.getOvershootInterpolation(progress, - (float) mMaxOverscrollAmountForPulse / mView.getHeight(), - 0.2f); - setOverStrechAmount(overstretch); - }); + mPulseExpansionHandler.setUp(mNotificationStackScrollLayoutController); mWakeUpCoordinator.addListener(new NotificationWakeUpCoordinator.WakeUpListener() { @Override public void onFullyHiddenChanged(boolean isFullyHidden) { @@ -899,7 +901,6 @@ public class NotificationPanelViewController extends PanelViewController { if (mKeyguardBypassController.getBypassEnabled()) { // Position the notifications while dragging down while pulsing requestScrollerTopPaddingUpdate(false /* animate */); - updateQSPulseExpansion(); } } }); @@ -937,8 +938,6 @@ public class NotificationPanelViewController extends PanelViewController { R.dimen.notification_panel_min_side_margin); mIndicationBottomPadding = mResources.getDimensionPixelSize( R.dimen.keyguard_indication_bottom_padding); - mQsNotificationTopPadding = mResources.getDimensionPixelSize( - R.dimen.qs_notification_padding); mShelfHeight = mResources.getDimensionPixelSize(R.dimen.notification_shelf_height); mDarkIconSize = mResources.getDimensionPixelSize(R.dimen.status_bar_icon_drawing_size_dark); int statusbarHeight = mResources.getDimensionPixelSize( @@ -1177,6 +1176,7 @@ public class NotificationPanelViewController extends PanelViewController { mKeyguardBottomArea.setUserSetupComplete(mUserSetupComplete); mKeyguardBottomArea.setFalsingManager(mFalsingManager); mKeyguardBottomArea.initWallet(mQuickAccessWalletController); + mKeyguardBottomArea.initControls(mControlsComponent); } private void updateMaxDisplayedNotifications(boolean recompute) { @@ -1336,8 +1336,7 @@ public class NotificationPanelViewController extends PanelViewController { * @return the padding of the stackscroller when unlocked */ private int getUnlockedStackScrollerPadding() { - return (mQs != null ? mQs.getHeader().getHeight() : 0) + mQsPeekHeight - + mQsNotificationTopPadding; + return (mQs != null ? mQs.getHeader().getHeight() : 0) + mQsPeekHeight; } /** @@ -2234,7 +2233,7 @@ public class NotificationPanelViewController extends PanelViewController { } } - protected void updateQsExpansion() { + private void updateQsExpansion() { if (mQs == null) return; float qsExpansionFraction = computeQsExpansionFraction(); mQs.setQsExpansion(qsExpansionFraction, getHeaderTranslation()); @@ -2293,9 +2292,20 @@ public class NotificationPanelViewController extends PanelViewController { top = mTransitionToFullShadeQSPosition; } else { final float notificationTop = getQSEdgePosition(); - top = (int) (isOnKeyguard() ? Math.min(qsPanelBottomY, notificationTop) - : notificationTop); + if (isOnKeyguard()) { + if (mKeyguardBypassController.getBypassEnabled()) { + // When bypassing on the keyguard, let's use the panel bottom. + // this should go away once we unify the stackY position and don't have + // to do this min anymore below. + top = qsPanelBottomY; + } else { + top = (int) Math.min(qsPanelBottomY, notificationTop); + } + } else { + top = (int) notificationTop; + } } + top += mOverStretchAmount; bottom = getView().getBottom(); // notification bounds should take full screen width regardless of insets left = 0; @@ -2348,6 +2358,7 @@ public class NotificationPanelViewController extends PanelViewController { public void onAnimationEnd(Animator animation) { mQsClippingAnimation = null; mIsQsTranslationResetAnimator = false; + mIsPulseExpansionResetAnimator = false; } }); mQsClippingAnimation.start(); @@ -2373,9 +2384,17 @@ public class NotificationPanelViewController extends PanelViewController { } if (mQs != null) { float qsTranslation = 0; - if (mTransitioningToFullShadeProgress > 0.0f || (mQsClippingAnimation != null - && mIsQsTranslationResetAnimator)) { - qsTranslation = (top - mQs.getHeader().getHeight()) * QS_PARALLAX_AMOUNT; + boolean pulseExpanding = mPulseExpansionHandler.isExpanding(); + if (mTransitioningToFullShadeProgress > 0.0f || pulseExpanding + || (mQsClippingAnimation != null + && (mIsQsTranslationResetAnimator || mIsPulseExpansionResetAnimator))) { + if (pulseExpanding || mIsPulseExpansionResetAnimator) { + // qsTranslation should only be positive during pulse expansion because it's + // already translating in from the top + qsTranslation = Math.max(0, (top - mQs.getHeader().getHeight()) / 2.0f); + } else { + qsTranslation = (top - mQs.getHeader().getHeight()) * QS_PARALLAX_AMOUNT; + } } mQsTranslationForFullShadeTransition = qsTranslation; updateQsFrameTranslation(); @@ -2442,7 +2461,7 @@ public class NotificationPanelViewController extends PanelViewController { private float calculateNotificationsTopPadding() { if (mShouldUseSplitNotificationShade && !mKeyguardShowing) { - return mSplitShadeNotificationsTopPadding + mQsNotificationTopPadding; + return mSplitShadeNotificationsTopPadding; } if (mKeyguardShowing && (mQsExpandImmediate || mIsExpanding && mQsExpandedWhenExpandingStarted)) { @@ -2453,7 +2472,7 @@ public class NotificationPanelViewController extends PanelViewController { // panel. We need to take the maximum and linearly interpolate with the panel expansion // for a nice motion. int maxNotificationPadding = getKeyguardNotificationStaticPadding(); - int maxQsPadding = mQsMaxExpansionHeight + mQsNotificationTopPadding; + int maxQsPadding = mQsMaxExpansionHeight; int max = mBarState == KEYGUARD ? Math.max( maxNotificationPadding, maxQsPadding) : maxQsPadding; return (int) MathUtils.lerp((float) mQsMinExpansionHeight, (float) max, @@ -2466,10 +2485,10 @@ public class NotificationPanelViewController extends PanelViewController { // We can only do the smoother transition on Keyguard when we also are not collapsing // from a scrolled quick settings. return MathUtils.lerp((float) getKeyguardNotificationStaticPadding(), - (float) (mQsMaxExpansionHeight + mQsNotificationTopPadding), + (float) (mQsMaxExpansionHeight), computeQsExpansionFraction()); } else { - return mQsExpansionHeight + mQsNotificationTopPadding; + return mQsExpansionHeight; } } @@ -2504,14 +2523,6 @@ public class NotificationPanelViewController extends PanelViewController { } } - private void updateQSPulseExpansion() { - if (mQs != null) { - mQs.setPulseExpanding( - mKeyguardShowing && mKeyguardBypassController.getBypassEnabled() - && mNotificationStackScrollLayoutController.isPulseExpanding()); - } - } - /** * Set the amount of pixels we have currently dragged down if we're transitioning to the full * shade. 0.0f means we're not transitioning yet. @@ -2563,6 +2574,15 @@ public class NotificationPanelViewController extends PanelViewController { } /** + * Notify the panel that the pulse expansion has finished and that we're going to the full + * shade + */ + public void onPulseExpansionFinished() { + animateNextNotificationBounds(StackStateAnimator.ANIMATION_DURATION_GO_TO_FULL_SHADE, 0); + mIsPulseExpansionResetAnimator = true; + } + + /** * Set the alpha of the keyguard elements which only show on the lockscreen, but not in * shade locked / shade. This is used when dragging down to the full shade. */ @@ -2855,10 +2875,6 @@ public class NotificationPanelViewController extends PanelViewController { } int maxQsHeight = mQsMaxExpansionHeight; - if (mKeyguardShowing) { - maxQsHeight += mQsNotificationTopPadding; - } - // If an animation is changing the size of the QS panel, take the animated value. if (mQsSizeChangeAnimator != null) { maxQsHeight = (int) mQsSizeChangeAnimator.getAnimatedValue(); @@ -2923,19 +2939,7 @@ public class NotificationPanelViewController extends PanelViewController { startHeight = -mQsExpansionHeight * QS_PARALLAX_AMOUNT; } if (mKeyguardBypassController.getBypassEnabled() && isOnKeyguard()) { - if (mNotificationStackScrollLayoutController.isPulseExpanding()) { - if (!mPulseExpansionHandler.isExpanding() - && !mPulseExpansionHandler.getLeavingLockscreen()) { - // If we aborted the expansion we need to make sure the header doesn't reappear - // again after the header has animated away - appearAmount = 0; - } else { - appearAmount = mNotificationStackScrollLayoutController - .calculateAppearFractionBypass(); - } - } else { - appearAmount = 0.0f; - } + appearAmount = mNotificationStackScrollLayoutController.calculateAppearFractionBypass(); startHeight = -mQs.getQsMinExpansionHeight(); } float translation = MathUtils.lerp(startHeight, 0, Math.min(1.0f, appearAmount)); @@ -3538,7 +3542,6 @@ public class NotificationPanelViewController extends PanelViewController { mQs.setPanelView(mHeightListener); mQs.setExpandClickListener(mOnClickListener); mQs.setHeaderClickable(isQsExpansionEnabled()); - updateQSPulseExpansion(); mQs.setOverscrolling(mStackScrollerOverscrolling); mQs.setTranslateWhileExpanding(mShouldUseSplitNotificationShade); @@ -4299,8 +4302,7 @@ public class NotificationPanelViewController extends PanelViewController { if (mAccessibilityManager.isEnabled()) { mView.setAccessibilityPaneTitle(determineAccessibilityPaneTitle()); } - mNotificationStackScrollLayoutController.setMaxTopPadding( - mQsMaxExpansionHeight + mQsNotificationTopPadding); + mNotificationStackScrollLayoutController.setMaxTopPadding(mQsMaxExpansionHeight); } } @@ -4418,7 +4420,6 @@ public class NotificationPanelViewController extends PanelViewController { updateMaxDisplayedNotifications(false); // The update needs to happen after the headerSlide in above, otherwise the translation // would reset - updateQSPulseExpansion(); maybeAnimateBottomAreaAlpha(); resetHorizontalPanelPosition(); updateQsState(); @@ -4453,7 +4454,9 @@ public class NotificationPanelViewController extends PanelViewController { * Sets the overstretch amount in raw pixels when dragging down. */ public void setOverStrechAmount(float amount) { - mOverStretchAmount = amount; + float progress = amount / mView.getHeight(); + float overstretch = Interpolators.getOvershootInterpolation(progress); + mOverStretchAmount = overstretch * mMaxOverscrollAmountForPulse; positionClockAndNotifications(true /* forceUpdate */); } @@ -4507,8 +4510,7 @@ public class NotificationPanelViewController extends PanelViewController { if (mQs != null) { updateQSMinHeight(); mQsMaxExpansionHeight = mQs.getDesiredHeight(); - mNotificationStackScrollLayoutController.setMaxTopPadding( - mQsMaxExpansionHeight + mQsNotificationTopPadding); + mNotificationStackScrollLayoutController.setMaxTopPadding(mQsMaxExpansionHeight); } positionClockAndNotifications(); if (mQsExpanded && mQsFullyExpanded) { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java index 742eae391a75..394e4ad76df1 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java @@ -3616,6 +3616,7 @@ public class StatusBar extends SystemUI implements DemoMode, mIsKeyguard = false; Trace.beginSection("StatusBar#hideKeyguard"); boolean staying = mStatusBarStateController.leaveOpenOnKeyguardHide(); + int previousState = mStatusBarStateController.getState(); if (!(mStatusBarStateController.setState(StatusBarState.SHADE, force))) { //TODO: StatusBarStateController should probably know about hiding the keyguard and // notify listeners. @@ -3628,7 +3629,7 @@ public class StatusBar extends SystemUI implements DemoMode, mStatusBarStateController.setLeaveOpenOnKeyguardHide(false); } long delay = mKeyguardStateController.calculateGoingToFullShadeDelay(); - mLockscreenShadeTransitionController.onHideKeyguard(delay); + mLockscreenShadeTransitionController.onHideKeyguard(delay, previousState); // Disable layout transitions in navbar for this transition because the load is just // too heavy for the CPU and GPU on any device. @@ -3950,7 +3951,11 @@ public class StatusBar extends SystemUI implements DemoMode, || !wakingUp && mWakefulnessLifecycle.getLastSleepReason() == PowerManager.GO_TO_SLEEP_REASON_POWER_BUTTON) { mLightRevealScrim.setRevealEffect(mPowerButtonReveal); - } else if (!(mLightRevealScrim.getRevealEffect() instanceof CircleReveal)) { + } else if (!wakingUp || !(mLightRevealScrim.getRevealEffect() instanceof CircleReveal)) { + // If we're going to sleep, but it's not from the power button, use the default reveal. + // If we're waking up, only use the default reveal if the biometric controller didn't + // already set it to the circular reveal because we're waking up from a fingerprint/face + // auth. mLightRevealScrim.setRevealEffect(LiftReveal.INSTANCE); } } @@ -3979,7 +3984,7 @@ public class StatusBar extends SystemUI implements DemoMode, public void onUnlockHintStarted() { mFalsingCollector.onUnlockHintStarted(); - mKeyguardIndicationController.showTransientIndication(R.string.keyguard_unlock); + mKeyguardIndicationController.showActionToUnlock(); } public void onHintFinished() { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/UserSwitcherController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/UserSwitcherController.java index c94eaeda3906..ae73f7327def 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/UserSwitcherController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/UserSwitcherController.java @@ -23,6 +23,7 @@ import static com.android.systemui.DejankUtils.whitelistIpcs; import android.annotation.UserIdInt; import android.app.ActivityManager; +import android.app.AlertDialog; import android.app.Dialog; import android.app.IActivityTaskManager; import android.content.BroadcastReceiver; @@ -71,9 +72,11 @@ import com.android.systemui.plugins.FalsingManager; import com.android.systemui.plugins.qs.DetailAdapter; import com.android.systemui.qs.QSUserSwitcherEvent; import com.android.systemui.qs.tiles.UserDetailView; +import com.android.systemui.settings.UserTracker; import com.android.systemui.statusbar.phone.SystemUIDialog; import com.android.systemui.telephony.TelephonyListenerManager; import com.android.systemui.user.CreateUserActivity; +import com.android.systemui.util.settings.SecureSettings; import java.io.FileDescriptor; import java.io.PrintWriter; @@ -104,9 +107,12 @@ public class UserSwitcherController implements Dumpable { private static final String PERMISSION_SELF = "com.android.systemui.permission.SELF"; protected final Context mContext; + protected final UserTracker mUserTracker; protected final UserManager mUserManager; + private final ContentObserver mSettingsObserver; private final ArrayList<WeakReference<BaseUserAdapter>> mAdapters = new ArrayList<>(); - private final GuestResumeSessionReceiver mGuestResumeSessionReceiver; + @VisibleForTesting + final GuestResumeSessionReceiver mGuestResumeSessionReceiver; private final KeyguardStateController mKeyguardStateController; protected final Handler mHandler; private final ActivityStarter mActivityStarter; @@ -115,15 +121,18 @@ public class UserSwitcherController implements Dumpable { private final IActivityTaskManager mActivityTaskManager; private ArrayList<UserRecord> mUsers = new ArrayList<>(); - private Dialog mExitGuestDialog; - private Dialog mAddUserDialog; + @VisibleForTesting + AlertDialog mExitGuestDialog; + @VisibleForTesting + Dialog mAddUserDialog; private int mLastNonGuestUser = UserHandle.USER_SYSTEM; private boolean mResumeUserOnGuestLogout = true; private boolean mSimpleUserSwitcher; // When false, there won't be any visual affordance to add a new user from the keyguard even if // the user is unlocked private boolean mAddUsersFromLockScreen; - private boolean mPauseRefreshUsers; + @VisibleForTesting + boolean mPauseRefreshUsers; private int mSecondaryUser = UserHandle.USER_NULL; private Intent mSecondaryUserServiceIntent; private SparseBooleanArray mForcePictureLoadForUserId = new SparseBooleanArray(2); @@ -131,11 +140,14 @@ public class UserSwitcherController implements Dumpable { public final DetailAdapter mUserDetailAdapter; private final Executor mUiBgExecutor; private final boolean mGuestUserAutoCreated; + private final AtomicBoolean mGuestIsResetting; private final AtomicBoolean mGuestCreationScheduled; private FalsingManager mFalsingManager; @Inject public UserSwitcherController(Context context, + UserManager userManager, + UserTracker userTracker, KeyguardStateController keyguardStateController, @Main Handler handler, ActivityStarter activityStarter, @@ -145,14 +157,17 @@ public class UserSwitcherController implements Dumpable { TelephonyListenerManager telephonyListenerManager, IActivityTaskManager activityTaskManager, UserDetailAdapter userDetailAdapter, + SecureSettings secureSettings, @UiBackground Executor uiBgExecutor) { mContext = context; + mUserTracker = userTracker; mBroadcastDispatcher = broadcastDispatcher; mTelephonyListenerManager = telephonyListenerManager; mActivityTaskManager = activityTaskManager; mUiEventLogger = uiEventLogger; mFalsingManager = falsingManager; - mGuestResumeSessionReceiver = new GuestResumeSessionReceiver(this, mUiEventLogger); + mGuestResumeSessionReceiver = new GuestResumeSessionReceiver( + this, mUserTracker, mUiEventLogger, secureSettings); mUserDetailAdapter = userDetailAdapter; mUiBgExecutor = uiBgExecutor; if (!UserManager.isGuestUserEphemeral()) { @@ -160,11 +175,12 @@ public class UserSwitcherController implements Dumpable { } mGuestUserAutoCreated = mContext.getResources().getBoolean( com.android.internal.R.bool.config_guestUserAutoCreated); + mGuestIsResetting = new AtomicBoolean(); mGuestCreationScheduled = new AtomicBoolean(); mKeyguardStateController = keyguardStateController; mHandler = handler; mActivityStarter = activityStarter; - mUserManager = UserManager.get(context); + mUserManager = userManager; IntentFilter filter = new IntentFilter(); filter.addAction(Intent.ACTION_USER_ADDED); filter.addAction(Intent.ACTION_USER_REMOVED); @@ -183,6 +199,15 @@ public class UserSwitcherController implements Dumpable { mContext.registerReceiverAsUser(mReceiver, UserHandle.SYSTEM, filter, PERMISSION_SELF, null /* scheduler */); + mSettingsObserver = new ContentObserver(mHandler) { + @Override + public void onChange(boolean selfChange) { + mSimpleUserSwitcher = shouldUseSimpleUserSwitcher(); + mAddUsersFromLockScreen = Settings.Global.getInt(mContext.getContentResolver(), + Settings.Global.ADD_USERS_WHEN_LOCKED, 0) != 0; + refreshUsers(UserHandle.USER_NULL); + }; + }; mContext.getContentResolver().registerContentObserver( Settings.Global.getUriFor(SIMPLE_USER_SWITCHER_GLOBAL_SETTING), true, mSettingsObserver); @@ -244,11 +269,11 @@ public class UserSwitcherController implements Dumpable { return null; } ArrayList<UserRecord> records = new ArrayList<>(infos.size()); - int currentId = ActivityManager.getCurrentUser(); + int currentId = mUserTracker.getUserId(); // Check user switchability of the foreground user since SystemUI is running in // User 0 boolean canSwitchUsers = mUserManager.getUserSwitchability( - UserHandle.of(ActivityManager.getCurrentUser())) == SWITCHABILITY_STATUS_OK; + UserHandle.of(mUserTracker.getUserId())) == SWITCHABILITY_STATUS_OK; UserInfo currentUserInfo = null; UserRecord guestRecord = null; @@ -301,7 +326,20 @@ public class UserSwitcherController implements Dumpable { boolean createIsRestricted = !addUsersWhenLocked; if (guestRecord == null) { - if (canCreateGuest) { + if (mGuestUserAutoCreated) { + // If mGuestIsResetting=true, the switch should be disabled since + // we will just use it as an indicator for "Resetting guest...". + // Otherwise, default to canSwitchUsers. + boolean isSwitchToGuestEnabled = + !mGuestIsResetting.get() && canSwitchUsers; + guestRecord = new UserRecord(null /* info */, null /* picture */, + true /* isGuest */, false /* isCurrent */, + false /* isAddUser */, false /* isRestricted */, + isSwitchToGuestEnabled); + // Don't call checkIfAddUserDisallowedByAdminOnly if + // config_guestUserAutoCreated=true. + records.add(guestRecord); + } else if (canCreateGuest) { guestRecord = new UserRecord(null /* info */, null /* picture */, true /* isGuest */, false /* isCurrent */, false /* isAddUser */, createIsRestricted, canSwitchUsers); @@ -376,7 +414,7 @@ public class UserSwitcherController implements Dumpable { } public void logoutCurrentUser() { - int currentUser = ActivityManager.getCurrentUser(); + int currentUser = mUserTracker.getUserId(); if (currentUser != UserHandle.USER_SYSTEM) { pauseRefreshUsers(); ActivityManager.logoutCurrentUser(); @@ -388,7 +426,7 @@ public class UserSwitcherController implements Dumpable { Log.w(TAG, "User " + userId + " could not removed."); return; } - if (ActivityManager.getCurrentUser() == userId) { + if (mUserTracker.getUserId() == userId) { switchToUserId(UserHandle.USER_SYSTEM); } if (mUserManager.removeUser(userId)) { @@ -396,7 +434,8 @@ public class UserSwitcherController implements Dumpable { } } - private void onUserListItemClicked(UserRecord record) { + @VisibleForTesting + void onUserListItemClicked(UserRecord record) { int id; if (record.isGuest && record.info == null) { // No guest user. Create one. @@ -414,7 +453,7 @@ public class UserSwitcherController implements Dumpable { id = record.info.id; } - int currUserId = ActivityManager.getCurrentUser(); + int currUserId = mUserTracker.getUserId(); if (currUserId == id) { if (record.isGuest) { showExitGuestDialog(id); @@ -572,15 +611,6 @@ public class UserSwitcherController implements Dumpable { } }; - private final ContentObserver mSettingsObserver = new ContentObserver(new Handler()) { - public void onChange(boolean selfChange) { - mSimpleUserSwitcher = shouldUseSimpleUserSwitcher(); - mAddUsersFromLockScreen = Settings.Global.getInt(mContext.getContentResolver(), - Settings.Global.ADD_USERS_WHEN_LOCKED, 0) != 0; - refreshUsers(UserHandle.USER_NULL); - }; - }; - @Override public void dump(FileDescriptor fd, PrintWriter pw, String[] args) { pw.println("UserSwitcherController state:"); @@ -639,13 +669,7 @@ public class UserSwitcherController implements Dumpable { * UserHandle.USER_NULL}, then switch immediately to the newly created guest user. */ public void removeGuestUser(@UserIdInt int guestUserId, @UserIdInt int targetUserId) { - UserInfo currentUser; - try { - currentUser = ActivityManager.getService().getCurrentUser(); - } catch (RemoteException e) { - Log.e(TAG, "Couldn't remove guest because ActivityManager is dead"); - return; - } + UserInfo currentUser = mUserTracker.getUserInfo(); if (currentUser.id != guestUserId) { Log.w(TAG, "User requesting to start a new session (" + guestUserId + ")" + " is not current user (" + currentUser.id + ")"); @@ -677,6 +701,9 @@ public class UserSwitcherController implements Dumpable { switchToUserId(newGuestId); mUserManager.removeUser(currentUser.id); } else { + if (mGuestUserAutoCreated) { + mGuestIsResetting.set(true); + } switchToUserId(targetUserId); mUserManager.removeUser(currentUser.id); } @@ -693,10 +720,14 @@ public class UserSwitcherController implements Dumpable { mUiBgExecutor.execute(() -> { int newGuestId = createGuest(); + mGuestCreationScheduled.set(false); + mGuestIsResetting.set(false); if (newGuestId == UserHandle.USER_NULL) { Log.w(TAG, "Could not create new guest while exiting existing guest"); + // Refresh users so that we still display "Guest" if + // config_guestUserAutoCreated=true + refreshUsers(UserHandle.USER_NULL); } - mGuestCreationScheduled.set(false); }); } @@ -799,12 +830,25 @@ public class UserSwitcherController implements Dumpable { ? com.android.settingslib.R.string.guest_reset_guest : com.android.settingslib.R.string.guest_exit_guest); } else { - // If config_guestUserAutoCreated, always show guest nickname instead of "Add - // guest" to make it seem as though the device always has a guest ready for use - return context.getString( - item.info == null && !mController.mGuestUserAutoCreated - ? com.android.settingslib.R.string.guest_new_guest - : com.android.settingslib.R.string.guest_nickname); + if (item.info != null) { + return context.getString(com.android.settingslib.R.string.guest_nickname); + } else { + if (mController.mGuestUserAutoCreated) { + // If mGuestIsResetting=true, we expect the guest user to be created + // shortly, so display a "Resetting guest..." as an indicator that we + // are busy. Otherwise, if mGuestIsResetting=false, we probably failed + // to create a guest at some point. In this case, always show guest + // nickname instead of "Add guest" to make it seem as though the device + // always has a guest ready for use. + return context.getString( + mController.mGuestIsResetting.get() + ? com.android.settingslib.R.string.guest_resetting + : com.android.settingslib.R.string.guest_nickname); + } else { + return context.getString( + com.android.settingslib.R.string.guest_new_guest); + } + } } } else if (item.isAddUser) { return context.getString(R.string.user_add_user); @@ -839,9 +883,9 @@ public class UserSwitcherController implements Dumpable { private void checkIfAddUserDisallowedByAdminOnly(UserRecord record) { EnforcedAdmin admin = RestrictedLockUtilsInternal.checkIfRestrictionEnforced(mContext, - UserManager.DISALLOW_ADD_USER, ActivityManager.getCurrentUser()); + UserManager.DISALLOW_ADD_USER, mUserTracker.getUserId()); if (admin != null && !RestrictedLockUtilsInternal.hasBaseUserRestriction(mContext, - UserManager.DISALLOW_ADD_USER, ActivityManager.getCurrentUser())) { + UserManager.DISALLOW_ADD_USER, mUserTracker.getUserId())) { record.isDisabledByAdmin = true; record.enforcedAdmin = admin; } else { @@ -1053,7 +1097,8 @@ public class UserSwitcherController implements Dumpable { } } - private final class AddUserDialog extends SystemUIDialog implements + @VisibleForTesting + final class AddUserDialog extends SystemUIDialog implements DialogInterface.OnClickListener { public AddUserDialog(Context context) { diff --git a/packages/SystemUI/tests/src/com/android/keyguard/KeyguardUpdateMonitorTest.java b/packages/SystemUI/tests/src/com/android/keyguard/KeyguardUpdateMonitorTest.java index e9061afb647d..ec4dfba87af0 100644 --- a/packages/SystemUI/tests/src/com/android/keyguard/KeyguardUpdateMonitorTest.java +++ b/packages/SystemUI/tests/src/com/android/keyguard/KeyguardUpdateMonitorTest.java @@ -513,7 +513,7 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase { public void testTriesToAuthenticate_whenBouncer() { setKeyguardBouncerVisibility(true); - verify(mFaceManager).authenticate(any(), any(), any(), any(), anyInt()); + verify(mFaceManager).authenticate(any(), any(), any(), any(), anyInt(), anyBoolean()); verify(mFaceManager).isHardwareDetected(); verify(mFaceManager).hasEnrolledTemplates(anyInt()); } @@ -523,7 +523,7 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase { mKeyguardUpdateMonitor.dispatchStartedWakingUp(); mTestableLooper.processAllMessages(); mKeyguardUpdateMonitor.onKeyguardVisibilityChanged(true); - verify(mFaceManager).authenticate(any(), any(), any(), any(), anyInt()); + verify(mFaceManager).authenticate(any(), any(), any(), any(), anyInt(), anyBoolean()); } @Test @@ -533,7 +533,8 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase { mTestableLooper.processAllMessages(); mKeyguardUpdateMonitor.onKeyguardVisibilityChanged(true); - verify(mFaceManager, never()).authenticate(any(), any(), any(), any(), anyInt()); + verify(mFaceManager, never()).authenticate(any(), any(), any(), any(), anyInt(), + anyBoolean()); } @Test @@ -545,7 +546,8 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase { mKeyguardUpdateMonitor.dispatchStartedWakingUp(); mTestableLooper.processAllMessages(); mKeyguardUpdateMonitor.onKeyguardVisibilityChanged(true); - verify(mFaceManager, never()).authenticate(any(), any(), any(), any(), anyInt()); + verify(mFaceManager, never()).authenticate(any(), any(), any(), any(), anyInt(), + anyBoolean()); } @Test @@ -568,13 +570,14 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase { mKeyguardUpdateMonitor.dispatchStartedWakingUp(); mTestableLooper.processAllMessages(); mKeyguardUpdateMonitor.onKeyguardVisibilityChanged(true); - verify(mFaceManager).authenticate(any(), any(), any(), any(), anyInt()); + verify(mFaceManager).authenticate(any(), any(), any(), any(), anyInt(), anyBoolean()); // Stop scanning when bouncer becomes visible setKeyguardBouncerVisibility(true); clearInvocations(mFaceManager); mKeyguardUpdateMonitor.requestFaceAuth(true); - verify(mFaceManager, never()).authenticate(any(), any(), any(), any(), anyInt()); + verify(mFaceManager, never()).authenticate(any(), any(), any(), any(), anyInt(), + anyBoolean()); } @Test @@ -582,7 +585,7 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase { mKeyguardUpdateMonitor.setKeyguardOccluded(true); mKeyguardUpdateMonitor.setAssistantVisible(true); - verify(mFaceManager).authenticate(any(), any(), any(), any(), anyInt()); + verify(mFaceManager).authenticate(any(), any(), any(), any(), anyInt(), anyBoolean()); } @Test @@ -594,7 +597,7 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase { mKeyguardUpdateMonitor.onTrustChanged(true /* enabled */, KeyguardUpdateMonitor.getCurrentUser(), 0 /* flags */); mKeyguardUpdateMonitor.onKeyguardVisibilityChanged(true); - verify(mFaceManager).authenticate(any(), any(), any(), any(), anyInt()); + verify(mFaceManager).authenticate(any(), any(), any(), any(), anyInt(), anyBoolean()); } @Test @@ -604,7 +607,8 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase { mKeyguardUpdateMonitor.onTrustChanged(true /* enabled */, KeyguardUpdateMonitor.getCurrentUser(), 0 /* flags */); mKeyguardUpdateMonitor.onKeyguardVisibilityChanged(true); - verify(mFaceManager, never()).authenticate(any(), any(), any(), any(), anyInt()); + verify(mFaceManager, never()).authenticate(any(), any(), any(), any(), anyInt(), + anyBoolean()); } @Test @@ -615,7 +619,8 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase { KeyguardUpdateMonitor.StrongAuthTracker.STRONG_AUTH_REQUIRED_AFTER_USER_LOCKDOWN); mKeyguardUpdateMonitor.onKeyguardVisibilityChanged(true); - verify(mFaceManager, never()).authenticate(any(), any(), any(), any(), anyInt()); + verify(mFaceManager, never()).authenticate(any(), any(), any(), any(), anyInt(), + anyBoolean()); } @Test @@ -626,7 +631,7 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase { KeyguardUpdateMonitor.StrongAuthTracker.STRONG_AUTH_REQUIRED_AFTER_LOCKOUT); mKeyguardUpdateMonitor.onKeyguardVisibilityChanged(true); - verify(mFaceManager).authenticate(any(), any(), any(), any(), anyInt()); + verify(mFaceManager).authenticate(any(), any(), any(), any(), anyInt(), anyBoolean()); } @Test @@ -638,7 +643,8 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase { mKeyguardUpdateMonitor.sendKeyguardBouncerChanged(true); mTestableLooper.processAllMessages(); - verify(mFaceManager, never()).authenticate(any(), any(), any(), any()); + verify(mFaceManager, never()).authenticate(any(), any(), any(), any(), anyInt(), + anyBoolean()); } @Test diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/QSFragmentTest.java b/packages/SystemUI/tests/src/com/android/systemui/qs/QSFragmentTest.java index c40977b31e73..c1a7bc5f8bf5 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/qs/QSFragmentTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/qs/QSFragmentTest.java @@ -55,6 +55,7 @@ import com.android.systemui.shared.plugins.PluginManager; import com.android.systemui.statusbar.CommandQueue; import com.android.systemui.statusbar.FeatureFlags; import com.android.systemui.statusbar.phone.AutoTileManager; +import com.android.systemui.statusbar.phone.KeyguardBypassController; import com.android.systemui.statusbar.phone.StatusBar; import com.android.systemui.statusbar.phone.StatusBarIconController; import com.android.systemui.statusbar.policy.Clock; @@ -92,6 +93,8 @@ public class QSFragmentTest extends SysuiBaseFragmentTest { @Mock private MediaHost mQQSMediaHost; @Mock + private KeyguardBypassController mBypassController; + @Mock private FeatureFlags mFeatureFlags; @Mock private FalsingManager mFalsingManager; @@ -184,6 +187,7 @@ public class QSFragmentTest extends SysuiBaseFragmentTest { new QSDetailDisplayer(), mQSMediaHost, mQQSMediaHost, + mBypassController, mQsComponentFactory, mFeatureFlags, mFalsingManager); diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/KeyguardIndicationControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/KeyguardIndicationControllerTest.java index 298bd9a3082d..f5ce673c249e 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/KeyguardIndicationControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/KeyguardIndicationControllerTest.java @@ -81,6 +81,7 @@ import com.android.systemui.keyguard.KeyguardIndication; import com.android.systemui.keyguard.KeyguardIndicationRotateTextViewController; import com.android.systemui.plugins.FalsingManager; import com.android.systemui.plugins.statusbar.StatusBarStateController; +import com.android.systemui.statusbar.phone.KeyguardBypassController; import com.android.systemui.statusbar.phone.KeyguardIndicationTextView; import com.android.systemui.statusbar.phone.LockIcon; import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager; @@ -146,6 +147,8 @@ public class KeyguardIndicationControllerTest extends SysuiTestCase { private LockPatternUtils mLockPatternUtils; @Mock private IActivityManager mIActivityManager; + @Mock + private KeyguardBypassController mKeyguardBypassController; @Captor private ArgumentCaptor<DockManager.AlignmentStateListener> mAlignmentListener; @Captor @@ -216,7 +219,8 @@ public class KeyguardIndicationControllerTest extends SysuiTestCase { mController = new KeyguardIndicationController(mContext, mWakeLockBuilder, mKeyguardStateController, mStatusBarStateController, mKeyguardUpdateMonitor, mDockManager, mBroadcastDispatcher, mDevicePolicyManager, mIBatteryStats, - mUserManager, mExecutor, mFalsingManager, mLockPatternUtils, mIActivityManager); + mUserManager, mExecutor, mFalsingManager, mLockPatternUtils, mIActivityManager, + mKeyguardBypassController); mController.init(); mController.setIndicationArea(mIndicationArea); verify(mStatusBarStateController).addCallback(mStatusBarStateListenerCaptor.capture()); @@ -507,6 +511,7 @@ public class KeyguardIndicationControllerTest extends SysuiTestCase { createController(); String message = mContext.getString(R.string.keyguard_retry); when(mStatusBarKeyguardViewManager.isBouncerShowing()).thenReturn(true); + when(mKeyguardUpdateMonitor.isFaceEnrolled()).thenReturn(true); mController.setVisible(true); mController.getKeyguardCallback().onBiometricError(FaceManager.FACE_ERROR_TIMEOUT, diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NotificationPanelViewTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NotificationPanelViewTest.java index f8fc22495d8d..d7661be21752 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NotificationPanelViewTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NotificationPanelViewTest.java @@ -85,6 +85,7 @@ import com.android.systemui.SysuiTestCase; import com.android.systemui.biometrics.AuthController; import com.android.systemui.classifier.FalsingCollectorFake; import com.android.systemui.classifier.FalsingManagerFake; +import com.android.systemui.controls.dagger.ControlsComponent; import com.android.systemui.doze.DozeLog; import com.android.systemui.fragments.FragmentHostManager; import com.android.systemui.fragments.FragmentService; @@ -298,6 +299,8 @@ public class NotificationPanelViewTest extends SysuiTestCase { private RemoteInputController mRemoteInputController; @Mock private RecordingController mRecordingController; + @Mock + private ControlsComponent mControlsComponent; private SysuiStatusBarStateController mStatusBarStateController; private NotificationPanelViewController mNotificationPanelViewController; @@ -369,16 +372,17 @@ public class NotificationPanelViewTest extends SysuiTestCase { mKeyguardBypassController, mDozeParameters, mUnlockedScreenOffAnimationController); + mConfigurationController = new ConfigurationControllerImpl(mContext); PulseExpansionHandler expansionHandler = new PulseExpansionHandler( mContext, coordinator, mKeyguardBypassController, mHeadsUpManager, mock(NotificationRoundnessManager.class), + mConfigurationController, mStatusBarStateController, mFalsingManager, mLockscreenShadeTransitionController, new FalsingCollectorFake()); - mConfigurationController = new ConfigurationControllerImpl(mContext); when(mKeyguardStatusViewComponentFactory.build(any())) .thenReturn(mKeyguardStatusViewComponent); when(mKeyguardStatusViewComponent.getKeyguardClockSwitchController()) @@ -440,7 +444,8 @@ public class NotificationPanelViewTest extends SysuiTestCase { new FakeExecutor(new FakeSystemClock()), mSecureSettings, mUnlockedScreenOffAnimationController, - mNotificationRemoteInputManager); + mNotificationRemoteInputManager, + mControlsComponent); mNotificationPanelViewController.initDependencies( mStatusBar, mNotificationShelfController); diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/UserSwitcherControllerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/UserSwitcherControllerTest.kt new file mode 100644 index 000000000000..ace2c71d9c63 --- /dev/null +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/UserSwitcherControllerTest.kt @@ -0,0 +1,257 @@ +/* + * Copyright (C) 2021 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License + */ + +package com.android.systemui.statusbar.policy + +import android.app.IActivityTaskManager +import android.content.Context +import android.content.DialogInterface +import android.content.Intent +import android.content.pm.UserInfo +import android.graphics.Bitmap +import android.hardware.face.FaceManager +import android.hardware.fingerprint.FingerprintManager +import android.os.Handler +import android.os.UserHandle +import android.os.UserManager +import android.testing.AndroidTestingRunner +import android.testing.TestableLooper +import androidx.test.filters.SmallTest +import com.android.internal.logging.testing.UiEventLoggerFake +import com.android.internal.util.UserIcons +import com.android.systemui.GuestResumeSessionReceiver +import com.android.systemui.R +import com.android.systemui.SysuiTestCase +import com.android.systemui.broadcast.BroadcastDispatcher +import com.android.systemui.plugins.ActivityStarter +import com.android.systemui.plugins.FalsingManager +import com.android.systemui.qs.QSUserSwitcherEvent +import com.android.systemui.settings.UserTracker +import com.android.systemui.telephony.TelephonyListenerManager +import com.android.systemui.util.concurrency.FakeExecutor +import com.android.systemui.util.settings.SecureSettings +import com.android.systemui.util.time.FakeSystemClock +import org.junit.Assert.assertEquals +import org.junit.Assert.assertNotNull +import org.junit.Before +import org.junit.Test +import org.junit.runner.RunWith +import org.mockito.ArgumentMatchers.anyInt +import org.mockito.ArgumentMatchers.eq +import org.mockito.Mock +import org.mockito.Mockito.any +import org.mockito.Mockito.anyString +import org.mockito.Mockito.mock +import org.mockito.Mockito.`when` +import org.mockito.MockitoAnnotations + +@RunWith(AndroidTestingRunner::class) +@TestableLooper.RunWithLooper(setAsMainLooper = true) +@SmallTest +class UserSwitcherControllerTest : SysuiTestCase() { + @Mock private lateinit var keyguardStateController: KeyguardStateController + @Mock private lateinit var handler: Handler + @Mock private lateinit var userTracker: UserTracker + @Mock private lateinit var userManager: UserManager + @Mock private lateinit var activityStarter: ActivityStarter + @Mock private lateinit var broadcastDispatcher: BroadcastDispatcher + @Mock private lateinit var activityTaskManager: IActivityTaskManager + @Mock private lateinit var userDetailAdapter: UserSwitcherController.UserDetailAdapter + @Mock private lateinit var telephonyListenerManager: TelephonyListenerManager + @Mock private lateinit var secureSettings: SecureSettings + @Mock private lateinit var falsingManager: FalsingManager + private lateinit var testableLooper: TestableLooper + private lateinit var uiBgExecutor: FakeExecutor + private lateinit var uiEventLogger: UiEventLoggerFake + private lateinit var userSwitcherController: UserSwitcherController + private lateinit var picture: Bitmap + private val ownerId = UserHandle.USER_SYSTEM + private val ownerInfo = UserInfo(ownerId, "Owner", null, + UserInfo.FLAG_ADMIN or UserInfo.FLAG_FULL or UserInfo.FLAG_INITIALIZED or + UserInfo.FLAG_PRIMARY or UserInfo.FLAG_SYSTEM, + UserManager.USER_TYPE_FULL_SYSTEM) + private val guestId = 1234 + private val guestInfo = UserInfo(guestId, "Guest", null, + UserInfo.FLAG_FULL or UserInfo.FLAG_GUEST, UserManager.USER_TYPE_FULL_GUEST) + + @Before + fun setUp() { + MockitoAnnotations.initMocks(this) + testableLooper = TestableLooper.get(this) + uiBgExecutor = FakeExecutor(FakeSystemClock()) + uiEventLogger = UiEventLoggerFake() + + context.orCreateTestableResources.addOverride( + com.android.internal.R.bool.config_guestUserAutoCreated, false) + + context.addMockSystemService(Context.FACE_SERVICE, mock(FaceManager::class.java)) + context.addMockSystemService(Context.FINGERPRINT_SERVICE, + mock(FingerprintManager::class.java)) + + `when`(userManager.canAddMoreUsers()).thenReturn(true) + + userSwitcherController = UserSwitcherController(context, + userManager, + userTracker, + keyguardStateController, + handler, + activityStarter, + broadcastDispatcher, + uiEventLogger, + falsingManager, + telephonyListenerManager, + activityTaskManager, + userDetailAdapter, + secureSettings, + uiBgExecutor) + userSwitcherController.mPauseRefreshUsers = true + + picture = UserIcons.convertToBitmap(context.getDrawable(R.drawable.ic_avatar_user)) + } + + @Test + fun testAddGuest_okButtonPressed_isLogged() { + val emptyGuestUserRecord = UserSwitcherController.UserRecord( + null, + null, + true /* guest */, + false /* current */, + false /* isAddUser */, + false /* isRestricted */, + true /* isSwitchToEnabled */) + `when`(userTracker.userId).thenReturn(ownerId) + `when`(userTracker.userInfo).thenReturn(ownerInfo) + + `when`(userManager.createGuest(any(), anyString())).thenReturn(guestInfo) + + userSwitcherController.onUserListItemClicked(emptyGuestUserRecord) + testableLooper.processAllMessages() + assertEquals(1, uiEventLogger.numLogs()) + assertEquals(QSUserSwitcherEvent.QS_USER_GUEST_ADD.id, uiEventLogger.eventId(0)) + } + + @Test + fun testRemoveGuest_removeButtonPressed_isLogged() { + val currentGuestUserRecord = UserSwitcherController.UserRecord( + guestInfo, + picture, + true /* guest */, + true /* current */, + false /* isAddUser */, + false /* isRestricted */, + true /* isSwitchToEnabled */) + `when`(userTracker.userId).thenReturn(guestInfo.id) + `when`(userTracker.userInfo).thenReturn(guestInfo) + + userSwitcherController.onUserListItemClicked(currentGuestUserRecord) + assertNotNull(userSwitcherController.mExitGuestDialog) + userSwitcherController.mExitGuestDialog + .getButton(DialogInterface.BUTTON_POSITIVE).performClick() + testableLooper.processAllMessages() + assertEquals(1, uiEventLogger.numLogs()) + assertEquals(QSUserSwitcherEvent.QS_USER_GUEST_REMOVE.id, uiEventLogger.eventId(0)) + } + + @Test + fun testRemoveGuest_cancelButtonPressed_isNotLogged() { + val currentGuestUserRecord = UserSwitcherController.UserRecord( + guestInfo, + picture, + true /* guest */, + true /* current */, + false /* isAddUser */, + false /* isRestricted */, + true /* isSwitchToEnabled */) + `when`(userTracker.userId).thenReturn(guestId) + `when`(userTracker.userInfo).thenReturn(guestInfo) + + userSwitcherController.onUserListItemClicked(currentGuestUserRecord) + assertNotNull(userSwitcherController.mExitGuestDialog) + userSwitcherController.mExitGuestDialog + .getButton(DialogInterface.BUTTON_NEGATIVE).performClick() + testableLooper.processAllMessages() + assertEquals(0, uiEventLogger.numLogs()) + } + + @Test + fun testWipeGuest_startOverButtonPressed_isLogged() { + val currentGuestUserRecord = UserSwitcherController.UserRecord( + guestInfo, + picture, + true /* guest */, + false /* current */, + false /* isAddUser */, + false /* isRestricted */, + true /* isSwitchToEnabled */) + `when`(userTracker.userId).thenReturn(guestId) + `when`(userTracker.userInfo).thenReturn(guestInfo) + + // Simulate that guest user has already logged in + `when`(secureSettings.getIntForUser( + eq(GuestResumeSessionReceiver.SETTING_GUEST_HAS_LOGGED_IN), anyInt(), anyInt())) + .thenReturn(1) + + userSwitcherController.onUserListItemClicked(currentGuestUserRecord) + + // Simulate a user switch event + val intent = Intent(Intent.ACTION_USER_SWITCHED).putExtra(Intent.EXTRA_USER_HANDLE, guestId) + + assertNotNull(userSwitcherController.mGuestResumeSessionReceiver) + userSwitcherController.mGuestResumeSessionReceiver.onReceive(context, intent) + + assertNotNull(userSwitcherController.mGuestResumeSessionReceiver.mNewSessionDialog) + userSwitcherController.mGuestResumeSessionReceiver.mNewSessionDialog + .getButton(GuestResumeSessionReceiver.ResetSessionDialog.BUTTON_WIPE).performClick() + testableLooper.processAllMessages() + assertEquals(1, uiEventLogger.numLogs()) + assertEquals(QSUserSwitcherEvent.QS_USER_GUEST_WIPE.id, uiEventLogger.eventId(0)) + } + + @Test + fun testWipeGuest_continueButtonPressed_isLogged() { + val currentGuestUserRecord = UserSwitcherController.UserRecord( + guestInfo, + picture, + true /* guest */, + false /* current */, + false /* isAddUser */, + false /* isRestricted */, + true /* isSwitchToEnabled */) + `when`(userTracker.userId).thenReturn(guestId) + `when`(userTracker.userInfo).thenReturn(guestInfo) + + // Simulate that guest user has already logged in + `when`(secureSettings.getIntForUser( + eq(GuestResumeSessionReceiver.SETTING_GUEST_HAS_LOGGED_IN), anyInt(), anyInt())) + .thenReturn(1) + + userSwitcherController.onUserListItemClicked(currentGuestUserRecord) + + // Simulate a user switch event + val intent = Intent(Intent.ACTION_USER_SWITCHED).putExtra(Intent.EXTRA_USER_HANDLE, guestId) + + assertNotNull(userSwitcherController.mGuestResumeSessionReceiver) + userSwitcherController.mGuestResumeSessionReceiver.onReceive(context, intent) + + assertNotNull(userSwitcherController.mGuestResumeSessionReceiver.mNewSessionDialog) + userSwitcherController.mGuestResumeSessionReceiver.mNewSessionDialog + .getButton(GuestResumeSessionReceiver.ResetSessionDialog.BUTTON_DONTWIPE) + .performClick() + testableLooper.processAllMessages() + assertEquals(1, uiEventLogger.numLogs()) + assertEquals(QSUserSwitcherEvent.QS_USER_GUEST_CONTINUE.id, uiEventLogger.eventId(0)) + } +} diff --git a/packages/VpnDialogs/res/values-gu/strings.xml b/packages/VpnDialogs/res/values-gu/strings.xml index b5a88310fb43..5ffdcb1d8079 100644 --- a/packages/VpnDialogs/res/values-gu/strings.xml +++ b/packages/VpnDialogs/res/values-gu/strings.xml @@ -29,7 +29,7 @@ <string name="always_on_disconnected_message" msgid="555634519845992917">"<xliff:g id="VPN_APP_0">%1$s</xliff:g>ને હંમેશાં જોડાયેલ રહેવા માટે સેટ કરેલ છે, પરંતુ તે હાલમાં કનેક્ટ કરી શકાતું નથી. તમારો ફોન જ્યાં સુધી <xliff:g id="VPN_APP_1">%1$s</xliff:g> સાથે ફરીથી કનેક્ટ ન થાય ત્યાં સુધી તે સાર્વજનિક નેટવર્કનો ઉપયોગ કરશે."</string> <string name="always_on_disconnected_message_lockdown" msgid="4232225539869452120">"<xliff:g id="VPN_APP">%1$s</xliff:g>ને હંમેશાં જોડાયેલ રહેવા માટે સેટ કરેલ છે, પરંતુ તે હાલમાં કનેક્ટ કરી શકાતું નથી. VPN ફરીથી કનેક્ટ ન થઈ શકે ત્યાં સુધી તમારી પાસે કોઈ કનેક્શન હશે નહીં."</string> <string name="always_on_disconnected_message_separator" msgid="3310614409322581371">" "</string> - <string name="always_on_disconnected_message_settings_link" msgid="6172280302829992412">"VPN સેટિંગ્સ બદલો"</string> + <string name="always_on_disconnected_message_settings_link" msgid="6172280302829992412">"VPN સેટિંગ બદલો"</string> <string name="configure" msgid="4905518375574791375">"ગોઠવો"</string> <string name="disconnect" msgid="971412338304200056">"ડિસ્કનેક્ટ કરો"</string> <string name="open_app" msgid="3717639178595958667">"ઍપ ખોલો"</string> diff --git a/services/core/java/com/android/server/PersistentDataBlockService.java b/services/core/java/com/android/server/PersistentDataBlockService.java index e336b6bafac4..16645dfd386d 100644 --- a/services/core/java/com/android/server/PersistentDataBlockService.java +++ b/services/core/java/com/android/server/PersistentDataBlockService.java @@ -375,15 +375,38 @@ public class PersistentDataBlockService extends SystemService { try { FileChannel channel = getBlockOutputChannel(); + // Format the data selectively. + // + // 1. write header, set length = 0 int header_size = DIGEST_SIZE_BYTES + HEADER_SIZE; ByteBuffer buf = ByteBuffer.allocate(header_size); buf.put(new byte[DIGEST_SIZE_BYTES]); buf.putInt(PARTITION_TYPE_MARKER); buf.putInt(0); + buf.flip(); channel.write(buf); - // corrupt the payload explicitly + channel.force(true); + + // 2. corrupt the legacy FRP data explicitly int payload_size = (int) getBlockDeviceSize() - header_size; - buf = ByteBuffer.allocate(payload_size); + buf = ByteBuffer.allocate(payload_size + - TEST_MODE_RESERVED_SIZE - FRP_CREDENTIAL_RESERVED_SIZE - 1); + channel.write(buf); + channel.force(true); + + // 3. skip the test mode data and leave it unformat + // This is for a feature that enables testing. + channel.position(channel.position() + TEST_MODE_RESERVED_SIZE); + + // 4. wipe the FRP_CREDENTIAL explicitly + buf = ByteBuffer.allocate(FRP_CREDENTIAL_RESERVED_SIZE); + channel.write(buf); + channel.force(true); + + // 5. set unlock = 0 because it's a formatPartitionLocked + buf = ByteBuffer.allocate(FRP_CREDENTIAL_RESERVED_SIZE); + buf.put((byte)0); + buf.flip(); channel.write(buf); channel.force(true); } catch (IOException e) { diff --git a/services/core/java/com/android/server/SensorPrivacyService.java b/services/core/java/com/android/server/SensorPrivacyService.java index ac43fbd4f976..019e4ea207ef 100644 --- a/services/core/java/com/android/server/SensorPrivacyService.java +++ b/services/core/java/com/android/server/SensorPrivacyService.java @@ -232,14 +232,14 @@ public final class SensorPrivacyService extends SystemService { public void onUserStarting(TargetUser user) { if (mCurrentUser == -1) { mCurrentUser = user.getUserIdentifier(); - setGlobalRestriction(); + mSensorPrivacyServiceImpl.userSwitching(-1, user.getUserIdentifier()); } } @Override public void onUserSwitching(TargetUser from, TargetUser to) { mCurrentUser = to.getUserIdentifier(); - setGlobalRestriction(); + mSensorPrivacyServiceImpl.userSwitching(from.getUserIdentifier(), to.getUserIdentifier()); } class SensorPrivacyServiceImpl extends ISensorPrivacyManager.Stub implements @@ -897,18 +897,22 @@ public final class SensorPrivacyService extends SystemService { public boolean isIndividualSensorPrivacyEnabled(@UserIdInt int userId, int sensor) { enforceObserveSensorPrivacyPermission(); synchronized (mLock) { - SparseArray<SensorState> states = mIndividualEnabled.get(userId); - if (states == null) { - return false; - } - SensorState state = states.get(sensor); - if (state == null) { - return false; - } - return state.mEnabled; + return isIndividualSensorPrivacyEnabledLocked(userId, sensor); } } + private boolean isIndividualSensorPrivacyEnabledLocked(int userId, int sensor) { + SparseArray<SensorState> states = mIndividualEnabled.get(userId); + if (states == null) { + return false; + } + SensorState state = states.get(sensor); + if (state == null) { + return false; + } + return state.mEnabled; + } + /** * Returns the state of sensor privacy from persistent storage. */ @@ -1149,11 +1153,27 @@ public final class SensorPrivacyService extends SystemService { ISensorPrivacyListener listener) { enforceObserveSensorPrivacyPermission(); if (listener == null) { - throw new NullPointerException("listener cannot be null"); + throw new IllegalArgumentException("listener cannot be null"); } mHandler.addListener(userId, sensor, listener); } + + /** + * Registers a listener to be notified when the sensor privacy state changes. The callback + * can be called if the user changes and the setting is different between the transitioning + * users. + */ + @Override + public void addUserGlobalIndividualSensorPrivacyListener(int sensor, + ISensorPrivacyListener listener) { + enforceObserveSensorPrivacyPermission(); + if (listener == null) { + throw new IllegalArgumentException("listener cannot be null"); + } + mHandler.addUserGlobalListener(sensor, listener); + } + /** * Unregisters a listener from sensor privacy state change notifications. */ @@ -1174,12 +1194,22 @@ public final class SensorPrivacyService extends SystemService { ISensorPrivacyListener listener) { enforceObserveSensorPrivacyPermission(); if (listener == null) { - throw new NullPointerException("listener cannot be null"); + throw new IllegalArgumentException("listener cannot be null"); } mHandler.removeListener(sensor, listener); } @Override + public void removeUserGlobalIndividualSensorPrivacyListener(int sensor, + ISensorPrivacyListener listener) { + enforceObserveSensorPrivacyPermission(); + if (listener == null) { + throw new IllegalArgumentException("listener cannot be null"); + } + mHandler.removeUserGlobalListener(sensor, listener); + } + + @Override public void suppressIndividualSensorPrivacyReminders(int userId, int sensor, IBinder token, boolean suppress) { enforceManageSensorPrivacyPermission(); @@ -1209,6 +1239,40 @@ public final class SensorPrivacyService extends SystemService { } } + private void userSwitching(int from, int to) { + boolean micState; + boolean camState; + boolean prevMicState; + boolean prevCamState; + synchronized (mLock) { + prevMicState = isIndividualSensorPrivacyEnabledLocked(from, MICROPHONE); + prevCamState = isIndividualSensorPrivacyEnabledLocked(from, CAMERA); + micState = isIndividualSensorPrivacyEnabledLocked(to, MICROPHONE); + camState = isIndividualSensorPrivacyEnabledLocked(to, CAMERA); + } + if (prevMicState != micState) { + mHandler.onUserGlobalSensorPrivacyChanged(MICROPHONE, micState); + setGlobalRestriction(MICROPHONE, micState); + } + if (prevCamState != camState) { + mHandler.onUserGlobalSensorPrivacyChanged(CAMERA, camState); + setGlobalRestriction(CAMERA, micState); + } + } + + private void setGlobalRestriction(int sensor, boolean enabled) { + switch(sensor) { + case MICROPHONE: + mAppOpsManagerInternal.setGlobalRestriction(OP_RECORD_AUDIO, enabled, + mAppOpsRestrictionToken); + break; + case CAMERA: + mAppOpsManagerInternal.setGlobalRestriction(OP_CAMERA, enabled, + mAppOpsRestrictionToken); + break; + } + } + /** * Remove a sensor use reminder suppression token. * @@ -1454,7 +1518,12 @@ public final class SensorPrivacyService extends SystemService { @GuardedBy("mListenerLock") private final SparseArray<SparseArray<RemoteCallbackList<ISensorPrivacyListener>>> mIndividualSensorListeners = new SparseArray<>(); - private final ArrayMap<ISensorPrivacyListener, DeathRecipient> mDeathRecipients; + @GuardedBy("mListenerLock") + private final SparseArray<RemoteCallbackList<ISensorPrivacyListener>> + mUserGlobalIndividualSensorListeners = new SparseArray<>(); + @GuardedBy("mListenerLock") + private final ArrayMap<ISensorPrivacyListener, Pair<DeathRecipient, Integer>> + mDeathRecipients; private final Context mContext; SensorPrivacyHandler(Looper looper, Context context) { @@ -1479,18 +1548,22 @@ public final class SensorPrivacyService extends SystemService { mSensorPrivacyServiceImpl)); } + public void onUserGlobalSensorPrivacyChanged(int sensor, boolean enabled) { + sendMessage(PooledLambda.obtainMessage( + SensorPrivacyHandler::handleUserGlobalSensorPrivacyChanged, + this, sensor, enabled)); + } + public void addListener(ISensorPrivacyListener listener) { synchronized (mListenerLock) { - DeathRecipient deathRecipient = new DeathRecipient(listener); - mDeathRecipients.put(listener, deathRecipient); - mListeners.register(listener); + if (mListeners.register(listener)) { + addDeathRecipient(listener); + } } } public void addListener(int userId, int sensor, ISensorPrivacyListener listener) { synchronized (mListenerLock) { - DeathRecipient deathRecipient = new DeathRecipient(listener); - mDeathRecipients.put(listener, deathRecipient); SparseArray<RemoteCallbackList<ISensorPrivacyListener>> listenersForUser = mIndividualSensorListeners.get(userId); if (listenersForUser == null) { @@ -1502,32 +1575,55 @@ public final class SensorPrivacyService extends SystemService { listeners = new RemoteCallbackList<>(); listenersForUser.put(sensor, listeners); } - listeners.register(listener); + if (listeners.register(listener)) { + addDeathRecipient(listener); + } } } - public void removeListener(ISensorPrivacyListener listener) { + public void addUserGlobalListener(int sensor, ISensorPrivacyListener listener) { synchronized (mListenerLock) { - DeathRecipient deathRecipient = mDeathRecipients.remove(listener); - if (deathRecipient != null) { - deathRecipient.destroy(); + RemoteCallbackList<ISensorPrivacyListener> listeners = + mUserGlobalIndividualSensorListeners.get(sensor); + if (listeners == null) { + listeners = new RemoteCallbackList<>(); + mUserGlobalIndividualSensorListeners.put(sensor, listeners); + } + if (listeners.register(listener)) { + addDeathRecipient(listener); } - mListeners.unregister(listener); } } - public void removeListener(int sensor, ISensorPrivacyListener listener) { + public void removeListener(ISensorPrivacyListener listener) { synchronized (mListenerLock) { - DeathRecipient deathRecipient = mDeathRecipients.remove(listener); - if (deathRecipient != null) { - deathRecipient.destroy(); + if (mListeners.unregister(listener)) { + removeDeathRecipient(listener); } + } + } + public void removeListener(int sensor, ISensorPrivacyListener listener) { + synchronized (mListenerLock) { for (int i = 0, numUsers = mIndividualSensorListeners.size(); i < numUsers; i++) { RemoteCallbackList callbacks = mIndividualSensorListeners.valueAt(i).get(sensor); if (callbacks != null) { - callbacks.unregister(listener); + if (callbacks.unregister(listener)) { + removeDeathRecipient(listener); + } + } + } + } + } + + public void removeUserGlobalListener(int sensor, ISensorPrivacyListener listener) { + synchronized (mListenerLock) { + RemoteCallbackList callbacks = + mUserGlobalIndividualSensorListeners.get(sensor); + if (callbacks != null) { + if (callbacks.unregister(listener)) { + removeDeathRecipient(listener); } } } @@ -1551,9 +1647,12 @@ public final class SensorPrivacyService extends SystemService { SparseArray<RemoteCallbackList<ISensorPrivacyListener>> listenersForUser = mIndividualSensorListeners.get(userId); - setGlobalRestriction(); if (userId == mCurrentUser) { - setGlobalRestriction(); + mSensorPrivacyServiceImpl.setGlobalRestriction(sensor, enabled); + } + + if (userId == mCurrentUser) { + onUserGlobalSensorPrivacyChanged(sensor, enabled); } if (listenersForUser == null) { @@ -1563,16 +1662,42 @@ public final class SensorPrivacyService extends SystemService { if (listeners == null) { return; } - final int count = listeners.beginBroadcast(); - for (int i = 0; i < count; i++) { - ISensorPrivacyListener listener = listeners.getBroadcastItem(i); - try { - listener.onSensorPrivacyChanged(enabled); - } catch (RemoteException e) { - Log.e(TAG, "Caught an exception notifying listener " + listener + ": ", e); + try { + final int count = listeners.beginBroadcast(); + for (int i = 0; i < count; i++) { + ISensorPrivacyListener listener = listeners.getBroadcastItem(i); + try { + listener.onSensorPrivacyChanged(enabled); + } catch (RemoteException e) { + Log.e(TAG, "Caught an exception notifying listener " + listener + ": ", e); + } } + } finally { + listeners.finishBroadcast(); + } + } + + public void handleUserGlobalSensorPrivacyChanged(int sensor, boolean enabled) { + RemoteCallbackList<ISensorPrivacyListener> listeners = + mUserGlobalIndividualSensorListeners.get(sensor); + + if (listeners == null) { + return; + } + + try { + final int count = listeners.beginBroadcast(); + for (int i = 0; i < count; i++) { + ISensorPrivacyListener listener = listeners.getBroadcastItem(i); + try { + listener.onSensorPrivacyChanged(enabled); + } catch (RemoteException e) { + Log.e(TAG, "Caught an exception notifying listener " + listener + ": ", e); + } + } + } finally { + listeners.finishBroadcast(); } - listeners.finishBroadcast(); } public void removeSuppressPackageReminderToken(Pair<Integer, UserHandle> key, @@ -1581,20 +1706,33 @@ public final class SensorPrivacyService extends SystemService { SensorPrivacyServiceImpl::removeSuppressPackageReminderToken, mSensorPrivacyServiceImpl, key, token)); } - } - private void setGlobalRestriction() { - boolean camState = - mSensorPrivacyServiceImpl - .isIndividualSensorPrivacyEnabled(mCurrentUser, CAMERA); - boolean micState = - mSensorPrivacyServiceImpl - .isIndividualSensorPrivacyEnabled(mCurrentUser, MICROPHONE); - - mAppOpsManagerInternal - .setGlobalRestriction(OP_CAMERA, camState, mAppOpsRestrictionToken); - mAppOpsManagerInternal - .setGlobalRestriction(OP_RECORD_AUDIO, micState, mAppOpsRestrictionToken); + private void addDeathRecipient(ISensorPrivacyListener listener) { + Pair<DeathRecipient, Integer> deathRecipient = mDeathRecipients.get(listener); + if (deathRecipient == null) { + deathRecipient = new Pair<>(new DeathRecipient(listener), 1); + } else { + int newRefCount = deathRecipient.second + 1; + deathRecipient = new Pair<>(deathRecipient.first, newRefCount); + } + mDeathRecipients.put(listener, deathRecipient); + } + + private void removeDeathRecipient(ISensorPrivacyListener listener) { + Pair<DeathRecipient, Integer> deathRecipient = mDeathRecipients.get(listener); + if (deathRecipient == null) { + return; + } else { + int newRefCount = deathRecipient.second - 1; + if (newRefCount == 0) { + mDeathRecipients.remove(listener); + deathRecipient.first.destroy(); + return; + } + deathRecipient = new Pair<>(deathRecipient.first, newRefCount); + } + mDeathRecipients.put(listener, deathRecipient); + } } private final class DeathRecipient implements IBinder.DeathRecipient { diff --git a/services/core/java/com/android/server/am/LmkdConnection.java b/services/core/java/com/android/server/am/LmkdConnection.java index 1ecb9eb81709..598f086db94d 100644 --- a/services/core/java/com/android/server/am/LmkdConnection.java +++ b/services/core/java/com/android/server/am/LmkdConnection.java @@ -50,7 +50,7 @@ public class LmkdConnection { * Used to hold the data for the statsd atoms logging * Must be in sync with statslog.h */ - private static final int LMKD_REPLY_MAX_SIZE = 214; + private static final int LMKD_REPLY_MAX_SIZE = 222; // connection listener interface interface LmkdConnectionListener { diff --git a/services/core/java/com/android/server/am/LmkdStatsReporter.java b/services/core/java/com/android/server/am/LmkdStatsReporter.java index a8d058229a4b..91588913c33c 100644 --- a/services/core/java/com/android/server/am/LmkdStatsReporter.java +++ b/services/core/java/com/android/server/am/LmkdStatsReporter.java @@ -64,11 +64,14 @@ public final class LmkdStatsReporter { final int freeMemKb = inputData.readInt(); final int freeSwapKb = inputData.readInt(); final int killReason = inputData.readInt(); + final int thrashing = inputData.readInt(); + final int maxThrashing = inputData.readInt(); final String procName = inputData.readUTF(); FrameworkStatsLog.write(FrameworkStatsLog.LMK_KILL_OCCURRED, uid, procName, oomScore, pgFault, pgMajFault, rssInBytes, cacheInBytes, swapInBytes, processStartTimeNS, - minOomScore, freeMemKb, freeSwapKb, mapKillReason(killReason)); + minOomScore, freeMemKb, freeSwapKb, mapKillReason(killReason), thrashing, + maxThrashing); } catch (IOException e) { Slog.e(TAG, "Invalid buffer data. Failed to log LMK_KILL_OCCURRED"); return; diff --git a/services/core/java/com/android/server/biometrics/BiometricService.java b/services/core/java/com/android/server/biometrics/BiometricService.java index 6b7787aad17e..4973d45293e3 100644 --- a/services/core/java/com/android/server/biometrics/BiometricService.java +++ b/services/core/java/com/android/server/biometrics/BiometricService.java @@ -1103,9 +1103,8 @@ public class BiometricService extends SystemService { } public boolean isAdvancedCoexLogicEnabled(Context context) { - return (Build.IS_USERDEBUG || Build.IS_ENG) - && Settings.Secure.getInt(context.getContentResolver(), - CoexCoordinator.SETTING_ENABLE_NAME, 0) != 0; + return Settings.Secure.getInt(context.getContentResolver(), + CoexCoordinator.SETTING_ENABLE_NAME, 1) != 0; } } diff --git a/services/core/java/com/android/server/biometrics/sensors/AuthenticationClient.java b/services/core/java/com/android/server/biometrics/sensors/AuthenticationClient.java index 6463e04a4ff6..013c74d10d00 100644 --- a/services/core/java/com/android/server/biometrics/sensors/AuthenticationClient.java +++ b/services/core/java/com/android/server/biometrics/sensors/AuthenticationClient.java @@ -70,6 +70,7 @@ public abstract class AuthenticationClient<T> extends AcquisitionClient<T> private final LockoutTracker mLockoutTracker; private final boolean mIsRestricted; private final boolean mAllowBackgroundAuthentication; + private final boolean mIsKeyguardBypassEnabled; protected final long mOperationId; @@ -97,7 +98,7 @@ public abstract class AuthenticationClient<T> extends AcquisitionClient<T> int cookie, boolean requireConfirmation, int sensorId, boolean isStrongBiometric, int statsModality, int statsClient, @Nullable TaskStackListener taskStackListener, @NonNull LockoutTracker lockoutTracker, boolean allowBackgroundAuthentication, - boolean shouldVibrate) { + boolean shouldVibrate, boolean isKeyguardBypassEnabled) { super(context, lazyDaemon, token, listener, targetUserId, owner, cookie, sensorId, shouldVibrate, statsModality, BiometricsProtoEnums.ACTION_AUTHENTICATE, statsClient); @@ -110,6 +111,7 @@ public abstract class AuthenticationClient<T> extends AcquisitionClient<T> mLockoutTracker = lockoutTracker; mIsRestricted = restricted; mAllowBackgroundAuthentication = allowBackgroundAuthentication; + mIsKeyguardBypassEnabled = isKeyguardBypassEnabled; } public @LockoutTracker.LockoutMode int handleFailedAttempt(int userId) { @@ -394,6 +396,14 @@ public abstract class AuthenticationClient<T> extends AcquisitionClient<T> return mState; } + /** + * @return true if the client supports bypass (e.g. passive auth such as face), and if it's + * enabled by the user. + */ + public boolean isKeyguardBypassEnabled() { + return mIsKeyguardBypassEnabled; + } + @Override public int getProtoEnum() { return BiometricsProto.CM_AUTHENTICATE; diff --git a/services/core/java/com/android/server/biometrics/sensors/CoexCoordinator.java b/services/core/java/com/android/server/biometrics/sensors/CoexCoordinator.java index f732a147e4b7..b576673111ae 100644 --- a/services/core/java/com/android/server/biometrics/sensors/CoexCoordinator.java +++ b/services/core/java/com/android/server/biometrics/sensors/CoexCoordinator.java @@ -26,7 +26,6 @@ import android.os.Handler; import android.os.Looper; import android.util.Slog; -import com.android.internal.annotations.GuardedBy; import com.android.internal.annotations.VisibleForTesting; import com.android.server.biometrics.sensors.BiometricScheduler.SensorType; import com.android.server.biometrics.sensors.fingerprint.Udfps; @@ -242,6 +241,11 @@ public class CoexCoordinator { callback.sendHapticFeedback(); callback.sendAuthenticationResult(true /* addAuthTokenIfStrong */); callback.handleLifecycleAfterAuth(); + } else { + // Capacitive fingerprint sensor (or other) + callback.sendHapticFeedback(); + callback.sendAuthenticationResult(true /* addAuthTokenIfStrong */); + callback.handleLifecycleAfterAuth(); } } } else { diff --git a/services/core/java/com/android/server/biometrics/sensors/LoggableMonitor.java b/services/core/java/com/android/server/biometrics/sensors/LoggableMonitor.java index c8867ea2df1c..b4c82f2ed799 100644 --- a/services/core/java/com/android/server/biometrics/sensors/LoggableMonitor.java +++ b/services/core/java/com/android/server/biometrics/sensors/LoggableMonitor.java @@ -48,6 +48,64 @@ public abstract class LoggableMonitor { private boolean mLightSensorEnabled = false; private boolean mShouldLogMetrics = true; + /** + * Probe for loggable attributes that can be continuously monitored, such as ambient light. + * + * Disable probes when the sensors are in states that are not interesting for monitoring + * purposes to save power. + */ + protected interface Probe { + /** Ensure the probe is actively sampling for new data. */ + void enable(); + /** Stop sampling data. */ + void disable(); + } + + /** + * Client monitor callback that exposes a probe. + * + * Disables the probe when the operation completes. + */ + protected static class CallbackWithProbe<T extends Probe> + implements BaseClientMonitor.Callback { + private final boolean mStartWithClient; + private final T mProbe; + + public CallbackWithProbe(@NonNull T probe, boolean startWithClient) { + mProbe = probe; + mStartWithClient = startWithClient; + } + + @Override + public void onClientStarted(@NonNull BaseClientMonitor clientMonitor) { + if (mStartWithClient) { + mProbe.enable(); + } + } + + @Override + public void onClientFinished(@NonNull BaseClientMonitor clientMonitor, boolean success) { + mProbe.disable(); + } + + @NonNull + public T getProbe() { + return mProbe; + } + } + + private class ALSProbe implements Probe { + @Override + public void enable() { + setLightSensorLoggingEnabled(getAmbientLightSensor(mSensorManager)); + } + + @Override + public void disable() { + setLightSensorLoggingEnabled(null); + } + } + // report only the most recent value // consider com.android.server.display.utils.AmbientFilter or similar if need arises private volatile float mLastAmbientLux = 0; @@ -285,21 +343,17 @@ public abstract class LoggableMonitor { return latency; } - /** Get a callback to start/stop ALS capture when client runs. */ + /** + * Get a callback to start/stop ALS capture when client runs. + * + * If the probe should not run for the entire operation, do not set startWithClient and + * start/stop the problem when needed. + * + * @param startWithClient if probe should start automatically when the operation starts. + */ @NonNull - protected BaseClientMonitor.Callback createALSCallback() { - return new BaseClientMonitor.Callback() { - @Override - public void onClientStarted(@NonNull BaseClientMonitor clientMonitor) { - setLightSensorLoggingEnabled(getAmbientLightSensor(mSensorManager)); - } - - @Override - public void onClientFinished(@NonNull BaseClientMonitor clientMonitor, - boolean success) { - setLightSensorLoggingEnabled(null); - } - }; + protected CallbackWithProbe<Probe> createALSCallback(boolean startWithClient) { + return new CallbackWithProbe<>(new ALSProbe(), startWithClient); } /** The sensor to use for ALS logging. */ diff --git a/services/core/java/com/android/server/biometrics/sensors/face/FaceService.java b/services/core/java/com/android/server/biometrics/sensors/face/FaceService.java index 219e06358afb..12d6b08b8bcf 100644 --- a/services/core/java/com/android/server/biometrics/sensors/face/FaceService.java +++ b/services/core/java/com/android/server/biometrics/sensors/face/FaceService.java @@ -251,7 +251,8 @@ public class FaceService extends SystemService { @Override // Binder call public void authenticate(final IBinder token, final long operationId, int userId, - final IFaceServiceReceiver receiver, final String opPackageName) { + final IFaceServiceReceiver receiver, final String opPackageName, + boolean isKeyguardBypassEnabled) { Utils.checkPermission(getContext(), USE_BIOMETRIC_INTERNAL); // TODO(b/152413782): If the sensor supports face detect and the device is encrypted or @@ -275,7 +276,7 @@ public class FaceService extends SystemService { provider.second.scheduleAuthenticate(provider.first, token, operationId, userId, 0 /* cookie */, new ClientMonitorCallbackConverter(receiver), opPackageName, restricted, - statsClient, isKeyguard); + statsClient, isKeyguard, isKeyguardBypassEnabled); } @Override // Binder call @@ -318,10 +319,12 @@ public class FaceService extends SystemService { return; } + final boolean isKeyguardBypassEnabled = false; // only valid for keyguard clients final boolean restricted = true; // BiometricPrompt is always restricted provider.scheduleAuthenticate(sensorId, token, operationId, userId, cookie, new ClientMonitorCallbackConverter(sensorReceiver), opPackageName, restricted, - BiometricsProtoEnums.CLIENT_BIOMETRIC_PROMPT, allowBackgroundAuthentication); + BiometricsProtoEnums.CLIENT_BIOMETRIC_PROMPT, allowBackgroundAuthentication, + isKeyguardBypassEnabled); } @Override // Binder call diff --git a/services/core/java/com/android/server/biometrics/sensors/face/ServiceProvider.java b/services/core/java/com/android/server/biometrics/sensors/face/ServiceProvider.java index 1d2ac3b3bfdc..93ab1b65edff 100644 --- a/services/core/java/com/android/server/biometrics/sensors/face/ServiceProvider.java +++ b/services/core/java/com/android/server/biometrics/sensors/face/ServiceProvider.java @@ -110,7 +110,7 @@ public interface ServiceProvider { void scheduleAuthenticate(int sensorId, @NonNull IBinder token, long operationId, int userId, int cookie, @NonNull ClientMonitorCallbackConverter callback, @NonNull String opPackageName, boolean restricted, int statsClient, - boolean allowBackgroundAuthentication); + boolean allowBackgroundAuthentication, boolean isKeyguardBypassEnabled); void cancelAuthentication(int sensorId, @NonNull IBinder token); diff --git a/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceAuthenticationClient.java b/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceAuthenticationClient.java index 35c17459804d..f7fd8d0972f6 100644 --- a/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceAuthenticationClient.java +++ b/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceAuthenticationClient.java @@ -69,11 +69,13 @@ class FaceAuthenticationClient extends AuthenticationClient<ISession> implements @NonNull ClientMonitorCallbackConverter listener, int targetUserId, long operationId, boolean restricted, String owner, int cookie, boolean requireConfirmation, int sensorId, boolean isStrongBiometric, int statsClient, @NonNull UsageStats usageStats, - @NonNull LockoutCache lockoutCache, boolean allowBackgroundAuthentication) { + @NonNull LockoutCache lockoutCache, boolean allowBackgroundAuthentication, + boolean isKeyguardBypassEnabled) { super(context, lazyDaemon, token, listener, targetUserId, operationId, restricted, owner, cookie, requireConfirmation, sensorId, isStrongBiometric, BiometricsProtoEnums.MODALITY_FACE, statsClient, null /* taskStackListener */, - lockoutCache, allowBackgroundAuthentication, true /* shouldVibrate */); + lockoutCache, allowBackgroundAuthentication, true /* shouldVibrate */, + isKeyguardBypassEnabled); mUsageStats = usageStats; mLockoutCache = lockoutCache; mNotificationManager = context.getSystemService(NotificationManager.class); @@ -98,7 +100,7 @@ class FaceAuthenticationClient extends AuthenticationClient<ISession> implements @NonNull @Override protected Callback wrapCallbackForStart(@NonNull Callback callback) { - return new CompositeCallback(createALSCallback(), callback); + return new CompositeCallback(createALSCallback(true /* startWithClient */), callback); } @Override diff --git a/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceEnrollClient.java b/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceEnrollClient.java index 55c987a19e45..a806277ed45e 100644 --- a/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceEnrollClient.java +++ b/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceEnrollClient.java @@ -109,7 +109,8 @@ public class FaceEnrollClient extends EnrollClient<ISession> { @NonNull @Override protected Callback wrapCallbackForStart(@NonNull Callback callback) { - return new CompositeCallback(mPreviewHandleDeleterCallback, createALSCallback(), callback); + return new CompositeCallback(mPreviewHandleDeleterCallback, + createALSCallback(true /* startWithClient */), callback); } @Override diff --git a/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceProvider.java b/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceProvider.java index 5c24108dcded..718b9da968f5 100644 --- a/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceProvider.java +++ b/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceProvider.java @@ -378,7 +378,7 @@ public class FaceProvider implements IBinder.DeathRecipient, ServiceProvider { public void scheduleAuthenticate(int sensorId, @NonNull IBinder token, long operationId, int userId, int cookie, @NonNull ClientMonitorCallbackConverter callback, @NonNull String opPackageName, boolean restricted, int statsClient, - boolean allowBackgroundAuthentication) { + boolean allowBackgroundAuthentication, boolean isKeyguardBypassEnabled) { mHandler.post(() -> { final boolean isStrongBiometric = Utils.isStrongBiometric(sensorId); final FaceAuthenticationClient client = new FaceAuthenticationClient( @@ -386,7 +386,7 @@ public class FaceProvider implements IBinder.DeathRecipient, ServiceProvider { operationId, restricted, opPackageName, cookie, false /* requireConfirmation */, sensorId, isStrongBiometric, statsClient, mUsageStats, mSensors.get(sensorId).getLockoutCache(), - allowBackgroundAuthentication); + allowBackgroundAuthentication, isKeyguardBypassEnabled); scheduleForSensor(sensorId, client); }); } diff --git a/services/core/java/com/android/server/biometrics/sensors/face/hidl/Face10.java b/services/core/java/com/android/server/biometrics/sensors/face/hidl/Face10.java index da4ad863fdba..d05333db7532 100644 --- a/services/core/java/com/android/server/biometrics/sensors/face/hidl/Face10.java +++ b/services/core/java/com/android/server/biometrics/sensors/face/hidl/Face10.java @@ -622,7 +622,7 @@ public class Face10 implements IHwBinder.DeathRecipient, ServiceProvider { public void scheduleAuthenticate(int sensorId, @NonNull IBinder token, long operationId, int userId, int cookie, @NonNull ClientMonitorCallbackConverter receiver, @NonNull String opPackageName, boolean restricted, int statsClient, - boolean allowBackgroundAuthentication) { + boolean allowBackgroundAuthentication, boolean isKeyguardBypassEnabled) { mHandler.post(() -> { scheduleUpdateActiveUserWithoutHandler(userId); @@ -630,7 +630,8 @@ public class Face10 implements IHwBinder.DeathRecipient, ServiceProvider { final FaceAuthenticationClient client = new FaceAuthenticationClient(mContext, mLazyDaemon, token, receiver, userId, operationId, restricted, opPackageName, cookie, false /* requireConfirmation */, mSensorId, isStrongBiometric, - statsClient, mLockoutTracker, mUsageStats, allowBackgroundAuthentication); + statsClient, mLockoutTracker, mUsageStats, allowBackgroundAuthentication, + isKeyguardBypassEnabled); mScheduler.scheduleClientMonitor(client); }); } diff --git a/services/core/java/com/android/server/biometrics/sensors/face/hidl/FaceAuthenticationClient.java b/services/core/java/com/android/server/biometrics/sensors/face/hidl/FaceAuthenticationClient.java index e65245b98829..c33b957223a4 100644 --- a/services/core/java/com/android/server/biometrics/sensors/face/hidl/FaceAuthenticationClient.java +++ b/services/core/java/com/android/server/biometrics/sensors/face/hidl/FaceAuthenticationClient.java @@ -61,11 +61,13 @@ class FaceAuthenticationClient extends AuthenticationClient<IBiometricsFace> { @NonNull ClientMonitorCallbackConverter listener, int targetUserId, long operationId, boolean restricted, String owner, int cookie, boolean requireConfirmation, int sensorId, boolean isStrongBiometric, int statsClient, @NonNull LockoutTracker lockoutTracker, - @NonNull UsageStats usageStats, boolean allowBackgroundAuthentication) { + @NonNull UsageStats usageStats, boolean allowBackgroundAuthentication, + boolean isKeyguardBypassEnabled) { super(context, lazyDaemon, token, listener, targetUserId, operationId, restricted, owner, cookie, requireConfirmation, sensorId, isStrongBiometric, BiometricsProtoEnums.MODALITY_FACE, statsClient, null /* taskStackListener */, - lockoutTracker, allowBackgroundAuthentication, true /* shouldVibrate */); + lockoutTracker, allowBackgroundAuthentication, true /* shouldVibrate */, + isKeyguardBypassEnabled); mUsageStats = usageStats; final Resources resources = getContext().getResources(); @@ -88,7 +90,7 @@ class FaceAuthenticationClient extends AuthenticationClient<IBiometricsFace> { @NonNull @Override protected Callback wrapCallbackForStart(@NonNull Callback callback) { - return new CompositeCallback(createALSCallback(), callback); + return new CompositeCallback(createALSCallback(true /* startWithClient */), callback); } @Override diff --git a/services/core/java/com/android/server/biometrics/sensors/face/hidl/FaceEnrollClient.java b/services/core/java/com/android/server/biometrics/sensors/face/hidl/FaceEnrollClient.java index 455d6f868e65..80828cced4e8 100644 --- a/services/core/java/com/android/server/biometrics/sensors/face/hidl/FaceEnrollClient.java +++ b/services/core/java/com/android/server/biometrics/sensors/face/hidl/FaceEnrollClient.java @@ -69,7 +69,7 @@ public class FaceEnrollClient extends EnrollClient<IBiometricsFace> { @NonNull @Override protected Callback wrapCallbackForStart(@NonNull Callback callback) { - return new CompositeCallback(createALSCallback(), callback); + return new CompositeCallback(createALSCallback(true /* startWithClient */), callback); } @Override diff --git a/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintAuthenticationClient.java b/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintAuthenticationClient.java index 14d18225d674..99e6e626f5fe 100644 --- a/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintAuthenticationClient.java +++ b/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintAuthenticationClient.java @@ -55,6 +55,7 @@ class FingerprintAuthenticationClient extends AuthenticationClient<ISession> imp @NonNull private final LockoutCache mLockoutCache; @Nullable private final IUdfpsOverlayController mUdfpsOverlayController; @NonNull private final FingerprintSensorPropertiesInternal mSensorProps; + @NonNull private final CallbackWithProbe<Probe> mALSProbeCallback; @Nullable private ICancellationSignal mCancellationSignal; private boolean mIsPointerDown; @@ -71,10 +72,12 @@ class FingerprintAuthenticationClient extends AuthenticationClient<ISession> imp super(context, lazyDaemon, token, listener, targetUserId, operationId, restricted, owner, cookie, requireConfirmation, sensorId, isStrongBiometric, BiometricsProtoEnums.MODALITY_FINGERPRINT, statsClient, taskStackListener, - lockoutCache, allowBackgroundAuthentication, true /* shouldVibrate */); + lockoutCache, allowBackgroundAuthentication, true /* shouldVibrate */, + false /* isKeyguardBypassEnabled */); mLockoutCache = lockoutCache; mUdfpsOverlayController = udfpsOverlayController; mSensorProps = sensorProps; + mALSProbeCallback = createALSCallback(false /* startWithClient */); } @Override @@ -92,7 +95,7 @@ class FingerprintAuthenticationClient extends AuthenticationClient<ISession> imp @NonNull @Override protected Callback wrapCallbackForStart(@NonNull Callback callback) { - return new CompositeCallback(createALSCallback(), callback); + return new CompositeCallback(mALSProbeCallback, callback); } @Override @@ -170,7 +173,9 @@ class FingerprintAuthenticationClient extends AuthenticationClient<ISession> imp try { mIsPointerDown = true; mState = STATE_STARTED; + mALSProbeCallback.getProbe().enable(); getFreshDaemon().onPointerDown(0 /* pointerId */, x, y, minor, major); + if (getListener() != null) { getListener().onUdfpsPointerDown(getSensorId()); } @@ -184,7 +189,9 @@ class FingerprintAuthenticationClient extends AuthenticationClient<ISession> imp try { mIsPointerDown = false; mState = STATE_STARTED_PAUSED; + mALSProbeCallback.getProbe().disable(); getFreshDaemon().onPointerUp(0 /* pointerId */); + if (getListener() != null) { getListener().onUdfpsPointerUp(getSensorId()); } diff --git a/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintEnrollClient.java b/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintEnrollClient.java index e8200af68db5..c420c5c57241 100644 --- a/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintEnrollClient.java +++ b/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintEnrollClient.java @@ -84,7 +84,7 @@ class FingerprintEnrollClient extends EnrollClient<ISession> implements Udfps { @NonNull @Override protected Callback wrapCallbackForStart(@NonNull Callback callback) { - return new CompositeCallback(createALSCallback(), callback); + return new CompositeCallback(createALSCallback(true /* startWithClient */), callback); } @Override diff --git a/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/FingerprintAuthenticationClient.java b/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/FingerprintAuthenticationClient.java index 9347244d7c77..7558d15fbe32 100644 --- a/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/FingerprintAuthenticationClient.java +++ b/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/FingerprintAuthenticationClient.java @@ -54,6 +54,7 @@ class FingerprintAuthenticationClient extends AuthenticationClient<IBiometricsFi private final LockoutFrameworkImpl mLockoutFrameworkImpl; @Nullable private final IUdfpsOverlayController mUdfpsOverlayController; @NonNull private final FingerprintSensorPropertiesInternal mSensorProps; + @NonNull private final CallbackWithProbe<Probe> mALSProbeCallback; private boolean mIsPointerDown; @@ -70,10 +71,12 @@ class FingerprintAuthenticationClient extends AuthenticationClient<IBiometricsFi super(context, lazyDaemon, token, listener, targetUserId, operationId, restricted, owner, cookie, requireConfirmation, sensorId, isStrongBiometric, BiometricsProtoEnums.MODALITY_FINGERPRINT, statsClient, taskStackListener, - lockoutTracker, allowBackgroundAuthentication, true /* shouldVibrate */); + lockoutTracker, allowBackgroundAuthentication, true /* shouldVibrate */, + false /* isKeyguardBypassEnabled */); mLockoutFrameworkImpl = lockoutTracker; mUdfpsOverlayController = udfpsOverlayController; mSensorProps = sensorProps; + mALSProbeCallback = createALSCallback(false /* startWithClient */); } @Override @@ -91,7 +94,7 @@ class FingerprintAuthenticationClient extends AuthenticationClient<IBiometricsFi @NonNull @Override protected Callback wrapCallbackForStart(@NonNull Callback callback) { - return new CompositeCallback(createALSCallback(), callback); + return new CompositeCallback(mALSProbeCallback, callback); } @Override @@ -188,7 +191,9 @@ class FingerprintAuthenticationClient extends AuthenticationClient<IBiometricsFi public void onPointerDown(int x, int y, float minor, float major) { mIsPointerDown = true; mState = STATE_STARTED; + mALSProbeCallback.getProbe().enable(); UdfpsHelper.onFingerDown(getFreshDaemon(), x, y, minor, major); + if (getListener() != null) { try { getListener().onUdfpsPointerDown(getSensorId()); @@ -202,7 +207,9 @@ class FingerprintAuthenticationClient extends AuthenticationClient<IBiometricsFi public void onPointerUp() { mIsPointerDown = false; mState = STATE_STARTED_PAUSED; + mALSProbeCallback.getProbe().disable(); UdfpsHelper.onFingerUp(getFreshDaemon()); + if (getListener() != null) { try { getListener().onUdfpsPointerUp(getSensorId()); diff --git a/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/FingerprintEnrollClient.java b/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/FingerprintEnrollClient.java index 250e1328104b..dc705346f534 100644 --- a/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/FingerprintEnrollClient.java +++ b/services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/FingerprintEnrollClient.java @@ -77,7 +77,7 @@ public class FingerprintEnrollClient extends EnrollClient<IBiometricsFingerprint @NonNull @Override protected Callback wrapCallbackForStart(@NonNull Callback callback) { - return new CompositeCallback(createALSCallback(), callback); + return new CompositeCallback(createALSCallback(true /* startWithClient */), callback); } @Override diff --git a/services/core/java/com/android/server/display/DisplayPowerController.java b/services/core/java/com/android/server/display/DisplayPowerController.java index 110893765cbd..59f536cc4c5d 100644 --- a/services/core/java/com/android/server/display/DisplayPowerController.java +++ b/services/core/java/com/android/server/display/DisplayPowerController.java @@ -2342,7 +2342,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call try { // TODO(brightnessfloat): change BatteryStats to use float mBatteryStats.noteScreenBrightness(BrightnessSynchronizer.brightnessFloatToInt( - brightness)); + brightness, null)); } catch (RemoteException e) { // same process } diff --git a/services/core/java/com/android/server/display/LocalDisplayAdapter.java b/services/core/java/com/android/server/display/LocalDisplayAdapter.java index f953cc8c8a27..24d29d320cf6 100644 --- a/services/core/java/com/android/server/display/LocalDisplayAdapter.java +++ b/services/core/java/com/android/server/display/LocalDisplayAdapter.java @@ -795,11 +795,12 @@ final class LocalDisplayAdapter extends DisplayAdapter { mBacklightAdapter.setBacklight(sdrBacklight, sdrNits, backlight, nits); Trace.traceCounter(Trace.TRACE_TAG_POWER, "ScreenBrightness", - BrightnessSynchronizer.brightnessFloatToInt(brightnessState)); + BrightnessSynchronizer.brightnessFloatToInt( + brightnessState, null)); Trace.traceCounter(Trace.TRACE_TAG_POWER, "SdrScreenBrightness", BrightnessSynchronizer.brightnessFloatToInt( - sdrBrightnessState)); + sdrBrightnessState, null)); } finally { Trace.traceEnd(Trace.TRACE_TAG_POWER); } diff --git a/services/core/java/com/android/server/lights/LightsService.java b/services/core/java/com/android/server/lights/LightsService.java index 91f14de040fe..bebe6ed8dc53 100644 --- a/services/core/java/com/android/server/lights/LightsService.java +++ b/services/core/java/com/android/server/lights/LightsService.java @@ -293,7 +293,7 @@ public class LightsService extends SystemService { + ": brightness=" + brightness); return; } - int brightnessInt = BrightnessSynchronizer.brightnessFloatToInt(brightness); + int brightnessInt = BrightnessSynchronizer.brightnessFloatToInt(brightness, null); int color = brightnessInt & 0x000000ff; color = 0xff000000 | (color << 16) | (color << 8) | color; setLightLocked(color, LIGHT_FLASH_NONE, 0, 0, brightnessMode); diff --git a/services/core/java/com/android/server/vcn/VcnGatewayConnection.java b/services/core/java/com/android/server/vcn/VcnGatewayConnection.java index 3c0a05b6edf7..450257fcdecb 100644 --- a/services/core/java/com/android/server/vcn/VcnGatewayConnection.java +++ b/services/core/java/com/android/server/vcn/VcnGatewayConnection.java @@ -195,6 +195,7 @@ public class VcnGatewayConnection extends StateMachine { @VisibleForTesting(visibility = Visibility.PRIVATE) static final int SAFEMODE_TIMEOUT_SECONDS = 30; + private static final int SAFEMODE_TIMEOUT_SECONDS_TEST_MODE = 10; private interface EventInfo {} @@ -1082,7 +1083,9 @@ public class VcnGatewayConnection extends StateMachine { createScheduledAlarm( SAFEMODE_TIMEOUT_ALARM, delayedMessage, - TimeUnit.SECONDS.toMillis(SAFEMODE_TIMEOUT_SECONDS)); + mVcnContext.isInTestMode() + ? TimeUnit.SECONDS.toMillis(SAFEMODE_TIMEOUT_SECONDS_TEST_MODE) + : TimeUnit.SECONDS.toMillis(SAFEMODE_TIMEOUT_SECONDS)); } private void cancelSafeModeAlarm() { diff --git a/services/core/java/com/android/server/wm/ActivityMetricsLogger.java b/services/core/java/com/android/server/wm/ActivityMetricsLogger.java index 0f6a71823334..494f49663b67 100644 --- a/services/core/java/com/android/server/wm/ActivityMetricsLogger.java +++ b/services/core/java/com/android/server/wm/ActivityMetricsLogger.java @@ -933,9 +933,11 @@ class ActivityMetricsLogger { // This will avoid any races with other operations that modify the ActivityRecord. final TransitionInfoSnapshot infoSnapshot = new TransitionInfoSnapshot(info); if (info.isInterestingToLoggerAndObserver()) { + final long timestamp = info.mTransitionStartTimeNs; + final long uptime = info.mTransitionDeviceUptimeMs; + final int transitionDelay = info.mCurrentTransitionDelayMs; mLoggerHandler.post(() -> logAppTransition( - info.mTransitionDeviceUptimeMs, info.mCurrentTransitionDelayMs, - infoSnapshot, isHibernating)); + timestamp, uptime, transitionDelay, infoSnapshot, isHibernating)); } mLoggerHandler.post(() -> logAppDisplayed(infoSnapshot)); if (info.mPendingFullyDrawn != null) { @@ -946,8 +948,8 @@ class ActivityMetricsLogger { } // This gets called on another thread without holding the activity manager lock. - private void logAppTransition(long transitionDeviceUptimeMs, int currentTransitionDelayMs, - TransitionInfoSnapshot info, boolean isHibernating) { + private void logAppTransition(long transitionStartTimeNs, long transitionDeviceUptimeMs, + int currentTransitionDelayMs, TransitionInfoSnapshot info, boolean isHibernating) { final LogMaker builder = new LogMaker(APP_TRANSITION); builder.setPackageName(info.packageName); builder.setType(info.type); @@ -998,7 +1000,7 @@ class ActivityMetricsLogger { info.launchedActivityName, info.launchedActivityLaunchedFromPackage, isInstantApp, - transitionDeviceUptimeMs, + 0 /* deprecated transitionDeviceUptimeMs */, info.reason, currentTransitionDelayMs, info.startingWindowDelayMs, @@ -1012,7 +1014,8 @@ class ActivityMetricsLogger { isHibernating, isIncremental, isLoading, - info.launchedActivityName.hashCode()); + info.launchedActivityName.hashCode(), + TimeUnit.NANOSECONDS.toMillis(transitionStartTimeNs)); if (DEBUG_METRICS) { Slog.i(TAG, String.format("APP_START_OCCURRED(%s, %s, %s, %s, %s)", diff --git a/services/core/java/com/android/server/wm/ActivityRecord.java b/services/core/java/com/android/server/wm/ActivityRecord.java index 22bff21831de..308df2f4e9a0 100644 --- a/services/core/java/com/android/server/wm/ActivityRecord.java +++ b/services/core/java/com/android/server/wm/ActivityRecord.java @@ -5033,6 +5033,12 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A void notifyAppStopped() { ProtoLog.v(WM_DEBUG_ADD_REMOVE, "notifyAppStopped: %s", this); mAppStopped = true; + // This is to fix the edge case that auto-enter-pip is finished in Launcher but app calls + // setAutoEnterEnabled(false) and transitions to STOPPED state, see b/191930787. + // Clear any surface transactions and content overlay in this case. + if (task != null && task.mLastRecentsAnimationTransaction != null) { + task.clearLastRecentsAnimationTransaction(true /* forceRemoveOverlay */); + } // Reset the last saved PiP snap fraction on app stop. mDisplayContent.mPinnedTaskController.onActivityHidden(mActivityComponent); mDisplayContent.mUnknownAppVisibilityController.appRemovedOrHidden(this); diff --git a/services/core/java/com/android/server/wm/DisplayContent.java b/services/core/java/com/android/server/wm/DisplayContent.java index 3144c87e8314..c7ae9fda05b5 100644 --- a/services/core/java/com/android/server/wm/DisplayContent.java +++ b/services/core/java/com/android/server/wm/DisplayContent.java @@ -61,6 +61,7 @@ import static android.view.WindowManager.LayoutParams.FIRST_APPLICATION_WINDOW; import static android.view.WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE; import static android.view.WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE; import static android.view.WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL; +import static android.view.WindowManager.LayoutParams.FLAG_SECURE; import static android.view.WindowManager.LayoutParams.FLAG_SPLIT_TOUCH; import static android.view.WindowManager.LayoutParams.LAST_APPLICATION_WINDOW; import static android.view.WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN; @@ -5829,7 +5830,9 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp return false; /* continue */ } } - + if (nextWindow.isSecureLocked()) { + return false; /* continue */ + } return true; /* stop, match found */ } }); diff --git a/services/core/java/com/android/server/wm/RootWindowContainer.java b/services/core/java/com/android/server/wm/RootWindowContainer.java index a843c806f010..bd688a618c63 100644 --- a/services/core/java/com/android/server/wm/RootWindowContainer.java +++ b/services/core/java/com/android/server/wm/RootWindowContainer.java @@ -2151,7 +2151,7 @@ class RootWindowContainer extends WindowContainer<DisplayContent> rootTask.setLastRecentsAnimationTransaction( task.mLastRecentsAnimationTransaction, task.mLastRecentsAnimationOverlay); - task.clearLastRecentsAnimationTransaction(); + task.clearLastRecentsAnimationTransaction(false /* forceRemoveOverlay */); } // There are multiple activities in the task and moving the top activity should diff --git a/services/core/java/com/android/server/wm/Task.java b/services/core/java/com/android/server/wm/Task.java index fa8b6a15671c..ced5af126e49 100644 --- a/services/core/java/com/android/server/wm/Task.java +++ b/services/core/java/com/android/server/wm/Task.java @@ -4167,7 +4167,9 @@ class Task extends WindowContainer<WindowContainer> { StartingWindowInfo getStartingWindowInfo(ActivityRecord activity) { final StartingWindowInfo info = new StartingWindowInfo(); info.taskInfo = getTaskInfo(); - + info.targetActivityInfo = info.taskInfo.topActivityInfo != null + && activity.info != info.taskInfo.topActivityInfo + ? activity.info : null; info.isKeyguardOccluded = mAtmService.mKeyguardController.isDisplayOccluded(DEFAULT_DISPLAY); @@ -7625,7 +7627,10 @@ class Task extends WindowContainer<WindowContainer> { mLastRecentsAnimationOverlay = overlay; } - void clearLastRecentsAnimationTransaction() { + void clearLastRecentsAnimationTransaction(boolean forceRemoveOverlay) { + if (forceRemoveOverlay && mLastRecentsAnimationOverlay != null) { + getPendingTransaction().remove(mLastRecentsAnimationOverlay); + } mLastRecentsAnimationTransaction = null; mLastRecentsAnimationOverlay = null; // reset also the crop and transform introduced by mLastRecentsAnimationTransaction diff --git a/services/tests/servicestests/src/com/android/server/biometrics/sensors/BiometricSchedulerTest.java b/services/tests/servicestests/src/com/android/server/biometrics/sensors/BiometricSchedulerTest.java index 1fe41234849f..8592166aae15 100644 --- a/services/tests/servicestests/src/com/android/server/biometrics/sensors/BiometricSchedulerTest.java +++ b/services/tests/servicestests/src/com/android/server/biometrics/sensors/BiometricSchedulerTest.java @@ -360,7 +360,8 @@ public class BiometricSchedulerTest { false /* restricted */, TAG, 1 /* cookie */, false /* requireConfirmation */, TEST_SENSOR_ID, true /* isStrongBiometric */, 0 /* statsModality */, 0 /* statsClient */, null /* taskStackListener */, mock(LockoutTracker.class), - false /* isKeyguard */, true /* shouldVibrate */); + false /* isKeyguard */, true /* shouldVibrate */, + false /* isKeyguardBypassEnabled */); } @Override @@ -388,7 +389,8 @@ public class BiometricSchedulerTest { false /* restricted */, TAG, 1 /* cookie */, false /* requireConfirmation */, TEST_SENSOR_ID, true /* isStrongBiometric */, 0 /* statsModality */, 0 /* statsClient */, null /* taskStackListener */, mock(LockoutTracker.class), - false /* isKeyguard */, true /* shouldVibrate */); + false /* isKeyguard */, true /* shouldVibrate */, + false /* isKeyguardBypassEnabled */); } @Override diff --git a/services/tests/servicestests/src/com/android/server/biometrics/sensors/CoexCoordinatorTest.java b/services/tests/servicestests/src/com/android/server/biometrics/sensors/CoexCoordinatorTest.java index a169ebd0320f..f1adcae257a7 100644 --- a/services/tests/servicestests/src/com/android/server/biometrics/sensors/CoexCoordinatorTest.java +++ b/services/tests/servicestests/src/com/android/server/biometrics/sensors/CoexCoordinatorTest.java @@ -17,6 +17,7 @@ package com.android.server.biometrics.sensors; import static com.android.server.biometrics.sensors.BiometricScheduler.SENSOR_TYPE_FACE; +import static com.android.server.biometrics.sensors.BiometricScheduler.SENSOR_TYPE_FP_OTHER; import static com.android.server.biometrics.sensors.BiometricScheduler.SENSOR_TYPE_UDFPS; import static junit.framework.Assert.assertEquals; @@ -327,6 +328,49 @@ public class CoexCoordinatorTest { } @Test + public void testKeyguard_capacitiveAccepted_whenFaceScanning() { + mCoexCoordinator.reset(); + + AuthenticationClient<?> faceClient = mock(AuthenticationClient.class); + when(faceClient.isKeyguard()).thenReturn(true); + when(faceClient.getState()).thenReturn(AuthenticationClient.STATE_STARTED); + + AuthenticationClient<?> fpClient = mock(AuthenticationClient.class); + when(fpClient.getState()).thenReturn(AuthenticationClient.STATE_STARTED); + when(fpClient.isKeyguard()).thenReturn(true); + + mCoexCoordinator.addAuthenticationClient(SENSOR_TYPE_FACE, faceClient); + mCoexCoordinator.addAuthenticationClient(SENSOR_TYPE_FP_OTHER, fpClient); + + mCoexCoordinator.onAuthenticationSucceeded(0 /* currentTimeMillis */, fpClient, mCallback); + verify(mCallback).sendHapticFeedback(); + verify(mCallback).sendAuthenticationResult(eq(true) /* addAuthTokenIfStrong */); + verify(mCallback).handleLifecycleAfterAuth(); + } + + @Test + public void testKeyguard_capacitiveRejected_whenFaceScanning() { + mCoexCoordinator.reset(); + + AuthenticationClient<?> faceClient = mock(AuthenticationClient.class); + when(faceClient.isKeyguard()).thenReturn(true); + when(faceClient.getState()).thenReturn(AuthenticationClient.STATE_STARTED); + + AuthenticationClient<?> fpClient = mock(AuthenticationClient.class); + when(fpClient.getState()).thenReturn(AuthenticationClient.STATE_STARTED); + when(fpClient.isKeyguard()).thenReturn(true); + + mCoexCoordinator.addAuthenticationClient(SENSOR_TYPE_FACE, faceClient); + mCoexCoordinator.addAuthenticationClient(SENSOR_TYPE_FP_OTHER, fpClient); + + mCoexCoordinator.onAuthenticationRejected(0 /* currentTimeMillis */, fpClient, + LockoutTracker.LOCKOUT_NONE, mCallback); + verify(mCallback).sendHapticFeedback(); + verify(mCallback).sendAuthenticationResult(eq(false) /* addAuthTokenIfStrong */); + verify(mCallback).handleLifecycleAfterAuth(); + } + + @Test public void testNonKeyguard_rejectAndNotLockedOut() { mCoexCoordinator.reset(); diff --git a/services/tests/servicestests/src/com/android/server/usage/AppStandbyControllerTests.java b/services/tests/servicestests/src/com/android/server/usage/AppStandbyControllerTests.java index 645fa630f0db..9e46e1f2be92 100644 --- a/services/tests/servicestests/src/com/android/server/usage/AppStandbyControllerTests.java +++ b/services/tests/servicestests/src/com/android/server/usage/AppStandbyControllerTests.java @@ -93,6 +93,7 @@ import android.util.Pair; import android.view.Display; import androidx.test.InstrumentationRegistry; +import androidx.test.filters.FlakyTest; import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; @@ -103,7 +104,6 @@ import com.android.server.usage.AppStandbyInternal.AppIdleStateChangeListener; import org.junit.After; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; @@ -502,6 +502,7 @@ public class AppStandbyControllerTests { } @Test + @FlakyTest(bugId = 185169504) public void testBoundWidgetPackageExempt() throws Exception { assumeTrue(mInjector.getContext().getSystemService(AppWidgetManager.class) != null); assertEquals(STANDBY_BUCKET_ACTIVE, @@ -584,6 +585,7 @@ public class AppStandbyControllerTests { } @Test + @FlakyTest(bugId = 185169504) public void testIsAppIdle_Charging() throws Exception { TestParoleListener paroleListener = new TestParoleListener(); mController.addListener(paroleListener); @@ -616,6 +618,7 @@ public class AppStandbyControllerTests { } @Test + @FlakyTest(bugId = 185169504) public void testIsAppIdle_Enabled() throws Exception { setChargingState(mController, false); TestParoleListener paroleListener = new TestParoleListener(); @@ -715,6 +718,7 @@ public class AppStandbyControllerTests { } @Test + @FlakyTest(bugId = 185169504) public void testBuckets() throws Exception { assertTimeout(mController, 0, STANDBY_BUCKET_NEVER); @@ -747,6 +751,7 @@ public class AppStandbyControllerTests { } @Test + @FlakyTest(bugId = 185169504) public void testSetAppStandbyBucket() throws Exception { // For a known package, standby bucket should be set properly reportEvent(mController, USER_INTERACTION, 0, PACKAGE_1); @@ -766,6 +771,7 @@ public class AppStandbyControllerTests { } @Test + @FlakyTest(bugId = 185169504) public void testAppStandbyBucketOnInstallAndUninstall() throws Exception { // On package install, standby bucket should be ACTIVE reportEvent(mController, USER_INTERACTION, 0, PACKAGE_UNKNOWN); @@ -784,6 +790,7 @@ public class AppStandbyControllerTests { } @Test + @FlakyTest(bugId = 185169504) public void testScreenTimeAndBuckets() throws Exception { mInjector.setDisplayOn(false); @@ -807,6 +814,7 @@ public class AppStandbyControllerTests { } @Test + @FlakyTest(bugId = 185169504) public void testForcedIdle() throws Exception { mController.forceIdleState(PACKAGE_1, USER_ID, true); assertEquals(STANDBY_BUCKET_RARE, getStandbyBucket(mController, PACKAGE_1)); @@ -819,6 +827,7 @@ public class AppStandbyControllerTests { } @Test + @FlakyTest(bugId = 185169504) public void testNotificationEvent() throws Exception { reportEvent(mController, USER_INTERACTION, 0, PACKAGE_1); assertEquals(STANDBY_BUCKET_ACTIVE, getStandbyBucket(mController, PACKAGE_1)); @@ -832,6 +841,7 @@ public class AppStandbyControllerTests { } @Test + @FlakyTest(bugId = 185169504) public void testSlicePinnedEvent() throws Exception { reportEvent(mController, USER_INTERACTION, 0, PACKAGE_1); assertEquals(STANDBY_BUCKET_ACTIVE, getStandbyBucket(mController, PACKAGE_1)); @@ -845,6 +855,7 @@ public class AppStandbyControllerTests { } @Test + @FlakyTest(bugId = 185169504) public void testSlicePinnedPrivEvent() throws Exception { mController.forceIdleState(PACKAGE_1, USER_ID, true); reportEvent(mController, SLICE_PINNED_PRIV, mInjector.mElapsedRealtime, PACKAGE_1); @@ -852,6 +863,7 @@ public class AppStandbyControllerTests { } @Test + @FlakyTest(bugId = 185169504) public void testPredictionTimedOut() throws Exception { // Set it to timeout or usage, so that prediction can override it mInjector.mElapsedRealtime = HOUR_MS; @@ -882,6 +894,7 @@ public class AppStandbyControllerTests { } @Test + @FlakyTest(bugId = 185169504) public void testOverrides() throws Exception { // Can force to NEVER mInjector.mElapsedRealtime = HOUR_MS; @@ -992,6 +1005,7 @@ public class AppStandbyControllerTests { } @Test + @FlakyTest(bugId = 185169504) public void testTimeout() throws Exception { reportEvent(mController, USER_INTERACTION, 0, PACKAGE_1); assertBucket(STANDBY_BUCKET_ACTIVE); @@ -1015,6 +1029,7 @@ public class AppStandbyControllerTests { /** Test that timeouts still work properly even if invalid configuration values are set. */ @Test + @FlakyTest(bugId = 185169504) public void testTimeout_InvalidThresholds() throws Exception { mInjector.mSettingsBuilder .setLong("screen_threshold_active", -1) @@ -1052,6 +1067,7 @@ public class AppStandbyControllerTests { * timeout has passed. */ @Test + @FlakyTest(bugId = 185169504) public void testTimeoutBeforeRestricted() throws Exception { reportEvent(mController, USER_INTERACTION, 0, PACKAGE_1); assertBucket(STANDBY_BUCKET_ACTIVE); @@ -1078,6 +1094,7 @@ public class AppStandbyControllerTests { * Test that an app is put into the RESTRICTED bucket after enough time has passed. */ @Test + @FlakyTest(bugId = 185169504) public void testRestrictedDelay() throws Exception { reportEvent(mController, USER_INTERACTION, 0, PACKAGE_1); assertBucket(STANDBY_BUCKET_ACTIVE); @@ -1100,6 +1117,7 @@ public class AppStandbyControllerTests { * Test that an app is put into the RESTRICTED bucket after enough time has passed. */ @Test + @FlakyTest(bugId = 185169504) public void testRestrictedDelay_DelayChange() throws Exception { reportEvent(mController, USER_INTERACTION, 0, PACKAGE_1); assertBucket(STANDBY_BUCKET_ACTIVE); @@ -1124,6 +1142,7 @@ public class AppStandbyControllerTests { * a low bucket after the RESTRICTED timeout. */ @Test + @FlakyTest(bugId = 185169504) public void testRestrictedTimeoutOverridesRestoredLowBucketPrediction() throws Exception { reportEvent(mController, USER_INTERACTION, mInjector.mElapsedRealtime, PACKAGE_1); assertBucket(STANDBY_BUCKET_ACTIVE); @@ -1160,6 +1179,7 @@ public class AppStandbyControllerTests { * a low bucket after the RESTRICTED timeout. */ @Test + @FlakyTest(bugId = 185169504) public void testRestrictedTimeoutOverridesPredictionLowBucket() throws Exception { reportEvent(mController, USER_INTERACTION, mInjector.mElapsedRealtime, PACKAGE_1); @@ -1187,6 +1207,7 @@ public class AppStandbyControllerTests { * interaction. */ @Test + @FlakyTest(bugId = 185169504) public void testSystemInteractionOverridesRestrictedTimeout() throws Exception { reportEvent(mController, USER_INTERACTION, mInjector.mElapsedRealtime, PACKAGE_1); assertBucket(STANDBY_BUCKET_ACTIVE); @@ -1213,6 +1234,7 @@ public class AppStandbyControllerTests { } @Test + @FlakyTest(bugId = 185169504) public void testRestrictedBucketDisabled() throws Exception { mInjector.mIsRestrictedBucketEnabled = false; // Get the controller to read the new value. Capturing the ContentObserver isn't possible @@ -1238,6 +1260,7 @@ public class AppStandbyControllerTests { } @Test + @FlakyTest(bugId = 185169504) public void testRestrictedBucket_EnabledToDisabled() throws Exception { reportEvent(mController, USER_INTERACTION, mInjector.mElapsedRealtime, PACKAGE_1); mInjector.mElapsedRealtime += RESTRICTED_THRESHOLD; @@ -1255,6 +1278,7 @@ public class AppStandbyControllerTests { } @Test + @FlakyTest(bugId = 185169504) public void testPredictionRaiseFromRestrictedTimeout_highBucket() throws Exception { reportEvent(mController, USER_INTERACTION, mInjector.mElapsedRealtime, PACKAGE_1); @@ -1272,6 +1296,7 @@ public class AppStandbyControllerTests { } @Test + @FlakyTest(bugId = 185169504) public void testPredictionRaiseFromRestrictedTimeout_lowBucket() throws Exception { reportEvent(mController, USER_INTERACTION, mInjector.mElapsedRealtime, PACKAGE_1); @@ -1289,6 +1314,7 @@ public class AppStandbyControllerTests { } @Test + @FlakyTest(bugId = 185169504) public void testCascadingTimeouts() throws Exception { reportEvent(mController, USER_INTERACTION, 0, PACKAGE_1); assertBucket(STANDBY_BUCKET_ACTIVE); @@ -1312,6 +1338,7 @@ public class AppStandbyControllerTests { } @Test + @FlakyTest(bugId = 185169504) public void testOverlappingTimeouts() throws Exception { reportEvent(mController, USER_INTERACTION, 0, PACKAGE_1); assertBucket(STANDBY_BUCKET_ACTIVE); @@ -1343,6 +1370,7 @@ public class AppStandbyControllerTests { } @Test + @FlakyTest(bugId = 185169504) public void testSystemInteractionTimeout() throws Exception { reportEvent(mController, USER_INTERACTION, 0, PACKAGE_1); // Fast forward to RARE @@ -1366,6 +1394,7 @@ public class AppStandbyControllerTests { } @Test + @FlakyTest(bugId = 185169504) public void testInitialForegroundServiceTimeout() throws Exception { mInjector.mElapsedRealtime = 1 * RARE_THRESHOLD + 100; // Make sure app is in NEVER bucket @@ -1399,6 +1428,7 @@ public class AppStandbyControllerTests { } @Test + @FlakyTest(bugId = 185169504) public void testPredictionNotOverridden() throws Exception { reportEvent(mController, USER_INTERACTION, 0, PACKAGE_1); assertBucket(STANDBY_BUCKET_ACTIVE); @@ -1424,8 +1454,8 @@ public class AppStandbyControllerTests { assertBucket(STANDBY_BUCKET_ACTIVE); } - @Ignore @Test + @FlakyTest(bugId = 185169504) public void testPredictionStrikesBack() throws Exception { reportEvent(mController, USER_INTERACTION, 0, PACKAGE_1); assertBucket(STANDBY_BUCKET_ACTIVE); @@ -1451,6 +1481,7 @@ public class AppStandbyControllerTests { } @Test + @FlakyTest(bugId = 185169504) public void testSystemForcedFlags_NotAddedForUserForce() throws Exception { final int expectedReason = REASON_MAIN_FORCED_BY_USER; mController.setAppStandbyBucket(PACKAGE_1, USER_ID, STANDBY_BUCKET_RESTRICTED, @@ -1465,6 +1496,7 @@ public class AppStandbyControllerTests { } @Test + @FlakyTest(bugId = 185169504) public void testSystemForcedFlags_AddedForSystemForce() throws Exception { mController.setAppStandbyBucket(PACKAGE_1, USER_ID, STANDBY_BUCKET_ACTIVE, REASON_MAIN_DEFAULT); @@ -1487,6 +1519,7 @@ public class AppStandbyControllerTests { } @Test + @FlakyTest(bugId = 185169504) public void testSystemForcedFlags_SystemForceChangesBuckets() throws Exception { mController.setAppStandbyBucket(PACKAGE_1, USER_ID, STANDBY_BUCKET_ACTIVE, REASON_MAIN_DEFAULT); @@ -1524,6 +1557,7 @@ public class AppStandbyControllerTests { } @Test + @FlakyTest(bugId = 185169504) public void testRestrictApp_MainReason() throws Exception { mController.setAppStandbyBucket(PACKAGE_1, USER_ID, STANDBY_BUCKET_ACTIVE, REASON_MAIN_DEFAULT); @@ -1598,6 +1632,7 @@ public class AppStandbyControllerTests { } @Test + @FlakyTest(bugId = 185169504) public void testUserInteraction_CrossProfile() throws Exception { mInjector.mRunningUsers = new int[] {USER_ID, USER_ID2, USER_ID3}; mInjector.mCrossProfileTargets = Arrays.asList(USER_HANDLE_USER2); @@ -1621,6 +1656,7 @@ public class AppStandbyControllerTests { } @Test + @FlakyTest(bugId = 185169504) public void testUnexemptedSyncScheduled() throws Exception { rearmLatch(PACKAGE_1); mController.addListener(mListener); @@ -1642,6 +1678,7 @@ public class AppStandbyControllerTests { } @Test + @FlakyTest(bugId = 185169504) public void testExemptedSyncScheduled() throws Exception { setAndAssertBucket(PACKAGE_1, USER_ID, STANDBY_BUCKET_RARE, REASON_MAIN_FORCED_BY_SYSTEM); mInjector.mDeviceIdleMode = true; diff --git a/services/tests/wmtests/src/com/android/server/wm/DisplayContentTests.java b/services/tests/wmtests/src/com/android/server/wm/DisplayContentTests.java index d498d4663d78..745793cf5908 100644 --- a/services/tests/wmtests/src/com/android/server/wm/DisplayContentTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/DisplayContentTests.java @@ -42,6 +42,7 @@ import static android.view.WindowInsetsController.BEHAVIOR_SHOW_TRANSIENT_BARS_B import static android.view.WindowManager.LayoutParams.FIRST_SUB_WINDOW; import static android.view.WindowManager.LayoutParams.FLAG_LAYOUT_INSET_DECOR; import static android.view.WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN; +import static android.view.WindowManager.LayoutParams.FLAG_SECURE; import static android.view.WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES; import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_NO_MOVE_ANIMATION; import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION; @@ -1746,6 +1747,31 @@ public class DisplayContentTests extends WindowTestsBase { } @Test + public void testFindScrollCaptureTargetWindow_secure() { + DisplayContent display = createNewDisplay(); + Task rootTask = createTask(display); + Task task = createTaskInRootTask(rootTask, 0 /* userId */); + WindowState secureWindow = createWindow(null, TYPE_APPLICATION, "Secure Window"); + secureWindow.mAttrs.flags |= FLAG_SECURE; + + WindowState result = display.findScrollCaptureTargetWindow(null, + ActivityTaskManager.INVALID_TASK_ID); + assertNull(result); + } + + @Test + public void testFindScrollCaptureTargetWindow_secureTaskId() { + DisplayContent display = createNewDisplay(); + Task rootTask = createTask(display); + Task task = createTaskInRootTask(rootTask, 0 /* userId */); + WindowState secureWindow = createWindow(null, TYPE_APPLICATION, "Secure Window"); + secureWindow.mAttrs.flags |= FLAG_SECURE; + + WindowState result = display.findScrollCaptureTargetWindow(null, task.mTaskId); + assertNull(result); + } + + @Test public void testFindScrollCaptureTargetWindow_taskId() { DisplayContent display = createNewDisplay(); Task rootTask = createTask(display); diff --git a/services/voiceinteraction/java/com/android/server/voiceinteraction/HotwordDetectionConnection.java b/services/voiceinteraction/java/com/android/server/voiceinteraction/HotwordDetectionConnection.java index e408cfc77ad0..965f126000fd 100644 --- a/services/voiceinteraction/java/com/android/server/voiceinteraction/HotwordDetectionConnection.java +++ b/services/voiceinteraction/java/com/android/server/voiceinteraction/HotwordDetectionConnection.java @@ -87,14 +87,14 @@ import java.util.function.Function; */ final class HotwordDetectionConnection { private static final String TAG = "HotwordDetectionConnection"; - // TODO (b/177502877): Set the Debug flag to false before shipping. - static final boolean DEBUG = true; + static final boolean DEBUG = false; // TODO: These constants need to be refined. private static final long VALIDATION_TIMEOUT_MILLIS = 3000; private static final long MAX_UPDATE_TIMEOUT_MILLIS = 6000; private static final Duration MAX_UPDATE_TIMEOUT_DURATION = Duration.ofMillis(MAX_UPDATE_TIMEOUT_MILLIS); + private static final long RESET_DEBUG_HOTWORD_LOGGING_TIMEOUT_MILLIS = 60 * 60 * 1000; // 1 hour private final Executor mAudioCopyExecutor = Executors.newCachedThreadPool(); // TODO: This may need to be a Handler(looper) @@ -103,6 +103,7 @@ final class HotwordDetectionConnection { private final AtomicBoolean mUpdateStateAfterStartFinished = new AtomicBoolean(false); private final IBinder.DeathRecipient mAudioServerDeathRecipient = this::audioServerDied; private final @NonNull ServiceConnectionFactory mServiceConnectionFactory; + private final IHotwordRecognitionStatusCallback mCallback; final Object mLock; final int mVoiceInteractionServiceUid; @@ -110,11 +111,11 @@ final class HotwordDetectionConnection { final int mUser; final Context mContext; volatile HotwordDetectionServiceIdentity mIdentity; - private IHotwordRecognitionStatusCallback mCallback; private IMicrophoneHotwordDetectionVoiceInteractionCallback mSoftwareCallback; private Instant mLastRestartInstant; private ScheduledFuture<?> mCancellationTaskFuture; + private ScheduledFuture<?> mDebugHotwordLoggingTimeoutFuture = null; /** Identity used for attributing app ops when delivering data to the Interactor. */ @GuardedBy("mLock") @@ -128,17 +129,24 @@ final class HotwordDetectionConnection { private boolean mPerformingSoftwareHotwordDetection; private @NonNull ServiceConnection mRemoteHotwordDetectionService; private IBinder mAudioFlinger; + private boolean mDebugHotwordLogging = false; HotwordDetectionConnection(Object lock, Context context, int voiceInteractionServiceUid, Identity voiceInteractorIdentity, ComponentName serviceName, int userId, boolean bindInstantServiceAllowed, @Nullable PersistableBundle options, - @Nullable SharedMemory sharedMemory, IHotwordRecognitionStatusCallback callback) { + @Nullable SharedMemory sharedMemory, + @NonNull IHotwordRecognitionStatusCallback callback) { + if (callback == null) { + Slog.w(TAG, "Callback is null while creating connection"); + throw new IllegalArgumentException("Callback is null while creating connection"); + } mLock = lock; mContext = context; mVoiceInteractionServiceUid = voiceInteractionServiceUid; mVoiceInteractorIdentity = voiceInteractorIdentity; mDetectionComponentName = serviceName; mUser = userId; + mCallback = callback; final Intent intent = new Intent(HotwordDetectionService.SERVICE_INTERFACE); intent.setComponent(mDetectionComponentName); initAudioFlingerLocked(); @@ -147,22 +155,13 @@ final class HotwordDetectionConnection { mRemoteHotwordDetectionService = mServiceConnectionFactory.createLocked(); - if (callback == null) { - updateStateLocked(options, sharedMemory); - return; - } - mCallback = callback; - mLastRestartInstant = Instant.now(); updateStateAfterProcessStart(options, sharedMemory); // TODO(volnov): we need to be smarter here, e.g. schedule it a bit more often, but wait // until the current session is closed. mCancellationTaskFuture = mScheduledExecutorService.scheduleAtFixedRate(() -> { - if (DEBUG) { - Slog.i(TAG, "Time to restart the process, TTL has passed"); - } - + Slog.v(TAG, "Time to restart the process, TTL has passed"); synchronized (mLock) { restartProcessLocked(); } @@ -268,9 +267,9 @@ final class HotwordDetectionConnection { } void cancelLocked() { - if (DEBUG) { - Slog.d(TAG, "cancelLocked"); - } + Slog.v(TAG, "cancelLocked"); + clearDebugHotwordLoggingTimeoutLocked(); + mDebugHotwordLogging = false; if (mRemoteHotwordDetectionService.isBound()) { mRemoteHotwordDetectionService.unbind(); LocalServices.getService(PermissionManagerServiceInternal.class) @@ -288,6 +287,7 @@ final class HotwordDetectionConnection { // TODO(b/191742511): this logic needs a test if (!mUpdateStateAfterStartFinished.get() && Instant.now().minus(MAX_UPDATE_TIMEOUT_DURATION).isBefore(mLastRestartInstant)) { + Slog.v(TAG, "call updateStateAfterProcessStart"); updateStateAfterProcessStart(options, sharedMemory); } else { mRemoteHotwordDetectionService.run( @@ -330,6 +330,9 @@ final class HotwordDetectionConnection { if (result != null) { Slog.i(TAG, "Egressed " + HotwordDetectedResult.getUsageSize(result) + " bits from hotword trusted process"); + if (mDebugHotwordLogging) { + Slog.i(TAG, "Egressed detected result: " + result); + } } } else { Slog.i(TAG, "Hotword detection has already completed"); @@ -407,15 +410,11 @@ final class HotwordDetectionConnection { private void detectFromDspSourceForTest(SoundTrigger.KeyphraseRecognitionEvent recognitionEvent, IHotwordRecognitionStatusCallback externalCallback) { - if (DEBUG) { - Slog.d(TAG, "detectFromDspSourceForTest"); - } + Slog.v(TAG, "detectFromDspSourceForTest"); IDspHotwordDetectionCallback internalCallback = new IDspHotwordDetectionCallback.Stub() { @Override public void onDetected(HotwordDetectedResult result) throws RemoteException { - if (DEBUG) { - Slog.d(TAG, "onDetected"); - } + Slog.v(TAG, "onDetected"); synchronized (mLock) { if (mValidatingDspTrigger) { mValidatingDspTrigger = false; @@ -424,6 +423,9 @@ final class HotwordDetectionConnection { if (result != null) { Slog.i(TAG, "Egressed " + HotwordDetectedResult.getUsageSize(result) + " bits from hotword trusted process"); + if (mDebugHotwordLogging) { + Slog.i(TAG, "Egressed detected result: " + result); + } } } else { Slog.i(TAG, "Ignored hotword detected since trigger has been handled"); @@ -433,13 +435,14 @@ final class HotwordDetectionConnection { @Override public void onRejected(HotwordRejectedResult result) throws RemoteException { - if (DEBUG) { - Slog.d(TAG, "onRejected"); - } + Slog.v(TAG, "onRejected"); synchronized (mLock) { if (mValidatingDspTrigger) { mValidatingDspTrigger = false; externalCallback.onRejected(result); + if (mDebugHotwordLogging && result != null) { + Slog.i(TAG, "Egressed rejected result: " + result); + } } else { Slog.i(TAG, "Ignored hotword rejected since trigger has been handled"); } @@ -482,6 +485,9 @@ final class HotwordDetectionConnection { if (result != null) { Slog.i(TAG, "Egressed " + HotwordDetectedResult.getUsageSize(result) + " bits from hotword trusted process"); + if (mDebugHotwordLogging) { + Slog.i(TAG, "Egressed detected result: " + result); + } } } } @@ -498,6 +504,9 @@ final class HotwordDetectionConnection { } mValidatingDspTrigger = false; externalCallback.onRejected(result); + if (mDebugHotwordLogging && result != null) { + Slog.i(TAG, "Egressed rejected result: " + result); + } } } }; @@ -514,19 +523,37 @@ final class HotwordDetectionConnection { } void forceRestart() { - if (DEBUG) { - Slog.i(TAG, "Requested to restart the service internally. Performing the restart"); - } + Slog.v(TAG, "Requested to restart the service internally. Performing the restart"); synchronized (mLock) { restartProcessLocked(); } } - private void restartProcessLocked() { - if (DEBUG) { - Slog.i(TAG, "Restarting hotword detection process"); + void setDebugHotwordLoggingLocked(boolean logging) { + Slog.v(TAG, "setDebugHotwordLoggingLocked: " + logging); + clearDebugHotwordLoggingTimeoutLocked(); + mDebugHotwordLogging = logging; + + if (logging) { + // Reset mDebugHotwordLogging to false after one hour + mDebugHotwordLoggingTimeoutFuture = mScheduledExecutorService.schedule(() -> { + Slog.v(TAG, "Timeout to reset mDebugHotwordLogging to false"); + synchronized (mLock) { + mDebugHotwordLogging = false; + } + }, RESET_DEBUG_HOTWORD_LOGGING_TIMEOUT_MILLIS, TimeUnit.MILLISECONDS); + } + } + + private void clearDebugHotwordLoggingTimeoutLocked() { + if (mDebugHotwordLoggingTimeoutFuture != null) { + mDebugHotwordLoggingTimeoutFuture.cancel(/* mayInterruptIfRunning= */true); + mDebugHotwordLoggingTimeoutFuture = null; } + } + private void restartProcessLocked() { + Slog.v(TAG, "Restarting hotword detection process"); ServiceConnection oldConnection = mRemoteHotwordDetectionService; // TODO(volnov): this can be done after connect() has been successful. @@ -547,9 +574,7 @@ final class HotwordDetectionConnection { // Recreate connection to reset the cache. mRemoteHotwordDetectionService = mServiceConnectionFactory.createLocked(); - if (DEBUG) { - Slog.i(TAG, "Started the new process, issuing #onProcessRestarted"); - } + Slog.v(TAG, "Started the new process, issuing #onProcessRestarted"); try { mCallback.onProcessRestarted(); } catch (RemoteException e) { @@ -700,6 +725,9 @@ final class HotwordDetectionConnection { bestEffortClose(serviceAudioSource); bestEffortClose(audioSource); + if (mDebugHotwordLogging && result != null) { + Slog.i(TAG, "Egressed rejected result: " + result); + } // TODO: Propagate the HotwordRejectedResult. } @@ -714,6 +742,9 @@ final class HotwordDetectionConnection { if (triggerResult != null) { Slog.i(TAG, "Egressed " + HotwordDetectedResult.getUsageSize( triggerResult) + " bits from hotword trusted process"); + if (mDebugHotwordLogging) { + Slog.i(TAG, "Egressed detected result: " + triggerResult); + } } // TODO: Add a delay before closing. bestEffortClose(audioSource); @@ -773,9 +804,7 @@ final class HotwordDetectionConnection { } synchronized (mLock) { if (!mRespectServiceConnectionStatusChanged) { - if (DEBUG) { - Slog.d(TAG, "Ignored onServiceConnectionStatusChanged event"); - } + Slog.v(TAG, "Ignored onServiceConnectionStatusChanged event"); return; } mIsBound = connected; @@ -792,9 +821,7 @@ final class HotwordDetectionConnection { super.binderDied(); synchronized (mLock) { if (!mRespectServiceConnectionStatusChanged) { - if (DEBUG) { - Slog.d(TAG, "Ignored #binderDied event"); - } + Slog.v(TAG, "Ignored #binderDied event"); return; } diff --git a/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java b/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java index ccf4267a0fbc..71541ad729d5 100644 --- a/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java +++ b/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java @@ -832,6 +832,17 @@ public class VoiceInteractionManagerService extends SystemService { mImpl.forceRestartHotwordDetector(); } + // Called by Shell command + void setDebugHotwordLogging(boolean logging) { + synchronized (this) { + if (mImpl == null) { + Slog.w(TAG, "setTemporaryLogging without running voice interaction service"); + return; + } + mImpl.setDebugHotwordLoggingLocked(logging); + } + } + @Override public void showSession(Bundle args, int flags) { synchronized (this) { diff --git a/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerServiceImpl.java b/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerServiceImpl.java index cbcbf52c2c9c..558a9ac9298e 100644 --- a/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerServiceImpl.java +++ b/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerServiceImpl.java @@ -79,8 +79,7 @@ import java.util.List; class VoiceInteractionManagerServiceImpl implements VoiceInteractionSessionConnection.Callback { final static String TAG = "VoiceInteractionServiceManager"; - // TODO (b/177502877): Set the Debug flag to false before shipping. - static final boolean DEBUG = true; + static final boolean DEBUG = false; final static String CLOSE_REASON_VOICE_INTERACTION = "voiceinteraction"; @@ -420,9 +419,7 @@ class VoiceInteractionManagerServiceImpl implements VoiceInteractionSessionConne @Nullable PersistableBundle options, @Nullable SharedMemory sharedMemory, IHotwordRecognitionStatusCallback callback) { - if (DEBUG) { - Slog.d(TAG, "updateStateLocked"); - } + Slog.v(TAG, "updateStateLocked"); if (mHotwordDetectionComponentName == null) { Slog.w(TAG, "Hotword detection service name not found"); throw new IllegalStateException("Hotword detection service name not found"); @@ -584,6 +581,14 @@ class VoiceInteractionManagerServiceImpl implements VoiceInteractionSessionConne mHotwordDetectionConnection.forceRestart(); } + void setDebugHotwordLoggingLocked(boolean logging) { + if (mHotwordDetectionConnection == null) { + Slog.w(TAG, "Failed to set temporary debug logging: no hotword detection active"); + return; + } + mHotwordDetectionConnection.setDebugHotwordLoggingLocked(logging); + } + void resetHotwordDetectionConnectionLocked() { if (DEBUG) { Slog.d(TAG, "resetHotwordDetectionConnectionLocked"); diff --git a/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerServiceShellCommand.java b/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerServiceShellCommand.java index cdd8f7b91d9d..9bdf4e418a52 100644 --- a/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerServiceShellCommand.java +++ b/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerServiceShellCommand.java @@ -56,6 +56,8 @@ final class VoiceInteractionManagerServiceShellCommand extends ShellCommand { return requestDisable(pw); case "restart-detection": return requestRestartDetection(pw); + case "set-debug-hotword-logging": + return setDebugHotwordLogging(pw); default: return handleDefaultCommands(cmd); } @@ -76,9 +78,14 @@ final class VoiceInteractionManagerServiceShellCommand extends ShellCommand { pw.println(""); pw.println(" disable [true|false]"); pw.println(" Temporarily disable (when true) service"); + pw.println(""); pw.println(" restart-detection"); pw.println(" Force a restart of a hotword detection service"); pw.println(""); + pw.println(" set-debug-hotword-logging [true|false]"); + pw.println(" Temporarily enable or disable debug logging for hotword result."); + pw.println(" The debug logging will be reset after one hour from last enable."); + pw.println(""); } } @@ -157,6 +164,17 @@ final class VoiceInteractionManagerServiceShellCommand extends ShellCommand { return 0; } + private int setDebugHotwordLogging(PrintWriter pw) { + boolean logging = Boolean.parseBoolean(getNextArgRequired()); + Slog.i(TAG, "setDebugHotwordLogging(): " + logging); + try { + mService.setDebugHotwordLogging(logging); + } catch (Exception e) { + return handleError(pw, "setDebugHotwordLogging()", e); + } + return 0; + } + private static int handleError(PrintWriter pw, String message, Exception e) { Slog.e(TAG, "error calling " + message, e); pw.printf("Error calling %s: %s\n", message, e); diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index f01519f934f3..72ad23b8edb1 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -3538,7 +3538,7 @@ public class CarrierConfigManager { "nr_advanced_capable_pco_id_int"; /** - * This configuration allows the framework to use user data communication to detect RRC state, + * This configuration allows the framework to use user data communication to detect Idle state, * and this is used on the 5G icon. * * There is a new way for for RRC state detection at Android 12. If @@ -3546,16 +3546,23 @@ public class CarrierConfigManager { * {@link TelephonyManager#CAPABILITY_PHYSICAL_CHANNEL_CONFIG_1_6_SUPPORTED}) returns true, * then framework can use PHYSICAL_CHANNEL_CONFIG for RRC state detection. Based on this * condition, some carriers want to use the legacy behavior that way is using user data - * communication to detect the RRC state. Therefore, this configuration allows the framework - * to use user data communication to detect RRC state. + * communication to detect the Idle state. Therefore, this configuration allows the framework + * to use user data communication to detect Idle state. * - * The precondition is + * There are 3 situations reflects the carrier define Idle state. + * 1. using PHYSICAL_CHANNEL_CONFIG to detect RRC Idle + * 2. using all of data connections to detect RRC Idle. + * 3. using data communication(consider internet data connection only) to detect data Idle. + * + * How to setup for above 3 cases? + * For below part, we call the condition#1 is device support * {@link android.telephony.TelephonyManager#isRadioInterfaceCapabilitySupported}( - * {@link TelephonyManager#CAPABILITY_PHYSICAL_CHANNEL_CONFIG_1_6_SUPPORTED}) returns true, - * otherwise this config is not working. - * If this is true, framework uses the user data communication for RRC state detection. - * If this is false, framework uses the PHYSICAL_CHANNEL_CONFIG for RRC state detection. + * {@link TelephonyManager#CAPABILITY_PHYSICAL_CHANNEL_CONFIG_1_6_SUPPORTED}). + * The condition#2 is carrier enable the KEY_LTE_ENDC_USING_USER_DATA_FOR_RRC_DETECTION_BOOL. * + * For case#1, the condition#1 is true and the condition#2 is false. + * For case#2, the condition#1 is false and the condition#2 is false. + * For case#3, the condition#2 is true. * @hide */ public static final String KEY_LTE_ENDC_USING_USER_DATA_FOR_RRC_DETECTION_BOOL = diff --git a/telephony/java/android/telephony/CellSignalStrengthNr.java b/telephony/java/android/telephony/CellSignalStrengthNr.java index 72150ddf8597..6ada32e1a86d 100644 --- a/telephony/java/android/telephony/CellSignalStrengthNr.java +++ b/telephony/java/android/telephony/CellSignalStrengthNr.java @@ -178,7 +178,7 @@ public final class CellSignalStrengthNr extends CellSignalStrength implements Pa mCsiSinr = inRangeOrUnavailable(csiSinr, -23, 23); mCsiCqiTableIndex = inRangeOrUnavailable(csiCqiTableIndex, 1, 3); mCsiCqiReport = csiCqiReport.stream() - .map(cqi -> new Integer(inRangeOrUnavailable(Byte.toUnsignedInt(cqi), 1, 3))) + .map(cqi -> new Integer(inRangeOrUnavailable(Byte.toUnsignedInt(cqi), 0, 15))) .collect(Collectors.toList()); mSsRsrp = inRangeOrUnavailable(ssRsrp, -140, -44); mSsRsrq = inRangeOrUnavailable(ssRsrq, -43, 20); |